diff options
Diffstat (limited to 'lib/base/eerror.cpp')
| -rw-r--r-- | lib/base/eerror.cpp | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/lib/base/eerror.cpp b/lib/base/eerror.cpp index a8411879..2182df49 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 = @@ -67,16 +66,12 @@ void DumpUnfreed() printf("Total Unfreed: %d bytes\n", totalSize); fflush(stdout); }; -#else - #include <lib/base/elock.h> #endif -int infatal=0; - Signal2<void, int, const std::string&> logOutput; -int logOutputConsole=1; +int logOutputConsole=0; -pthread_mutex_t signalLock = +static pthread_mutex_t DebugLock = PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP; void eFatal(const char* fmt, ...) @@ -86,18 +81,9 @@ void eFatal(const char* fmt, ...) va_start(ap, fmt); vsnprintf(buf, 1024, fmt, ap); va_end(ap); - singleLock s(signalLock); + singleLock s(DebugLock); logOutput(lvlFatal, buf); 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); } @@ -109,7 +95,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 +108,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,19 +121,20 @@ 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); } -#endif // DEBUG void ePythonOutput(const char *string) { + singleLock s(DebugLock); logOutput(lvlWarning, string); if (logOutputConsole) fwrite(string, 1, strlen(string), stderr); } +#endif // DEBUG void eWriteCrashdump() { |