Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverted my last change as it causes a segfault with syslog output enabled.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17094 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz 2006-04-11 19:40:49 +00:00
parent 2f09691580
commit 6ac6b512a0
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/system/kernel/debug/debug.c
View File

@ -588,7 +588,7 @@ debug_puts(const char *string, int32 length)
length = OUTPUT_BUFFER_SIZE - 1; length = OUTPUT_BUFFER_SIZE - 1;
if (strncmp(string, sLastOutputBuffer, length) == 0 if (strncmp(string, sLastOutputBuffer, length) == 0
&& length > 0 && string[length - 1] == '\n') { && length > 1 && string[length - 1] == '\n') {
sMessageRepeatCount++; sMessageRepeatCount++;
sMessageRepeatTime = system_time(); sMessageRepeatTime = system_time();
} else { } else {
@ -826,22 +826,16 @@ static void
flush_pending_repeats(void) flush_pending_repeats(void)
{ {
if (sMessageRepeatCount > 0) { if (sMessageRepeatCount > 0) {
int32 length; char temp[128];
int32 length = snprintf(temp, sizeof(temp),
if (sMessageRepeatCount > 1) { "Last message repeated %ld times.\n", sMessageRepeatCount);
length = snprintf(sOutputBuffer, OUTPUT_BUFFER_SIZE,
"Last message repeated %ld times.\n", sMessageRepeatCount);
} else {
// if we only have one repeat just reprint the buffer
length = strlen(sOutputBuffer);
}
if (sSerialDebugEnabled) if (sSerialDebugEnabled)
arch_debug_serial_puts(sOutputBuffer); arch_debug_serial_puts(temp);
if (sSyslogOutputEnabled) if (sSyslogOutputEnabled)
syslog_write(sOutputBuffer, length); syslog_write(temp, length);
if (sBlueScreenEnabled || sDebugScreenEnabled) if (sBlueScreenEnabled || sDebugScreenEnabled)
blue_screen_puts(sOutputBuffer); blue_screen_puts(temp);
sMessageRepeatCount = 0; sMessageRepeatCount = 0;
} }