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
Merge pull request #1 from berkus/patch-1
[tpg/acess2.git]
/
KernelLand
/
Kernel
/
debug.c
diff --git
a/KernelLand/Kernel/debug.c
b/KernelLand/Kernel/debug.c
index
9edf126
..
f0d21fa
100644
(file)
--- a/
KernelLand/Kernel/debug.c
+++ b/
KernelLand/Kernel/debug.c
@@
-1,22
+1,20
@@
/*
* AcessOS Microkernel Version
* debug.c
/*
* AcessOS Microkernel Version
* debug.c
- *
- * TODO: Move the Debug_putchar methods out to the arch/ tree
*/
#include <acess.h>
#include <stdarg.h>
#define DEBUG_MAX_LINE_LEN 256
*/
#include <acess.h>
#include <stdarg.h>
#define DEBUG_MAX_LINE_LEN 256
-
-#define LOCK_DEBUG_OUTPUT 1
-
-#define TRACE_TO_KTERM 1
+#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);
// === IMPORTS ===
extern void Threads_Dump(void);
+extern void Heap_Dump(void);
extern void KernelPanic_SetMode(void);
extern void KernelPanic_PutChar(char Ch);
extern void KernelPanic_SetMode(void);
extern void KernelPanic_PutChar(char Ch);
+extern void IPStack_SendDebugText(const char *Text);
// === PROTOTYPES ===
static void Debug_Putchar(char ch);
// === PROTOTYPES ===
static void Debug_Putchar(char ch);
@@
-34,12
+32,18
@@
volatile int gbInPutChar = 0;
#if LOCK_DEBUG_OUTPUT
tShortSpinlock glDebug_Lock;
#endif
#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);
// === 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;
{
if(gbInPutChar) return ;
gbInPutChar = 1;
@@
-47,8
+51,12
@@
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 )
+ {
+ char str[2] = {ch, 0};
+ IPStack_SendDebugText(str);
+ }
}
static void Debug_Puts(int UseKTerm, const char *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 ++ );
}
else
for( len = 0; Str[len]; len ++ );
-
+
+ if( gbSendNetworkDebug )
+ IPStack_SendDebugText(Str);
+
// Output to the kernel terminal
// 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;
@@
-83,9
+94,9
@@
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;
+
//
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);
+
/*len = */
vsnprintf(buf, DEBUG_MAX_LINE_LEN-1, format, args);
//if( len < DEBUG_MAX_LINE )
// do something
Debug_Puts(bUseKTerm, buf);
//if( len < DEBUG_MAX_LINE )
// do something
Debug_Puts(bUseKTerm, buf);
@@
-105,7
+116,7
@@
void Debug_KernelPanic(void)
#if LOCK_DEBUG_OUTPUT
SHORTREL(&glDebug_Lock);
#endif
#if LOCK_DEBUG_OUTPUT
SHORTREL(&glDebug_Lock);
#endif
- gbDebug_IsKPanic
= 1
;
+ gbDebug_IsKPanic
++
;
KernelPanic_SetMode();
}
KernelPanic_SetMode();
}
@@
-140,7
+151,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: ");
@@
-153,27
+164,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;
@@
-198,7
+229,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
@@
-212,6
+244,7
@@
void Panic(const char *Fmt, ...)
Debug_Putchar('\n');
Threads_Dump();
Debug_Putchar('\n');
Threads_Dump();
+ Heap_Dump();
for(;;) ;
}
for(;;) ;
}
@@
-375,7
+408,7
@@
void Debug_Leave(const char *FuncName, char RetType, ...)
#endif
}
#endif
}
-void Debug_HexDump(const char *Header, const void *Data,
Uin
t Length)
+void Debug_HexDump(const char *Header, const void *Data,
size_
t Length)
{
const Uint8 *cdat = Data;
Uint pos = 0;
{
const Uint8 *cdat = Data;
Uint pos = 0;
UCC
git Repository :: git.ucc.asn.au