X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fdebug.c;h=5bcbcb8e03917701eb93ce43c59cba2122ecd1d7;hb=9c05263776f7fc01de6a3247f9d5f88ed58a9ddc;hp=2444cb1604fc568c4f12be8905fe5b1684c1a6a0;hpb=45ff232a1db704623e0c4baed011d12cbd44b06e;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/debug.c b/KernelLand/Kernel/debug.c
index 2444cb16..5bcbcb8e 100644
--- a/KernelLand/Kernel/debug.c
+++ b/KernelLand/Kernel/debug.c
@@ -7,7 +7,7 @@
 
 #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  	0	// Send ENTER/DEBUG/LEAVE to debug?
 
 // === IMPORTS ===
 extern void	Threads_Dump(void);
@@ -94,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 ;
 }
 
@@ -113,14 +114,17 @@ void Debug_FmtS(int bUseKTerm, const char *format, ...)
 
 void Debug_KernelPanic(void)
 {
-	if( !gbDebug_IsKPanic )
+	// 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);
 	}
-	gbDebug_IsKPanic ++;
 	KernelPanic_SetMode();
 }
 
@@ -133,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
 	
@@ -155,7 +160,8 @@ void Debug(const char *Fmt, ...)
 	va_list	args;
 	
 	#if LOCK_DEBUG_OUTPUT
-	if(!CPU_HAS_LOCK(&glDebug_Lock)) SHORTLOCK(&glDebug_Lock);
+	if(CPU_HAS_LOCK(&glDebug_Lock))	return ;
+	SHORTLOCK(&glDebug_Lock);
 	#endif
 
 	Debug_Puts(0, "Debug: ");
@@ -173,6 +179,7 @@ void Debug(const char *Fmt, ...)
 void LogFV(const char *Fmt, va_list args)
 {
 	#if LOCK_DEBUG_OUTPUT
+	if(CPU_HAS_LOCK(&glDebug_Lock))	return ;
 	SHORTLOCK(&glDebug_Lock);
 	#endif
 
@@ -186,6 +193,7 @@ void LogFV(const char *Fmt, va_list args)
 void LogV(const char *Fmt, va_list args)
 {
 	#if LOCK_DEBUG_OUTPUT
+	if(CPU_HAS_LOCK(&glDebug_Lock))	return ;
 	SHORTLOCK(&glDebug_Lock);
 	#endif
 
@@ -214,6 +222,7 @@ void Warning(const char *Fmt, ...)
 	va_list	args;
 	
 	#if LOCK_DEBUG_OUTPUT
+	if(CPU_HAS_LOCK(&glDebug_Lock))	return ;
 	SHORTLOCK(&glDebug_Lock);
 	#endif
 	
@@ -247,10 +256,11 @@ void Panic(const char *Fmt, ...)
 	Debug_Putchar('\r');
 	Debug_Putchar('\n');
 
-	Threads_Dump();
-	Heap_Dump();
+	Proc_PrintBacktrace();
+	//Threads_Dump();
+	//Heap_Dump();
 
-	for(;;)	;
+	HALT_CPU();
 }
 
 void Debug_SetKTerminal(const char *File)
@@ -275,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
 
@@ -335,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
 
@@ -363,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