1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Guard tick_spinner start/stop

Browse Source 
All tests passing on OSX. Thanks to Bert for debugging this.
This commit is contained in:
Ryan Dahl 2011-05-23 15:38:54 -07:00
parent d3426789d2
commit 207901e7de
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/node.cc
View File

@ -216,8 +216,10 @@ static Handle<Value> NeedTickCallback(const Arguments& args) {
// there is nothing left to do in the event loop and libev will exit. The // there is nothing left to do in the event loop and libev will exit. The
// ev_prepare callback isn't called before exiting. Thus we start this // ev_prepare callback isn't called before exiting. Thus we start this
// tick_spinner to keep the event loop alive long enough to handle it. // tick_spinner to keep the event loop alive long enough to handle it.
uv_idle_start(&tick_spinner, Spin); if (!uv_is_active(&tick_spinner)) {
uv_ref(); uv_idle_start(&tick_spinner, Spin);
uv_ref();
}
return Undefined(); return Undefined();
} }
@ -227,8 +229,10 @@ static void Tick(void) {
if (!need_tick_cb) return; if (!need_tick_cb) return;
need_tick_cb = false; need_tick_cb = false;
uv_idle_stop(&tick_spinner); if (uv_is_active(&tick_spinner)) {
uv_unref(); uv_idle_stop(&tick_spinner);
uv_unref();
}
HandleScope scope; HandleScope scope;
@ -2369,9 +2373,12 @@ char** Init(int argc, char *argv[]) {
ev_timer_init(&node::gc_timer, node::CheckStatus, 5., 5.); ev_timer_init(&node::gc_timer, node::CheckStatus, 5., 5.);
// Setup the EIO thread pool // Setup the EIO thread pool. It requires 3, yes 3, watchers.
{ // It requires 3, yes 3, watchers. {
ev_idle_init(&node::eio_poller, node::DoPoll); ev_idle_init(&node::eio_poller, node::DoPoll);
// TODO Probably don't need to start this each time.
// Avoids failing on test/simple/test-eio-race3.js though
ev_idle_start(EV_DEFAULT_UC_ &eio_poller);
ev_async_init(&node::eio_want_poll_notifier, node::WantPollNotifier); ev_async_init(&node::eio_want_poll_notifier, node::WantPollNotifier);
ev_async_start(EV_DEFAULT_UC_ &node::eio_want_poll_notifier); ev_async_start(EV_DEFAULT_UC_ &node::eio_want_poll_notifier);
@ -2460,10 +2467,6 @@ int Start(int argc, char *argv[]) {
// so your next reading stop should be node::Load()! // so your next reading stop should be node::Load()!
Load(process); Load(process);
// TODO Probably don't need to start this each time.
// Avoids failing on test/simple/test-eio-race3.js though
ev_idle_start(EV_DEFAULT_UC_ &eio_poller);
// All our arguments are loaded. We've evaluated all of the scripts. We // All our arguments are loaded. We've evaluated all of the scripts. We
// might even have created TCP servers. Now we enter the main eventloop. If // might even have created TCP servers. Now we enter the main eventloop. If
// there are no watchers on the loop (except for the ones that were // there are no watchers on the loop (except for the ones that were