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
Modules/UDI - Implimenting UDI support, can load udi_dpt from udiref
[tpg/acess2.git]
/
KernelLand
/
Kernel
/
debug.c
diff --git
a/KernelLand/Kernel/debug.c
b/KernelLand/Kernel/debug.c
index
1cea00c
..
a378ae8
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);
@@
-93,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];
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;
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);
Debug_Puts(bUseKTerm, buf);
+ if( len > DEBUG_MAX_LINE_LEN-1 ) {
+ // do something
+ Debug_Puts(bUseKTerm, "[...]");
+ }
return ;
}
return ;
}
@@
-112,9
+114,16
@@
void Debug_FmtS(int bUseKTerm, const char *format, ...)
void Debug_KernelPanic(void)
{
void Debug_KernelPanic(void)
{
- #if LOCK_DEBUG_OUTPUT
- SHORTREL(&glDebug_Lock);
- #endif
+ 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();
}
gbDebug_IsKPanic ++;
KernelPanic_SetMode();
}
@@
-242,8
+251,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