--- cvsroot/EV/EV.xs	2007/11/06 12:36:25	1.55
+++ cvsroot/EV/EV.xs	2007/11/09 19:33:51	1.62
@@ -7,9 +7,17 @@
 #define EV_PROTOTYPES 1
 #include "EV/EVAPI.h"
 
+/* fix perl api breakage */
+#undef signal
+#undef sigaction
+
+#define EV_SELECT_USE_WIN32_HANDLES 0
+#define EV_SELECT_USE_FD_SET 0
 /* due to bugs in OS X we have to use libev/ explicitly here */
 #include "libev/ev.c"
 #include "event.c"
+
+#ifndef WIN32
 #define DNS_USE_GETTIMEOFDAY_FOR_ID 1
 #if !defined (WIN32) && !defined(__CYGWIN__)
 # define HAVE_STRUCT_IN6_ADDR 1
@@ -17,7 +25,9 @@
 #undef HAVE_STRTOK_R
 #undef strtok_r
 #define strtok_r fake_strtok_r
+#include "evdns.h"
 #include "evdns.c"
+#endif
 
 #ifndef WIN32
 # include <pthread.h>
@@ -95,6 +105,7 @@
 
   ev_watcher_init (w, e_cb);
 
+  w->data  = 0;
   w->fh    = 0;
   w->cb_sv = newSVsv (cb_sv);
   w->self  = self;
@@ -102,13 +113,14 @@
   return (void *)w;
 }
 
-static void *
+static void
 e_destroy (void *w_)
 {
-  struct ev_watcher *w = w_;
+  struct ev_watcher *w = (struct ev_watcher *)w_;
 
   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 *
@@ -172,9 +184,53 @@
     }
 }
 
+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
 
+#ifndef WIN32
 static void
 dns_cb (int result, char type, int count, int ttl, void *addresses, void *arg)
 {
@@ -223,6 +279,7 @@
 
   LEAVE;
 }
+#endif
 
 #define CHECK_REPEAT(repeat) if (repeat < 0.) \
   croak (# repeat " value must be >= 0");
@@ -239,7 +296,6 @@
 
 BOOT:
 {
-  int i;
   HV *stash = gv_stashpv ("EV", 1);
 
   static const struct {
@@ -322,10 +378,9 @@
     sv_setiv (sv, (IV)&evapi);
     SvREADONLY_on (sv);
   }
-
-  #ifndef WIN32
-    pthread_atfork (0, 0, ev_default_fork);
-  #endif
+#ifndef WIN32
+  pthread_atfork (0, 0, ev_default_fork);
+#endif
 }
 
 NV ev_now ()
@@ -368,15 +423,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
 
@@ -448,6 +508,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);
@@ -627,12 +695,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:
@@ -640,7 +710,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);
 }
@@ -727,6 +799,8 @@
 	OUTPUT:
         RETVAL
 
+#ifndef WIN32
+
 MODULE = EV		PACKAGE = EV::DNS	PREFIX = evdns_
 
 BOOT:
@@ -860,6 +934,7 @@
 
 #endif
 
+#endif