Replace rand() implementation - fixes threading lockups

[tpg/acess2.git] / Kernel / debug.c

diff --git a/Kernel/debug.c b/Kernel/debug.c
index 66c2059..ce87d9d 100644 (file)
--- a/Kernel/debug.c
+++ b/Kernel/debug.c
@@ -13,6 +13,8 @@
 #define        GDB_SERIAL_PORT 0x2F8
 #define        DEBUG_MAX_LINE_LEN      256
 
+#define        LOCK_DEBUG_OUTPUT       1
+
 // === IMPORTS ===
 extern void Threads_Dump(void);
 extern void    KernelPanic_SetMode(void);
@@ -32,6 +34,9 @@ void  Debug_Fmt(const char *format, va_list args);
  int   gbGDB_SerialSetup = 0;
  int   gbDebug_IsKPanic = 0;
 volatile int   gbInPutChar = 0;
+#if LOCK_DEBUG_OUTPUT
+tShortSpinlock glDebug_Lock;
+#endif
 
 // === CODE ===
 int putDebugChar(char ch)
@@ -150,6 +155,14 @@ void Debug_Fmt(const char *format, va_list args)
        return ;
 }
 
+void Debug_FmtS(const char *format, ...)
+{
+       va_list args;   
+       va_start(args, format);
+       Debug_Fmt(format, args);
+       va_end(args);
+}
+
 void Debug_KernelPanic()
 {
        gbDebug_IsKPanic = 1;
@@ -163,11 +176,19 @@ void LogF(char *Fmt, ...)
 {
        va_list args;
 
+       #if LOCK_DEBUG_OUTPUT
+       SHORTLOCK(&glDebug_Lock);
+       #endif
+       
        va_start(args, Fmt);
 
        Debug_Fmt(Fmt, args);
 
        va_end(args);
+       
+       #if LOCK_DEBUG_OUTPUT
+       SHORTREL(&glDebug_Lock);
+       #endif
 }
 /**
  * \fn void Debug(char *Msg, ...)
@@ -176,6 +197,10 @@ void LogF(char *Fmt, ...)
 void Debug(char *Fmt, ...)
 {
        va_list args;
+       
+       #if LOCK_DEBUG_OUTPUT
+       SHORTLOCK(&glDebug_Lock);
+       #endif
 
        Debug_Puts(0, "Debug: ");
        va_start(args, Fmt);
@@ -183,6 +208,9 @@ void Debug(char *Fmt, ...)
        va_end(args);
        Debug_PutCharDebug('\r');
        Debug_PutCharDebug('\n');
+       #if LOCK_DEBUG_OUTPUT
+       SHORTREL(&glDebug_Lock);
+       #endif
 }
 /**
  * \fn void Log(char *Msg, ...)
@@ -190,6 +218,10 @@ void Debug(char *Fmt, ...)
 void Log(char *Fmt, ...)
 {
        va_list args;
+       
+       #if LOCK_DEBUG_OUTPUT
+       SHORTLOCK(&glDebug_Lock);
+       #endif
 
        Debug_Puts(1, "Log: ");
        va_start(args, Fmt);
@@ -197,21 +229,39 @@ void Log(char *Fmt, ...)
        va_end(args);
        Debug_Putchar('\r');
        Debug_Putchar('\n');
+       
+       #if LOCK_DEBUG_OUTPUT
+       SHORTREL(&glDebug_Lock);
+       #endif
 }
 void Warning(char *Fmt, ...)
 {
        va_list args;
+       
+       #if LOCK_DEBUG_OUTPUT
+       SHORTLOCK(&glDebug_Lock);
+       #endif
+       
        Debug_Puts(1, "Warning: ");
        va_start(args, Fmt);
        Debug_Fmt(Fmt, args);
        va_end(args);
        Debug_Putchar('\r');
        Debug_Putchar('\n');
+       
+       #if LOCK_DEBUG_OUTPUT
+       SHORTREL(&glDebug_Lock);
+       #endif
 }
 void Panic(char *Fmt, ...)
 {
        va_list args;
        
+       #if LOCK_DEBUG_OUTPUT
+       SHORTLOCK(&glDebug_Lock);
+       #endif
+       // And never SHORTREL
+       
        Debug_KernelPanic();
        
        Debug_Puts(1, "Panic: ");
@@ -245,14 +295,23 @@ void Debug_SetKTerminal(char *File)
 void Debug_Enter(char *FuncName, char *ArgTypes, ...)
 {
        va_list args;
-        int    i = gDebug_Level ++;
+        int    i;
         int    pos;
+       tTID    tid = Threads_GetTID();
+        
+       #if LOCK_DEBUG_OUTPUT
+       SHORTLOCK(&glDebug_Lock);
+       #endif
+
+       i = gDebug_Level ++;
 
        va_start(args, ArgTypes);
 
        while(i--)      Debug_Putchar(' ');
 
-       Debug_Puts(1, FuncName);        Debug_Puts(1, ": (");
+       Debug_Puts(1, FuncName);
+       Debug_FmtS("[%i]", tid);
+       Debug_Puts(1, ": (");
 
        while(*ArgTypes)
        {
@@ -284,29 +343,51 @@ void Debug_Enter(char *FuncName, char *ArgTypes, ...)
 
        va_end(args);
        Debug_Putchar(')');     Debug_Putchar('\r');    Debug_Putchar('\n');
+       
+       #if LOCK_DEBUG_OUTPUT
+       SHORTREL(&glDebug_Lock);
+       #endif
 }
 
 void Debug_Log(char *FuncName, char *Fmt, ...)
 {
        va_list args;
         int    i = gDebug_Level;
+       tTID    tid = Threads_GetTID();
+
+       #if LOCK_DEBUG_OUTPUT
+       SHORTLOCK(&glDebug_Lock);
+       #endif
 
        va_start(args, Fmt);
 
        while(i--)      Debug_Putchar(' ');
 
-       Debug_Puts(1, FuncName);        Debug_Puts(1, ": ");
+       Debug_Puts(1, FuncName);
+       Debug_FmtS("[%i]", tid);
+       Debug_Puts(1, ": ");
        Debug_Fmt(Fmt, args);
 
        va_end(args);
        Debug_Putchar('\r');
        Debug_Putchar('\n');
+       
+       #if LOCK_DEBUG_OUTPUT
+       SHORTREL(&glDebug_Lock);
+       #endif
 }
 
 void Debug_Leave(char *FuncName, char RetType, ...)
 {
        va_list args;
-        int    i = --gDebug_Level;
+        int    i;
+       tTID    tid = Threads_GetTID();
+
+       #if LOCK_DEBUG_OUTPUT
+       SHORTLOCK(&glDebug_Lock);
+       #endif
+       
+       i = --gDebug_Level;
 
        va_start(args, RetType);
 
@@ -317,12 +398,17 @@ void Debug_Leave(char *FuncName, char RetType, ...)
        // Indenting
        while(i--)      Debug_Putchar(' ');
 
-       Debug_Puts(1, FuncName);        Debug_Puts(1, ": RETURN");
+       Debug_Puts(1, FuncName);
+       Debug_FmtS("(%i)", tid);
+       Debug_Puts(1, ": RETURN");
 
        // No Return
        if(RetType == '-') {
                Debug_Putchar('\r');
                Debug_Putchar('\n');
+               #if LOCK_DEBUG_OUTPUT
+               SHORTREL(&glDebug_Lock);
+               #endif
                return;
        }
 
@@ -342,6 +428,10 @@ void Debug_Leave(char *FuncName, char RetType, ...)
        Debug_Putchar('\n');
 
        va_end(args);
+       
+       #if LOCK_DEBUG_OUTPUT
+       SHORTREL(&glDebug_Lock);
+       #endif
 }
 
 void Debug_HexDump(char *Header, void *Data, Uint Length)
@@ -351,9 +441,10 @@ void Debug_HexDump(char *Header, void *Data, Uint Length)
        Debug_Puts(1, Header);
        LogF(" (Hexdump of %p)\r\n", Data);
 
+       #define CH(n)   ((' '<=cdat[(n)]&&cdat[(n)]<=0x7F) ? cdat[(n)] : '.')
+
        while(Length >= 16)
        {
-               #define CH(n)   ((' '<=cdat[(n)]&&cdat[(n)]<=0x7F) ? cdat[(n)] : '.')
                Log("%04x: %02x %02x %02x %02x %02x %02x %02x %02x"
                        " %02x %02x %02x %02x %02x %02x %02x %02x"
                        "  %c%c%c%c%c%c%c%c %c%c%c%c%c%c%c%c",
@@ -368,14 +459,22 @@ void Debug_HexDump(char *Header, void *Data, Uint Length)
                pos += 16;
        }
 
-       LogF("Log: %04x: ", pos);
-       while(Length)
        {
-               Uint    byte = *cdat;
-               LogF("%02x ", byte);
-               Length--;
-               cdat ++;
+                int    i ;
+               LogF("Log: %04x: ", pos);
+               for(i = 0; i < Length; i ++)
+               {
+                       LogF("%02x ", cdat[i]);
+               }
+               for( ; i < 16; i ++)    LogF("   ");
+               LogF(" ");
+               for(i = 0; i < Length; i ++)
+               {
+                       if( i == 8 )    LogF(" ");
+                       LogF("%c", CH(i));
+               }
        }
+       
        Debug_Putchar('\r');
        Debug_Putchar('\n');
 }