fix colors

[enigma2.git] / main / bsod.cpp

diff --git a/main/bsod.cpp b/main/bsod.cpp
index 10021787dc7919a7501612fadb76537260338388..bb4c7ad7c27efc0fcc4177b0087deae4784a5ff0 100644 (file)
--- a/main/bsod.cpp
+++ b/main/bsod.cpp
@@ -6,6 +6,9 @@
 #include <lib/base/smartptr.h>
 #include <lib/gdi/grc.h>
 #include <lib/gdi/gfbdc.h>
+#ifdef WITH_SDL
+#include <lib/gdi/sdl.h>
+#endif
 
 #include "version.h"
 
@@ -86,32 +89,61 @@ void bsodFatal()
                std::string buffer = getLogBuffer();
                fwrite(buffer.c_str(), buffer.size(), 1, f);
                fclose(f);
+               
+               char cmd[256];
+               sprintf(cmd, "find /usr/lib/enigma2/python/ -name \"*.py\" | xargs md5sum >> %s", logfile);
+               system(cmd);
        }
        
+#ifdef WITH_SDL
+       ePtr<gSDLDC> my_dc;
+       gSDLDC::getInstance(my_dc);
+#else
        ePtr<gFBDC> my_dc;
        gFBDC::getInstance(my_dc);
+#endif
        
        {
                gPainter p(my_dc);
                p.resetOffset();
                p.resetClip(eRect(ePoint(0, 0), my_dc->size()));
-               p.setBackgroundColor(gRGB(0x0000C0));
+#ifdef ENIGMA2_CHECKOUT_TAG
+               if (ENIGMA2_CHECKOUT_TAG[0] == 'T') /* tagged checkout (release) */
+                       p.setBackgroundColor(gRGB(0x0000C0));
+               else if (ENIGMA2_CHECKOUT_TAG[0] == 'D') /* dated checkout (daily experimental build) */
+               {
+                       srand(time(0));
+                       int r = rand();
+                       unsigned int col = 0;
+                       if (r & 1)
+                               col |= 0x800000;
+                       if (r & 2)
+                               col |= 0x008000;
+                       if (r & 4)
+                               col |= 0x0000c0;
+                       p.setBackgroundColor(gRGB(col));
+               }
+#else
+                       p.setBackgroundColor(gRGB(0x008000));
+#endif
+
                p.setForegroundColor(gRGB(0xFFFFFF));
        
                ePtr<gFont> font = new gFont("Regular", 20);
                p.setFont(font);
                p.clear();
        
-               eRect usable_area = eRect(100, 70, my_dc->size().width() - 200, 100);
+               eRect usable_area = eRect(100, 70, my_dc->size().width() - 150, 100);
        
                p.renderText(usable_area, 
                        "We are really sorry. Something happened "
                        "which should not have happened, and "
                        "resulted in a crash. If you want to help "
                        "us in improving this situation, please send "
-                       "the logfile created in /hdd/ to " CRASH_EMAILADDR ".", gPainter::RT_WRAP|gPainter::RT_HALIGN_LEFT);
+                       "the logfile created in /hdd/ to " CRASH_EMAILADDR "."
+                       "Your receiver restarts in 10 seconds !", gPainter::RT_WRAP|gPainter::RT_HALIGN_LEFT);
        
-               usable_area = eRect(100, 170, my_dc->size().width() - 200, my_dc->size().height() - 20);
+               usable_area = eRect(100, 170, my_dc->size().width() - 180, my_dc->size().height() - 20);
        
                int i;
        
@@ -131,7 +163,7 @@ void bsodFatal()
        
                p.renderText(usable_area, 
                        lines.substr(start), gPainter::RT_HALIGN_LEFT);
-               p.flush();
+               sleep(10);
        }
 
        raise(SIGKILL);
@@ -141,10 +173,27 @@ void bsodFatal()
 void oops(const mcontext_t &context, int dumpcode)
 {
        eDebug("PC: %08lx, vaddr: %08lx", (unsigned long)context.pc, (unsigned long)context.badvaddr);
+       int i;
+       for (i=0; i<32; ++i)
+       {
+               eDebugNoNewLine(" %08x", (int)context.gregs[i]);
+               if ((i&3) == 3)
+                       eDebug("");
+       }
+               /* this is temporary debug stuff. */
+       if (dumpcode && ((unsigned long)context.pc) > 0x10000) /* not a zero pointer */
+       {
+               eDebug("As a final action, i will try to dump a bit of code.");
+               eDebug("I just hope that this won't crash.");
+               int i;
+               eDebugNoNewLine("%08lx:", (unsigned long)context.pc);
+               for (i=0; i<0x20; ++i)
+                       eDebugNoNewLine(" %02x", ((unsigned char*)context.pc)[i]);
+               eDebug(" (end)");
+       }
 }
 #else
 #warning "no oops support!"
-#error bla
 #define NO_OOPS_SUPPORT
 #endif
 
@@ -153,7 +202,7 @@ void handleFatalSignal(int signum, siginfo_t *si, void *ctx)
        ucontext_t *uc = (ucontext_t*)ctx;
        eDebug("KILLED BY signal %d", signum);
 #ifndef NO_OOPS_SUPPORT
-       oops(uc->uc_mcontext, signum == SIGSEGV);
+       oops(uc->uc_mcontext, signum == SIGSEGV || signum == SIGABRT);
 #endif
        eDebug("-------");
        bsodFatal();
@@ -164,7 +213,7 @@ void bsodCatchSignals()
        struct sigaction act;
        act.sa_handler = SIG_DFL;
        act.sa_sigaction = handleFatalSignal;
-       act.sa_flags = 0;
+       act.sa_flags = SA_RESTART | SA_SIGINFO;
        if (sigemptyset(&act.sa_mask) == -1)
                perror("sigemptyset");
        
@@ -172,6 +221,7 @@ void bsodCatchSignals()
        sigaction(SIGSEGV, &act, 0);
        sigaction(SIGILL, &act, 0);
        sigaction(SIGBUS, &act, 0);
+       sigaction(SIGABRT, &act, 0);
 }
 
 void bsodLogInit()