rarias/ovni
rarias/ovni
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Ensure the expected state was in the stack

Browse Source
This commit is contained in:
Rodrigo Arias 2021-09-23 15:13:28 +02:00 committed by Rodrigo Arias Mallo
parent c846e03899
commit f232b915a6
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
emu_nosv_ss.c
View File

@ -35,7 +35,7 @@ ss_push(struct ovni_ethread *t, int st)
} }
static int static int
ss_pop(struct ovni_ethread *t) ss_pop(struct ovni_ethread *t, int expected_st)
{ {
int st; int st;
@ -46,6 +46,14 @@ ss_pop(struct ovni_ethread *t)
} }
st = t->ss[t->nss - 1]; st = t->ss[t->nss - 1];
if(st > 0 && st != expected_st)
{
err("thread %d expected subsystem state %d (got %d)\n",
expected_st, st);
exit(EXIT_FAILURE);
}
t->nss--; t->nss--;
return st; return st;
@ -80,13 +88,13 @@ pre_sched(struct ovni_emu *emu)
ss_push(th, ST_SCHED_HUNGRY); ss_push(th, ST_SCHED_HUNGRY);
break; break;
case 'f': /* Fill: no longer hungry */ case 'f': /* Fill: no longer hungry */
ss_pop(th); ss_pop(th, ST_SCHED_HUNGRY);
break; break;
case '[': /* Server enter */ case '[': /* Server enter */
ss_push(th, ST_SCHED_SERVING); ss_push(th, ST_SCHED_SERVING);
break; break;
case ']': /* Server exit */ case ']': /* Server exit */
ss_pop(th); ss_pop(th, ST_SCHED_SERVING);
break; break;
case '@': ss_ev(th, EV_SCHED_SELF); break; case '@': ss_ev(th, EV_SCHED_SELF); break;
case 'r': ss_ev(th, EV_SCHED_RECV); break; case 'r': ss_ev(th, EV_SCHED_RECV); break;
@ -105,7 +113,7 @@ pre_submit(struct ovni_emu *emu)
switch(emu->cur_ev->header.value) switch(emu->cur_ev->header.value)
{ {
case '[': ss_push(th, ST_SCHED_SUBMITTING); break; case '[': ss_push(th, ST_SCHED_SUBMITTING); break;
case ']': ss_pop(th); break; case ']': ss_pop(th, ST_SCHED_SUBMITTING); break;
default: default:
break; break;
} }
@ -120,7 +128,7 @@ pre_memory(struct ovni_emu *emu)
switch(emu->cur_ev->header.value) switch(emu->cur_ev->header.value)
{ {
case '[': ss_push(th, ST_MEM_ALLOCATING); break; case '[': ss_push(th, ST_MEM_ALLOCATING); break;
case ']': ss_pop(th); break; case ']': ss_pop(th, ST_MEM_ALLOCATING); break;
default: default:
break; break;
} }