--- Coro/Event/Event.xs	2006/12/01 19:41:06	1.13
+++ Coro/Event/Event.xs	2006/12/04 22:05:49	1.17
@@ -8,10 +8,10 @@
 #include "EventAPI.h"
 #include "../Coro/CoroAPI.h"
 
-#define CD_CORO	0
+#define CD_WAIT	0 /* wait queue */
 #define CD_TYPE	1
 #define CD_OK	2
-#define CD_PRIO	3 /* hardcoded in Coro::Event */
+
 #define CD_HITS	4 /* hardcoded in Coro::Event */
 #define CD_GOT	5 /* hardcoded in Coro::Event, Coro::Handle */
 #define CD_MAX	5
@@ -21,25 +21,22 @@
 {
   AV *priv = (AV *)pe->ext_data;
   IV type = SvIV (AvARRAY (priv)[CD_TYPE]);
-  SV **cd_coro;
+  AV *cd_wait;
+  SV *coro;
 
-  SvIV_set (AvARRAY (priv)[CD_PRIO], pe->prio);
   SvIV_set (AvARRAY (priv)[CD_HITS], pe->hits);
-
-  if (type == 1)
-    SvIV_set (AvARRAY (priv)[CD_GOT], ((pe_ioevent *)pe)->got);
-
-  GEventAPI->stop (pe->up, 0);
+  SvIV_set (AvARRAY (priv)[CD_GOT], type ? ((pe_ioevent *)pe)->got : 0);
 
   AvARRAY (priv)[CD_OK] = &PL_sv_yes;
 
-  cd_coro = &AvARRAY(priv)[CD_CORO];
-  if (*cd_coro != &PL_sv_undef)
+  cd_wait = (AV *)AvARRAY(priv)[CD_WAIT];
+  if ((coro = av_shift (cd_wait)))
     {
-      AvARRAY (priv)[CD_OK] = &PL_sv_yes;
-      CORO_READY (*cd_coro);
-      SvREFCNT_dec (*cd_coro);
-      *cd_coro = &PL_sv_undef;
+      if (av_len (cd_wait) < 0)
+        GEventAPI->stop (pe->up, 0);
+
+      CORO_READY (coro);
+      SvREFCNT_dec (coro);
     }
 }
 
@@ -76,11 +73,10 @@
           AV *priv = newAV ();
           SV *rv = newRV_noinc ((SV *)priv);
 
-          av_extend (priv, CD_MAX);
-          AvARRAY (priv)[CD_CORO] = &PL_sv_undef;
+          av_fill (priv, CD_MAX);
+          AvARRAY (priv)[CD_WAIT] = (SV *)newAV (); /* badbad */
           AvARRAY (priv)[CD_TYPE] = newSViv (type);
           AvARRAY (priv)[CD_OK  ] = &PL_sv_no;
-          AvARRAY (priv)[CD_PRIO] = newSViv (0);
           AvARRAY (priv)[CD_HITS] = newSViv (0);
           AvARRAY (priv)[CD_GOT ] = newSViv (0);
           SvREADONLY_on (priv);
@@ -107,14 +103,28 @@
             XSRETURN_NO; /* got an event */
           }
 
+        av_push ((AV *)AvARRAY (priv)[CD_WAIT], SvREFCNT_inc (CORO_CURRENT));
+
         if (!w->running)
           GEventAPI->start (w, 1);
 
-        if (AvARRAY (priv)[CD_CORO] == &PL_sv_undef)
-          AvARRAY (priv)[CD_CORO] = SvREFCNT_inc (CORO_CURRENT);
-        else if (AvARRAY (priv)[CD_CORO] != CORO_CURRENT)
-          croak ("Coro::Event::next can only be called from a single coroutine at a time, caught");
-
         XSRETURN_YES; /* schedule */
 }
 
+SV *
+_event (SV *self)
+	CODE:
+{
+        if (GIMME_V == G_VOID)
+          XSRETURN_EMPTY;
+
+        {
+          pe_watcher *w = GEventAPI->sv_2watcher (self);
+          AV *priv = (AV *)w->ext_data;
+
+          RETVAL = newRV_inc ((SV *)priv);
+        }
+}
+	OUTPUT:
+        RETVAL
+