--- cvsroot/EV/EV.xs	2008/05/20 23:49:41	1.112
+++ cvsroot/EV/EV.xs	2009/04/15 17:49:26	1.121
@@ -26,24 +26,49 @@
 # include <pthread.h>
 #endif
 
+/* 5.10.0 */
+#ifndef SvREFCNT_inc_NN
+# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
+#endif
+
+/* 5.6.x */
+#ifndef SvRV_set
+# define SvRV_set(a,b) SvRV ((a)) = (b)
+#endif
+
+#if __GNUC__ >= 3
+# define expect(expr,value) __builtin_expect ((expr),(value))
+#else
+# define expect(expr,value) (expr)
+#endif
+
+#define expect_false(expr) expect ((expr) != 0, 0)
+#define expect_true(expr)  expect ((expr) != 0, 1)
+
 #define e_loop(w) INT2PTR (struct ev_loop *, SvIVX ((w)->loop))
 
 #define WFLAG_KEEPALIVE 1
+#define WFLAG_UNREFED   2 /* has been unref'ed */
 
 #define UNREF(w)				\
-  if (!((w)->e_flags & WFLAG_KEEPALIVE)		\
-      && !ev_is_active (w))			\
-    ev_unref (e_loop (w));
+  if (!((w)->e_flags & (WFLAG_KEEPALIVE | WFLAG_UNREFED))	\
+      && ev_is_active (w))			\
+    {						\
+      ev_unref (e_loop (w));			\
+      (w)->e_flags |= WFLAG_UNREFED;		\
+    }
 
 #define REF(w)					\
-  if (!((w)->e_flags & WFLAG_KEEPALIVE)		\
-      && ev_is_active (w))			\
-    ev_ref (e_loop (w));
+  if ((w)->e_flags & WFLAG_UNREFED)		\
+    {						\
+      (w)->e_flags &= ~WFLAG_UNREFED;		\
+      ev_ref (e_loop (w));			\
+    }
 
 #define START(type,w)				\
   do {						\
-    UNREF (w);					\
     ev_ ## type ## _start (e_loop (w), w);	\
+    UNREF (w);					\
   } while (0)
 
 #define STOP(type,w)				\
@@ -145,7 +170,7 @@
 static void *
 e_new (int size, SV *cb_sv, SV *loop)
 {
-  SV *cv = e_get_cv (cb_sv);
+  SV *cv = cb_sv ? e_get_cv (cb_sv) : 0;
   ev_watcher *w;
   SV *self = NEWSV (0, size);
   SvPOK_only (self);
@@ -153,7 +178,7 @@
 
   w = (ev_watcher *)SvPVX (self);
 
-  ev_init (w, e_cb);
+  ev_init (w, cv ? e_cb : 0);
 
   w->loop    = SvREFCNT_inc (SvRV (loop));
   w->e_flags = WFLAG_KEEPALIVE;
@@ -193,7 +218,7 @@
   return rv;
 }
 
-static SV *sv_events_cache;
+static SV *sv_self_cache, *sv_events_cache;
 
 static void
 e_cb (EV_P_ ev_watcher *w, int revents)
@@ -202,15 +227,32 @@
   I32 mark = SP - PL_stack_base;
   SV *sv_self, *sv_events;
 
-  sv_self = newRV_inc (w->self); /* w->self MUST be blessed by now */
+  /* libev might have stopped the watcher */
+  if (expect_false (w->e_flags & WFLAG_UNREFED)
+      && !ev_is_active (w))
+    REF (w);
 
-  if (sv_events_cache)
+  if (expect_true (sv_self_cache))
+    {
+      sv_self = sv_self_cache; sv_self_cache = 0;
+      SvRV_set (sv_self, SvREFCNT_inc_NN (w->self));
+    }
+  else
+    {
+      sv_self = newRV_inc (w->self); /* w->self MUST be blessed by now */
+      SvREADONLY_on (sv_self);
+    }
+
+  if (expect_true (sv_events_cache))
     {
       sv_events = sv_events_cache; sv_events_cache = 0;
       SvIV_set (sv_events, revents);
     }
   else
-    sv_events = newSViv (revents);
+    {
+      sv_events = newSViv (revents);
+      SvREADONLY_on (sv_events);
+    }
 
   PUSHMARK (SP);
   EXTEND (SP, 2);
