#define LOGHDR(col,type) fprintf(stderr, "\e["col"m[%-8.8s]"type"%2i ", Ident, Threads_GetTID())
#define LOGTAIL() fprintf(stderr, "\e[0m\n")
-#define PUTERR(col,type) {\
+#define LOG_LOCK_ACQUIRE() do{ \
if(!gbThreadInLog) SHORTLOCK(&glDebugLock); \
gbThreadInLog ++; \
+}while(0)
+#define LOG_LOCK_RELEASE() do {\
+ gbThreadInLog --; \
+ if(!gbThreadInLog) SHORTREL(&glDebugLock); \
+} while(0)
+
+#define PUTERR(col,type) {\
+ LOG_LOCK_ACQUIRE(); \
LOGHDR(col,type);\
va_list args; va_start(args, Message);\
vfprintf(stderr, Message, args);\
va_end(args);\
LOGTAIL();\
- gbThreadInLog --; \
- if(!gbThreadInLog) SHORTREL(&glDebugLock); \
+ LOG_LOCK_RELEASE(); \
}
// === GLOBALS ===
const char *Ident = "";
PUTERR("37", "L")
}
+void Debug(const char *Message, ...) {
+ const char *Ident = "";
+ PUTERR("38", "D")
+}
void Debug_HexDump(const char *Prefix, const void *Data, size_t Length)
{
const uint8_t *data = Data;
size_t ofs;
+ LOG_LOCK_ACQUIRE();
fprintf(stderr, "[HexDump ]d %s: %i bytes\n", Prefix, (int)Length);
for( ofs = 0; ofs + 16 <= Length; ofs += 16 )
{
fprintf(stderr, " %02x", data[ofs%16]);
}
fprintf(stderr, "\n");
+ LOG_LOCK_RELEASE();
}
int giDebug_TraceLevel = 0;
void Debug_TraceEnter(const char *Function, const char *Format, ...)
{
- const char *Ident = "Trace";
- LOGHDR("37","T");
+ LOG_LOCK_ACQUIRE();
+ //const char *Ident = "Trace";
+ //LOGHDR("37","T");
for( int i = 0; i < giDebug_TraceLevel; i ++ )
fprintf(stderr, " ");
fprintf(stderr, "%s: (", Function);
fprintf(stderr, ")");
LOGTAIL();
giDebug_TraceLevel ++;
+ LOG_LOCK_RELEASE();
}
void Debug_TraceLog(const char *Function, const char *Format, ...)
{
- const char *Ident = "Trace";
- LOGHDR("37","T");
+ LOG_LOCK_ACQUIRE();
+ //const char *Ident = "Trace";
+ //LOGHDR("37","T");
for( int i = 0; i < giDebug_TraceLevel; i ++ )
fprintf(stderr, " ");
va_end(args);
LOGTAIL();
+ LOG_LOCK_RELEASE();
}
void Debug_TraceLeave(const char *Function, char Type, ...)
Log_Error("Debug", "Function %s called LEAVE without ENTER", Function);
}
- const char *Ident = "Trace";
- LOGHDR("37","T");
+ LOG_LOCK_ACQUIRE();
+ //const char *Ident = "Trace";
+ //LOGHDR("37","T");
va_list args;
va_start(args, Type);
va_end(args);
LOGTAIL();
+ LOG_LOCK_RELEASE();
}