--- cvsroot/EV/EV.xs	2007/11/02 11:02:22	1.39
+++ cvsroot/EV/EV.xs	2007/11/03 10:37:28	1.46
@@ -27,6 +27,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 +140,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 +236,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 +252,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; )
@@ -318,7 +329,7 @@
 
 NV ev_time ()
 
-void ev_init (int flags = 0)
+int ev_init (int methods = EVMETHOD_AUTO)
 
 void ev_loop (int flags = 0)
 
@@ -410,7 +421,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 +449,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 +496,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 +515,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 +534,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);
@@ -512,11 +556,11 @@
         ev_signal_stop (w);
         e_destroy (w);
 
-void set (struct ev_signal *w, SV *signal = 0)
+void set (struct ev_signal *w, SV *signal)
 	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);
 
@@ -528,12 +572,12 @@
 int signal (struct ev_signal *w, SV *new_signal = 0)
 	CODE:
 {
-	Signal signum = new_signal ? sv_signum (signal) : 0; /* may croak here */
         RETVAL = w->signum;
 
         if (items > 1)
           {
-            int active = w->active;
+            Signal signum = sv_signum (new_signal); /* may croak here */
+            int active = ev_is_active (w);
             if (active) ev_signal_stop (w);
 
             ev_signal_set (w, signum);
@@ -568,7 +612,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 +636,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 +691,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);
@@ -658,11 +702,11 @@
 int pid (struct ev_child *w, int new_pid = 0)
 	CODE:
 {
-        RETVAL = newSVsv (w->pid);
+        RETVAL = w->pid;
 
         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 +718,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