Prevent empty-queue check from eating the CPU.

diff --git a/BUGS b/BUGS
index 44b510068ed94e57a346cd707785a043905f1a42..12564e5b302d9c15976708eea6a97c8482d470d3 100644 (file)
--- a/BUGS
+++ b/BUGS
@@ -1,13 +1,4 @@
                        KNOWN BUGS
 
-We apologize for the rough edges on this software.  The initial release
-was somewhat rushed by the sudden death of cia.vc in late September 2012;
-a replacement needed to be fielded immediately.
-
-* Testing has been minimal.
-
-* There is one report of unexplainedly high CPU usage by irkerd when
-  processing UDP requests.
-
 * Despite what the header comment implies, the URL prefix and message template
   in irkerhook.py can at present only be modified by hacking the script.

diff --git a/NEWS b/NEWS
index 8ab0826ea6232ee51ca3c4292a4515e1a6f33693..d6014cef02440d2ea2b4f039c703799cca923e38 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,4 +3,7 @@
 1.0 @ 2012-09-27
   First production version, somewhat rushed by the sudden death of cia.vc.
 
+1.1 @ 2012-09-28
+  Add a delay to avoid threads spinning on the empty-queue-check, eating CPU.
+
 

diff --git a/README b/README
index 2f151d0cea8fe050304cbd57143fd80e55d464b5..54b85535599702d7ad2a3b52424f4f6914f7051c 100644 (file)
--- a/README
+++ b/README
@@ -15,7 +15,7 @@ and passes them to a local irker instance. Find it here:
 
     https://github.com/nenolod/irker-cia-proxy
 
-Due to the abrupt death of cia.vc in late September 2012 the
+Due to the abrupt death of cia.vc on September 24 2012 the
 initial release of this software was a bit rushed.  See the file
 BUGS for known problems.
 

diff --git a/irkerd b/irkerd
index 3187e7f4967cc250e86c43834f7149af41185537..905c12d850458116b54f533b267e41217a272737 100755 (executable)
--- a/irkerd
+++ b/irkerd
@@ -34,6 +34,7 @@ DISCONNECT_TTL = (24 * 60 * 60)       # Time to live, seconds from last connect
 UNSEEN_TTL = 60                        # Time to live, seconds since first request
 CHANNEL_MAX = 18               # Max channels open per socket (default)
 ANTI_FLOOD_DELAY = 0.125       # Anti-flood delay after transmissions, seconds
+ANTI_BUZZ = 0.09               # Anti-buzz delay after queue-empty check
 
 # No user-serviceable parts below this line
 
@@ -41,7 +42,7 @@ import sys, json, getopt, urlparse, time
 import threading, Queue, SocketServer
 import irc.client, logging
 
-version = "1.0"
+version = "1.1"
 
 # Sketch of implementation:
 #
@@ -152,6 +153,13 @@ class Connection:
                     self.connection.close()
                     self.connection = None
                     self.status = "disconnected"
+                else:
+                    # Prevent this thread from hogging the CPU by pausing
+                    # for just a little bit after the queue-empty check.
+                    # As long as this is less that the duration of a human
+                    # reflex arc it is highly unlikely any human will ever
+                    # notice.
+                    time.sleep(ANTI_BUZZ)
             elif self.status == "disconnected" \
                      and time.time() > self.last_xmit + DISCONNECT_TTL:
                 # Queue is nonempty, but the IRC server might be down. Letting