i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Cleanup.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28279 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2008-10-22 10:29:54 +00:00
parent 210b7fe013
commit 8d805b68a5
1 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/debug/debug.cpp
+38 -30
View File
@@ -1138,9 +1138,12 @@ debug_puts(const char *string, int32 length)
syslog_write(string, length); syslog_write(string, length);
if (sBlueScreenEnabled || sDebugScreenEnabled) if (sBlueScreenEnabled || sDebugScreenEnabled)
blue_screen_puts(string); blue_screen_puts(string);
for (uint32 i = 0; sSerialDebugEnabled && i < kMaxDebuggerModules; i++) if (sSerialDebugEnabled) {
if (sDebuggerModules[i] && sDebuggerModules[i]->debugger_puts) for (uint32 i = 0; i < kMaxDebuggerModules; i++) {
sDebuggerModules[i]->debugger_puts(string, length); if (sDebuggerModules[i] && sDebuggerModules[i]->debugger_puts)
sDebuggerModules[i]->debugger_puts(string, length);
}
}
memcpy(sLastOutputBuffer, string, length); memcpy(sLastOutputBuffer, string, length);
sLastOutputBuffer[length] = 0; sLastOutputBuffer[length] = 0;
@@ -1364,47 +1367,52 @@ set_dprintf_enabled(bool newState)
} }
//! Must be called with the sSpinlock held.
static void static void
flush_pending_repeats(void) flush_pending_repeats(void)
{ {
if (sMessageRepeatCount > 0) { if (sMessageRepeatCount <= 0)
int32 length; return;
uint32 i;
if (sMessageRepeatCount > 1) { if (sMessageRepeatCount > 1) {
static char temp[40]; static char temp[40];
length = snprintf(temp, sizeof(temp), size_t length = snprintf(temp, sizeof(temp),
"Last message repeated %ld times.\n", sMessageRepeatCount); "Last message repeated %ld times.\n", sMessageRepeatCount);
if (sSerialDebugEnabled) if (sSerialDebugEnabled)
arch_debug_serial_puts(temp); arch_debug_serial_puts(temp);
if (sSyslogOutputEnabled) if (sSyslogOutputEnabled)
syslog_write(temp, length); syslog_write(temp, length);
if (sBlueScreenEnabled || sDebugScreenEnabled) if (sBlueScreenEnabled || sDebugScreenEnabled)
blue_screen_puts(temp); blue_screen_puts(temp);
for (i = 0; sSerialDebugEnabled && i < kMaxDebuggerModules; i++) { if (sSerialDebugEnabled) {
for (uint32 i = 0; i < kMaxDebuggerModules; i++) {
if (sDebuggerModules[i] && sDebuggerModules[i]->debugger_puts) if (sDebuggerModules[i] && sDebuggerModules[i]->debugger_puts)
sDebuggerModules[i]->debugger_puts(temp, length); sDebuggerModules[i]->debugger_puts(temp, length);
} }
} else { }
// if we only have one repeat just reprint the last buffer } else {
if (sSerialDebugEnabled) // if we only have one repeat just reprint the last buffer
arch_debug_serial_puts(sLastOutputBuffer); size_t length = strlen(sLastOutputBuffer);
if (sSyslogOutputEnabled)
syslog_write(sLastOutputBuffer, strlen(sLastOutputBuffer)); if (sSerialDebugEnabled)
if (sBlueScreenEnabled || sDebugScreenEnabled) arch_debug_serial_puts(sLastOutputBuffer);
blue_screen_puts(sLastOutputBuffer); if (sSyslogOutputEnabled)
for (i = 0; sSerialDebugEnabled && i < kMaxDebuggerModules; i++) { syslog_write(sLastOutputBuffer, length);
if (sBlueScreenEnabled || sDebugScreenEnabled)
blue_screen_puts(sLastOutputBuffer);
if (sSerialDebugEnabled) {
for (uint32 i = 0; i < kMaxDebuggerModules; i++) {
if (sDebuggerModules[i] && sDebuggerModules[i]->debugger_puts) { if (sDebuggerModules[i] && sDebuggerModules[i]->debugger_puts) {
sDebuggerModules[i]->debugger_puts(sLastOutputBuffer, sDebuggerModules[i]->debugger_puts(sLastOutputBuffer,
strlen(sLastOutputBuffer)); length);
} }
} }
} }
sMessageRepeatFirstTime = 0;
sMessageRepeatCount = 0;
} }
sMessageRepeatFirstTime = 0;
sMessageRepeatCount = 0;
} }