AcessNative - Bugfixing

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

diff --git a/Kernel/logging.c b/Kernel/logging.c
index 3d6351d..1650342 100644 (file)
--- a/Kernel/logging.c
+++ b/Kernel/logging.c
@@ -66,12 +66,12 @@ EXPORT(Log_Log);
 EXPORT(Log_Debug);
 
 // === GLOBALS ===
-tSpinlock      glLog;
-tSpinlock      glLogOutput;
+tShortSpinlock glLogOutput;
 #if USE_RING_BUFFER
 Uint8  gaLog_RingBufferData[sizeof(tRingBuffer)+RING_BUFFER_SIZE];
 tRingBuffer    *gpLog_RingBuffer = (void*)gaLog_RingBufferData;
 #else
+tMutex glLog;
 tLogList       gLog;
 tLogList       gLog_Levels[NUM_LOG_LEVELS];
 #endif
@@ -102,6 +102,7 @@ void Log_AddEvent(char *Ident, int Level, char *Format, va_list Args)
        #endif
        ent->Time = now();
        strncpy(ent->Ident, Ident, 8);
+       ent->Ident[8] = '\0';
        ent->Level = Level;
        ent->Length = len;
        vsnprintf( ent->Data, len+1, Format, Args );
@@ -118,7 +119,7 @@ void Log_AddEvent(char *Ident, int Level, char *Format, va_list Args)
                RingBuffer_Write( gpLog_RingBuffer, newData, LOG_HDR_LEN + len + 2 );
        }
        #else
-       LOCK( &glLog );
+       Mutex_Acquire( &glLog );
        
        ent->Next = gLog.Tail;
        if(gLog.Head)
@@ -132,7 +133,7 @@ void Log_AddEvent(char *Ident, int Level, char *Format, va_list Args)
        else
                gLog_Levels[Level].Tail = gLog_Levels[Level].Head = ent;
        
-       RELEASE( &glLog );
+       Mutex_Release( &glLog );
        #endif
        
        #if PRINT_ON_APPEND
@@ -149,7 +150,7 @@ void Log_AddEvent(char *Ident, int Level, char *Format, va_list Args)
  */
 void Log_Int_PrintMessage(tLogEntry *Entry)
 {
-       //LOCK( &glLogOutput );
+       SHORTLOCK( &glLogOutput );
        LogF("%s%014lli%s [%+8s] %s\x1B[0m\r\n",
                csaLevelColours[Entry->Level],
                Entry->Time,
@@ -157,7 +158,7 @@ void Log_Int_PrintMessage(tLogEntry *Entry)
                Entry->Ident,
                Entry->Data
                );
-       //RELEASE( &glLogOutput );
+       SHORTREL( &glLogOutput );
 }
 
 /**