X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flog.cpp;h=23fc806fa325bccc970b0a1661d49ef285001e82;hb=48dd9ba5b6742935eef61cec80964afe093139ad;hp=f748183ab1bfd3af24fd3a43072b9a8341bc1737;hpb=0031c06df2f7f099ca5ecf1632f46b92f6b0dd79;p=virtualjaguar

diff --git a/src/log.cpp b/src/log.cpp
index f748183..23fc806 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -1,29 +1,80 @@
 //
 // Log handler
 //
-// by cal2
+// Originally by David Raingeard (Cal2)
 // GCC/SDL port by Niels Wagenaar (Linux/WIN32) and Caz (BeOS)
-// Cleanups by James L. Hammons
+// 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 "log.h"
 
-FILE * log_stream = NULL;
+#include <stdlib.h>
+#include <stdarg.h>
+#include <stdint.h>
+
+
+//#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 log_init(char * path)
+int LogInit(const char * path)
 {
-	log_stream = fopen(path, "wrt");
+	log_stream = fopen(path, "w");
+
 	if (log_stream == NULL)
 		return 0;
+
 	return 1;
 }
 
-FILE * log_get(void)
+FILE * LogGet(void)
 {
 	return log_stream;
 }
 
-void log_done(void)
+void LogDone(void)
 {
-	fclose(log_stream);
+	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 WriteLog(const char * text, ...)
+{
+	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!
 }