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

kernel/user_debugger: Clean up scheduling of flushes a bit.

Browse Source 
Instead of doing the checks in profiling_do_sample, we now do them
in profiling_event. This allows some comments to be consolidated
and make the logic clearer (but it should be functionally the same.)

Also add a check that profiling is still happening at the end
of profiling_flush.
This commit is contained in:
Augustin Cavalier
2024-07-18 21:25:00 -04:00
parent c5a499a74b
commit bc19d91fb6
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/debug/user_debugger.cpp
+11 -15
View File
@@ -1331,11 +1331,10 @@ profiling_timer_left(Thread* thread)
/*! Samples the current thread's instruction pointer/stack trace.
The caller must hold the current thread's debug info lock.
\param flushBuffer Return parameter: Set to \c true when the sampling
buffer must be flushed.
\returns Whether the profiling timer should be rescheduled.
*/
static bool
profiling_do_sample(bool& flushBuffer)
profiling_do_sample()
{
Thread* thread = thread_get_current_thread();
thread_debug_info& debugInfo = thread->debug_info;
@@ -1367,11 +1366,6 @@ profiling_do_sample(bool& flushBuffer)
|| debugInfo.profile.flush_threshold - sampleCount < stackDepth) {
debugInfo.profile.flush_needed = true;
// If we've interrupted a kernel function, we can't flush now.
// (The flush will instead happen in the post_syscall hook.)
if (!IS_KERNEL_ADDRESS(arch_debug_get_interrupt_pc(NULL)))
flushBuffer = true;
// If the buffer is not full yet, we add the samples,
// otherwise we have to drop them.
if (maxSamples - sampleCount < stackDepth) {
@@ -1472,7 +1466,8 @@ profiling_flush(void*)
disable_interrupts();
threadDebugInfoLocker.Lock();
schedule_profiling_timer(thread, interval);
if (debugInfo.profile.samples != NULL)
schedule_profiling_timer(thread, interval);
}
threadDebugInfoLocker.Unlock();
@@ -1492,12 +1487,13 @@ profiling_event(timer* /*unused*/)
SpinLocker threadDebugInfoLocker(debugInfo.lock);
debugInfo.profile.installed_timer = NULL;
bool flushBuffer = false;
if (profiling_do_sample(flushBuffer)) {
if (flushBuffer) {
// The sample buffer needs to be flushed; we'll have to notify the
// debugger. We can't do that right here. Instead we set a post
// interrupt callback doing that for us.
if (profiling_do_sample()) {
// Check if the sample buffer needs to be flushed. We can't do it here,
// since we're in an interrupt handler, and we can't set the callback
// if we interrupted a kernel function, since the callback will pause
// this thread. (The post_syscall hook will do the flush in that case.)
if (debugInfo.profile.flush_needed
&& !IS_KERNEL_ADDRESS(arch_debug_get_interrupt_pc(NULL))) {
thread->post_interrupt_callback = profiling_flush;
// We don't reschedule the timer here because profiling_flush() will