portugalfuturista/seL4
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Debug: fix ksDebugTCBs for SMP

Browse source 
There is a separate list of tcbs per core.

- migrate between debug lists when setting affinity
- use the correct core when removing
This commit is contained in:
Anna Lyons 2017-08-21 14:58:19 +10:00
parent 9de5e2aa65
commit c4d86b9844
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/object/tcb.c
View file

@ -177,19 +177,19 @@ void tcbDebugAppend(tcb_t *tcb)
/* prepend to the list */
tcb->tcbDebugPrev = NULL;
if (NODE_STATE(ksDebugTCBs)) {
NODE_STATE(ksDebugTCBs)->tcbDebugPrev = tcb;
if (NODE_STATE_ON_CORE(ksDebugTCBs, tcb->tcbAffinity)) {
NODE_STATE_ON_CORE(ksDebugTCBs, tcb->tcbAffinity)->tcbDebugPrev = tcb;
}
tcb->tcbDebugNext = NODE_STATE(ksDebugTCBs);
NODE_STATE(ksDebugTCBs) = tcb;
tcb->tcbDebugNext = NODE_STATE_ON_CORE(ksDebugTCBs, tcb->tcbAffinity);
NODE_STATE_ON_CORE(ksDebugTCBs, tcb->tcbAffinity) = tcb;
}
void tcbDebugRemove(tcb_t *tcb)
{
assert(NODE_STATE(ksDebugTCBs) != NULL);
if (tcb == NODE_STATE(ksDebugTCBs)) {
NODE_STATE(ksDebugTCBs) = NODE_STATE(ksDebugTCBs)->tcbDebugNext;
assert(NODE_STATE_ON_CORE(ksDebugTCBs, tcb->tcbAffinity) != NULL);
if (tcb == NODE_STATE_ON_CORE(ksDebugTCBs, tcb->tcbAffinity)) {
NODE_STATE_ON_CORE(ksDebugTCBs, tcb->tcbAffinity) = NODE_STATE_ON_CORE(ksDebugTCBs, tcb->tcbAffinity)->tcbDebugNext;
} else {
assert(tcb->tcbDebugPrev);
tcb->tcbDebugPrev->tcbDebugNext = tcb->tcbDebugNext;
@ -382,11 +382,16 @@ invokeTCB_SetAffinity(tcb_t *thread, word_t affinity)
/* remove the tcb from scheduler queue in case it is already in one
* and add it to new queue if required */
tcbSchedDequeue(thread);
#ifdef CONFIG_DEGBUD_BUILD
tcbDebugRemove(thread);
#endif
thread->tcbAffinity = affinity;
if (isRunnable(thread)) {
SCHED_APPEND(thread);
}
#if CONFIG_DEBUG_BUILD
tcbDebugAppend(thread);
#endif
/* reschedule current cpu if tcb moves itself */
if (thread == NODE_STATE(ksCurThread)) {
rescheduleRequired();