More behavior fixes (changes to resolution only apply on a mode set)

[tpg/acess2.git] / Kernel / logging.c

diff --git a/Kernel/logging.c b/Kernel/logging.c
index 567f64e..baca0aa 100644 (file)
--- 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
@@ -21,7 +23,11 @@ enum eLogLevels
        LOG_LEVEL_DEBUG,
        NUM_LOG_LEVELS
 };
-const char     csaLevelCodes[] = {'k','p','f','e','w','n','l','d'};
+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"};
 
 // === TYPES ===
 typedef struct sLogEntry
@@ -29,9 +35,9 @@ typedef struct sLogEntry
        struct sLogEntry        *Next;
        struct sLogEntry        *LevelNext;
        Sint64  Time;
-       Uint64  Ident;
         int    Level;
         int    Length;
+       char    Ident[9];
        char    Data[];
 }      tLogEntry;
 typedef struct sLogList
@@ -47,15 +53,28 @@ void        Log_KernelPanic(char *Ident, char *Message, ...);
 void   Log_Panic(char *Ident, char *Message, ...);
 void   Log_Error(char *Ident, char *Message, ...);
 void   Log_Warning(char *Ident, char *Message, ...);
-void   Log_Log(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_Panic);
+EXPORT(Log_Error);
+EXPORT(Log_Warning);
+EXPORT(Log_Notice);
+EXPORT(Log_Log);
+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 ===
 /**
@@ -65,19 +84,40 @@ void Log_AddEvent(char *Ident, int Level, char *Format, va_list Args)
 {
         int    len;
        tLogEntry       *ent;
-       Uint64  ident = Log_Int_GetIdent(Ident);
+       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();
-       ent->Ident = ident;
+       strncpy(ent->Ident, Ident, 8);
        ent->Level = Level;
        ent->Length = len;
-       vsnprintf( ent->Data, 256, Format, Args );
+       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;
@@ -93,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
 }
 
 /**
@@ -105,12 +149,15 @@ void Log_AddEvent(char *Ident, int Level, char *Format, va_list Args)
  */
 void Log_Int_PrintMessage(tLogEntry *Entry)
 {
-       LogF("%018%c [%8s] %s\n",
+       LOCK( &glLogOutput );
+       LogF("%s%014lli%s [%+8s] %s\x1B[0m\r\n",
+               csaLevelColours[Entry->Level],
                Entry->Time,
                csaLevelCodes[Entry->Level],
-               &Entry->Ident,
+               Entry->Ident,
                Entry->Data
                );
+       RELEASE( &glLogOutput );
 }
 
 /**
@@ -190,30 +237,3 @@ void Log_Debug(char *Ident, char *Message, ...)
        Log_AddEvent(Ident, LOG_LEVEL_DEBUG, Message, args);
        va_end(args);
 }
-
-/**
- * \brief Converts a string into a 64-bit ident
- */
-static Uint64 Log_Int_GetIdent(const char *Str)
-{
-       Uint64  ret = 0;
-        int    i;
-       char    ch;
-       
-       for( i = 0; Str[i] && i < 7; i++ )
-       {
-               ch = Str[i];
-               
-               if(ch < ' ')
-                       ch = '?';
-               else if(ch > '~')
-                       ch = '?';
-               
-               ret |= (Uint64)ch << 8*i;
-       }
-       
-       for( ; i < 7; i++ )
-               ret |= 0x20 << (8*i);
-       
-       return ret;
-}