X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Flogging.c;h=3ccfef2b03159d61cb72f25e27f437bfbe5eef01;hb=98bd9c0c8985c50c42231c116a4e18fedd47761e;hp=323e84b3049c8bfedad2576886ef6f5fd7947cb2;hpb=3bcb89ec409dc04c55465bdb79ffc7828f003e3c;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/logging.c b/KernelLand/Kernel/logging.c
index 323e84b3..3ccfef2b 100644
--- a/KernelLand/Kernel/logging.c
+++ b/KernelLand/Kernel/logging.c
@@ -29,7 +29,10 @@ const char	*csaLevelColours[] = {
 		"\x1B[35m", "\x1B[34m", "\x1B[36m", "\x1B[31m",
 		"\x1B[33m", "\x1B[32m", "\x1B[0m", "\x1B[0m"
 		};
-const char	*csaLevelCodes[] =  {"k","p","f","e","w","n","l","d"};
+const char	*csaLevelCodes[] =  {
+		"k","p","f","e",
+		"w","n","l","d"
+		};
 
 // === TYPES ===
 typedef struct sLogEntry
@@ -91,11 +94,9 @@ void Log_AddEvent(const char *Ident, int Level, const char *Format, va_list Args
 	va_list	args_tmp;
 	
 	if( Level >= NUM_LOG_LEVELS )	return;
-	
+
 	va_copy(args_tmp, Args);
-	len = vsnprintf(NULL, 256, Format, args_tmp);
-	
-	//Log("len = %i", len);
+	len = vsnprintf(NULL, 0, Format, args_tmp);
 	
 	#if USE_RING_BUFFER || !CACHE_MESSAGES
 	{
@@ -116,9 +117,7 @@ void Log_AddEvent(const char *Ident, int Level, const char *Format, va_list Args
 	{
 		#define LOG_HDR_LEN	(14+1+2+8+2)
 		char	newData[ LOG_HDR_LEN + len + 2 + 1 ];
-		char	_ident[9];
-		strncpy(_ident, Ident, 9);
-		sprintf( newData, "%014lli%s [%-8s] ",
+		sprintf( newData, "%014lli%s [%-8.8s] ",
 			ent->Time, csaLevelCodes[Level], Ident);
 		strcpy( newData + LOG_HDR_LEN, ent->Data );
 		strcpy( newData + LOG_HDR_LEN + len, "\r\n" );
@@ -129,16 +128,14 @@ void Log_AddEvent(const char *Ident, int Level, const char *Format, va_list Args
 	Mutex_Acquire( &glLog );
 	
 	ent->Next = gLog.Tail;
-	if(gLog.Head)
-		gLog.Tail = ent;
-	else
-		gLog.Tail = gLog.Head = ent;
+	tLogEntry	**pnp = (gLog.Tail ? &gLog.Tail->Next : &gLog.Head);
+	*pnp = ent;
+	gLog.Tail = ent;
 	
 	ent->LevelNext = gLog_Levels[Level].Tail;
-	if(gLog_Levels[Level].Head)
-		gLog_Levels[Level].Tail = ent;
-	else
-		gLog_Levels[Level].Tail = gLog_Levels[Level].Head = ent;
+	pnp = (gLog_Levels[Level].Tail ? &gLog_Levels[Level].Tail->LevelNext : &gLog_Levels[Level].Head);
+	*pnp = ent;
+	gLog_Levels[Level].Tail = ent;
 	
 	Mutex_Release( &glLog );
 	# endif
@@ -161,17 +158,18 @@ void Log_Int_PrintMessage(tLogEntry *Entry)
 	if( CPU_HAS_LOCK(&glLogOutput) )
 		return ;	// TODO: Error?
 	SHORTLOCK( &glLogOutput );
-	LogF("%s%014lli",
+	bool completed = LogF(
+		"%s%014lli%s [%-8s] %i - %.*s\x1B[0m\r\n",
 		csaLevelColours[Entry->Level],
-		Entry->Time
-		);
-	LogF("%s [%-8s] %i - %s",
+		Entry->Time,
 		csaLevelCodes[Entry->Level],
 		Entry->Ident,
 		Threads_GetTID(),
+		Entry->Length,
 		Entry->Data
 		);
-	LogF("\x1B[0m\r\n");	// Separate in case Entry->Data is too long
+	if( !completed )
+		LogF("\x1B[0m\r\n");	// Separate in case Entry->Data is too long
 	SHORTREL( &glLogOutput );
 }