git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't abort if /etc/localtime already exists (and enigma2 isn't run as root)
[enigma2.git]
/
main
/
bsod.cpp
diff --git
a/main/bsod.cpp
b/main/bsod.cpp
index 2248d01c4e9caf32bfa4e80fd4a40010db405f7c..5eb6b129681a0d0801f699dbf51592c85f66b90e 100644
(file)
--- a/
main/bsod.cpp
+++ b/
main/bsod.cpp
@@
-86,6
+86,10
@@
void bsodFatal()
std::string buffer = getLogBuffer();
fwrite(buffer.c_str(), buffer.size(), 1, f);
fclose(f);
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);
}
ePtr<gFBDC> my_dc;
}
ePtr<gFBDC> my_dc;
@@
-132,7
+136,6
@@
void bsodFatal()
p.renderText(usable_area,
lines.substr(start), gPainter::RT_HALIGN_LEFT);
p.renderText(usable_area,
lines.substr(start), gPainter::RT_HALIGN_LEFT);
- p.flush();
sleep(10);
}
sleep(10);
}
@@
-143,14
+146,20
@@
void bsodFatal()
void oops(const mcontext_t &context, int dumpcode)
{
eDebug("PC: %08lx, vaddr: %08lx", (unsigned long)context.pc, (unsigned long)context.badvaddr);
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;
/* 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("%08x:", (unsigned long)context.pc);
+ eDebugNoNewLine("%08
l
x:", (unsigned long)context.pc);
for (i=0; i<0x20; ++i)
eDebugNoNewLine(" %02x", ((unsigned char*)context.pc)[i]);
eDebug(" (end)");
for (i=0; i<0x20; ++i)
eDebugNoNewLine(" %02x", ((unsigned char*)context.pc)[i]);
eDebug(" (end)");
@@
-158,7
+167,6
@@
void oops(const mcontext_t &context, int dumpcode)
}
#else
#warning "no oops support!"
}
#else
#warning "no oops support!"
-#error bla
#define NO_OOPS_SUPPORT
#endif
#define NO_OOPS_SUPPORT
#endif
@@
-167,7
+175,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
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();
#endif
eDebug("-------");
bsodFatal();
@@
-186,6
+194,7
@@
void bsodCatchSignals()
sigaction(SIGSEGV, &act, 0);
sigaction(SIGILL, &act, 0);
sigaction(SIGBUS, &act, 0);
sigaction(SIGSEGV, &act, 0);
sigaction(SIGILL, &act, 0);
sigaction(SIGBUS, &act, 0);
+ sigaction(SIGABRT, &act, 0);
}
void bsodLogInit()
}
void bsodLogInit()