[or-cvs] Allow a few EINVALs from libevent before dying. Warn on kq...

[nickm@xxxxxxxx (Nick Mathewson)]

Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv28979/src/or

Modified Files:
	config.c main.c 
Log Message:
Allow a few EINVALs from libevent before dying.  Warn on kqueue with libevent before 1.1a

Index: config.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/config.c,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -d -r1.362 -r1.363
--- config.c	11 Jun 2005 18:56:16 -0000	1.362
+++ config.c	13 Jun 2005 00:35:19 -0000	1.363
@@ -2684,7 +2684,8 @@
   tor_assert(m && v);
 
   if (!strcmp(m, "kqueue")) {
-    if (!strcmp(v, "1.0c")) {
+    if (!strcmp(v, "1.0c") || !strcmp(v, "1.0d") || !strcmp(v, "1.0e") ||
+        !strcmp(v, "1.1")) {
       buggy = 1;
     }
   } else if (!strcmp(m, "epoll")) {

Index: main.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/main.c,v
retrieving revision 1.516
retrieving revision 1.517
diff -u -d -r1.516 -r1.517
--- main.c	11 Jun 2005 18:52:11 -0000	1.516
+++ main.c	13 Jun 2005 00:35:19 -0000	1.517
@@ -810,6 +810,7 @@
 }
 
 static struct event *timeout_event = NULL;
+static int n_libevent_errors = 0;
 
 /** Libevent callback: invoked once every second. */
 static void
@@ -829,6 +830,8 @@
     one_second.tv_usec = 0;
   }
 
+  n_libevent_errors = 0;
+
   /* log_fn(LOG_NOTICE, "Tick."); */
   tor_gettimeofday(&now);
 
@@ -885,6 +888,19 @@
            "Error from libevent when setting one-second timeout event");
 }
 
+/** Called when a possibly ignorable libevent error occurs; ensures that we
+ * don't get into an infinite loop by ignoring too many errors from
+ * libevent. */
+int
+got_libevent_error(void)
+{
+  if (++n_libevent_errors > 8) {
+    log_fn(LOG_ERR, "Too many libevent errors in one second; dying");
+    return -1;
+  }
+  return 0;
+}
+
 /** Called when we get a SIGHUP: reload configuration files and keys,
  * retry all connections, re-upload all descriptors, and so on. */
 static int
@@ -1001,6 +1017,12 @@
                tor_socket_strerror(e), e);
 #endif
         return -1;
+#ifndef MS_WINDOWS
+      } else if (e == EINVAL) {
+        log_fn(LOG_WARN, "EINVAL from libevent: should you upgrade libevent?");
+        if (got_libevent_error())
+          return -1;
+#endif
       } else {
         if (ERRNO_IS_EINPROGRESS(e))
           log_fn(LOG_WARN,"libevent poll returned EINPROGRESS? Please report.");