X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9bef763b47b5e5a273ce6eed4583004690571fcf..e50156a91ed81be0b9b00b7bdaab60ee17130bf5:/lib/base/eerror.cpp

diff --git a/lib/base/eerror.cpp b/lib/base/eerror.cpp
index a8411879..1e4d348f 100644
--- a/lib/base/eerror.cpp
+++ b/lib/base/eerror.cpp
@@ -1,4 +1,5 @@
 #include <lib/base/eerror.h>
+#include <lib/base/elock.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -6,8 +7,6 @@
 
 #include <string>
 
-// #include <lib/gui/emessage.h>
-
 #ifdef MEMLEAK_CHECK
 AllocList *allocList;
 pthread_mutex_t memLock =
@@ -21,14 +20,16 @@ void DumpUnfreed()
 	if(!allocList)
 		return;
 
+	FILE *f = fopen("/var/tmp/enigma2_mem.out", "w");
 	size_t len = 1024;
 	char *buffer = (char*)malloc(1024);
 	for(i = allocList->begin(); i != allocList->end(); i++)
 	{
 		unsigned int tmp;
-		printf("%s\tLINE %d\tADDRESS %p\t%d unfreed\ttype %d (btcount %d)\n",
+		fprintf(f, "%s\tLINE %d\tADDRESS %p\t%d unfreed\ttype %d (btcount %d)\n",
 			i->second.file, i->second.line, (void*)i->second.address, i->second.size, i->second.type, i->second.btcount);
 		totalSize += i->second.size;
+
 		char **bt_string = backtrace_symbols( i->second.backtrace, i->second.btcount );
 		for ( tmp=0; tmp < i->second.btcount; tmp++ )
 		{
@@ -48,37 +49,36 @@ void DumpUnfreed()
 							int state;
 							abi::__cxa_demangle(tmp1.c_str(), buffer, &len, &state);
 							if (!state)
-								printf("%d %s%s\n", tmp, buffer,tmp2.c_str());
+								fprintf(f, "%d %s%s\n", tmp, buffer,tmp2.c_str());
 							else
-								printf("%d %s\n", tmp, bt_string[tmp]);
+								fprintf(f, "%d %s\n", tmp, bt_string[tmp]);
 						}
 					}
 				}
 				else
-					printf("%d %s\n", tmp, bt_string[tmp]);
+					fprintf(f, "%d %s\n", tmp, bt_string[tmp]);
 			}
 		}
 		free(bt_string);
-		printf("\n");
+		if (i->second.btcount)
+			fprintf(f, "\n");
 	}
 	free(buffer);
 
-	printf("-----------------------------------------------------------\n");
-	printf("Total Unfreed: %d bytes\n", totalSize);
-	fflush(stdout);
+	fprintf(f, "-----------------------------------------------------------\n");
+	fprintf(f, "Total Unfreed: %d bytes\n", totalSize);
+	fflush(f);
 };
-#else
-	#include <lib/base/elock.h>
 #endif
 
-int infatal=0;
-
 Signal2<void, int, const std::string&> logOutput;
 int logOutputConsole=1;
 
-pthread_mutex_t signalLock =
+static pthread_mutex_t DebugLock =
 	PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP;
 
+extern void bsodFatal();
+
 void eFatal(const char* fmt, ...)
 {
 	char buf[1024];
@@ -86,19 +86,10 @@ void eFatal(const char* fmt, ...)
 	va_start(ap, fmt);
 	vsnprintf(buf, 1024, fmt, ap);
 	va_end(ap);
-	singleLock s(signalLock);
-	logOutput(lvlFatal, buf);
+	singleLock s(DebugLock);
+	logOutput(lvlFatal, "FATAL: " + std::string(buf) + "\n");
 	fprintf(stderr, "FATAL: %s\n",buf );
-#if 0
-	if (!infatal)
-	{
-		infatal=1;
-		eMessageBox msg(buf, "FATAL ERROR", eMessageBox::iconError|eMessageBox::btOK);
-		msg.show();
-		msg.exec();
-	}
-#endif
-	_exit(0);
+	bsodFatal();
 }
 
 #ifdef DEBUG
@@ -109,7 +100,7 @@ void eDebug(const char* fmt, ...)
 	va_start(ap, fmt);
 	vsnprintf(buf, 1024, fmt, ap);
 	va_end(ap);
-	singleLock s(signalLock);
+	singleLock s(DebugLock);
 	logOutput(lvlDebug, std::string(buf) + "\n");
 	if (logOutputConsole)
 		fprintf(stderr, "%s\n", buf);
@@ -122,7 +113,7 @@ void eDebugNoNewLine(const char* fmt, ...)
 	va_start(ap, fmt);
 	vsnprintf(buf, 1024, fmt, ap);
 	va_end(ap);
-	singleLock s(signalLock);
+	singleLock s(DebugLock);
 	logOutput(lvlDebug, buf);
 	if (logOutputConsole)
 		fprintf(stderr, "%s", buf);
@@ -135,7 +126,7 @@ void eWarning(const char* fmt, ...)
 	va_start(ap, fmt);
 	vsnprintf(buf, 1024, fmt, ap);
 	va_end(ap);
-	singleLock s(signalLock);
+	singleLock s(DebugLock);
 	logOutput(lvlWarning, std::string(buf) + "\n");
 	if (logOutputConsole)
 		fprintf(stderr, "%s\n", buf);
@@ -144,9 +135,12 @@ void eWarning(const char* fmt, ...)
 
 void ePythonOutput(const char *string)
 {
+#ifdef DEBUG
+	singleLock s(DebugLock);
 	logOutput(lvlWarning, string);
 	if (logOutputConsole)
 		fwrite(string, 1, strlen(string), stderr);
+#endif
 }
 
 void eWriteCrashdump()