--- cvsroot/EV/EV.xs	2007/10/31 20:10:17	1.24
+++ cvsroot/EV/EV.xs	2007/10/31 21:50:15	1.28
@@ -244,7 +244,7 @@
     newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
 
   stash_watcher  = gv_stashpv ("EV::Watcher" , 1);
-  stash_io       = gv_stashpv ("EV::IO"      , 1);
+  stash_io       = gv_stashpv ("EV::Io"      , 1);
   stash_time     = gv_stashpv ("EV::Time"    , 1);
   stash_timer    = gv_stashpv ("EV::Timer"   , 1);
   stash_periodic = gv_stashpv ("EV::Periodic", 1);
@@ -389,7 +389,7 @@
 	OUTPUT:
         RETVAL
 
-struct ev_child *child (SV *cb, int pid)
+struct ev_child *child (int pid, SV *cb)
 	ALIAS:
         check_ns = 1
 	CODE:
@@ -417,12 +417,20 @@
 	OUTPUT:
         RETVAL
 
-MODULE = EV		PACKAGE = EV::IO	PREFIX = evio_
+void trigger (struct ev_watcher *w, int revents = EV_NONE)
+	CODE:
+        w->cb (w, revents);
+
+MODULE = EV		PACKAGE = EV::Io	PREFIX = evio_
 
 void evio_start (struct ev_io *w)
 
 void evio_stop (struct ev_io *w)
 
+void DESTROY (struct ev_io *w)
+	CODE:
+        evio_stop (w);
+
 void set (struct ev_io *w, SV *fh, int events)
 	CODE:
 {
@@ -478,6 +486,10 @@
 
 void evsignal_stop (struct ev_signal *w)
 
+void DESTROY (struct ev_signal *w)
+	CODE:
+        evsignal_stop (w);
+
 void set (struct ev_signal *w, SV *signal = 0)
 	CODE:
 {
@@ -503,6 +515,10 @@
         INIT:
         CHECK_REPEAT (w->repeat);
 
+void DESTROY (struct ev_timer *w)
+	CODE:
+        evtimer_stop (w);
+
 void set (struct ev_timer *w, NV after, NV repeat = 0.)
         INIT:
         CHECK_REPEAT (repeat);
@@ -522,6 +538,10 @@
 
 void evperiodic_stop (struct ev_periodic *w)
 
+void DESTROY (struct ev_periodic *w)
+	CODE:
+        evperiodic_stop (w);
+
 void set (struct ev_periodic *w, NV at, NV interval = 0.)
         INIT:
         CHECK_REPEAT (interval);
@@ -539,24 +559,40 @@
 
 void evidle_stop (struct ev_idle *w)
 
+void DESTROY (struct ev_idle *w)
+	CODE:
+        evidle_stop (w);
+
 MODULE = EV		PACKAGE = EV::Prepare	PREFIX = evcheck_
 
 void evprepare_start (struct ev_prepare *w)
 
 void evprepare_stop (struct ev_prepare *w)
 
+void DESTROY (struct ev_prepare *w)
+	CODE:
+        evprepare_stop (w);
+
 MODULE = EV		PACKAGE = EV::Check	PREFIX = evcheck_
 
 void evcheck_start (struct ev_check *w)
 
 void evcheck_stop (struct ev_check *w)
 
+void DESTROY (struct ev_check *w)
+	CODE:
+        evcheck_stop (w);
+
 MODULE = EV		PACKAGE = EV::Child	PREFIX = evchild_
 
 void evchild_start (struct ev_child *w)
 
 void evchild_stop (struct ev_child *w)
 
+void DESTROY (struct ev_child *w)
+	CODE:
+        evchild_stop (w);
+
 void set (struct ev_child *w, int pid)
 	CODE:
 {