--- cvsroot/EV/EV.xs	2007/11/02 11:09:50	1.40
+++ cvsroot/EV/EV.xs	2007/11/03 21:58:51	1.47
@@ -5,11 +5,17 @@
 /*#include <netinet/in.h>*/
 
 #define EV_PROTOTYPES 1
+#define EV_STANDALONE 1
 #include "EV/EVAPI.h"
 
 #include "libev/ev.c"
 #include "libev/event.h"
 #include "libev/event.c"
+#define DNS_USE_GETTIMEOFDAY_FOR_ID 1
+#define HAVE_STRUCT_IN6_ADDR 1
+#undef HAVE_STRTOK_R
+#undef strtok_r
+#define strtok_r fake_strtok_r
 #include "libev/evdns.c"
 
 typedef int Signal;
@@ -27,6 +33,12 @@
   *stash_check,
   *stash_child;
 
+#ifndef SIG_SIZE
+/* kudos to Slaven Rezic for the idea */
+static char sig_size [] = { SIG_NUM };
+# define SIG_SIZE (sizeof (sig_size) + 1)
+#endif
+
 static int
 sv_signum (SV *sig)
 {
@@ -134,9 +146,6 @@
   PUSHs (sv_self);
   PUSHs (sv_events);
 
-  if (revents & EV_CHILD)
-    XPUSHs (sv_status = newSViv (((struct ev_child *)w)->status));
-
   PUTBACK;
   call_sv (w->cb_sv, G_DISCARD | G_VOID | G_EVAL);
   SP = PL_stack_base + mark; PUTBACK;
@@ -233,6 +242,9 @@
     IV iv;
   } *civ, const_iv[] = {
 #   define const_iv(pfx, name) { # name, (IV) pfx ## name },
+    const_iv (EV_, MINPRI)
+    const_iv (EV_, MAXPRI)
+
     const_iv (EV_, UNDEF)
     const_iv (EV_, NONE)
     const_iv (EV_, TIMEOUT)
@@ -246,9 +258,14 @@
     const_iv (EV, LOOP_ONESHOT)
     const_iv (EV, LOOP_NONBLOCK)
 
-    const_iv (EV, METHOD_NONE)
+    const_iv (EV, METHOD_AUTO)
     const_iv (EV, METHOD_SELECT)
+    const_iv (EV, METHOD_POLL)
     const_iv (EV, METHOD_EPOLL)
+    const_iv (EV, METHOD_KQUEUE)
+    const_iv (EV, METHOD_DEVPOLL)
+    const_iv (EV, METHOD_PORT)
+    const_iv (EV, METHOD_ANY)
   };
 
   for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
@@ -273,9 +290,9 @@
     evapi.rev            = EV_API_REVISION;
     evapi.sv_fileno      = sv_fileno;
     evapi.sv_signum      = sv_signum;
-    evapi.now            = &ev_now;
-    evapi.method         = &ev_method;
-    evapi.loop_done      = &ev_loop_done;
+    evapi.now            = ev_now;
+    evapi.method         = ev_method;
+    evapi.unloop         = ev_unloop;
     evapi.time           = ev_time;
     evapi.loop           = ev_loop;
     evapi.once           = ev_once;
@@ -305,26 +322,16 @@
 }
 
 NV ev_now ()
-	CODE:
-        RETVAL = ev_now;
-	OUTPUT:
-        RETVAL
 
 int ev_method ()
-	CODE:
-        RETVAL = ev_method;
-	OUTPUT:
-        RETVAL
 
 NV ev_time ()
 
-void ev_init (int flags = 0)
+int ev_init (int methods = EVMETHOD_AUTO)
 
 void ev_loop (int flags = 0)
 
-void ev_loop_done (int value = 1)
-	CODE:
-        ev_loop_done = value;
+void ev_unloop (int how = 1)
 
 struct ev_io *io (SV *fh, int events, SV *cb)
 	ALIAS:
@@ -410,7 +417,7 @@
 	ALIAS:
         check_ns = 1
 	CODE:
