nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add assertions to Signal::DispatchHandler callers.

This commit is contained in:
Jonas 'Sortie' Termansen 2016-03-28 17:37:37 +02:00
parent c1e5bcba7f
commit ecfe121a8c
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/scheduler.cpp
View File

@ -322,6 +322,7 @@ static void RealSwitch(struct interrupt_context* intctx, bool yielded)
{
// We're already this thread, so run the signal handler.
Interrupt::Enable();
assert(Interrupt::IsEnabled());
Signal::DispatchHandler(intctx, NULL);
}
else

3
kernel/signal.cpp
View File

@ -818,6 +818,7 @@ void Thread::HandleSigreturn(struct interrupt_context* intctx)
lock.Reset();
assert(Interrupt::IsEnabled());
HandleSignal(intctx);
}
@ -825,11 +826,13 @@ namespace Signal {
void DispatchHandler(struct interrupt_context* intctx, void* /*user*/)
{
assert(Interrupt::IsEnabled());
return CurrentThread()->HandleSignal(intctx);
}
void ReturnHandler(struct interrupt_context* intctx, void* /*user*/)
{
assert(Interrupt::IsEnabled());
return CurrentThread()->HandleSigreturn(intctx);
}

13
kernel/x86-family/interrupt.cpp
View File

@ -132,6 +132,13 @@ static struct interrupt_handler Signal__DispatchHandler_handler;
static struct interrupt_handler Signal__ReturnHandler_handler;
static struct interrupt_handler Scheduler__ThreadExitCPU_handler;
// Temporarily to see if this is the source of the assertion failure.
void DispatchHandlerWrap(struct interrupt_context* intctx, void* user)
{
assert(Interrupt::IsEnabled());
return Signal::DispatchHandler(intctx, user);
}
void RegisterHandler(unsigned int index, struct interrupt_handler* handler)
{
assert(index < NUM_INTERRUPTS);
@ -239,7 +246,7 @@ void Init()
Scheduler__InterruptYieldCPU_handler.handler = Scheduler::InterruptYieldCPU;
RegisterHandler(129, &Scheduler__InterruptYieldCPU_handler);
Signal__DispatchHandler_handler.handler = Signal::DispatchHandler;
Signal__DispatchHandler_handler.handler = DispatchHandlerWrap;
RegisterHandler(130, &Signal__DispatchHandler_handler);
Signal__ReturnHandler_handler.handler = Signal::ReturnHandler;
RegisterHandler(131, &Signal__ReturnHandler_handler);
@ -295,7 +302,10 @@ void UserCrashHandler(struct interrupt_context* intctx)
CurrentThread()->DeliverSignalUnlocked(SIGSEGV);
kthread_mutex_unlock(&CurrentProcess()->signal_lock);
if ( handled )
{
assert(Interrupt::IsEnabled());
return Signal::DispatchHandler(intctx, NULL);
}
}
// Issue a diagnostic message to the kernel log concerning the crash.
@ -310,6 +320,7 @@ void UserCrashHandler(struct interrupt_context* intctx)
CurrentProcess()->ExitThroughSignal(SIGSEGV);
// Deliver signals to this thread so it can exit correctly.
assert(Interrupt::IsEnabled());
Signal::DispatchHandler(intctx, NULL);
}