X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Flogging.c;h=baca0aa8818e0c3b402e83ffee65c1aabc1f46fd;hb=b2934fe046a55291ae03035a6270db3b32950c8f;hp=f4a23b4bd312a2987c7517701d487250071ad347;hpb=85eb17b306404571aa39596946c87ad9bb1d9d13;p=tpg%2Facess2.git

diff --git a/Kernel/logging.c b/Kernel/logging.c
index f4a23b4b..baca0aa8 100644
--- a/Kernel/logging.c
+++ b/Kernel/logging.c
@@ -7,6 +7,8 @@
 #include <acess.h>
 
 #define PRINT_ON_APPEND	1
+#define USE_RING_BUFFER	1
+#define RING_BUFFER_SIZE	4096
 
 // === CONSTANTS ===
 enum eLogLevels
@@ -54,10 +56,8 @@ void	Log_Warning(char *Ident, char *Message, ...);
 void	Log_Notice(char *Ident, char *Message, ...);
 void	Log_Log(char *Ident, char *Message, ...);
 void	Log_Debug(char *Ident, char *Message, ...);
-//static Uint64	Log_Int_GetIdent(const char *Str);
 
 // === EXPORTS ===
-EXPORT(Log_KernelPanic);
 EXPORT(Log_Panic);
 EXPORT(Log_Error);
 EXPORT(Log_Warning);
@@ -67,8 +67,14 @@ EXPORT(Log_Debug);
 
 // === GLOBALS ===
 tSpinlock	glLog;
+tSpinlock	glLogOutput;
+#if USE_RING_BUFFER
+Uint8	gaLog_RingBufferData[sizeof(tRingBuffer)+RING_BUFFER_SIZE];
+tRingBuffer	*gpLog_RingBuffer = (void*)gaLog_RingBufferData;
+#else
 tLogList	gLog;
 tLogList	gLog_Levels[NUM_LOG_LEVELS];
+#endif
 
 // === CODE ===
 /**
@@ -78,23 +84,40 @@ void Log_AddEvent(char *Ident, int Level, char *Format, va_list Args)
 {
 	 int	len;
 	tLogEntry	*ent;
+	va_list	args_tmp;
 	
 	if( Level >= NUM_LOG_LEVELS )	return;
 	
-	len = vsnprintf(NULL, 256, Format, Args);
+	va_copy(args_tmp, Args);
+	len = vsnprintf(NULL, 256, Format, args_tmp);
 	
 	//Log("len = %i", len);
 	
+	#if USE_RING_BUFFER
+	{
+	char	buf[sizeof(tLogEntry)+len+1];
+	ent = (void*)buf;
+	#else
 	ent = malloc(sizeof(tLogEntry)+len+1);
+	#endif
 	ent->Time = now();
 	strncpy(ent->Ident, Ident, 8);
 	ent->Level = Level;
 	ent->Length = len;
-	vsnprintf( ent->Data, 256, Format, Args );
-	
-	//Log("ent->Ident = '%s'", ent->Ident);
-	//Log("ent->Data = '%s'", ent->Data);
+	vsnprintf( ent->Data, len+1, Format, Args );
 	
+	#if USE_RING_BUFFER
+	{
+		#define LOG_HDR_LEN	(14+1+2+8+2)
+		char	newData[ LOG_HDR_LEN + len + 2 + 1 ];
+		sprintf( newData, "%014lli%s [%+8s] ",
+			ent->Time, csaLevelCodes[Level], Ident);
+		strcpy( newData + LOG_HDR_LEN, ent->Data );
+		strcpy( newData + LOG_HDR_LEN + len, "\r\n" );
+		gpLog_RingBuffer->Space = RING_BUFFER_SIZE;	// Needed to init the buffer
+		RingBuffer_Write( gpLog_RingBuffer, newData, LOG_HDR_LEN + len + 2 );
+	}
+	#else
 	LOCK( &glLog );
 	
 	ent->Next = gLog.Tail;
@@ -110,11 +133,15 @@ void Log_AddEvent(char *Ident, int Level, char *Format, va_list Args)
 		gLog_Levels[Level].Tail = gLog_Levels[Level].Head = ent;
 	
 	RELEASE( &glLog );
+	#endif
 	
 	#if PRINT_ON_APPEND
 	Log_Int_PrintMessage( ent );
 	#endif
 	
+	#if USE_RING_BUFFER
+	}
+	#endif
 }
 
 /**
@@ -122,13 +149,15 @@ void Log_AddEvent(char *Ident, int Level, char *Format, va_list Args)
  */
 void Log_Int_PrintMessage(tLogEntry *Entry)
 {
-	LogF("%s%018lli%s [%+8s] %s\x1B[0m\n",
+	LOCK( &glLogOutput );
+	LogF("%s%014lli%s [%+8s] %s\x1B[0m\r\n",
 		csaLevelColours[Entry->Level],
 		Entry->Time,
 		csaLevelCodes[Entry->Level],
 		Entry->Ident,
 		Entry->Data
 		);
+	RELEASE( &glLogOutput );
 }
 
 /**