-        RETVAL = e_new (sizeof (struct ev_check), cb);
+        RETVAL = e_new (sizeof (struct ev_child), cb);
         ev_child_set (RETVAL, pid);
         if (!ix) ev_child_start (RETVAL);
 	OUTPUT:
@@ -438,6 +445,39 @@
 	CODE:
         w->cb (w, revents);
 
+int priority (struct ev_watcher *w, int new_priority = 0)
+	CODE:
+{
+        RETVAL = w->priority;
+
+        if (items > 1)
+          {
+            int active = ev_is_active (w);
+
+            if (new_priority < EV_MINPRI || new_priority > EV_MAXPRI)
+              croak ("watcher priority out of range, value must be between %d and %d, inclusive", EV_MINPRI, EV_MAXPRI);
+
+            if (active)
+              {
+                /* grrr. */
+                PUSHMARK (SP);
+                XPUSHs (ST (0));
+                call_method ("stop", G_DISCARD | G_VOID);
+              }
+
+            ev_set_priority (w, new_priority);
+
+            if (active)
+              {
+                PUSHMARK (SP);
+                XPUSHs (ST (0));
+                call_method ("start", G_DISCARD | G_VOID);
+              }
+          }
+}
+	OUTPUT:
+        RETVAL
+
 MODULE = EV		PACKAGE = EV::Io	PREFIX = ev_io_
 
 void ev_io_start (struct ev_io *w)
@@ -452,7 +492,7 @@
 void set (struct ev_io *w, SV *fh, int events)
 	CODE:
 {
-        int active = w->active;
+        int active = ev_is_active (w);
 	int fd = sv_fileno (fh);
         CHECK_FD (fh, fd);
 
@@ -471,7 +511,7 @@
 
         if (items > 1)
           {
-            int active = w->active;
+            int active = ev_is_active (w);
             if (active) ev_io_stop (w);
 
             sv_setsv (w->fh, new_fh);
@@ -490,7 +530,7 @@
 
         if (items > 1)
           {
-            int active = w->active;
+            int active = ev_is_active (w);
             if (active) ev_io_stop (w);
 
             ev_io_set (w, w->fd, new_events);
@@ -516,7 +556,7 @@
 	CODE:
 {
 	Signal signum = sv_signum (signal); /* may croak here */
-        int active = w->active;
+        int active = ev_is_active (w);
 
         if (active) ev_signal_stop (w);
 
@@ -533,7 +573,7 @@
         if (items > 1)
           {
             Signal signum = sv_signum (new_signal); /* may croak here */
-            int active = w->active;
+            int active = ev_is_active (w);
             if (active) ev_signal_stop (w);
 
             ev_signal_set (w, signum);
@@ -568,7 +608,7 @@
         CHECK_REPEAT (repeat);
 	CODE:
 {
-        int active = w->active;
+        int active = ev_is_active (w);
         if (active) ev_timer_stop (w);
         ev_timer_set (w, after, repeat);
         if (active) ev_timer_start (w);
@@ -592,7 +632,7 @@
         CHECK_REPEAT (interval);
 	CODE:
 {
-        int active = w->active;
+        int active = ev_is_active (w);
         if (active) ev_periodic_stop (w);
 
         ev_periodic_set (w, at, interval);
@@ -647,7 +687,7 @@
 void set (struct ev_child *w, int pid)
 	CODE:
 {
-        int active = w->active;
+        int active = ev_is_active (w);
         if (active) ev_child_stop (w);
 
         ev_child_set (w, pid);
@@ -662,7 +702,7 @@
 
         if (items > 1)
           {
-            int active = w->active;
+            int active = ev_is_active (w);
             if (active) ev_child_stop (w);
 
             ev_child_set (w, new_pid);
@@ -674,9 +714,11 @@
         RETVAL
 
 
-int status (struct ev_child *w)
+int rstatus (struct ev_child *w)
+	ALIAS:
+        rpid = 1
 	CODE:
-        RETVAL = w->status;
+        RETVAL = ix ? w->rpid : w->rstatus;
 	OUTPUT:
         RETVAL