--- cvsroot/EV/EV.xs	2008/04/15 04:41:57	1.110
+++ cvsroot/EV/EV.xs	2008/09/08 17:27:42	1.115
@@ -129,9 +129,23 @@
   return -1;
 }
 
+static SV *
+e_get_cv (SV *cb_sv)
+{
+  HV *st;
+  GV *gvp;
+  CV *cv = sv_2cv (cb_sv, &st, &gvp, 0);
+
+  if (!cv)
+    croak ("EV watcher callback must be a CODE reference");
+
+  return (SV *)cv;
+}
+
 static void *
 e_new (int size, SV *cb_sv, SV *loop)
 {
+  SV *cv = cb_sv ? e_get_cv (cb_sv) : 0;
   ev_watcher *w;
   SV *self = NEWSV (0, size);
   SvPOK_only (self);
@@ -139,13 +153,13 @@
 
   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;
   w->data    = 0;
   w->fh      = 0;
-  w->cb_sv   = SvTEMP (cb_sv) && SvREFCNT (cb_sv) == 1 ? SvREFCNT_inc (cb_sv) : newSVsv (cb_sv);
+  w->cb_sv   = SvREFCNT_inc (cv);
   w->self    = self;
 
   return (void *)w;
@@ -399,6 +413,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;
@@ -479,6 +494,9 @@
 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
 
@@ -630,7 +648,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:
@@ -641,9 +659,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:
@@ -705,10 +720,14 @@
 SV *cb (ev_watcher *w, SV *new_cb = 0)
 	CODE:
 {
-        RETVAL = newSVsv (w->cb_sv);
-
         if (items > 1)
-          sv_setsv (w->cb_sv, new_cb);
+          {
+            new_cb = e_get_cv (new_cb);
+            RETVAL = newRV_noinc (w->cb_sv);
+            w->cb_sv = SvREFCNT_inc (new_cb);
+          }
+        else
+          RETVAL = newRV_inc (w->cb_sv);
 }
 	OUTPUT:
         RETVAL
@@ -891,12 +910,6 @@
 	CODE:
         RESET (timer, w, (w, after, repeat));
 
-NV at (ev_timer *w)
-	CODE:
-        RETVAL = w->at;
-	OUTPUT:
-        RETVAL
-
 MODULE = EV		PACKAGE = EV::Periodic	PREFIX = ev_periodic_
 
 void ev_periodic_start (ev_periodic *w)
@@ -933,7 +946,7 @@
 
 NV at (ev_periodic *w)
 	CODE:
-        RETVAL = w->at;
+        RETVAL = ev_periodic_at (w);
 	OUTPUT:
         RETVAL
 
@@ -1198,8 +1211,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)
@@ -1352,7 +1369,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:
@@ -1363,9 +1380,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: