Merge branch 'idle_fix' of https://github.com/doublec/WaspVM into dou…

…blec-idle_fix
doublec · Jan 18, 2011 · 51c70da · 51c70da
2 parents 49e3d24 + 72f23c5
commit 51c70da
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/vm/os.c b/vm/os.c
@@ -64,8 +64,14 @@ void wasp_disable_os_loop( ){
     if( -- wasp_os_loop_use ) return;
     wasp_disable_process( wasp_os_loop_process );
 }
-
-void wasp_os_poll( ){ event_loop( EVLOOP_NONBLOCK | EVLOOP_ONCE ); }
+
+void wasp_os_poll( ){
+    if( wasp_enable_count == 1 ){
+        event_loop( EVLOOP_ONCE );
+    }else{
+        event_loop( EVLOOP_NONBLOCK | EVLOOP_ONCE ); 
+    }
+}
 
 void wasp_enable_conn_loop( wasp_os_connection oscon ){
     if( oscon->looping ) return;

diff --git a/vm/waspvm/process.h b/vm/waspvm/process.h
@@ -76,6 +76,8 @@ extern wasp_process wasp_first_enabled;
 extern wasp_process wasp_last_enabled;
 extern wasp_process wasp_active_process;
 
+extern wasp_quad wasp_enable_count;
+
 #define REQ_PROCESS_ARG( x ) REQ_TYPED_ARG( x, process )
 #define OPT_PROCESS_ARG( x ) OPT_TYPED_ARG( x, process )
 #define PROCESS_RESULT( x )  TYPED_RESULT( process, x )