hyung-hwan/moo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added some VM clean-up code to make it more robust

Browse Source
This commit is contained in:
hyunghwan.chung 2021-04-14 15:46:39 +00:00
parent e37a6dcd05
commit 5db759b684
1 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
moo/lib/exec.c
View File

@ -135,6 +135,7 @@ static MOO_INLINE const char* proc_state_to_string (int state)
static int delete_sem_from_sem_io_tuple (moo_t* moo, moo_oop_semaphore_t sem, int force); static int delete_sem_from_sem_io_tuple (moo_t* moo, moo_oop_semaphore_t sem, int force);
static void signal_io_semaphore (moo_t* moo, moo_ooi_t io_handle, moo_ooi_t mask); static void signal_io_semaphore (moo_t* moo, moo_ooi_t io_handle, moo_ooi_t mask);
static void terminate_all_processes (moo_t* moo);
static int send_message (moo_t* moo, moo_oop_char_t selector, moo_ooi_t nargs, int to_super); static int send_message (moo_t* moo, moo_oop_char_t selector, moo_ooi_t nargs, int to_super);
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
@ -165,6 +166,24 @@ static MOO_INLINE void vm_cleanup (moo_t* moo)
/* TODO: clean up semaphores being waited on /* TODO: clean up semaphores being waited on
MOO_ASSERT (moo, moo->sem_io_wait_count == 0); */ MOO_ASSERT (moo, moo->sem_io_wait_count == 0); */
if (moo->processor->total_count != MOO_SMOOI_TO_OOP(0))
{
/* the stock kernel code is supposed to stop all processes.
* if the code reaches here, the kernel code must be buggy */
MOO_LOG3 (moo, MOO_LOG_WARN, "Warning - non-zero number of processes upon VM clean-up - total: %zd runnable: %zd suspended: %zd\n",
(moo_ooi_t)MOO_OOP_TO_SMOOI(moo->processor->total_count),
(moo_ooi_t)MOO_OOP_TO_SMOOI(moo->processor->runnable.count),
(moo_ooi_t)MOO_OOP_TO_SMOOI(moo->processor->suspended.count));
MOO_LOG0 (moo, MOO_LOG_WARN, "Warning - Terminating all residue processes\n");
terminate_all_processes (moo);
}
MOO_ASSERT (moo, moo->processor->active == moo->nil_process);
MOO_ASSERT (moo, MOO_OOP_TO_SMOOI(moo->processor->total_count) == 0);
MOO_ASSERT (moo, MOO_OOP_TO_SMOOI(moo->processor->runnable.count) == 0);
MOO_ASSERT (moo, MOO_OOP_TO_SMOOI(moo->processor->suspended.count) == 0);
for (i = 0; i < moo->sem_io_map_capa;) for (i = 0; i < moo->sem_io_map_capa;)
{ {
moo_ooi_t sem_io_index; moo_ooi_t sem_io_index;
@ -778,6 +797,22 @@ static void terminate_process (moo_t* moo, moo_oop_process_t proc)
#endif #endif
} }
static void terminate_all_processes (moo_t* moo)
{
while (MOO_OOP_TO_SMOOI(moo->processor->suspended.count) > 0)
{
terminate_process (moo, moo->processor->suspended.first);
}
while (MOO_OOP_TO_SMOOI(moo->processor->runnable.count) > 0)
{
terminate_process (moo, moo->processor->runnable.first);
}
MOO_ASSERT (moo, MOO_OOP_TO_SMOOI(moo->processor->total_count) == 0);
MOO_ASSERT (moo, moo->processor->active == moo->nil_process);
}
static void resume_process (moo_t* moo, moo_oop_process_t proc) static void resume_process (moo_t* moo, moo_oop_process_t proc)
{ {
if (proc->state == MOO_SMOOI_TO_OOP(PROC_STATE_SUSPENDED)) if (proc->state == MOO_SMOOI_TO_OOP(PROC_STATE_SUSPENDED))