eventloop cleanups

svaarala · svaarala · commit bacc96e5f6df · 2014-03-14T22:46:01.000+02:00
diff --git a/examples/eventloop/README.txt b/examples/eventloop/README.txt
@@ -59,12 +59,13 @@ keep the example somewhat simple.  Some shortcomings include:
 * Buffer churn caused by allocating a new buffer for every socket read
   should be eliminated by reusing buffers where appropriate.  Although
   churn doesn't increase memory footprint with reference counting, it
-  is slower than reusing buffers and might aggravate memory fragmentation.
+  is slower than reusing buffers and might increase memory fragmentation.
 
 * There is no way to suspend reading or writing in the example.  Adding
   them is straightforward: the poll set needs to be managed dynamically.
 
 * The example uses poll() while one should use epoll() on Linux, kqueue()
   on BSD systems, etc.
 
-* Error handling is mostly missing.
+* Error handling is mostly missing.  Debug prints don't interact well
+  with curses.
diff --git a/examples/eventloop/ecma_eventloop.js b/examples/eventloop/ecma_eventloop.js
@@ -26,6 +26,7 @@ EventLoop = {
     nextTimerId: 1,
     minimumDelay: 1,
     minimumWait: 1,
+    maximumWait: 60000,
     maxExpirys: 10,
 
     // sockets
@@ -57,7 +58,7 @@ EventLoop.getEarliestTimer = function() {
 
 EventLoop.getEarliestWait = function() {
     var t = this.getEarliestTimer();
-    return (t ? Math.max(this.minimumWait, t.target - Date.now()) : null);
+    return (t ? t.target - Date.now() : null);
 }
 
 EventLoop.insertTimer = function(timer) {
@@ -252,9 +253,15 @@ EventLoop.run = function() {
          */
 
         wait = this.getEarliestWait();
-        if (!wait && poll_count === 0) {
-            print('no active timers and no sockets to poll, exit');
-            break;
+        if (wait === null) {
+            if (poll_count === 0) {
+                print('no active timers and no sockets to poll, exit');
+                break;
+            } else {
+                wait = this.maximumWait;
+            }
+        } else {
+            wait = Math.min(this.maximumWait, Math.max(this.minimumWait, wait));
         }
 
         /*
