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

Replaced the hash based approach to repeat detection with the probably more efficient strncmp.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16970 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz 2006-04-02 16:45:04 +00:00
parent 5652ba7236
commit 3647d70ded
1 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,12 +60,11 @@ static struct debugger_command *sCommands;
#define SYSLOG_BUFFER_SIZE 65536 #define SYSLOG_BUFFER_SIZE 65536
#define OUTPUT_BUFFER_SIZE 1024 #define OUTPUT_BUFFER_SIZE 1024
static char sOutputBuffer[OUTPUT_BUFFER_SIZE]; static char sOutputBuffer[OUTPUT_BUFFER_SIZE];
static char sLastOutputBuffer[OUTPUT_BUFFER_SIZE];
static int64 hash_string(const char *string);
static void flush_pending_repeats(void); static void flush_pending_repeats(void);
static status_t check_pending_repeats(void *data); static status_t check_pending_repeats(void *data);
static int64 sLastMessageHash = 0;
static int64 sMessageRepeatTime = 0; static int64 sMessageRepeatTime = 0;
static int32 sMessageRepeatCount = 0; static int32 sMessageRepeatCount = 0;
@ -593,14 +592,13 @@ debug_puts(const char *string)
state = disable_interrupts(); state = disable_interrupts();
acquire_spinlock(&sSpinlock); acquire_spinlock(&sSpinlock);
newHash = hash_string(string); if (strncmp(sOutputBuffer, sLastOutputBuffer, OUTPUT_BUFFER_SIZE) == 0) {
if (newHash == sLastMessageHash) {
sMessageRepeatCount++; sMessageRepeatCount++;
sMessageRepeatTime = system_time(); sMessageRepeatTime = system_time();
} else { } else {
flush_pending_repeats(); flush_pending_repeats();
kputs(string); kputs(string);
sLastMessageHash = newHash; memcpy(sLastOutputBuffer, sOutputBuffer, OUTPUT_BUFFER_SIZE);
} }
// kputs() doesn't output to syslog (as it's only used // kputs() doesn't output to syslog (as it's only used
@ -826,22 +824,6 @@ set_dprintf_enabled(bool newState)
} }
static int64
hash_string(const char *string)
{
char ch;
int64 result = 0;
while ((ch = *string++) != 0) {
result = (result << 7) ^ (result >> 24);
result ^= ch;
}
result ^= result << 12;
return result;
}
static void static void
flush_pending_repeats(void) flush_pending_repeats(void)
{ {
@ -901,8 +883,7 @@ dprintf(const char *format, ...)
length = vsnprintf(sOutputBuffer, OUTPUT_BUFFER_SIZE, format, args); length = vsnprintf(sOutputBuffer, OUTPUT_BUFFER_SIZE, format, args);
va_end(args); va_end(args);
newHash = hash_string(sOutputBuffer); if (strncmp(sOutputBuffer, sLastOutputBuffer, length) == 0) {
if (newHash == sLastMessageHash) {
sMessageRepeatCount++; sMessageRepeatCount++;
sMessageRepeatTime = system_time(); sMessageRepeatTime = system_time();
} else { } else {
@ -915,7 +896,7 @@ dprintf(const char *format, ...)
if (sBlueScreenEnabled || sDebugScreenEnabled) if (sBlueScreenEnabled || sDebugScreenEnabled)
blue_screen_puts(sOutputBuffer); blue_screen_puts(sOutputBuffer);
sLastMessageHash = newHash; memcpy(sLastOutputBuffer, sOutputBuffer, length);
} }
release_spinlock(&sSpinlock); release_spinlock(&sSpinlock);