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

* Applied patch by Adrian Panasiuk (Adek336) to fix the syslog output to insert

Browse Source 
the <DROP> marker at the place data was dropped, not somewhere else. See
  ticket #156; this might already fix this bug.
* Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28278 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2008-10-22 10:22:26 +00:00
parent ab869c3c27
commit 210b7fe013
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/system/kernel/debug/debug.cpp
View File

@ -928,14 +928,11 @@ syslog_sender(void *data)
length = SYSLOG_MAX_MESSAGE_LENGTH;
length = ring_buffer_read(sSyslogBuffer,
(uint8 *)sSyslogMessage->message, length);
(uint8*)sSyslogMessage->message, length);
if (sSyslogDropped) {
// add drop marker
if (length < (int32)SYSLOG_MAX_MESSAGE_LENGTH - 6)
strlcat(sSyslogMessage->message, "<DROP>", SYSLOG_MAX_MESSAGE_LENGTH);
else if (length > 7)
strcpy(sSyslogMessage->message + length - 7, "<DROP>");
// Add drop marker - since parts had to be dropped, it's
// guaranteed that we have enough space in the buffer now.
ring_buffer_write(sSyslogBuffer, (uint8*)"<DROP>", 6);
sSyslogDropped = false;
}
@ -1412,13 +1409,11 @@ flush_pending_repeats(void)
static void
check_pending_repeats(void *data, int iter)
check_pending_repeats(void* /*data*/, int /*iteration*/)
{
(void)data;
(void)iter;
if (sMessageRepeatCount > 0
&& ((system_time() - sMessageRepeatLastTime) > 1000000
|| (system_time() - sMessageRepeatFirstTime) > 3000000)) {
&& (system_time() - sMessageRepeatLastTime > 1000000
|| system_time() - sMessageRepeatFirstTime > 3000000)) {
cpu_status state = disable_interrupts();
acquire_spinlock(&sSpinlock);