Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions pkg/vere/king.c
Original file line number Diff line number Diff line change
Expand Up @@ -951,13 +951,6 @@ _king_loop_init()
uv_timer_start(&u3K.tim_u, _boothack_cb, 0, 0);
}

/* _king_loop_exit(): cleanup after event loop
*/
void
_king_loop_exit()
{
}

static void
_king_boot_ivory(void)
{
Expand Down Expand Up @@ -1058,9 +1051,9 @@ u3_king_commence()
// run the loop
//
_king_loop_init();
// does not return becase u3_king_done does not return
//
uv_run(u3L, UV_RUN_DEFAULT);
_king_loop_exit();
u3m_stop();
}

/* u3_king_stub(): get the One Pier for unreconstructed code.
Expand Down Expand Up @@ -1649,7 +1642,7 @@ _king_done_cb(uv_handle_t* han_u)
}
}

/* u3_king_done(): all piers closed. s/b callback
/* u3_king_done(): all piers closed. s/b callback. Does not return
*/
void
u3_king_done(void)
Expand Down Expand Up @@ -1714,6 +1707,7 @@ u3_king_done(void)

// XX remove move
//
u3m_stop();
exit(u3_Host.xit_i);
}

Expand All @@ -1732,9 +1726,7 @@ u3_king_bail(void)
{
u3_Host.xit_i = 1;
_king_forall_unlink(u3_pier_bail);
_king_loop_exit();
u3_king_done();
exit(u3_Host.xit_i);
}

/* u3_king_grab(): gc the daemon
Expand Down
5 changes: 3 additions & 2 deletions pkg/vere/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2917,8 +2917,9 @@ _cw_boot(c3_i argc, c3_c* argv[])
// start reading
//
u3_newt_read(&inn_u);
// does not return because _mars_flush does not return
//
uv_run(lup_u, UV_RUN_DEFAULT);
u3m_stop();
}

/* _cw_work(): resume and run; replay and start event processing
Expand Down Expand Up @@ -3054,8 +3055,8 @@ _cw_work(c3_i argc, c3_c* argv[])
// start reading
//
u3_newt_read(&inn_u);
// does not return becase _mars_flush does not return
uv_run(lup_u, UV_RUN_DEFAULT);
u3m_stop();
}


Expand Down
1 change: 1 addition & 0 deletions pkg/vere/mars.c
Original file line number Diff line number Diff line change
Expand Up @@ -866,6 +866,7 @@ _mars_flush(u3_mars* mar_u)

// XX dispose [mar_u], exit cb ?
//
u3m_stop();
exit(0);
}
}
Expand Down