X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fdebug.c;h=d0de25abc389255c4ab9378bd57321d4d57b6a4f;hb=48f6d3ace33f15e2c46fb4c7a79f1f647e446e33;hp=25ffda1912e37d09958953308b8490d674d316d1;hpb=934d0f535e1929fd90ae0606e77794484aa55284;p=tpg%2Facess2.git diff --git a/KernelLand/Kernel/debug.c b/KernelLand/Kernel/debug.c index 25ffda19..d0de25ab 100644 --- a/KernelLand/Kernel/debug.c +++ b/KernelLand/Kernel/debug.c @@ -1,22 +1,20 @@ /* * AcessOS Microkernel Version * debug.c - * - * TODO: Move the Debug_putchar methods out to the arch/ tree */ #include #include +#include #define DEBUG_MAX_LINE_LEN 256 - -#define LOCK_DEBUG_OUTPUT 0 - -#define TRACE_TO_KTERM 0 +#define LOCK_DEBUG_OUTPUT 1 // Avoid interleaving of output lines? +#define TRACE_TO_KTERM 0 // Send ENTER/DEBUG/LEAVE to debug? // === IMPORTS === -extern void Threads_Dump(void); extern void KernelPanic_SetMode(void); extern void KernelPanic_PutChar(char Ch); +extern void IPStack_SendDebugText(const char *Text); +extern void VT_SetTerminal(int TerminalID); // === PROTOTYPES === static void Debug_Putchar(char ch); @@ -34,12 +32,18 @@ volatile int gbInPutChar = 0; #if LOCK_DEBUG_OUTPUT tShortSpinlock glDebug_Lock; #endif +// - Disabled because it breaks shit + int gbSendNetworkDebug = 0; // === CODE === static void Debug_Putchar(char ch) { Debug_PutCharDebug(ch); - if( !gbDebug_IsKPanic ) + + if( gbDebug_IsKPanic ) + KernelPanic_PutChar(ch); + + if( gbDebug_IsKPanic < 2 ) { if(gbInPutChar) return ; gbInPutChar = 1; @@ -47,8 +51,12 @@ static void Debug_Putchar(char ch) VFS_Write(giDebug_KTerm, 1, &ch); gbInPutChar = 0; } - else - KernelPanic_PutChar(ch); + + if( gbSendNetworkDebug ) + { + char str[2] = {ch, 0}; + IPStack_SendDebugText(str); + } } static void Debug_Puts(int UseKTerm, const char *Str) @@ -64,9 +72,12 @@ static void Debug_Puts(int UseKTerm, const char *Str) } else for( len = 0; Str[len]; len ++ ); - + + if( gbSendNetworkDebug ) + IPStack_SendDebugText(Str); + // Output to the kernel terminal - if( UseKTerm && !gbDebug_IsKPanic && giDebug_KTerm != -1) + if( UseKTerm && gbDebug_IsKPanic < 2 && giDebug_KTerm != -1) { if(gbInPutChar) return ; gbInPutChar = 1; @@ -83,12 +94,13 @@ void Debug_DbgOnlyFmt(const char *format, va_list args) void Debug_Fmt(int bUseKTerm, const char *format, va_list args) { char buf[DEBUG_MAX_LINE_LEN]; - int len; buf[DEBUG_MAX_LINE_LEN-1] = 0; - len = vsnprintf(buf, DEBUG_MAX_LINE_LEN-1, format, args); - //if( len < DEBUG_MAX_LINE ) - // do something + int len = vsnprintf(buf, DEBUG_MAX_LINE_LEN-1, format, args); Debug_Puts(bUseKTerm, buf); + if( len > DEBUG_MAX_LINE_LEN-1 ) { + // do something + Debug_Puts(bUseKTerm, "[...]"); + } return ; } @@ -102,10 +114,17 @@ void Debug_FmtS(int bUseKTerm, const char *format, ...) void Debug_KernelPanic(void) { - #if LOCK_DEBUG_OUTPUT - SHORTREL(&glDebug_Lock); - #endif - gbDebug_IsKPanic = 1; + // 5 nested panics? Fuck it + if( gbDebug_IsKPanic > 5 ) + HALT_CPU(); + gbDebug_IsKPanic ++; + if( gbDebug_IsKPanic == 1 ) + { + #if LOCK_DEBUG_OUTPUT + SHORTREL(&glDebug_Lock); + #endif + VT_SetTerminal(7); + } KernelPanic_SetMode(); } @@ -118,6 +137,7 @@ void LogF(const char *Fmt, ...) va_list args; #if LOCK_DEBUG_OUTPUT + if(CPU_HAS_LOCK(&glDebug_Lock)) return ; SHORTLOCK(&glDebug_Lock); #endif @@ -140,6 +160,7 @@ void Debug(const char *Fmt, ...) va_list args; #if LOCK_DEBUG_OUTPUT + if(CPU_HAS_LOCK(&glDebug_Lock)) return ; SHORTLOCK(&glDebug_Lock); #endif @@ -153,32 +174,55 @@ void Debug(const char *Fmt, ...) SHORTREL(&glDebug_Lock); #endif } -/** - * \fn void Log(const char *Msg, ...) - */ -void Log(const char *Fmt, ...) + + +void LogFV(const char *Fmt, va_list args) { - va_list args; + #if LOCK_DEBUG_OUTPUT + if(CPU_HAS_LOCK(&glDebug_Lock)) return ; + SHORTLOCK(&glDebug_Lock); + #endif + + Debug_Fmt(1, Fmt, args); #if LOCK_DEBUG_OUTPUT + SHORTREL(&glDebug_Lock); + #endif +} + +void LogV(const char *Fmt, va_list args) +{ + #if LOCK_DEBUG_OUTPUT + if(CPU_HAS_LOCK(&glDebug_Lock)) return ; SHORTLOCK(&glDebug_Lock); #endif Debug_Puts(1, "Log: "); - va_start(args, Fmt); Debug_Fmt(1, Fmt, args); - va_end(args); Debug_Puts(1, "\r\n"); #if LOCK_DEBUG_OUTPUT SHORTREL(&glDebug_Lock); #endif } + +/** + * \fn void Log(const char *Msg, ...) + */ +void Log(const char *Fmt, ...) +{ + va_list args; + va_start(args, Fmt); + LogV(Fmt, args); + va_end(args); +} + void Warning(const char *Fmt, ...) { va_list args; #if LOCK_DEBUG_OUTPUT + if(CPU_HAS_LOCK(&glDebug_Lock)) return ; SHORTLOCK(&glDebug_Lock); #endif @@ -198,7 +242,8 @@ void Panic(const char *Fmt, ...) va_list args; #if LOCK_DEBUG_OUTPUT - SHORTLOCK(&glDebug_Lock); + if( !CPU_HAS_LOCK(&glDebug_Lock) ) + SHORTLOCK(&glDebug_Lock); #endif // And never SHORTREL @@ -211,9 +256,11 @@ void Panic(const char *Fmt, ...) Debug_Putchar('\r'); Debug_Putchar('\n'); - Threads_Dump(); + Proc_PrintBacktrace(); + //Threads_Dump(); + //Heap_Dump(); - for(;;) ; + HALT_CPU(); } void Debug_SetKTerminal(const char *File) @@ -238,6 +285,7 @@ void Debug_Enter(const char *FuncName, const char *ArgTypes, ...) tTID tid = Threads_GetTID(); #if LOCK_DEBUG_OUTPUT + if(CPU_HAS_LOCK(&glDebug_Lock)) return ; SHORTLOCK(&glDebug_Lock); #endif @@ -298,6 +346,7 @@ void Debug_Log(const char *FuncName, const char *Fmt, ...) tTID tid = Threads_GetTID(); #if LOCK_DEBUG_OUTPUT + if(CPU_HAS_LOCK(&glDebug_Lock)) return ; SHORTLOCK(&glDebug_Lock); #endif @@ -326,6 +375,7 @@ void Debug_Leave(const char *FuncName, char RetType, ...) tTID tid = Threads_GetTID(); #if LOCK_DEBUG_OUTPUT + if(CPU_HAS_LOCK(&glDebug_Lock)) return ; SHORTLOCK(&glDebug_Lock); #endif @@ -375,7 +425,7 @@ void Debug_Leave(const char *FuncName, char RetType, ...) #endif } -void Debug_HexDump(const char *Header, const void *Data, Uint Length) +void Debug_HexDump(const char *Header, const void *Data, size_t Length) { const Uint8 *cdat = Data; Uint pos = 0;