--- Coro/Event/Event.xs	2003/03/22 18:50:32	1.9
+++ Coro/Event/Event.xs	2006/12/01 02:17:37	1.12
@@ -33,21 +33,12 @@
 
 #define EV_CLASS "Coro::Event"
 
-static pe_idle *scheduler;
-static int do_schedule;
-
-#define NEED_SCHEDULE if (!do_schedule)					\
-                        {						\
- 		          do_schedule = 1;				\
-		          GEventAPI->now ((pe_watcher *)scheduler);	\
-                        }
-
 static void
 coro_std_cb(pe_event *pe)
 {
   AV *priv = (AV *)pe->ext_data;
   IV type = SvIV (*av_fetch (priv, CD_TYPE, 1));
-  SV **cd_coro = &AvARRAY(priv)[CD_CORO];
+  SV **cd_coro;
 
   sv_setiv (AvARRAY(priv)[CD_PRIO], pe->prio);
   sv_setiv (AvARRAY(priv)[CD_HITS], pe->hits);
@@ -55,27 +46,27 @@
   if (type == 1)
     sv_setiv (AvARRAY(priv)[CD_GOT], ((pe_ioevent *)pe)->got);
 
+  GEventAPI->stop (pe->up, 0);
+
+  AvARRAY(priv)[CD_OK] = &PL_sv_yes;
+
+  cd_coro = &AvARRAY(priv)[CD_CORO];
   if (*cd_coro != &PL_sv_undef)
     {
+      AvARRAY(priv)[CD_OK] = &PL_sv_yes;
       CORO_READY (*cd_coro);
       SvREFCNT_dec (*cd_coro);
       *cd_coro = &PL_sv_undef;
-      NEED_SCHEDULE;
-    }
-  else
-    {
-      AvARRAY(priv)[CD_OK] = &PL_sv_yes;
-      GEventAPI->stop (pe->up, 0);
     }
 }
 
-static void
-scheduler_cb(pe_event *pe)
+static double
+prepare_hook (void *data)
 {
   while (CORO_NREADY)
     CORO_CEDE;
 
-  do_schedule = 0;
+  return 1e10;
 }
 
 MODULE = Coro::Event                PACKAGE = Coro::Event
@@ -87,13 +78,7 @@
         I_EVENT_API ("Coro::Event");
 	I_CORO_API ("Coro::Event");
 
-        /* create a fake idle handler (we only ever call now) */
-        scheduler = GEventAPI->new_idle (0, 0);
-        scheduler->base.callback = scheduler_cb;
-        scheduler->base.prio = PE_PRIO_NORMAL; /* StarvePrio */
-        scheduler->min_interval = newSVnv (0);
-        scheduler->max_interval = newSVnv (0);
-        GEventAPI->stop ((pe_watcher *)scheduler, 0);
+        GEventAPI->add_hook ("prepare", (void *)prepare_hook, 0);
 }
 
 void
@@ -101,6 +86,7 @@
 	SV *	self
         int	type
         CODE:
+{
         pe_watcher *w = GEventAPI->sv_2watcher (self);
 
         if (WaFLAGS (w) & PE_PERLCB)
@@ -127,40 +113,28 @@
 
           GEventAPI->start (w, 0);
         }
+}
 
 void
 _next(self)
 	SV *	self
         CODE:
+{
         pe_watcher *w = GEventAPI->sv_2watcher (self);
         AV *priv = (AV *)w->ext_data;
 
-        if (!w->running)
-          GEventAPI->start (w, 1);
-
         if (AvARRAY(priv)[CD_OK] == &PL_sv_yes)
           {
             AvARRAY(priv)[CD_OK] = &PL_sv_no;
             XSRETURN_NO;
           }
-        else 
-          {
-            if (AvARRAY(priv)[CD_CORO] != &PL_sv_undef)
-              confess ("only one coroutine can wait for an event");
-
-            AvARRAY(priv)[CD_CORO] = SvREFCNT_inc (CORO_CURRENT);
-            XSRETURN_YES;
-          }
 
-MODULE = Coro::Event                PACKAGE = Coro
+        if (!w->running)
+          GEventAPI->start (w, 1);
 
-# overwrite the ready function
-void
-ready(self)
-	SV *	self
-        PROTOTYPE: $
-	CODE:
-        NEED_SCHEDULE;
-        CORO_READY (self);
+        if (AvARRAY(priv)[CD_CORO] == &PL_sv_undef)
+          AvARRAY(priv)[CD_CORO] = SvREFCNT_inc (CORO_CURRENT);
 
+        XSRETURN_YES;
+}