optimize code

[enigma2.git] / lib / base / eerror.h

diff --git a/lib/base/eerror.h b/lib/base/eerror.h
index ea5fcc51380252b1950cfeacb1e963576b155ebc..6d38bcc74ec723ae2034e9f2ad22810ae4e1814d 100644 (file)
--- a/lib/base/eerror.h
+++ b/lib/base/eerror.h
@@ -7,25 +7,29 @@
 #include <libsig_comp.h>
 
 // to use memleak check change the following in configure.ac
 #include <libsig_comp.h>
 
 // to use memleak check change the following in configure.ac

-// * add -rdynamic to LD_FLAGS
-// * add -DMEMLEAK_CHECK to CPP_FLAGS
+// * add -DMEMLEAK_CHECK and -rdynamic to CPP_FLAGS

 
 #ifdef MEMLEAK_CHECK
 #define BACKTRACE_DEPTH 5
 
 #ifdef MEMLEAK_CHECK
 #define BACKTRACE_DEPTH 5

-// when you have c++filt and corresponding libs on your platform
-// then add -DHAVE_CPP_FILT to CPP_FLAGS in configure.ac

 #include <map>
 #include <lib/base/elock.h>
 #include <execinfo.h>
 #include <string>
 #include <new>
 #include <map>
 #include <lib/base/elock.h>
 #include <execinfo.h>
 #include <string>
 #include <new>

+#include <cxxabi.h>

 #endif // MEMLEAK_CHECK
 
 #ifndef NULL
 #define NULL 0
 #endif
 
 #endif // MEMLEAK_CHECK
 
 #ifndef NULL
 #define NULL 0
 #endif
 

-void eFatal(const char* fmt, ...);
+#ifndef SWIG
+#define CHECKFORMAT __attribute__ ((__format__(__printf__, 1, 2)))
+#else
+#define CHECKFORMAT
+#endif
+
+void CHECKFORMAT eFatal(const char*, ...);

 
 enum { lvlDebug=1, lvlWarning=2, lvlFatal=4 };
 
 
 enum { lvlDebug=1, lvlWarning=2, lvlFatal=4 };
 


@@ -39,9 +43,9 @@ extern int logOutputConsole;
 #endif
 
 #ifdef DEBUG
 #endif
 
 #ifdef DEBUG

-    void eDebug(const char* fmt, ...);
-    void eDebugNoNewLine(const char* fmt, ...);
-    void eWarning(const char* fmt, ...);
+    void CHECKFORMAT eDebug(const char*, ...);
+    void CHECKFORMAT eDebugNoNewLine(const char*, ...);
+    void CHECKFORMAT eWarning(const char*, ...);

 #ifndef SWIG
     #define ASSERT(x) { if (!(x)) eFatal("%s:%d ASSERTION %s FAILED!", __FILE__, __LINE__, #x); }
 #endif
 #ifndef SWIG
     #define ASSERT(x) { if (!(x)) eFatal("%s:%d ASSERTION %s FAILED!", __FILE__, __LINE__, #x); }
 #endif


@@ -125,67 +129,11 @@ inline void operator delete[](void *p)
        free(p);
 };
 
        free(p);
 };
 

-inline void DumpUnfreed()
-{
-       AllocList::iterator i;
-       unsigned int totalSize = 0;
-
-       if(!allocList)
-               return;
-
-       for(i = allocList->begin(); i != allocList->end(); i++)
-       {
-               unsigned int tmp;
-               printf("%s\tLINE %d\tADDRESS %p\t%d unfreed\ttype %d\n",
-                       i->second.file, i->second.line, (void*)i->second.address, i->second.size, i->second.type);
-               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] )
-                       {
-#ifdef HAVE_CPP_FILT
-                               char *beg = strchr(bt_string[tmp], '(');
-                               if ( beg )
-                               {
-                                       std::string tmp1(beg+1);
-                                       int pos1=tmp1.find('+'), pos2=tmp1.find(')');
-                                       std::string tmp2(tmp1.substr(pos1,(pos2-pos1)-1));
-                                       std::string cmd="c++filt ";
-                                       cmd+=tmp1.substr(0,pos1);
-                                       FILE *f = popen(cmd.c_str(), "r");
-                                       char buf[256];
-                                       if (f)
-                                       {
-                                               size_t rd = fread(buf, 1, 255, f);
-                                               if ( rd > 0 )
-                                               {
-                                                       buf[rd-1]=0;
-                                                       printf("%s %s\n", buf, tmp2.c_str() );
-                                               }
-                                               else
-                                                       printf("%s\n", tmp1.substr(0,pos1).c_str());
-                                               fclose(f);
-                                       }
-                               }
-                               else
-#endif // HAVE_CPP_FILT
-                                       printf("%s\n", bt_string[tmp]);
-                       }
-               }
-               free(bt_string);
-               printf("\n");
-       }
-
-       printf("-----------------------------------------------------------\n");
-       printf("Total Unfreed: %d bytes\n", totalSize);
-       fflush(stdout);
-};
+void DumpUnfreed();

 #define new new(__FILE__, __LINE__)
 
 #endif // MEMLEAK_CHECK
 
 #define new new(__FILE__, __LINE__)
 
 #endif // MEMLEAK_CHECK
 

-

 #else
     inline void eDebug(const char* fmt, ...)
     {
 #else
     inline void eDebug(const char* fmt, ...)
     {


@@ -201,4 +149,7 @@ inline void DumpUnfreed()
     #define ASSERT(x) do { } while (0)
 #endif //DEBUG
 
     #define ASSERT(x) do { } while (0)
 #endif //DEBUG
 

+void ePythonOutput(const char *);
+void eWriteCrashdump();
+

 #endif // __E_ERROR__
 #endif // __E_ERROR__