--- cvsroot/EV/EV.xs	2007/11/07 13:27:56	1.58
+++ cvsroot/EV/EV.xs	2007/11/08 17:24:00	1.61
@@ -104,6 +104,7 @@
 
   ev_watcher_init (w, e_cb);
 
+  w->data  = 0;
   w->fh    = 0;
   w->cb_sv = newSVsv (cb_sv);
   w->self  = self;
@@ -118,6 +119,7 @@
 
   SvREFCNT_dec (w->fh   ); w->fh    = 0;
   SvREFCNT_dec (w->cb_sv); w->cb_sv = 0;
+  SvREFCNT_dec (w->data ); w->data  = 0;
 }
 
 static SV *
@@ -181,6 +183,49 @@
     }
 }
 
+static ev_tstamp
+e_periodic_cb (struct ev_periodic *w, ev_tstamp now)
+{
+  ev_tstamp retval;
+  int count;
+  dSP;
+
+  ENTER;
+  SAVETMPS;
+
+  PUSHMARK (SP);
+  EXTEND (SP, 2);
+  PUSHs (newRV_inc (w->self)); /* w->self MUST be blessed by now */
+  PUSHs (newSVnv (now));
+
+  PUTBACK;
+  count = call_sv (w->fh, G_SCALAR | G_EVAL);
+  SPAGAIN;
+
+  if (SvTRUE (ERRSV))
+    {
+      PUSHMARK (SP);
+      PUTBACK;
+      call_sv (get_sv ("EV::DIED", 1), G_DISCARD | G_VOID | G_EVAL | G_KEEPERR);
+      SPAGAIN;
+    }
+
+  if (count > 0)
+    {
+      retval = SvNV (TOPs);
+
+      if (retval < now)
+        retval = now;
+    }
+  else
+    retval = now;
+
+  FREETMPS;
+  LEAVE;
+
+  return retval;
+}
+
 /////////////////////////////////////////////////////////////////////////////
 // DNS
 
@@ -377,15 +422,20 @@
 	OUTPUT:
         RETVAL
 
-struct ev_periodic *periodic (NV at, NV interval, SV *cb)
+SV *periodic (NV at, NV interval, SV *reschedule_cb, SV *cb)
 	ALIAS:
         periodic_ns = 1
         INIT:
         CHECK_REPEAT (interval);
 	CODE:
-        RETVAL = e_new (sizeof (struct ev_periodic), cb);
-        ev_periodic_set (RETVAL, at, interval);
-        if (!ix) ev_periodic_start (RETVAL);
+{
+  	struct ev_periodic *w;
+        w = e_new (sizeof (struct ev_periodic), cb);
+        w->fh = SvTRUE (reschedule_cb) ? newSVsv (reschedule_cb) : 0;
+        ev_periodic_set (w, at, interval, w->fh ? e_periodic_cb : 0);
+        RETVAL = e_bless ((struct ev_watcher *)w, stash_periodic);
+        if (!ix) ev_periodic_start (w);
+}
 	OUTPUT:
         RETVAL
 
@@ -457,6 +507,14 @@
 	OUTPUT:
         RETVAL
 
+SV *data (struct ev_watcher *w, SV *new_data = 0)
+	CODE:
+{
+	RETVAL = w->data ? newSVsv (w->data) : &PL_sv_undef;
+}
+	OUTPUT:
+        RETVAL
+
 void trigger (struct ev_watcher *w, int revents = EV_NONE)
 	CODE:
         w->cb (w, revents);
@@ -636,12 +694,14 @@
 
 void ev_periodic_stop (struct ev_periodic *w)
 
+void ev_periodic_again (struct ev_periodic *w)
+
 void DESTROY (struct ev_periodic *w)
 	CODE:
         ev_periodic_stop (w);
         e_destroy (w);
 
-void set (struct ev_periodic *w, NV at, NV interval = 0.)
+void set (struct ev_periodic *w, NV at, NV interval = 0., SV *reschedule_cb = &PL_sv_undef)
         INIT:
         CHECK_REPEAT (interval);
 	CODE:
@@ -649,7 +709,9 @@
         int active = ev_is_active (w);
         if (active) ev_periodic_stop (w);
 
-        ev_periodic_set (w, at, interval);
+        SvREFCNT_dec (w->fh);
+        w->fh = SvTRUE (reschedule_cb) ? newSVsv (reschedule_cb) : 0;
+        ev_periodic_set (w, at, interval, w->fh ? e_periodic_cb : 0);
 
         if (active) ev_periodic_start (w);
 }