X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Flogging.c;h=225ce53e89884a91f04ef52a949c82446c44068e;hb=a054fab667b0ebb7ea2c91181a961b3fdcc330a1;hp=baca0aa8818e0c3b402e83ffee65c1aabc1f46fd;hpb=ec807c5b95ffb495b9004265a8361b0c8bbd64a4;p=tpg%2Facess2.git

diff --git a/Kernel/logging.c b/Kernel/logging.c
index baca0aa8..225ce53e 100644
--- 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
@@ -118,7 +118,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 +132,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 +149,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 +157,7 @@ void Log_Int_PrintMessage(tLogEntry *Entry)
 		Entry->Ident,
 		Entry->Data
 		);
-	RELEASE( &glLogOutput );
+	SHORTREL( &glLogOutput );
 }
 
 /**