X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flog.cpp;h=23fc806fa325bccc970b0a1661d49ef285001e82;hb=39ab246ce68e50df4757bbe395d6722ada582927;hp=bdbab62c4a8a366c4d6f551a5545f8ea7ddd8321;hpb=86bd0f2592c3cd674239532247276bd2d579a857;p=virtualjaguar

diff --git a/src/log.cpp b/src/log.cpp
index bdbab62..23fc806 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -1,60 +1,80 @@
-//////////////////////////////////////////////////////////////////////////////
 //
-//////////////////////////////////////////////////////////////////////////////
+// Log handler
 //
+// Originally by David Raingeard (Cal2)
+// GCC/SDL port by Niels Wagenaar (Linux/WIN32) and Caz (BeOS)
+// Cleanups/new stuff by James Hammons
+// (C) 2010 Underground Software
 //
+// JLH = James Hammons <jlhamm@acm.org>
 //
+// Who  When        What
+// ---  ----------  -------------------------------------------------------------
+// JLH  01/16/2010  Created this log ;-)
+// JLH  07/11/2011  Instead of dumping out on max log file size being reached, we
+//                  now just silently ignore any more output. 10 megs ought to be
+//                  enough for anybody. ;-) Except when it isn't. :-P
 //
-//
-//
-//////////////////////////////////////////////////////////////////////////////
 
-#include "include/log.h"
+#include "log.h"
 
-FILE	*log_stream=NULL;
+#include <stdlib.h>
+#include <stdarg.h>
+#include <stdint.h>
 
-//////////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
-//
-//
-//////////////////////////////////////////////////////////////////////////////
-int log_init(char *path)
+
+//#define MAX_LOG_SIZE		10000000				// Maximum size of log file (10 MB)
+#define MAX_LOG_SIZE		100000000				// Maximum size of log file (100 MB)
+
+static FILE * log_stream = NULL;
+static uint32_t logSize = 0;
+
+int LogInit(const char * path)
 {
-	log_stream=fopen(path,"wrt");
-	if (log_stream==NULL)
-		return(0);
-	return(1);
+	log_stream = fopen(path, "w");
+
+	if (log_stream == NULL)
+		return 0;
+
+	return 1;
 }
-//////////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
-//
-//
-//////////////////////////////////////////////////////////////////////////////
-FILE *log_get(void)
+
+FILE * LogGet(void)
 {
-	return(log_stream);
+	return log_stream;
 }
-//////////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
+
+void LogDone(void)
+{
+	if (log_stream != NULL)
+		fclose(log_stream);
+}
+
 //
+// This logger is used mainly to ensure that text gets written to the log file
+// even if the program crashes. The performance hit is acceptable in this case!
 //
-//////////////////////////////////////////////////////////////////////////////
-void log_done(void)
+void WriteLog(const char * text, ...)
 {
-	fclose(log_stream);
+	va_list arg;
+	va_start(arg, text);
+
+	if (log_stream == NULL)
+	{
+		va_end(arg);
+		return;
+	}
+
+	logSize += vfprintf(log_stream, text, arg);
+
+	if (logSize > MAX_LOG_SIZE)
+	{
+		// Instead of dumping out, we just close the file and ignore any more output.
+		fflush(log_stream);
+		fclose(log_stream);
+		log_stream = NULL;
+	}
+
+	va_end(arg);
+	fflush(log_stream);					// Make sure that text is written!
 }