--- EV/EV.xs	2007/11/01 13:33:12	1.35
+++ EV/EV.xs	2007/11/02 20:21:33	1.41
@@ -4,12 +4,13 @@
 
 /*#include <netinet/in.h>*/
 
-#define TIMEOUT_NONE HUGE_VAL
-
 #define EV_PROTOTYPES 1
 #include "EV/EVAPI.h"
 
 #include "libev/ev.c"
+#include "libev/event.h"
+#include "libev/event.c"
+#include "libev/evdns.c"
 
 typedef int Signal;
 
@@ -157,7 +158,6 @@
     }
 }
 
-#if 0
 /////////////////////////////////////////////////////////////////////////////
 // DNS
 
@@ -209,7 +209,6 @@
 
   LEAVE;
 }
-#endif
 
 #define CHECK_REPEAT(repeat) if (repeat < 0.) \
   croak (# repeat " value must be >= 0");
@@ -234,6 +233,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)
@@ -247,9 +249,11 @@
     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_ANY)
   };
 
   for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
@@ -319,7 +323,7 @@
 
 NV ev_time ()
 
-void ev_init (int flags = 0)
+void ev_init (int methods = EVMETHOD_AUTO)
 
 void ev_loop (int flags = 0)
 
@@ -439,6 +443,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)
@@ -453,7 +490,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);
 
@@ -472,7 +509,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);
@@ -484,14 +521,14 @@
 	OUTPUT:
         RETVAL
 
-short events (struct ev_io *w, short new_events = EV_UNDEF)
+int events (struct ev_io *w, int new_events = EV_UNDEF)
 	CODE:
 {
         RETVAL = w->events;
 
         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);
@@ -513,17 +550,38 @@
         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);
+
         ev_signal_set (w, signum);
+
         if (active) ev_signal_start (w);
 }
 
+int signal (struct ev_signal *w, SV *new_signal = 0)
+	CODE:
+{
+        RETVAL = w->signum;
+
+        if (items > 1)
+          {
+            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);
+
+            if (active) ev_signal_start (w);
+          }
+}
+	OUTPUT:
+        RETVAL
+
 MODULE = EV		PACKAGE = EV::Time
 
 MODULE = EV		PACKAGE = EV::Timer	PREFIX = ev_timer_
@@ -548,7 +606,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);
@@ -572,9 +630,11 @@
         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);
+
         if (active) ev_periodic_start (w);
 }
 
@@ -625,20 +685,39 @@
 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);
+
         if (active) ev_child_start (w);
 }
 
+int pid (struct ev_child *w, int new_pid = 0)
+	CODE:
+{
+        RETVAL = w->pid;
+
+        if (items > 1)
+          {
+            int active = ev_is_active (w);
+            if (active) ev_child_stop (w);
+
+            ev_child_set (w, new_pid);
+
+            if (active) ev_child_start (w);
+          }
+}
+	OUTPUT:
+        RETVAL
+
+
 int status (struct ev_child *w)
 	CODE:
         RETVAL = w->status;
 	OUTPUT:
         RETVAL
 
-#if 0
-
 MODULE = EV		PACKAGE = EV::DNS	PREFIX = evdns_
 
 BOOT:
@@ -730,6 +809,7 @@
 
 void evdns_search_ndots_set (int ndots)
 
+#if 0
 
 MODULE = EV		PACKAGE = EV::HTTP	PREFIX = evhttp_