git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Kernel/debug - Enabled vterm traces, removed threads from panic
[tpg/acess2.git]
/
KernelLand
/
Kernel
/
debug.c
diff --git
a/KernelLand/Kernel/debug.c
b/KernelLand/Kernel/debug.c
index
ab3dd67
..
7e8acba
100644
(file)
--- a/
KernelLand/Kernel/debug.c
+++ b/
KernelLand/Kernel/debug.c
@@
-7,10
+7,11
@@
#define DEBUG_MAX_LINE_LEN 256
#define LOCK_DEBUG_OUTPUT 1 // Avoid interleaving of output lines?
#define DEBUG_MAX_LINE_LEN 256
#define LOCK_DEBUG_OUTPUT 1 // Avoid interleaving of output lines?
-#define TRACE_TO_KTERM
0
// Send ENTER/DEBUG/LEAVE to debug?
+#define TRACE_TO_KTERM
1
// Send ENTER/DEBUG/LEAVE to debug?
// === IMPORTS ===
extern void Threads_Dump(void);
// === IMPORTS ===
extern void Threads_Dump(void);
+extern void Heap_Dump(void);
extern void KernelPanic_SetMode(void);
extern void KernelPanic_PutChar(char Ch);
extern void IPStack_SendDebugText(const char *Text);
extern void KernelPanic_SetMode(void);
extern void KernelPanic_PutChar(char Ch);
extern void IPStack_SendDebugText(const char *Text);
@@
-39,7
+40,10
@@
static void Debug_Putchar(char ch)
{
Debug_PutCharDebug(ch);
{
Debug_PutCharDebug(ch);
- if( !gbDebug_IsKPanic )
+ if( gbDebug_IsKPanic )
+ KernelPanic_PutChar(ch);
+
+ if( gbDebug_IsKPanic < 2 )
{
if(gbInPutChar) return ;
gbInPutChar = 1;
{
if(gbInPutChar) return ;
gbInPutChar = 1;
@@
-47,8
+51,6
@@
static void Debug_Putchar(char ch)
VFS_Write(giDebug_KTerm, 1, &ch);
gbInPutChar = 0;
}
VFS_Write(giDebug_KTerm, 1, &ch);
gbInPutChar = 0;
}
- else
- KernelPanic_PutChar(ch);
if( gbSendNetworkDebug )
{
if( gbSendNetworkDebug )
{
@@
-75,7
+77,7
@@
static void Debug_Puts(int UseKTerm, const char *Str)
IPStack_SendDebugText(Str);
// Output to the kernel terminal
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;
{
if(gbInPutChar) return ;
gbInPutChar = 1;
@@
-111,10
+113,17
@@
void Debug_FmtS(int bUseKTerm, const char *format, ...)
void Debug_KernelPanic(void)
{
void Debug_KernelPanic(void)
{
- #if LOCK_DEBUG_OUTPUT
- SHORTREL(&glDebug_Lock);
- #endif
- gbDebug_IsKPanic = 1;
+ if( !gbDebug_IsKPanic )
+ {
+ #if LOCK_DEBUG_OUTPUT
+ SHORTREL(&glDebug_Lock);
+ #endif
+ VT_SetTerminal(7);
+ }
+ // 5 nested panics? Fuck it
+ if( gbDebug_IsKPanic > 5 )
+ for(;;);
+ gbDebug_IsKPanic ++;
KernelPanic_SetMode();
}
KernelPanic_SetMode();
}
@@
-149,7
+158,7
@@
void Debug(const char *Fmt, ...)
va_list args;
#if LOCK_DEBUG_OUTPUT
va_list args;
#if LOCK_DEBUG_OUTPUT
- SHORTLOCK(&glDebug_Lock);
+
if(!CPU_HAS_LOCK(&glDebug_Lock))
SHORTLOCK(&glDebug_Lock);
#endif
Debug_Puts(0, "Debug: ");
#endif
Debug_Puts(0, "Debug: ");
@@
-162,27
+171,47
@@
void Debug(const char *Fmt, ...)
SHORTREL(&glDebug_Lock);
#endif
}
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
+ 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
SHORTLOCK(&glDebug_Lock);
#endif
Debug_Puts(1, "Log: ");
#if LOCK_DEBUG_OUTPUT
SHORTLOCK(&glDebug_Lock);
#endif
Debug_Puts(1, "Log: ");
- va_start(args, Fmt);
Debug_Fmt(1, Fmt, args);
Debug_Fmt(1, Fmt, args);
- va_end(args);
Debug_Puts(1, "\r\n");
#if LOCK_DEBUG_OUTPUT
SHORTREL(&glDebug_Lock);
#endif
}
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;
void Warning(const char *Fmt, ...)
{
va_list args;
@@
-207,7
+236,8
@@
void Panic(const char *Fmt, ...)
va_list args;
#if LOCK_DEBUG_OUTPUT
va_list args;
#if LOCK_DEBUG_OUTPUT
- SHORTLOCK(&glDebug_Lock);
+ if( !CPU_HAS_LOCK(&glDebug_Lock) )
+ SHORTLOCK(&glDebug_Lock);
#endif
// And never SHORTREL
#endif
// And never SHORTREL
@@
-220,8
+250,8
@@
void Panic(const char *Fmt, ...)
Debug_Putchar('\r');
Debug_Putchar('\n');
Debug_Putchar('\r');
Debug_Putchar('\n');
- Threads_Dump();
- Heap_Dump();
+
//
Threads_Dump();
+
//
Heap_Dump();
for(;;) ;
}
for(;;) ;
}
UCC
git Repository :: git.ucc.asn.au