[or-cvs] r11314: Teach tor about more libevent versions. Be more clear that " (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-08-30 02:34:17 -0400 (Thu, 30 Aug 2007)
New Revision: 11314

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/config.c
Log:
 r14259 at Kushana:  nickm | 2007-08-30 02:33:55 -0400
 Teach tor about more libevent versions.  Be more clear that "Known bugs" means "it will crash or something."  Most significantly, stop issuing dire warnings every time we run with kqueue on os x: it seems to have worked for a while now.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r14259] on c95137ef-5f19-0410-b913-86e773d04f59

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-08-30 06:17:17 UTC (rev 11313)
+++ tor/trunk/ChangeLog	2007-08-30 06:34:17 UTC (rev 11314)
@@ -17,6 +17,8 @@
     - When generating information telling us how to extend to a given
       router, do not try to include the nickname if it is absent.  Fixes
       bug 467.
+    - On OSX, stop warning the user that kqueue support in libevent is
+      "experimental", since it seems to have worked fine for ages.
 
   o Code simplifications and refactoring:
     - Revamp file-writing logic so we don't need to have the entire contents

Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c	2007-08-30 06:17:17 UTC (rev 11313)
+++ tor/trunk/src/or/config.c	2007-08-30 06:34:17 UTC (rev 11314)
@@ -622,7 +622,7 @@
   /* Note: we compare these, so it's important that "old" precede everything,
    * and that "other" come last. */
   LE_OLD=0, LE_10C, LE_10D, LE_10E, LE_11, LE_11A, LE_11B, LE_12, LE_12A,
-  LE_13, LE_13A, LE_13B,
+  LE_13, LE_13A, LE_13B, LE_13C, LE_13D,
   LE_OTHER
 } le_version_t;
 static le_version_t decode_libevent_version(void);
@@ -4156,17 +4156,6 @@
 #ifdef __APPLE__
   if (decode_libevent_version() < LE_11B) {
     setenv("EVENT_NOKQUEUE","1",1);
-  } else if (!getenv("EVENT_NOKQUEUE")) {
-    const char *ver = NULL;
-#ifdef HAVE_EVENT_GET_VERSION
-    ver = event_get_version();
-#endif
-    /* If we're 1.1b or later, we'd better have get_version() */
-    tor_assert(ver);
-    log(LOG_NOTICE, LD_GENERAL, "Enabling experimental OS X kqueue support "
-        "with libevent %s.  If this turns out to not work, "
-        "set the environment variable EVENT_NOKQUEUE, and tell the Tor "
-        "developers.", ver);
   }
 #endif
   event_init();
@@ -4204,6 +4193,8 @@
   { "1.3",  LE_13 },
   { "1.3a", LE_13A },
   { "1.3b", LE_13B },
+  { "1.3c", LE_13C },
+  { "1.3d", LE_13D },
   { NULL, LE_OTHER }
 };
 
@@ -4288,7 +4279,7 @@
     badness = "BROKEN";
   } else if (buggy) {
     log(LOG_WARN, LD_GENERAL,
-        "There are known bugs in using %s with libevent %s. "
+        "There are serious bugs in using %s with libevent %s. "
         "Please use the latest version of libevent.", m, v);
     badness = "BROKEN";
   } else if (iffy) {