X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Flib%2Flog.qh;h=f33202f939ddaf975aa785b3fdd924372d6e1d11;hb=4236e2043e99c1c24d29dfb7c9bbe9ef0d44838d;hp=68c974dc31adc66faf5728c455fbaed42f8f1d1b;hpb=e0e847a336cdb7ab1fcb93d3cf3e1402b761a726;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/lib/log.qh b/qcsrc/lib/log.qh index 68c974dc3..f33202f93 100644 --- a/qcsrc/lib/log.qh +++ b/qcsrc/lib/log.qh @@ -2,111 +2,131 @@ #include "progname.qh" -#define assert(expr, ...) _assert(LOG_SEVERE, expr, __VA_ARGS__) -#define devassert(...) MACRO_BEGIN if (autocvar_developer) assert(__VA_ARGS__); MACRO_END +void print_assertfailed_severe(string expr); +void print_assertfailed_fatal(string expr); + +#define assert(expr, ...) _assert(print_assertfailed_severe, expr, __VA_ARGS__) +#define devassert(...) MACRO_BEGIN if (autocvar_developer > 0) assert(__VA_ARGS__); MACRO_END #define assert_once(expr, ...) \ - MACRO_BEGIN { \ + MACRO_BEGIN \ static bool __once; \ if (!__once) \ { \ assert(expr, __VA_ARGS__); \ __once = true; \ } \ - } MACRO_END -#define devassert_once(...) MACRO_BEGIN if (autocvar_developer) assert_once(__VA_ARGS__); MACRO_END + MACRO_END +#define devassert_once(...) MACRO_BEGIN if (autocvar_developer > 0) assert_once(__VA_ARGS__); MACRO_END -#define demand(expr, ...) _assert(LOG_FATAL, expr, __VA_ARGS__) -#define devdemand(...) MACRO_BEGIN if (autocvar_developer) demand(__VA_ARGS__); MACRO_END +#define demand(expr, ...) _assert(print_assertfailed_fatal, expr, __VA_ARGS__) +#define devdemand(...) MACRO_BEGIN if (autocvar_developer > 0) demand(__VA_ARGS__); MACRO_END #define _assert(f, expr, then) \ MACRO_BEGIN \ - { \ if (!(expr)) \ { \ - f("assertion failed: `" #expr "`\n"); \ + f(#expr); \ then; \ } \ - } MACRO_END + MACRO_END #define ASSERT_LESS(name, var, const) noref int name[(const - var + 1)]; #if defined(MENUQC) -string(string...) strcat0n = #53; +string(string, string...) strcat1n = #53; +#else +string(string, string...) strcat1n = #115; +#endif + +// would be nice if __FUNC__ could be concatenated at compile time +#if 0 + // less work, bigger binary + #define __SOURCELOC__ (sprintf("^7%s^9(^9"__FILE__"^7:^9"STR(__LINE__)"^7)", __FUNC__)) #else -string(string...) strcat0n = #115; + #define __SOURCELOC__ (sprintf("^7%s^9(^9%s^7:^9%s^7)", __FUNC__, __FILE__, STR(__LINE__))) #endif +#define _LOG_HEADER(level) "^9[::^7"PROGNAME"^9::"level"^9] ", __SOURCELOC__ #define _LOG(f, level, s) \ - MACRO_BEGIN { \ - f(sprintf("^9[::^7" PROGNAME "^9::" level "^9] [" __FILE__ "^7:^9%s^7:^9" STR(__LINE__) "] \n^7%s\n", __FUNC__, s)); \ - } MACRO_END + MACRO_BEGIN \ + if (autocvar_developer > 0) f(strcat1n(_LOG_HEADER(level), "\n")); \ + f(strcat1n("^7", s, "\n")); \ + MACRO_END -#define LOG_FATAL(...) _LOG_FATAL(strcat0n(__VA_ARGS__)) +#define LOG_FATAL(...) _LOG_FATAL(strcat1n(__VA_ARGS__)) #define LOG_FATALF(...) _LOG_FATAL(sprintf(__VA_ARGS__)) #define _LOG_FATAL(s) _LOG(error, "^1FATAL", s) -#define LOG_SEVERE(...) _LOG_SEVERE(strcat0n(__VA_ARGS__)) +#define LOG_SEVERE(...) _LOG_SEVERE(strcat1n(__VA_ARGS__)) #define LOG_SEVEREF(...) _LOG_SEVERE(sprintf(__VA_ARGS__)) #define _LOG_SEVERE(s) _LOG(backtrace, "^1SEVERE", s) -#define LOG_WARNING(...) _LOG_WARNING(strcat0n(__VA_ARGS__)) -#define LOG_WARNINGF(...) _LOG_WARNING(sprintf(__VA_ARGS__)) -#define _LOG_WARNING(s) _LOG(print, "^3WARNING", s) +#define LOG_WARN(...) _LOG_WARN(strcat1n(__VA_ARGS__)) +#define LOG_WARNF(...) _LOG_WARN(sprintf(__VA_ARGS__)) +#define _LOG_WARN(s) _LOG(print, "^3WARNING", s) -#define LOG_INFO(...) _LOG_INFO(strcat0n(__VA_ARGS__)) +#define LOG_INFO(...) _LOG_INFO(strcat1n(__VA_ARGS__)) #define LOG_INFOF(...) _LOG_INFO(sprintf(__VA_ARGS__)) #define _LOG_INFO(s) \ - MACRO_BEGIN { \ - string ___s = s; \ - if (autocvar_developer) \ - _LOG(print, "^5INFO", ___s); \ - else \ - print(___s); \ - } MACRO_END - -#define LOG_TRACE(...) _LOG_TRACE(strcat0n(__VA_ARGS__)) + MACRO_BEGIN \ + if (autocvar_developer > 1) dprint(strcat1n(_LOG_HEADER("^5INFO"), "\n")); \ + string __s = s; \ + print("^7", __s); \ + /* TODO: unconditionally add a newline when possible */ \ + if (str2chr(__s, strlen(__s) - 1) != '\n') { print("\n"); } \ + MACRO_END + +#define LOG_TRACE(...) _LOG_TRACE(strcat1n(__VA_ARGS__)) #define LOG_TRACEF(...) _LOG_TRACE(sprintf(__VA_ARGS__)) #define _LOG_TRACE(s) _LOG(dprint, "^6TRACE", s) -#define LOG_DEBUG(...) _LOG_DEBUG(strcat0n(__VA_ARGS__)) +#define LOG_DEBUG(...) _LOG_DEBUG(strcat1n(__VA_ARGS__)) #define LOG_DEBUGF(...) _LOG_DEBUG(sprintf(__VA_ARGS__)) #define _LOG_DEBUG(s) _LOG(dprint2, "^2DEBUG", s) #define dprint2(msg) \ - MACRO_BEGIN { \ + MACRO_BEGIN \ if (autocvar_developer > 1) dprint(msg); \ - } MACRO_END + MACRO_END + +// same as LOG_INFO but without any debug information that bloats console output and compiled program files +#define LOG_HELP(...) _LOG_HELP(strcat1n(__VA_ARGS__)) +#define LOG_HELPF(...) _LOG_HELP(sprintf(__VA_ARGS__)) +#define _LOG_HELP(s) \ + MACRO_BEGIN \ + string __s = s; \ + print("^7", __s, (str2chr(__s, strlen(__s) - 1) != '\n') ? "\n" : ""); \ + MACRO_END // TODO: this sucks, lets find a better way to do backtraces? -#ifdef SVQC - void builtin_remove(entity); - #define _backtrace() builtin_remove(NULL) -#else - void remove(entity); - #define _backtrace() remove(NULL) -#endif +#define _backtrace() builtin_remove(NULL) noref int autocvar_developer; noref bool autocvar_prvm_backtraceforwarnings; -#ifdef SVQC -#define bt_cvar_set(cvar, value) builtin_cvar_set(cvar, value) -#else -#define bt_cvar_set(cvar, value) cvar_set(cvar, value) -#endif - #define backtrace(msg) \ MACRO_BEGIN \ - { \ int dev = autocvar_developer; \ bool war = autocvar_prvm_backtraceforwarnings; \ - bt_cvar_set("developer", "1"); \ - bt_cvar_set("prvm_backtraceforwarnings", "1"); \ + cvar_set("developer", "1"); \ + cvar_set("prvm_backtraceforwarnings", "1"); \ print("\n--- CUT HERE ---\n", msg); \ _backtrace(); \ print("\n--- CUT UNTIL HERE ---\n"); \ - bt_cvar_set("developer", ftos(dev)); \ - bt_cvar_set("prvm_backtraceforwarnings", ftos(war)); \ - } MACRO_END + cvar_set("developer", ftos(dev)); \ + cvar_set("prvm_backtraceforwarnings", ftos(war)); \ + MACRO_END + +void print_assertfailed_severe(string expr) +{ + // this is inside a function to avoid expanding it on compilation everytime + LOG_SEVERE("assertion failed: `", expr, "`\n"); +} + +void print_assertfailed_fatal(string expr) +{ + // this is inside a function to avoid expanding it on compilation everytime + LOG_FATAL("assertion failed: `", expr, "`\n"); +}