[ViewVC] Diff of: cvs/libev/event.c

Comparing libev/event.c (file contents):
Revision 1.9 by root, Sun Nov 4 00:24:17 2007 UTC vs.
Revision 1.13 by root, Sun Nov 4 18:29:44 2007 UTC

  */
 #include <stddef.h>
 #include <stdlib.h>
 #include <sys/time.h>
+#include <assert.h>
+#include "ev.h"
 #include "event.h"
 #if EV_MULTIPLICITY
 # define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
 # define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
 struct event_base
 {
   int dummy;
 };
-static struct event_base x_base, *x_cur;
+static struct event_base *x_cur;
 static void
 tv_set (struct timeval *tv, ev_tstamp at)
 {
   tv->tv_sec  = (long)at;
 }
 void *event_init (void)
 {
 #if EV_MULTIPLICITY
+  if (x_cur)
-  x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO);
+    x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO);
+  else
+    x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO);
 #else
-  x_cur = &x_base;
+  assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
+  x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO);
 #endif
   return x_cur;
 }
 void event_base_free (struct event_base *base)
 {
   dLOOPbase;
 #if EV_MULTIPLICITY
+  if (ev_default_loop (EVMETHOD_AUTO) != loop)
-  ev_loop_delete (loop);
+    ev_loop_destroy (loop);
 #endif
 }
 int event_dispatch (void)
 {
   return 0;
 }
 int event_base_priority_init (struct event_base *base, int npri)
 {
-  dLOOPbase;
+  /*dLOOPbase;*/
   return 0;
 }

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines