X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d63d2c3c6cbbd574dda4f8b00ebe6c661735edd5..65effa9e0f808f8a981da5015df2cbddcfc8716b:/lib/base/eerror.cpp

diff --git a/lib/base/eerror.cpp b/lib/base/eerror.cpp
index 0871bb71..3fc38ade 100644
--- a/lib/base/eerror.cpp
+++ b/lib/base/eerror.cpp
@@ -4,11 +4,76 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <lib/gui/emessage.h>
+#include <string>
+
+// #include <lib/gui/emessage.h>
+
+#ifdef MEMLEAK_CHECK
+AllocList *allocList;
+pthread_mutex_t memLock =
+	PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+
+void DumpUnfreed()
+{
+	AllocList::iterator i;
+	unsigned int totalSize = 0;
+
+	if(!allocList)
+		return;
+
+	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",
+			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++ )
+		{
+			if ( bt_string[tmp] )
+			{
+				char *beg = strchr(bt_string[tmp], '(');
+				if ( beg )
+				{
+					std::string tmp1(beg+1);
+					int pos1=tmp1.find('+'), pos2=tmp1.find(')');
+					if ( pos1 != std::string::npos && pos2 != std::string::npos )
+					{
+						std::string tmp2(tmp1.substr(pos1,(pos2-pos1)));
+						tmp1.erase(pos1);
+						if (tmp1.length())
+						{
+							int state;
+							abi::__cxa_demangle(tmp1.c_str(), buffer, &len, &state);
+							if (!state)
+								printf("%d %s%s\n", tmp, buffer,tmp2.c_str());
+							else
+								printf("%d %s\n", tmp, bt_string[tmp]);
+						}
+					}
+				}
+				else
+					printf("%d %s\n", tmp, bt_string[tmp]);
+			}
+		}
+		free(bt_string);
+		printf("\n");
+	}
+	free(buffer);
+
+	printf("-----------------------------------------------------------\n");
+	printf("Total Unfreed: %d bytes\n", totalSize);
+	fflush(stdout);
+};
+#else
+	#include <lib/base/elock.h>
+#endif
 
 int infatal=0;
 
-Signal2<void, int, const eString&> logOutput;
+Signal2<void, int, const std::string&> logOutput;
 int logOutputConsole=1;
 
 void eFatal(const char* fmt, ...)
@@ -19,7 +84,8 @@ void eFatal(const char* fmt, ...)
 	vsnprintf(buf, 1024, fmt, ap);
 	va_end(ap);
 	logOutput(lvlFatal, buf);
-	fprintf(stderr, "%s\n",buf );
+	fprintf(stderr, "FATAL: %s\n",buf );
+#if 0
 	if (!infatal)
 	{
 		infatal=1;
@@ -27,6 +93,8 @@ void eFatal(const char* fmt, ...)
 		msg.show();
 		msg.exec();
 	}
+#endif
+
 	_exit(0);
 }
 
@@ -38,7 +106,7 @@ void eDebug(const char* fmt, ...)
 	va_start(ap, fmt);
 	vsnprintf(buf, 1024, fmt, ap);
 	va_end(ap);
-	logOutput(lvlDebug, eString(buf) + "\n");
+	logOutput(lvlDebug, std::string(buf) + "\n");
 	if (logOutputConsole)
 		fprintf(stderr, "%s\n", buf);
 }
@@ -62,8 +130,20 @@ void eWarning(const char* fmt, ...)
 	va_start(ap, fmt);
 	vsnprintf(buf, 1024, fmt, ap);
 	va_end(ap);
-	logOutput(lvlWarning, eString(buf) + "\n");
+	logOutput(lvlWarning, std::string(buf) + "\n");
 	if (logOutputConsole)
 		fprintf(stderr, "%s\n", buf);
 }
 #endif // DEBUG
+
+void ePythonOutput(const char *string)
+{
+	logOutput(lvlWarning, string);
+	if (logOutputConsole)
+		fwrite(string, 1, strlen(string), stderr);
+}
+
+void eWriteCrashdump()
+{
+		/* implement me */
+}