X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Flogging.c;h=0ae993e5b37ac3d6b690d44e6273023ad5d08f79;hb=HEAD;hp=8ca5fd43bc62e77c36a35dbcabc8b97266f5d66d;hpb=e939fc0ced4d445c24696636fe660dddbe035b1c;p=tpg%2Facess2.git

diff --git a/Kernel/logging.c b/Kernel/logging.c
deleted file mode 100644
index 8ca5fd43..00000000
--- a/Kernel/logging.c
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Acess 2 Kernel
- * - By John Hodge (thePowersGang)
- *
- * logging.c - Kernel Logging Service
- */
-#include <acess.h>
-
-#define PRINT_ON_APPEND	1
-
-// === CONSTANTS ===
-enum eLogLevels
-{
-	LOG_LEVEL_KPANIC,
-	LOG_LEVEL_PANIC,
-	LOG_LEVEL_FATAL,
-	LOG_LEVEL_ERROR,
-	LOG_LEVEL_WARNING,
-	LOG_LEVEL_NOTICE,
-	LOG_LEVEL_LOG,
-	LOG_LEVEL_DEBUG,
-	NUM_LOG_LEVELS
-};
-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
-{
-	struct sLogEntry	*Next;
-	struct sLogEntry	*LevelNext;
-	Sint64	Time;
-	 int	Level;
-	 int	Length;
-	char	Ident[9];
-	char	Data[];
-}	tLogEntry;
-typedef struct sLogList
-{
-	tLogEntry	*Head;
-	tLogEntry	*Tail;
-}	tLogList;
-
-// === PROTOTYPES ===
-void	Log_AddEvent(char *Ident, int Level, char *Format, va_list Args);
-static void	Log_Int_PrintMessage(tLogEntry *Entry);
-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_Notice(char *Ident, char *Message, ...);
-void	Log_Log(char *Ident, char *Message, ...);
-void	Log_Debug(char *Ident, char *Message, ...);
-
-// === EXPORTS ===
-EXPORT(Log_Panic);
-EXPORT(Log_Error);
-EXPORT(Log_Warning);
-EXPORT(Log_Notice);
-EXPORT(Log_Log);
-EXPORT(Log_Debug);
-
-// === GLOBALS ===
-tSpinlock	glLog;
-tSpinlock	glLogOutput;
-tLogList	gLog;
-tLogList	gLog_Levels[NUM_LOG_LEVELS];
-
-// === CODE ===
-/**
- * \brief Adds an event to the log
- */
-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;
-	
-	va_copy(args_tmp, Args);
-	len = vsnprintf(NULL, 256, Format, args_tmp);
-	
-	//Log("len = %i", len);
-	
-	ent = malloc(sizeof(tLogEntry)+len+1);
-	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);
-	
-	LOCK( &glLog );
-	
-	ent->Next = gLog.Tail;
-	if(gLog.Head)
-		gLog.Tail = ent;
-	else
-		gLog.Tail = gLog.Head = 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;
-	
-	RELEASE( &glLog );
-	
-	#if PRINT_ON_APPEND
-	Log_Int_PrintMessage( ent );
-	#endif
-	
-}
-
-/**
- * \brief Prints a log message to the debug console
- */
-void Log_Int_PrintMessage(tLogEntry *Entry)
-{
-	LogF("%s%018lli%s [%+8s] %s\x1B[0m\n",
-		csaLevelColours[Entry->Level],
-		Entry->Time,
-		csaLevelCodes[Entry->Level],
-		Entry->Ident,
-		Entry->Data
-		);
-}
-
-/**
- * \brief KERNEL PANIC!!!!
- */
-void Log_KernelPanic(char *Ident, char *Message, ...)
-{
-	va_list	args;	
-	va_start(args, Message);
-	Log_AddEvent(Ident, LOG_LEVEL_KPANIC, Message, args);
-	va_end(args);
-}
-
-/**
- * \brief Panic Message - Driver Unrecoverable error
- */
-void Log_Panic(char *Ident, char *Message, ...)
-{
-	va_list	args;	
-	va_start(args, Message);
-	Log_AddEvent(Ident, LOG_LEVEL_PANIC, Message, args);
-	va_end(args);
-}
-
-/**
- * \brief Error Message - Recoverable Error
- */
-void Log_Error(char *Ident, char *Message, ...)
-{
-	va_list	args;	
-	va_start(args, Message);
-	Log_AddEvent(Ident, LOG_LEVEL_ERROR, Message, args);
-	va_end(args);
-}
-
-/**
- * \brief Warning Message - Something the user should know
- */
-void Log_Warning(char *Ident, char *Message, ...)
-{
-	va_list	args;
-	
-	va_start(args, Message);
-	Log_AddEvent(Ident, LOG_LEVEL_WARNING, Message, args);
-	va_end(args);
-}
-
-/**
- * \brief Notice Message - Something the user might like to know
- */
-void Log_Notice(char *Ident, char *Message, ...)
-{
-	va_list	args;	
-	va_start(args, Message);
-	Log_AddEvent(Ident, LOG_LEVEL_NOTICE, Message, args);
-	va_end(args);
-}
-
-/**
- * \brief Log Message - Possibly useful information
- */
-void Log_Log(char *Ident, char *Message, ...)
-{
-	va_list	args;	
-	va_start(args, Message);
-	Log_AddEvent(Ident, LOG_LEVEL_LOG, Message, args);
-	va_end(args);
-}
-
-/**
- * \brief Debug Message - Only a developer would want this info
- */
-void Log_Debug(char *Ident, char *Message, ...)
-{
-	va_list	args;	
-	va_start(args, Message);
-	Log_AddEvent(Ident, LOG_LEVEL_DEBUG, Message, args);
-	va_end(args);
-}