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

* kernel_debugger_loop(): Don't access sSyslogBuffer without checking whether

Browse Source 
it is non-NULL first.
* syslog_init_post_vm(): Make sure the area for the debug syslog could actually
  be created and fail otherwise.
* syslog_init_post_threads(): Fixed the cleanup on error. In case of a debug
  syslog we need to delete the respective area instead of free()ing the
  memory.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36497 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2010-04-26 21:16:36 +00:00
parent e590fb24c6
commit 22984248fa
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/debug/debug.cpp
+19 -4
View File
@@ -101,6 +101,7 @@ static struct ring_buffer* sSyslogBuffer;
static size_t sSyslogBufferOffset = 0; static size_t sSyslogBufferOffset = 0;
// (relative) buffer offset of the yet unsent syslog messages // (relative) buffer offset of the yet unsent syslog messages
static bool sSyslogDropped = false; static bool sSyslogDropped = false;
static bool sDebugSyslog = false;
static size_t sSyslogDebuggerOffset = 0; static size_t sSyslogDebuggerOffset = 0;
// (relative) buffer offset of the kernel debugger messages of the current // (relative) buffer offset of the kernel debugger messages of the current
// KDL session // KDL session
@@ -805,7 +806,8 @@ kernel_debugger_loop(const char* messagePrefix, const char* message,
if (sCurrentKernelDebuggerMessage != NULL) if (sCurrentKernelDebuggerMessage != NULL)
va_copy(sCurrentKernelDebuggerMessageArgs, args); va_copy(sCurrentKernelDebuggerMessageArgs, args);
sSyslogDebuggerOffset = ring_buffer_readable(sSyslogBuffer); sSyslogDebuggerOffset = sSyslogBuffer != NULL
? ring_buffer_readable(sSyslogBuffer) : 0;
print_kernel_debugger_message(); print_kernel_debugger_message();
@@ -1298,8 +1300,15 @@ syslog_init_post_threads(void)
// initializing kernel syslog service failed -- disable it // initializing kernel syslog service failed -- disable it
sSyslogOutputEnabled = false; sSyslogOutputEnabled = false;
if (sSyslogBuffer != NULL) {
if (sDebugSyslog)
delete_area(area_for(sSyslogBuffer));
else
delete_ring_buffer(sSyslogBuffer);
}
free(sSyslogMessage); free(sSyslogMessage);
free(sSyslogBuffer);
delete_sem(sSyslogNotify); delete_sem(sSyslogNotify);
return B_ERROR; return B_ERROR;
@@ -1348,8 +1357,13 @@ syslog_init_post_vm(struct kernel_args* args)
// create an area for the debug syslog buffer // create an area for the debug syslog buffer
void* base = (void*)ROUNDDOWN((addr_t)args->debug_output, B_PAGE_SIZE); void* base = (void*)ROUNDDOWN((addr_t)args->debug_output, B_PAGE_SIZE);
size_t size = ROUNDUP(args->debug_size, B_PAGE_SIZE); size_t size = ROUNDUP(args->debug_size, B_PAGE_SIZE);
create_area("syslog debug", &base, B_EXACT_ADDRESS, size, area_id area = create_area("syslog debug", &base, B_EXACT_ADDRESS, size,
B_ALREADY_WIRED, B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA); B_ALREADY_WIRED, B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA);
if (area < 0) {
sSyslogBuffer = NULL;
status = B_NO_MEMORY;
goto err2;
}
} }
// initialize syslog message // initialize syslog message
@@ -1396,6 +1410,7 @@ syslog_init(struct kernel_args* args)
sSyslogBuffer = create_ring_buffer_etc(args->debug_output, args->debug_size, sSyslogBuffer = create_ring_buffer_etc(args->debug_output, args->debug_size,
RING_BUFFER_INIT_FROM_BUFFER); RING_BUFFER_INIT_FROM_BUFFER);
sDebugSyslog = true;
return B_OK; return B_OK;
} }