@@ -220,14 +262,21 @@
   PUTBACK;
   call_sv (w->cb_sv, G_DISCARD | G_VOID | G_EVAL);
 
-  SvREFCNT_dec (sv_self);
+  if (expect_false (SvREFCNT (sv_self) != 1 || sv_self_cache))
+    SvREFCNT_dec (sv_self);
+  else
+    {
+      SvREFCNT_dec (SvRV (sv_self));
+      SvRV_set (sv_self, &PL_sv_undef);
+      sv_self_cache = sv_self;
+    }
 
-  if (sv_events_cache)
+  if (expect_false (SvREFCNT (sv_events) != 1 || sv_events_cache))
     SvREFCNT_dec (sv_events);
   else
     sv_events_cache = sv_events;
 
-  if (SvTRUE (ERRSV))
+  if (expect_false (SvTRUE (ERRSV)))
     {
       SPAGAIN;
       PUSHMARK (SP);
@@ -413,6 +462,7 @@
     evapi.loop_fork            = ev_loop_fork;
     evapi.loop_count           = ev_loop_count;
     evapi.now                  = ev_now;
+    evapi.now_update           = ev_now_update;
     evapi.backend              = ev_backend;
     evapi.unloop               = ev_unloop;
     evapi.ref                  = ev_ref;
@@ -488,11 +538,16 @@
 
 unsigned int ev_embeddable_backends ()
 
+void ev_sleep (NV interval)
+
 NV ev_time ()
 
 NV ev_now ()
 	C_ARGS: evapi.default_loop
 
+void ev_now_update ()
+	C_ARGS: evapi.default_loop
+
 unsigned int ev_backend ()
 	C_ARGS: evapi.default_loop
 
@@ -644,7 +699,7 @@
 	OUTPUT:
         RETVAL
 
-ev_embed *embed (struct ev_loop *loop, SV *cb = &PL_sv_undef)
+ev_embed *embed (struct ev_loop *loop, SV *cb = 0)
 	ALIAS:
         embed_ns = 1
 	CODE:
@@ -655,9 +710,6 @@
         RETVAL = e_new (sizeof (ev_embed), cb, default_loop_sv);
         RETVAL->fh = newSVsv (ST (0));
         ev_embed_set (RETVAL, loop);
-
-        if (!SvOK (cb)) ev_set_cb (RETVAL, 0);
-
         if (!ix) START (embed, RETVAL);
 }
 	OUTPUT:
@@ -708,8 +760,8 @@
 
         if (items > 1 && ((new_value ^ w->e_flags) & WFLAG_KEEPALIVE))
           {
-            REF (w);
             w->e_flags = (w->e_flags & ~WFLAG_KEEPALIVE) | new_value;
+            REF (w);
             UNREF (w);
           }
 }
@@ -894,7 +946,6 @@
         INIT:
         CHECK_REPEAT (w->repeat);
         CODE:
-        REF (w);
         ev_timer_again (e_loop (w), w);
         UNREF (w);
 
@@ -923,7 +974,6 @@
 
 void ev_periodic_again (ev_periodic *w)
 	CODE:
-        REF (w);
         ev_periodic_again (e_loop (w), w);
         UNREF (w);
 
@@ -1210,8 +1260,12 @@
 
 void ev_loop_fork (struct ev_loop *loop)
 
+void ev_loop_verify (struct ev_loop *loop)
+
 NV ev_now (struct ev_loop *loop)
 
+void ev_now_update (struct ev_loop *loop)
+
 void ev_set_io_collect_interval (struct ev_loop *loop, NV interval)
 
 void ev_set_timeout_collect_interval (struct ev_loop *loop, NV interval)
@@ -1364,7 +1418,7 @@
 	OUTPUT:
         RETVAL
 
-ev_embed *embed (struct ev_loop *loop, struct ev_loop *other, SV *cb = &PL_sv_undef)
+ev_embed *embed (struct ev_loop *loop, struct ev_loop *other, SV *cb = 0)
 	ALIAS:
         embed_ns = 1
 	CODE:
@@ -1375,9 +1429,6 @@
         RETVAL = e_new (sizeof (ev_embed), cb, ST (0));
         RETVAL->fh = newSVsv (ST (1));
         ev_embed_set (RETVAL, other);
-
-        if (!SvOK (cb)) ev_set_cb (RETVAL, 0);
-
         if (!ix) START (embed, RETVAL);
 }
 	OUTPUT: