ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

Comparing Coro/Coro/State.xs (file contents):
Revision 1.346 by root, Tue Jun 9 18:56:45 2009 UTC vs.
Revision 1.372 by root, Thu Oct 1 23:50:23 2009 UTC

6#include "EXTERN.h" 6#include "EXTERN.h"
7#include "perl.h" 7#include "perl.h"
8#include "XSUB.h" 8#include "XSUB.h"
9#include "perliol.h" 9#include "perliol.h"
10 10
11#include "patchlevel.h" 11#include "schmorp.h"
12 12
13#include <stdio.h> 13#include <stdio.h>
14#include <errno.h> 14#include <errno.h>
15#include <assert.h> 15#include <assert.h>
16 16
51#endif 51#endif
52 52
53/* the maximum number of idle cctx that will be pooled */ 53/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 54static int cctx_max_idle = 4;
55 55
56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif
114
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 56#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 57# undef CORO_STACKGUARD
117#endif 58#endif
118 59
119#ifndef CORO_STACKGUARD 60#ifndef CORO_STACKGUARD
137 78
138#define IN_DESTRUCT PL_dirty 79#define IN_DESTRUCT PL_dirty
139 80
140#if __GNUC__ >= 3 81#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x) 82# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value)) 83# define expect(expr,value) __builtin_expect ((expr), (value))
143# define INLINE static inline 84# define INLINE static inline
144#else 85#else
145# define attribute(x) 86# define attribute(x)
146# define expect(expr,value) (expr) 87# define expect(expr,value) (expr)
147# define INLINE static 88# define INLINE static
159# if CORO_PTHREAD 100# if CORO_PTHREAD
160static void *coro_thx; 101static void *coro_thx;
161# endif 102# endif
162#endif 103#endif
163 104
105#ifdef __linux
106# include <time.h> /* for timespec */
107# include <syscall.h> /* for SYS_* */
108# ifdef SYS_clock_gettime
109# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
110# define CORO_CLOCK_MONOTONIC 1
111# define CORO_CLOCK_THREAD_CPUTIME_ID 3
112# endif
113#endif
114
164static double (*nvtime)(); /* so why doesn't it take void? */ 115static double (*nvtime)(); /* so why doesn't it take void? */
116static void (*u2time)(pTHX_ UV ret[2]);
165 117
166/* we hijack an hopefully unused CV flag for our purposes */ 118/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 119#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 120static OP *pp_slf (pTHX);
169 121
190static SV *sv_pool_size; 142static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 143static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 144static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 145static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 146static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 147
197/* Coro::AnyEvent */ 148/* Coro::AnyEvent */
198static SV *sv_activity; 149static SV *sv_activity;
150
151/* enable processtime/realtime profiling */
152static char enable_times;
153typedef U32 coro_ts[2];
154static coro_ts time_real, time_cpu;
155static char times_valid;
199 156
200static struct coro_cctx *cctx_first; 157static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 158static int cctx_count, cctx_idle;
202 159
203enum { 160enum {
261/* this is a structure representing a perl-level coroutine */ 218/* this is a structure representing a perl-level coroutine */
262struct coro { 219struct coro {
263 /* the C coroutine allocated to this perl coroutine, if any */ 220 /* the C coroutine allocated to this perl coroutine, if any */
264 coro_cctx *cctx; 221 coro_cctx *cctx;
265 222
223 /* ready queue */
224 struct coro *next_ready;
225
266 /* state data */ 226 /* state data */
267 struct CoroSLF slf_frame; /* saved slf frame */ 227 struct CoroSLF slf_frame; /* saved slf frame */
268 AV *mainstack; 228 AV *mainstack;
269 perl_slots *slot; /* basically the saved sp */ 229 perl_slots *slot; /* basically the saved sp */
270 230
290 250
291 /* on_enter/on_leave */ 251 /* on_enter/on_leave */
292 AV *on_enter; 252 AV *on_enter;
293 AV *on_leave; 253 AV *on_leave;
294 254
255 /* times */
256 coro_ts t_cpu, t_real;
257
295 /* linked list */ 258 /* linked list */
296 struct coro *next, *prev; 259 struct coro *next, *prev;
297}; 260};
298 261
299typedef struct coro *Coro__State; 262typedef struct coro *Coro__State;
304/* the mainr easonw e don't support windows process emulation */ 267/* the mainr easonw e don't support windows process emulation */
305static struct CoroSLF slf_frame; /* the current slf frame */ 268static struct CoroSLF slf_frame; /* the current slf frame */
306 269
307/** Coro ********************************************************************/ 270/** Coro ********************************************************************/
308 271
309#define PRIO_MAX 3 272#define CORO_PRIO_MAX 3
310#define PRIO_HIGH 1 273#define CORO_PRIO_HIGH 1
311#define PRIO_NORMAL 0 274#define CORO_PRIO_NORMAL 0
312#define PRIO_LOW -1 275#define CORO_PRIO_LOW -1
313#define PRIO_IDLE -3 276#define CORO_PRIO_IDLE -3
314#define PRIO_MIN -4 277#define CORO_PRIO_MIN -4
315 278
316/* for Coro.pm */ 279/* for Coro.pm */
317static SV *coro_current; 280static SV *coro_current;
318static SV *coro_readyhook; 281static SV *coro_readyhook;
319static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 282static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
320static CV *cv_coro_run, *cv_coro_terminate; 283static CV *cv_coro_run, *cv_coro_terminate;
321static struct coro *coro_first; 284static struct coro *coro_first;
322#define coro_nready coroapi.nready 285#define coro_nready coroapi.nready
286
287/** Coro::Select ************************************************************/
288
289static OP *(*coro_old_pp_sselect) (pTHX);
290static SV *coro_select_select;
291
292/* horrible hack, but if it works... */
293static OP *
294coro_pp_sselect (pTHX)
295{
296 dSP;
297 PUSHMARK (SP - 4); /* fake argument list */
298 XPUSHs (coro_select_select);
299 PUTBACK;
300
301 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
302 PL_op->op_flags |= OPf_STACKED;
303 PL_op->op_private = 0;
304 return PL_ppaddr [OP_ENTERSUB](aTHX);
305}
323 306
324/** lowlevel stuff **********************************************************/ 307/** lowlevel stuff **********************************************************/
325 308
326static SV * 309static SV *
327coro_get_sv (pTHX_ const char *name, int create) 310coro_get_sv (pTHX_ const char *name, int create)
351 get_hv (name, create); 334 get_hv (name, create);
352#endif 335#endif
353 return get_hv (name, create); 336 return get_hv (name, create);
354} 337}
355 338
356/* may croak */ 339INLINE void
357INLINE CV * 340coro_times_update ()
358coro_sv_2cv (pTHX_ SV *sv)
359{ 341{
360 HV *st; 342#ifdef coro_clock_gettime
361 GV *gvp; 343 struct timespec ts;
362 CV *cv = sv_2cv (sv, &st, &gvp, 0);
363 344
364 if (!cv) 345 ts.tv_sec = ts.tv_nsec = 0;
365 croak ("code reference expected"); 346 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
347 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
366 348
367 return cv; 349 ts.tv_sec = ts.tv_nsec = 0;
350 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
351 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
352#else
353 dTHX;
354 UV tv[2];
355
356 u2time (aTHX_ tv);
357 time_real [0] = tv [0];
358 time_real [1] = tv [1] * 1000;
359#endif
360}
361
362INLINE void
363coro_times_add (struct coro *c)
364{
365 c->t_real [1] += time_real [1];
366 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
367 c->t_real [0] += time_real [0];
368
369 c->t_cpu [1] += time_cpu [1];
370 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
371 c->t_cpu [0] += time_cpu [0];
372}
373
374INLINE void
375coro_times_sub (struct coro *c)
376{
377 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
378 c->t_real [1] -= time_real [1];
379 c->t_real [0] -= time_real [0];
380
381 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
382 c->t_cpu [1] -= time_cpu [1];
383 c->t_cpu [0] -= time_cpu [0];
368} 384}
369 385
370/*****************************************************************************/ 386/*****************************************************************************/
371/* magic glue */ 387/* magic glue */
372 388
472static int 488static int
473coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 489coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
474{ 490{
475 AV *padlist; 491 AV *padlist;
476 AV *av = (AV *)mg->mg_obj; 492 AV *av = (AV *)mg->mg_obj;
493
494 /* perl manages to free our internal AV and _then_ call us */
495 if (IN_DESTRUCT)
496 return 0;
477 497
478 /* casting is fun. */ 498 /* casting is fun. */
479 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 499 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
480 free_padlist (aTHX_ padlist); 500 free_padlist (aTHX_ padlist);
481 501
570 } 590 }
571 591
572 slf_frame = c->slf_frame; 592 slf_frame = c->slf_frame;
573 CORO_THROW = c->except; 593 CORO_THROW = c->except;
574 594
595 if (expect_false (enable_times))
596 {
597 if (expect_false (!times_valid))
598 coro_times_update ();
599
600 coro_times_sub (c);
601 }
602
575 if (expect_false (c->on_enter)) 603 if (expect_false (c->on_enter))
576 { 604 {
577 int i; 605 int i;
578 606
579 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 607 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
588 { 616 {
589 int i; 617 int i;
590 618
591 for (i = AvFILLp (c->on_leave); i >= 0; --i) 619 for (i = AvFILLp (c->on_leave); i >= 0; --i)
592 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 620 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
621 }
622
623 times_valid = 0;
624
625 if (expect_false (enable_times))
626 {
627 coro_times_update (); times_valid = 1;
628 coro_times_add (c);
593 } 629 }
594 630
595 c->except = CORO_THROW; 631 c->except = CORO_THROW;
596 c->slf_frame = slf_frame; 632 c->slf_frame = slf_frame;
597 633
612 { 648 {
613 while (expect_true (cxix >= 0)) 649 while (expect_true (cxix >= 0))
614 { 650 {
615 PERL_CONTEXT *cx = &ccstk[cxix--]; 651 PERL_CONTEXT *cx = &ccstk[cxix--];
616 652
617 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 653 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
618 { 654 {
619 CV *cv = cx->blk_sub.cv; 655 CV *cv = cx->blk_sub.cv;
620 656
621 if (expect_true (CvDEPTH (cv))) 657 if (expect_true (CvDEPTH (cv)))
622 { 658 {
646 /* we manually unroll here, as usually 2 slots is enough */ 682 /* we manually unroll here, as usually 2 slots is enough */
647 if (SLOT_COUNT >= 1) CXINC; 683 if (SLOT_COUNT >= 1) CXINC;
648 if (SLOT_COUNT >= 2) CXINC; 684 if (SLOT_COUNT >= 2) CXINC;
649 if (SLOT_COUNT >= 3) CXINC; 685 if (SLOT_COUNT >= 3) CXINC;
650 { 686 {
651 int i; 687 unsigned int i;
652 for (i = 3; i < SLOT_COUNT; ++i) 688 for (i = 3; i < SLOT_COUNT; ++i)
653 CXINC; 689 CXINC;
654 } 690 }
655 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 691 cxstack_ix -= SLOT_COUNT; /* undo allocation */
656 692
961 997
962 PL_op = (OP *)&coro_setup_op; 998 PL_op = (OP *)&coro_setup_op;
963 999
964 /* copy throw, in case it was set before coro_setup */ 1000 /* copy throw, in case it was set before coro_setup */
965 CORO_THROW = coro->except; 1001 CORO_THROW = coro->except;
1002
1003 if (expect_false (enable_times))
1004 {
1005 coro_times_update ();
1006 coro_times_sub (coro);
1007 }
966} 1008}
967 1009
968static void 1010static void
969coro_unwind_stacks (pTHX) 1011coro_unwind_stacks (pTHX)
970{ 1012{
987} 1029}
988 1030
989static void 1031static void
990coro_destruct_perl (pTHX_ struct coro *coro) 1032coro_destruct_perl (pTHX_ struct coro *coro)
991{ 1033{
1034 SV *svf [9];
1035
1036 {
1037 struct coro *current = SvSTATE_current;
1038
1039 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1040
1041 save_perl (aTHX_ current);
1042 load_perl (aTHX_ coro);
1043
992 coro_unwind_stacks (aTHX); 1044 coro_unwind_stacks (aTHX);
1045 coro_destruct_stacks (aTHX);
993 1046
994 SvREFCNT_dec (GvSV (PL_defgv)); 1047 // now save some sv's to be free'd later
995 SvREFCNT_dec (GvAV (PL_defgv)); 1048 svf [0] = GvSV (PL_defgv);
996 SvREFCNT_dec (GvSV (PL_errgv)); 1049 svf [1] = (SV *)GvAV (PL_defgv);
997 SvREFCNT_dec (PL_defoutgv); 1050 svf [2] = GvSV (PL_errgv);
998 SvREFCNT_dec (PL_rs); 1051 svf [3] = (SV *)PL_defoutgv;
999 SvREFCNT_dec (GvSV (irsgv)); 1052 svf [4] = PL_rs;
1000 SvREFCNT_dec (GvHV (PL_hintgv)); 1053 svf [5] = GvSV (irsgv);
1054 svf [6] = (SV *)GvHV (PL_hintgv);
1055 svf [7] = PL_diehook;
1056 svf [8] = PL_warnhook;
1057 assert (9 == sizeof (svf) / sizeof (*svf));
1001 1058
1002 SvREFCNT_dec (PL_diehook); 1059 load_perl (aTHX_ current);
1003 SvREFCNT_dec (PL_warnhook);
1004 1060 }
1061
1062 {
1063 unsigned int i;
1064
1065 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1066 SvREFCNT_dec (svf [i]);
1067
1005 SvREFCNT_dec (coro->saved_deffh); 1068 SvREFCNT_dec (coro->saved_deffh);
1006 SvREFCNT_dec (coro->rouse_cb); 1069 SvREFCNT_dec (coro->rouse_cb);
1007 SvREFCNT_dec (coro->invoke_cb); 1070 SvREFCNT_dec (coro->invoke_cb);
1008 SvREFCNT_dec (coro->invoke_av); 1071 SvREFCNT_dec (coro->invoke_av);
1009 1072 }
1010 coro_destruct_stacks (aTHX);
1011} 1073}
1012 1074
1013INLINE void 1075INLINE void
1014free_coro_mortal (pTHX) 1076free_coro_mortal (pTHX)
1015{ 1077{
1212 /* somebody or something will hit me for both perl_run and PL_restartop */ 1274 /* somebody or something will hit me for both perl_run and PL_restartop */
1213 PL_restartop = PL_op; 1275 PL_restartop = PL_op;
1214 perl_run (PL_curinterp); 1276 perl_run (PL_curinterp);
1215 /* 1277 /*
1216 * Unfortunately, there is no way to get at the return values of the 1278 * Unfortunately, there is no way to get at the return values of the
1217 * coro body here, as perl_run destroys these 1279 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1280 * runtime errors here, as this is just a random interpreter, not a thread.
1218 */ 1281 */
1219 1282
1220 /* 1283 /*
1221 * If perl-run returns we assume exit() was being called or the coro 1284 * If perl-run returns we assume exit() was being called or the coro
1222 * fell off the end, which seems to be the only valid (non-bug) 1285 * fell off the end, which seems to be the only valid (non-bug)
1502 1565
1503 if (coro->mainstack 1566 if (coro->mainstack
1504 && coro->mainstack != main_mainstack 1567 && coro->mainstack != main_mainstack
1505 && coro->slot 1568 && coro->slot
1506 && !PL_dirty) 1569 && !PL_dirty)
1507 {
1508 struct coro *current = SvSTATE_current;
1509
1510 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1511
1512 save_perl (aTHX_ current);
1513 load_perl (aTHX_ coro);
1514
1515 coro_destruct_perl (aTHX_ coro); 1570 coro_destruct_perl (aTHX_ coro);
1516
1517 load_perl (aTHX_ current);
1518
1519 coro->slot = 0;
1520 }
1521 1571
1522 cctx_destroy (coro->cctx); 1572 cctx_destroy (coro->cctx);
1523 SvREFCNT_dec (coro->startcv); 1573 SvREFCNT_dec (coro->startcv);
1524 SvREFCNT_dec (coro->args); 1574 SvREFCNT_dec (coro->args);
1525 SvREFCNT_dec (CORO_THROW); 1575 SvREFCNT_dec (CORO_THROW);
1584 1634
1585 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1635 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1586 TRANSFER (ta, 1); 1636 TRANSFER (ta, 1);
1587} 1637}
1588 1638
1589/*****************************************************************************/
1590/* gensub: simple closure generation utility */
1591
1592#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1593
1594/* create a closure from XS, returns a code reference */
1595/* the arg can be accessed via GENSUB_ARG from the callback */
1596/* the callback must use dXSARGS/XSRETURN */
1597static SV *
1598gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1599{
1600 CV *cv = (CV *)newSV (0);
1601
1602 sv_upgrade ((SV *)cv, SVt_PVCV);
1603
1604 CvANON_on (cv);
1605 CvISXSUB_on (cv);
1606 CvXSUB (cv) = xsub;
1607 GENSUB_ARG = arg;
1608
1609 return newRV_noinc ((SV *)cv);
1610}
1611
1612/** Coro ********************************************************************/ 1639/** Coro ********************************************************************/
1613 1640
1614INLINE void 1641INLINE void
1615coro_enq (pTHX_ struct coro *coro) 1642coro_enq (pTHX_ struct coro *coro)
1616{ 1643{
1617 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1644 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1618}
1619 1645
1620INLINE SV * 1646 SvREFCNT_inc_NN (coro->hv);
1647
1648 coro->next_ready = 0;
1649 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1650 ready [1] = coro;
1651}
1652
1653INLINE struct coro *
1621coro_deq (pTHX) 1654coro_deq (pTHX)
1622{ 1655{
1623 int prio; 1656 int prio;
1624 1657
1625 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1658 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1626 if (AvFILLp (coro_ready [prio]) >= 0) 1659 {
1627 return av_shift (coro_ready [prio]); 1660 struct coro **ready = coro_ready [prio];
1661
1662 if (ready [0])
1663 {
1664 struct coro *coro = ready [0];
1665 ready [0] = coro->next_ready;
1666 return coro;
1667 }
1668 }
1628 1669
1629 return 0; 1670 return 0;
1671}
1672
1673static void
1674invoke_sv_ready_hook_helper (void)
1675{
1676 dTHX;
1677 dSP;
1678
1679 ENTER;
1680 SAVETMPS;
1681
1682 PUSHMARK (SP);
1683 PUTBACK;
1684 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1685
1686 FREETMPS;
1687 LEAVE;
1630} 1688}
1631 1689
1632static int 1690static int
1633api_ready (pTHX_ SV *coro_sv) 1691api_ready (pTHX_ SV *coro_sv)
1634{ 1692{
1635 struct coro *coro;
1636 SV *sv_hook;
1637 void (*xs_hook)(void);
1638
1639 coro = SvSTATE (coro_sv); 1693 struct coro *coro = SvSTATE (coro_sv);
1640 1694
1641 if (coro->flags & CF_READY) 1695 if (coro->flags & CF_READY)
1642 return 0; 1696 return 0;
1643 1697
1644 coro->flags |= CF_READY; 1698 coro->flags |= CF_READY;
1645 1699
1646 sv_hook = coro_nready ? 0 : coro_readyhook;
1647 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1648
1649 coro_enq (aTHX_ coro); 1700 coro_enq (aTHX_ coro);
1650 ++coro_nready;
1651 1701
1652 if (sv_hook) 1702 if (!coro_nready++)
1653 { 1703 if (coroapi.readyhook)
1654 dSP; 1704 coroapi.readyhook ();
1655
1656 ENTER;
1657 SAVETMPS;
1658
1659 PUSHMARK (SP);
1660 PUTBACK;
1661 call_sv (sv_hook, G_VOID | G_DISCARD);
1662
1663 FREETMPS;
1664 LEAVE;
1665 }
1666
1667 if (xs_hook)
1668 xs_hook ();
1669 1705
1670 return 1; 1706 return 1;
1671} 1707}
1672 1708
1673static int 1709static int
1696static void 1732static void
1697prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1733prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1698{ 1734{
1699 for (;;) 1735 for (;;)
1700 { 1736 {
1701 SV *next_sv = coro_deq (aTHX); 1737 struct coro *next = coro_deq (aTHX);
1702 1738
1703 if (expect_true (next_sv)) 1739 if (expect_true (next))
1704 { 1740 {
1705 struct coro *next = SvSTATE_hv (next_sv);
1706
1707 /* cannot transfer to destroyed coros, skip and look for next */ 1741 /* cannot transfer to destroyed coros, skip and look for next */
1708 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1742 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1709 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1743 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1710 else 1744 else
1711 { 1745 {
1712 next->flags &= ~CF_READY; 1746 next->flags &= ~CF_READY;
1713 --coro_nready; 1747 --coro_nready;
1714 1748
1726 api_ready (aTHX_ SvRV (sv_idle)); 1760 api_ready (aTHX_ SvRV (sv_idle));
1727 --coro_nready; 1761 --coro_nready;
1728 } 1762 }
1729 else 1763 else
1730 { 1764 {
1765 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1731 dSP; 1766 dSP;
1732 1767
1733 ENTER; 1768 ENTER;
1734 SAVETMPS; 1769 SAVETMPS;
1735 1770
1881{ 1916{
1882 int i; 1917 int i;
1883 HV *hv = (HV *)SvRV (coro_current); 1918 HV *hv = (HV *)SvRV (coro_current);
1884 AV *av = newAV (); 1919 AV *av = newAV ();
1885 1920
1921 /* items are actually not so common, so optimise for this case */
1922 if (items)
1923 {
1886 av_extend (av, items - 1); 1924 av_extend (av, items - 1);
1925
1887 for (i = 0; i < items; ++i) 1926 for (i = 0; i < items; ++i)
1888 av_push (av, SvREFCNT_inc_NN (arg [i])); 1927 av_push (av, SvREFCNT_inc_NN (arg [i]));
1928 }
1889 1929
1890 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 1930 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1891 1931
1892 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 1932 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1893 api_ready (aTHX_ sv_manager); 1933 api_ready (aTHX_ sv_manager);
1983 2023
1984static void 2024static void
1985coro_rouse_callback (pTHX_ CV *cv) 2025coro_rouse_callback (pTHX_ CV *cv)
1986{ 2026{
1987 dXSARGS; 2027 dXSARGS;
1988 SV *data = (SV *)GENSUB_ARG; 2028 SV *data = (SV *)S_GENSUB_ARG;
1989 2029
1990 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2030 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1991 { 2031 {
1992 /* first call, set args */ 2032 /* first call, set args */
1993 SV *coro = SvRV (data); 2033 SV *coro = SvRV (data);
2059 || SvTYPE (SvRV (cb)) != SVt_PVCV 2099 || SvTYPE (SvRV (cb)) != SVt_PVCV
2060 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2100 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2061 croak ("Coro::rouse_wait called with illegal callback argument,"); 2101 croak ("Coro::rouse_wait called with illegal callback argument,");
2062 2102
2063 { 2103 {
2064 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2104 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2065 SV *data = (SV *)GENSUB_ARG; 2105 SV *data = (SV *)S_GENSUB_ARG;
2066 2106
2067 frame->data = (void *)data; 2107 frame->data = (void *)data;
2068 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2108 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2069 frame->check = slf_check_rouse_wait; 2109 frame->check = slf_check_rouse_wait;
2070 } 2110 }
2074coro_new_rouse_cb (pTHX) 2114coro_new_rouse_cb (pTHX)
2075{ 2115{
2076 HV *hv = (HV *)SvRV (coro_current); 2116 HV *hv = (HV *)SvRV (coro_current);
2077 struct coro *coro = SvSTATE_hv (hv); 2117 struct coro *coro = SvSTATE_hv (hv);
2078 SV *data = newRV_inc ((SV *)hv); 2118 SV *data = newRV_inc ((SV *)hv);
2079 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2119 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2080 2120
2081 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2121 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2082 SvREFCNT_dec (data); /* magicext increases the refcount */ 2122 SvREFCNT_dec (data); /* magicext increases the refcount */
2083 2123
2084 SvREFCNT_dec (coro->rouse_cb); 2124 SvREFCNT_dec (coro->rouse_cb);
2291 if (PL_op->op_ppaddr != PL_ppaddr [OP_ENTERSUB] 2331 if (PL_op->op_ppaddr != PL_ppaddr [OP_ENTERSUB]
2292 && PL_op->op_ppaddr != pp_slf) 2332 && PL_op->op_ppaddr != pp_slf)
2293 croak ("FATAL: Coro SLF calls can only be made normally, not via goto or any other means, caught"); 2333 croak ("FATAL: Coro SLF calls can only be made normally, not via goto or any other means, caught");
2294 2334
2295 CvFLAGS (cv) |= CVf_SLF; 2335 CvFLAGS (cv) |= CVf_SLF;
2336 CvNODEBUG_on (cv);
2296 CvXSUBANY (cv).any_ptr = (void *)init_cb; 2337 CvXSUBANY (cv).any_ptr = (void *)init_cb;
2297 slf_cv = cv; 2338 slf_cv = cv;
2298 2339
2299 /* we patch the op, and then re-run the whole call */ 2340 /* we patch the op, and then re-run the whole call */
2300 /* we have to put the same argument on the stack for this to work */ 2341 /* we have to put the same argument on the stack for this to work */
2455/* Coro::Semaphore & Coro::Signal */ 2496/* Coro::Semaphore & Coro::Signal */
2456 2497
2457static SV * 2498static SV *
2458coro_waitarray_new (pTHX_ int count) 2499coro_waitarray_new (pTHX_ int count)
2459{ 2500{
2460 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2501 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2461 AV *av = newAV (); 2502 AV *av = newAV ();
2462 SV **ary; 2503 SV **ary;
2463 2504
2464 /* unfortunately, building manually saves memory */ 2505 /* unfortunately, building manually saves memory */
2465 Newx (ary, 2, SV *); 2506 Newx (ary, 2, SV *);
2607{ 2648{
2608 if (items >= 2) 2649 if (items >= 2)
2609 { 2650 {
2610 /* callback form */ 2651 /* callback form */
2611 AV *av = (AV *)SvRV (arg [0]); 2652 AV *av = (AV *)SvRV (arg [0]);
2612 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2653 SV *cb_cv = s_get_cv_croak (arg [1]);
2613 2654
2614 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2655 av_push (av, SvREFCNT_inc_NN (cb_cv));
2615 2656
2616 if (SvIVX (AvARRAY (av)[0]) > 0) 2657 if (SvIVX (AvARRAY (av)[0]) > 0)
2617 coro_semaphore_adjust (aTHX_ av, 0); 2658 coro_semaphore_adjust (aTHX_ av, 0);
2618 2659
2619 frame->prepare = prepare_nop; 2660 frame->prepare = prepare_nop;
2643 AvARRAY (av)[0] = AvARRAY (av)[1]; 2684 AvARRAY (av)[0] = AvARRAY (av)[1];
2644 AvARRAY (av)[1] = cb; 2685 AvARRAY (av)[1] = cb;
2645 2686
2646 cb = av_shift (av); 2687 cb = av_shift (av);
2647 2688
2689 if (SvTYPE (cb) == SVt_PVCV)
2690 {
2691 dSP;
2692 PUSHMARK (SP);
2693 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2694 PUTBACK;
2695 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2696 }
2697 else
2698 {
2648 api_ready (aTHX_ cb); 2699 api_ready (aTHX_ cb);
2649 sv_setiv (cb, 0); /* signal waiter */ 2700 sv_setiv (cb, 0); /* signal waiter */
2701 }
2702
2650 SvREFCNT_dec (cb); 2703 SvREFCNT_dec (cb);
2651 2704
2652 --count; 2705 --count;
2653 } 2706 }
2654} 2707}
2663static void 2716static void
2664slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2717slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2665{ 2718{
2666 AV *av = (AV *)SvRV (arg [0]); 2719 AV *av = (AV *)SvRV (arg [0]);
2667 2720
2721 if (items >= 2)
2722 {
2723 SV *cb_cv = s_get_cv_croak (arg [1]);
2724 av_push (av, SvREFCNT_inc_NN (cb_cv));
2725
2668 if (SvIVX (AvARRAY (av)[0])) 2726 if (SvIVX (AvARRAY (av)[0]))
2727 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2728
2729 frame->prepare = prepare_nop;
2730 frame->check = slf_check_nop;
2731 }
2732 else if (SvIVX (AvARRAY (av)[0]))
2669 { 2733 {
2670 SvIVX (AvARRAY (av)[0]) = 0; 2734 SvIVX (AvARRAY (av)[0]) = 0;
2671 frame->prepare = prepare_nop; 2735 frame->prepare = prepare_nop;
2672 frame->check = slf_check_nop; 2736 frame->check = slf_check_nop;
2673 } 2737 }
2674 else 2738 else
2675 { 2739 {
2676 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2740 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2677 2741
2678 av_push (av, waiter); 2742 av_push (av, waiter);
2679 2743
2680 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2744 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2681 frame->prepare = prepare_schedule; 2745 frame->prepare = prepare_schedule;
2699 2763
2700static void 2764static void
2701coro_aio_callback (pTHX_ CV *cv) 2765coro_aio_callback (pTHX_ CV *cv)
2702{ 2766{
2703 dXSARGS; 2767 dXSARGS;
2704 AV *state = (AV *)GENSUB_ARG; 2768 AV *state = (AV *)S_GENSUB_ARG;
2705 SV *coro = av_pop (state); 2769 SV *coro = av_pop (state);
2706 SV *data_sv = newSV (sizeof (struct io_state)); 2770 SV *data_sv = newSV (sizeof (struct io_state));
2707 2771
2708 av_extend (state, items - 1); 2772 av_extend (state, items - 1);
2709 2773
2823 2887
2824 for (i = 0; i < items; ++i) 2888 for (i = 0; i < items; ++i)
2825 PUSHs (arg [i]); 2889 PUSHs (arg [i]);
2826 2890
2827 /* now push the callback closure */ 2891 /* now push the callback closure */
2828 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2892 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2829 2893
2830 /* now call the AIO function - we assume our request is uncancelable */ 2894 /* now call the AIO function - we assume our request is uncancelable */
2831 PUTBACK; 2895 PUTBACK;
2832 call_sv ((SV *)req, G_VOID | G_DISCARD); 2896 call_sv ((SV *)req, G_VOID | G_DISCARD);
2833 } 2897 }
2851/*****************************************************************************/ 2915/*****************************************************************************/
2852 2916
2853#if CORO_CLONE 2917#if CORO_CLONE
2854# include "clone.c" 2918# include "clone.c"
2855#endif 2919#endif
2920
2921/*****************************************************************************/
2922
2923static SV *
2924coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2925{
2926 SV *coro_sv;
2927 struct coro *coro;
2928 MAGIC *mg;
2929 HV *hv;
2930 SV *cb;
2931 int i;
2932
2933 if (argc > 0)
2934 {
2935 cb = s_get_cv_croak (argv [0]);
2936
2937 if (!is_coro)
2938 {
2939 if (CvISXSUB (cb))
2940 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2941
2942 if (!CvROOT (cb))
2943 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2944 }
2945 }
2946
2947 Newz (0, coro, 1, struct coro);
2948 coro->args = newAV ();
2949 coro->flags = CF_NEW;
2950
2951 if (coro_first) coro_first->prev = coro;
2952 coro->next = coro_first;
2953 coro_first = coro;
2954
2955 coro->hv = hv = newHV ();
2956 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2957 mg->mg_flags |= MGf_DUP;
2958 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
2959
2960 if (argc > 0)
2961 {
2962 av_extend (coro->args, argc + is_coro - 1);
2963
2964 if (is_coro)
2965 {
2966 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2967 cb = (SV *)cv_coro_run;
2968 }
2969
2970 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2971
2972 for (i = 1; i < argc; i++)
2973 av_push (coro->args, newSVsv (argv [i]));
2974 }
2975
2976 return coro_sv;
2977}
2856 2978
2857MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2979MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2858 2980
2859PROTOTYPES: DISABLE 2981PROTOTYPES: DISABLE
2860 2982
2920 3042
2921 if (!svp) croak ("Time::HiRes is required"); 3043 if (!svp) croak ("Time::HiRes is required");
2922 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3044 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2923 3045
2924 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3046 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3047
3048 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3049 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2925 } 3050 }
2926 3051
2927 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3052 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2928} 3053}
2929 3054
2930SV * 3055SV *
2931new (char *klass, ...) 3056new (SV *klass, ...)
2932 ALIAS: 3057 ALIAS:
2933 Coro::new = 1 3058 Coro::new = 1
2934 CODE: 3059 CODE:
2935{ 3060 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2936 struct coro *coro; 3061 OUTPUT:
2937 MAGIC *mg;
2938 HV *hv;
2939 CV *cb;
2940 int i;
2941
2942 if (items > 1)
2943 {
2944 cb = coro_sv_2cv (aTHX_ ST (1));
2945
2946 if (!ix)
2947 {
2948 if (CvISXSUB (cb))
2949 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2950
2951 if (!CvROOT (cb))
2952 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2953 }
2954 }
2955
2956 Newz (0, coro, 1, struct coro);
2957 coro->args = newAV ();
2958 coro->flags = CF_NEW;
2959
2960 if (coro_first) coro_first->prev = coro;
2961 coro->next = coro_first;
2962 coro_first = coro;
2963
2964 coro->hv = hv = newHV ();
2965 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2966 mg->mg_flags |= MGf_DUP;
2967 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2968
2969 if (items > 1)
2970 {
2971 av_extend (coro->args, items - 1 + ix - 1);
2972
2973 if (ix)
2974 {
2975 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2976 cb = cv_coro_run;
2977 }
2978
2979 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2980
2981 for (i = 2; i < items; i++)
2982 av_push (coro->args, newSVsv (ST (i)));
2983 }
2984}
2985 OUTPUT:
2986 RETVAL 3062 RETVAL
2987 3063
2988void 3064void
2989transfer (...) 3065transfer (...)
2990 PROTOTYPE: $$ 3066 PROTOTYPE: $$
3134 CODE: 3210 CODE:
3135{ 3211{
3136 struct coro *current = SvSTATE_current; 3212 struct coro *current = SvSTATE_current;
3137 SV **throwp = self == current ? &CORO_THROW : &self->except; 3213 SV **throwp = self == current ? &CORO_THROW : &self->except;
3138 SvREFCNT_dec (*throwp); 3214 SvREFCNT_dec (*throwp);
3215 SvGETMAGIC (throw);
3139 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3216 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
3140} 3217}
3141 3218
3142void 3219void
3143api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3220api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3202 CODE: 3279 CODE:
3203 coro_state_destroy (aTHX_ self); 3280 coro_state_destroy (aTHX_ self);
3204 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3281 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3205 3282
3206 3283
3284SV *
3285enable_times (int enabled = enable_times)
3286 CODE:
3287{
3288 RETVAL = boolSV (enable_times);
3289
3290 if (enabled != enable_times)
3291 {
3292 enable_times = enabled;
3293
3294 coro_times_update ();
3295 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3296 }
3297}
3298 OUTPUT:
3299 RETVAL
3300
3301void
3302times (Coro::State self)
3303 PPCODE:
3304{
3305 struct coro *current = SvSTATE (coro_current);
3306
3307 if (expect_false (current == self))
3308 {
3309 coro_times_update ();
3310 coro_times_add (SvSTATE (coro_current));
3311 }
3312
3313 EXTEND (SP, 2);
3314 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3315 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3316
3317 if (expect_false (current == self))
3318 coro_times_sub (SvSTATE (coro_current));
3319}
3320
3207MODULE = Coro::State PACKAGE = Coro 3321MODULE = Coro::State PACKAGE = Coro
3208 3322
3209BOOT: 3323BOOT:
3210{ 3324{
3211 int i;
3212
3213 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3325 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3214 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3326 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3215 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3327 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3216 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3328 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3217 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3329 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3221 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3333 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3222 3334
3223 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3335 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3224 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3336 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3225 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3337 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3226 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3338 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3227 3339
3228 coro_stash = gv_stashpv ("Coro", TRUE); 3340 coro_stash = gv_stashpv ("Coro", TRUE);
3229 3341
3230 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3342 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3231 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3343 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3232 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3344 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3233 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3345 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3234 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3346 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3235 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3347 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3236
3237 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3238 coro_ready[i] = newAV ();
3239 3348
3240 { 3349 {
3241 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3350 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3242 3351
3243 coroapi.schedule = api_schedule; 3352 coroapi.schedule = api_schedule;
3253 sv_setiv (sv, (IV)&coroapi); 3362 sv_setiv (sv, (IV)&coroapi);
3254 SvREADONLY_on (sv); 3363 SvREADONLY_on (sv);
3255 } 3364 }
3256} 3365}
3257 3366
3367SV *
3368async (...)
3369 PROTOTYPE: &@
3370 CODE:
3371 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3372 api_ready (aTHX_ RETVAL);
3373 OUTPUT:
3374 RETVAL
3375
3258void 3376void
3259terminate (...) 3377terminate (...)
3260 CODE: 3378 CODE:
3261 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3379 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3262 3380
3295void 3413void
3296_set_readyhook (SV *hook) 3414_set_readyhook (SV *hook)
3297 PROTOTYPE: $ 3415 PROTOTYPE: $
3298 CODE: 3416 CODE:
3299 SvREFCNT_dec (coro_readyhook); 3417 SvREFCNT_dec (coro_readyhook);
3418 SvGETMAGIC (hook);
3419 if (SvOK (hook))
3420 {
3300 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3421 coro_readyhook = newSVsv (hook);
3422 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3423 }
3424 else
3425 {
3426 coro_readyhook = 0;
3427 CORO_READYHOOK = 0;
3428 }
3301 3429
3302int 3430int
3303prio (Coro::State coro, int newprio = 0) 3431prio (Coro::State coro, int newprio = 0)
3304 PROTOTYPE: $;$ 3432 PROTOTYPE: $;$
3305 ALIAS: 3433 ALIAS:
3311 if (items > 1) 3439 if (items > 1)
3312 { 3440 {
3313 if (ix) 3441 if (ix)
3314 newprio = coro->prio - newprio; 3442 newprio = coro->prio - newprio;
3315 3443
3316 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3444 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3317 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3445 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3318 3446
3319 coro->prio = newprio; 3447 coro->prio = newprio;
3320 } 3448 }
3321} 3449}
3322 OUTPUT: 3450 OUTPUT:
3369 for (i = 1; i < items; ++i) 3497 for (i = 1; i < items; ++i)
3370 av_push (av, SvREFCNT_inc_NN (ST (i))); 3498 av_push (av, SvREFCNT_inc_NN (ST (i)));
3371 3499
3372 if ((SV *)hv == &PL_sv_undef) 3500 if ((SV *)hv == &PL_sv_undef)
3373 { 3501 {
3374 PUSHMARK (SP); 3502 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3375 EXTEND (SP, 2);
3376 PUSHs (sv_Coro);
3377 PUSHs ((SV *)cv_pool_handler);
3378 PUTBACK;
3379 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3380 SPAGAIN;
3381
3382 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3503 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3504 SvREFCNT_dec (sv);
3383 } 3505 }
3384 3506
3385 { 3507 {
3386 struct coro *coro = SvSTATE_hv (hv); 3508 struct coro *coro = SvSTATE_hv (hv);
3387 3509
3421 CODE: 3543 CODE:
3422{ 3544{
3423 struct coro *coro = SvSTATE_current; 3545 struct coro *coro = SvSTATE_current;
3424 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3546 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3425 3547
3426 block = (SV *)coro_sv_2cv (aTHX_ block); 3548 block = s_get_cv_croak (block);
3427 3549
3428 if (!*avp) 3550 if (!*avp)
3429 *avp = newAV (); 3551 *avp = newAV ();
3430 3552
3431 av_push (*avp, SvREFCNT_inc (block)); 3553 av_push (*avp, SvREFCNT_inc (block));
3448MODULE = Coro::State PACKAGE = Coro::Semaphore 3570MODULE = Coro::State PACKAGE = Coro::Semaphore
3449 3571
3450SV * 3572SV *
3451new (SV *klass, SV *count = 0) 3573new (SV *klass, SV *count = 0)
3452 CODE: 3574 CODE:
3575{
3576 int semcnt = 1;
3577
3578 if (count)
3579 {
3580 SvGETMAGIC (count);
3581
3582 if (SvOK (count))
3583 semcnt = SvIV (count);
3584 }
3585
3453 RETVAL = sv_bless ( 3586 RETVAL = sv_bless (
3454 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3587 coro_waitarray_new (aTHX_ semcnt),
3455 GvSTASH (CvGV (cv)) 3588 GvSTASH (CvGV (cv))
3456 ); 3589 );
3590}
3457 OUTPUT: 3591 OUTPUT:
3458 RETVAL 3592 RETVAL
3459 3593
3460# helper for Coro::Channel and others 3594# helper for Coro::Channel and others
3461SV * 3595SV *
3619 3753
3620void 3754void
3621_register (char *target, char *proto, SV *req) 3755_register (char *target, char *proto, SV *req)
3622 CODE: 3756 CODE:
3623{ 3757{
3624 CV *req_cv = coro_sv_2cv (aTHX_ req); 3758 SV *req_cv = s_get_cv_croak (req);
3625 /* newXSproto doesn't return the CV on 5.8 */ 3759 /* newXSproto doesn't return the CV on 5.8 */
3626 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3760 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3627 sv_setpv ((SV *)slf_cv, proto); 3761 sv_setpv ((SV *)slf_cv, proto);
3628 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3762 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3629} 3763}
3630 3764
3765MODULE = Coro::State PACKAGE = Coro::Select
3766
3767void
3768patch_pp_sselect ()
3769 CODE:
3770 if (!coro_old_pp_sselect)
3771 {
3772 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3773 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3774 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3775 }
3776
3777void
3778unpatch_pp_sselect ()
3779 CODE:
3780 if (coro_old_pp_sselect)
3781 {
3782 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3783 coro_old_pp_sselect = 0;
3784 }
3785
3786

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines