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.344 by root, Mon Dec 15 19:39:40 2008 UTC vs.
Revision 1.368 by root, Thu Aug 13 02:35:41 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
194static CV *cv_pool_handler; 146static CV *cv_pool_handler;
195static CV *cv_coro_state_new; 147static CV *cv_coro_state_new;
196 148
197/* Coro::AnyEvent */ 149/* Coro::AnyEvent */
198static SV *sv_activity; 150static SV *sv_activity;
151
152/* enable processtime/realtime profiling */
153static char enable_times;
154typedef U32 coro_ts[2];
155static coro_ts time_real, time_cpu;
156static char times_valid;
199 157
200static struct coro_cctx *cctx_first; 158static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 159static int cctx_count, cctx_idle;
202 160
203enum { 161enum {
261/* this is a structure representing a perl-level coroutine */ 219/* this is a structure representing a perl-level coroutine */
262struct coro { 220struct coro {
263 /* the C coroutine allocated to this perl coroutine, if any */ 221 /* the C coroutine allocated to this perl coroutine, if any */
264 coro_cctx *cctx; 222 coro_cctx *cctx;
265 223
224 /* ready queue */
225 struct coro *next_ready;
226
266 /* state data */ 227 /* state data */
267 struct CoroSLF slf_frame; /* saved slf frame */ 228 struct CoroSLF slf_frame; /* saved slf frame */
268 AV *mainstack; 229 AV *mainstack;
269 perl_slots *slot; /* basically the saved sp */ 230 perl_slots *slot; /* basically the saved sp */
270 231
290 251
291 /* on_enter/on_leave */ 252 /* on_enter/on_leave */
292 AV *on_enter; 253 AV *on_enter;
293 AV *on_leave; 254 AV *on_leave;
294 255
256 /* times */
257 coro_ts t_cpu, t_real;
258
295 /* linked list */ 259 /* linked list */
296 struct coro *next, *prev; 260 struct coro *next, *prev;
297}; 261};
298 262
299typedef struct coro *Coro__State; 263typedef struct coro *Coro__State;
304/* the mainr easonw e don't support windows process emulation */ 268/* the mainr easonw e don't support windows process emulation */
305static struct CoroSLF slf_frame; /* the current slf frame */ 269static struct CoroSLF slf_frame; /* the current slf frame */
306 270
307/** Coro ********************************************************************/ 271/** Coro ********************************************************************/
308 272
309#define PRIO_MAX 3 273#define CORO_PRIO_MAX 3
310#define PRIO_HIGH 1 274#define CORO_PRIO_HIGH 1
311#define PRIO_NORMAL 0 275#define CORO_PRIO_NORMAL 0
312#define PRIO_LOW -1 276#define CORO_PRIO_LOW -1
313#define PRIO_IDLE -3 277#define CORO_PRIO_IDLE -3
314#define PRIO_MIN -4 278#define CORO_PRIO_MIN -4
315 279
316/* for Coro.pm */ 280/* for Coro.pm */
317static SV *coro_current; 281static SV *coro_current;
318static SV *coro_readyhook; 282static SV *coro_readyhook;
319static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 283static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
320static CV *cv_coro_run, *cv_coro_terminate; 284static CV *cv_coro_run, *cv_coro_terminate;
321static struct coro *coro_first; 285static struct coro *coro_first;
322#define coro_nready coroapi.nready 286#define coro_nready coroapi.nready
287
288/** Coro::Select ************************************************************/
289
290static OP *(*coro_old_pp_sselect) (pTHX);
291static SV *coro_select_select;
292
293/* horrible hack, but if it works... */
294static OP *
295coro_pp_sselect (aTHX)
296{
297 dSP;
298 PUSHMARK (SP - 4); /* fake argument list */
299 XPUSHs (coro_select_select);
300 PUTBACK;
301
302 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
303 PL_op->op_flags |= OPf_STACKED;
304 PL_op->op_private = 0;
305 return PL_ppaddr [OP_ENTERSUB](aTHX);
306}
323 307
324/** lowlevel stuff **********************************************************/ 308/** lowlevel stuff **********************************************************/
325 309
326static SV * 310static SV *
327coro_get_sv (pTHX_ const char *name, int create) 311coro_get_sv (pTHX_ const char *name, int create)
351 get_hv (name, create); 335 get_hv (name, create);
352#endif 336#endif
353 return get_hv (name, create); 337 return get_hv (name, create);
354} 338}
355 339
356/* may croak */ 340INLINE void
357INLINE CV * 341coro_times_update ()
358coro_sv_2cv (pTHX_ SV *sv)
359{ 342{
360 HV *st; 343#ifdef coro_clock_gettime
361 GV *gvp; 344 struct timespec ts;
362 CV *cv = sv_2cv (sv, &st, &gvp, 0);
363 345
364 if (!cv) 346 ts.tv_sec = ts.tv_nsec = 0;
365 croak ("code reference expected"); 347 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
348 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
366 349
367 return cv; 350 ts.tv_sec = ts.tv_nsec = 0;
351 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
352 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
353#else
354 dTHX;
355 UV tv[2];
356
357 u2time (aTHX_ tv);
358 time_real [0] = tv [0];
359 time_real [1] = tv [1] * 1000;
360#endif
361}
362
363INLINE void
364coro_times_add (struct coro *c)
365{
366 c->t_real [1] += time_real [1];
367 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
368 c->t_real [0] += time_real [0];
369
370 c->t_cpu [1] += time_cpu [1];
371 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
372 c->t_cpu [0] += time_cpu [0];
373}
374
375INLINE void
376coro_times_sub (struct coro *c)
377{
378 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
379 c->t_real [1] -= time_real [1];
380 c->t_real [0] -= time_real [0];
381
382 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
383 c->t_cpu [1] -= time_cpu [1];
384 c->t_cpu [0] -= time_cpu [0];
368} 385}
369 386
370/*****************************************************************************/ 387/*****************************************************************************/
371/* magic glue */ 388/* magic glue */
372 389
472static int 489static int
473coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 490coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
474{ 491{
475 AV *padlist; 492 AV *padlist;
476 AV *av = (AV *)mg->mg_obj; 493 AV *av = (AV *)mg->mg_obj;
494
495 /* perl manages to free our internal AV and _then_ call us */
496 if (IN_DESTRUCT)
497 return 0;
477 498
478 /* casting is fun. */ 499 /* casting is fun. */
479 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 500 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
480 free_padlist (aTHX_ padlist); 501 free_padlist (aTHX_ padlist);
481 502
570 } 591 }
571 592
572 slf_frame = c->slf_frame; 593 slf_frame = c->slf_frame;
573 CORO_THROW = c->except; 594 CORO_THROW = c->except;
574 595
596 if (expect_false (enable_times))
597 {
598 if (expect_false (!times_valid))
599 coro_times_update ();
600
601 coro_times_sub (c);
602 }
603
575 if (expect_false (c->on_enter)) 604 if (expect_false (c->on_enter))
576 { 605 {
577 int i; 606 int i;
578 607
579 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 608 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
588 { 617 {
589 int i; 618 int i;
590 619
591 for (i = AvFILLp (c->on_leave); i >= 0; --i) 620 for (i = AvFILLp (c->on_leave); i >= 0; --i)
592 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 621 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
622 }
623
624 times_valid = 0;
625
626 if (expect_false (enable_times))
627 {
628 coro_times_update (); times_valid = 1;
629 coro_times_add (c);
593 } 630 }
594 631
595 c->except = CORO_THROW; 632 c->except = CORO_THROW;
596 c->slf_frame = slf_frame; 633 c->slf_frame = slf_frame;
597 634
612 { 649 {
613 while (expect_true (cxix >= 0)) 650 while (expect_true (cxix >= 0))
614 { 651 {
615 PERL_CONTEXT *cx = &ccstk[cxix--]; 652 PERL_CONTEXT *cx = &ccstk[cxix--];
616 653
617 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 654 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
618 { 655 {
619 CV *cv = cx->blk_sub.cv; 656 CV *cv = cx->blk_sub.cv;
620 657
621 if (expect_true (CvDEPTH (cv))) 658 if (expect_true (CvDEPTH (cv)))
622 { 659 {
646 /* we manually unroll here, as usually 2 slots is enough */ 683 /* we manually unroll here, as usually 2 slots is enough */
647 if (SLOT_COUNT >= 1) CXINC; 684 if (SLOT_COUNT >= 1) CXINC;
648 if (SLOT_COUNT >= 2) CXINC; 685 if (SLOT_COUNT >= 2) CXINC;
649 if (SLOT_COUNT >= 3) CXINC; 686 if (SLOT_COUNT >= 3) CXINC;
650 { 687 {
651 int i; 688 unsigned int i;
652 for (i = 3; i < SLOT_COUNT; ++i) 689 for (i = 3; i < SLOT_COUNT; ++i)
653 CXINC; 690 CXINC;
654 } 691 }
655 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 692 cxstack_ix -= SLOT_COUNT; /* undo allocation */
656 693
961 998
962 PL_op = (OP *)&coro_setup_op; 999 PL_op = (OP *)&coro_setup_op;
963 1000
964 /* copy throw, in case it was set before coro_setup */ 1001 /* copy throw, in case it was set before coro_setup */
965 CORO_THROW = coro->except; 1002 CORO_THROW = coro->except;
1003
1004 if (expect_false (enable_times))
1005 {
1006 coro_times_update ();
1007 coro_times_sub (coro);
1008 }
966} 1009}
967 1010
968static void 1011static void
969coro_unwind_stacks (pTHX) 1012coro_unwind_stacks (pTHX)
970{ 1013{
987} 1030}
988 1031
989static void 1032static void
990coro_destruct_perl (pTHX_ struct coro *coro) 1033coro_destruct_perl (pTHX_ struct coro *coro)
991{ 1034{
1035 SV *svf [9];
1036
1037 {
1038 struct coro *current = SvSTATE_current;
1039
1040 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1041
1042 save_perl (aTHX_ current);
1043 load_perl (aTHX_ coro);
1044
992 coro_unwind_stacks (aTHX); 1045 coro_unwind_stacks (aTHX);
1046 coro_destruct_stacks (aTHX);
993 1047
994 SvREFCNT_dec (GvSV (PL_defgv)); 1048 // now save some sv's to be free'd later
995 SvREFCNT_dec (GvAV (PL_defgv)); 1049 svf [0] = GvSV (PL_defgv);
996 SvREFCNT_dec (GvSV (PL_errgv)); 1050 svf [1] = (SV *)GvAV (PL_defgv);
997 SvREFCNT_dec (PL_defoutgv); 1051 svf [2] = GvSV (PL_errgv);
998 SvREFCNT_dec (PL_rs); 1052 svf [3] = (SV *)PL_defoutgv;
999 SvREFCNT_dec (GvSV (irsgv)); 1053 svf [4] = PL_rs;
1000 SvREFCNT_dec (GvHV (PL_hintgv)); 1054 svf [5] = GvSV (irsgv);
1055 svf [6] = (SV *)GvHV (PL_hintgv);
1056 svf [7] = PL_diehook;
1057 svf [8] = PL_warnhook;
1058 assert (9 == sizeof (svf) / sizeof (*svf));
1001 1059
1002 SvREFCNT_dec (PL_diehook); 1060 load_perl (aTHX_ current);
1003 SvREFCNT_dec (PL_warnhook);
1004 1061 }
1062
1063 {
1064 unsigned int i;
1065
1066 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1067 SvREFCNT_dec (svf [i]);
1068
1005 SvREFCNT_dec (coro->saved_deffh); 1069 SvREFCNT_dec (coro->saved_deffh);
1006 SvREFCNT_dec (coro->rouse_cb); 1070 SvREFCNT_dec (coro->rouse_cb);
1007 SvREFCNT_dec (coro->invoke_cb); 1071 SvREFCNT_dec (coro->invoke_cb);
1008 SvREFCNT_dec (coro->invoke_av); 1072 SvREFCNT_dec (coro->invoke_av);
1009 1073 }
1010 coro_destruct_stacks (aTHX);
1011} 1074}
1012 1075
1013INLINE void 1076INLINE void
1014free_coro_mortal (pTHX) 1077free_coro_mortal (pTHX)
1015{ 1078{
1212 /* somebody or something will hit me for both perl_run and PL_restartop */ 1275 /* somebody or something will hit me for both perl_run and PL_restartop */
1213 PL_restartop = PL_op; 1276 PL_restartop = PL_op;
1214 perl_run (PL_curinterp); 1277 perl_run (PL_curinterp);
1215 /* 1278 /*
1216 * Unfortunately, there is no way to get at the return values of the 1279 * Unfortunately, there is no way to get at the return values of the
1217 * coro body here, as perl_run destroys these 1280 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1281 * runtime errors here, as this is just a random interpreter, not a thread.
1218 */ 1282 */
1219 1283
1220 /* 1284 /*
1221 * If perl-run returns we assume exit() was being called or the coro 1285 * 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) 1286 * fell off the end, which seems to be the only valid (non-bug)
1502 1566
1503 if (coro->mainstack 1567 if (coro->mainstack
1504 && coro->mainstack != main_mainstack 1568 && coro->mainstack != main_mainstack
1505 && coro->slot 1569 && coro->slot
1506 && !PL_dirty) 1570 && !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); 1571 coro_destruct_perl (aTHX_ coro);
1516
1517 load_perl (aTHX_ current);
1518
1519 coro->slot = 0;
1520 }
1521 1572
1522 cctx_destroy (coro->cctx); 1573 cctx_destroy (coro->cctx);
1523 SvREFCNT_dec (coro->startcv); 1574 SvREFCNT_dec (coro->startcv);
1524 SvREFCNT_dec (coro->args); 1575 SvREFCNT_dec (coro->args);
1525 SvREFCNT_dec (CORO_THROW); 1576 SvREFCNT_dec (CORO_THROW);
1584 1635
1585 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1636 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1586 TRANSFER (ta, 1); 1637 TRANSFER (ta, 1);
1587} 1638}
1588 1639
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 ********************************************************************/ 1640/** Coro ********************************************************************/
1613 1641
1614INLINE void 1642INLINE void
1615coro_enq (pTHX_ struct coro *coro) 1643coro_enq (pTHX_ struct coro *coro)
1616{ 1644{
1617 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1645 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1618}
1619 1646
1620INLINE SV * 1647 SvREFCNT_inc_NN (coro->hv);
1648
1649 coro->next_ready = 0;
1650 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1651 ready [1] = coro;
1652}
1653
1654INLINE struct coro *
1621coro_deq (pTHX) 1655coro_deq (pTHX)
1622{ 1656{
1623 int prio; 1657 int prio;
1624 1658
1625 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1659 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1626 if (AvFILLp (coro_ready [prio]) >= 0) 1660 {
1627 return av_shift (coro_ready [prio]); 1661 struct coro **ready = coro_ready [prio];
1662
1663 if (ready [0])
1664 {
1665 struct coro *coro = ready [0];
1666 ready [0] = coro->next_ready;
1667 return coro;
1668 }
1669 }
1628 1670
1629 return 0; 1671 return 0;
1672}
1673
1674static void
1675invoke_sv_ready_hook_helper (void)
1676{
1677 dTHX;
1678 dSP;
1679
1680 ENTER;
1681 SAVETMPS;
1682
1683 PUSHMARK (SP);
1684 PUTBACK;
1685 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1686
1687 FREETMPS;
1688 LEAVE;
1630} 1689}
1631 1690
1632static int 1691static int
1633api_ready (pTHX_ SV *coro_sv) 1692api_ready (pTHX_ SV *coro_sv)
1634{ 1693{
1635 struct coro *coro;
1636 SV *sv_hook;
1637 void (*xs_hook)(void);
1638
1639 coro = SvSTATE (coro_sv); 1694 struct coro *coro = SvSTATE (coro_sv);
1640 1695
1641 if (coro->flags & CF_READY) 1696 if (coro->flags & CF_READY)
1642 return 0; 1697 return 0;
1643 1698
1644 coro->flags |= CF_READY; 1699 coro->flags |= CF_READY;
1645 1700
1646 sv_hook = coro_nready ? 0 : coro_readyhook;
1647 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1648
1649 coro_enq (aTHX_ coro); 1701 coro_enq (aTHX_ coro);
1650 ++coro_nready;
1651 1702
1652 if (sv_hook) 1703 if (!coro_nready++)
1653 { 1704 if (coroapi.readyhook)
1654 dSP; 1705 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 1706
1670 return 1; 1707 return 1;
1671} 1708}
1672 1709
1673static int 1710static int
1696static void 1733static void
1697prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1734prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1698{ 1735{
1699 for (;;) 1736 for (;;)
1700 { 1737 {
1701 SV *next_sv = coro_deq (aTHX); 1738 struct coro *next = coro_deq (aTHX);
1702 1739
1703 if (expect_true (next_sv)) 1740 if (expect_true (next))
1704 { 1741 {
1705 struct coro *next = SvSTATE_hv (next_sv);
1706
1707 /* cannot transfer to destroyed coros, skip and look for next */ 1742 /* cannot transfer to destroyed coros, skip and look for next */
1708 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1743 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1709 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1744 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1710 else 1745 else
1711 { 1746 {
1712 next->flags &= ~CF_READY; 1747 next->flags &= ~CF_READY;
1713 --coro_nready; 1748 --coro_nready;
1714 1749
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 */
2033 SV *coro = SvRV (data);
1993 AV *av = newAV (); 2034 AV *av = newAV ();
1994 SV *coro = SvRV (data);
1995 2035
1996 SvRV_set (data, (SV *)av); 2036 SvRV_set (data, (SV *)av);
1997 api_ready (aTHX_ coro);
1998 SvREFCNT_dec (coro);
1999 2037
2000 /* better take a full copy of the arguments */ 2038 /* better take a full copy of the arguments */
2001 while (items--) 2039 while (items--)
2002 av_store (av, items, newSVsv (ST (items))); 2040 av_store (av, items, newSVsv (ST (items)));
2041
2042 api_ready (aTHX_ coro);
2043 SvREFCNT_dec (coro);
2003 } 2044 }
2004 2045
2005 XSRETURN_EMPTY; 2046 XSRETURN_EMPTY;
2006} 2047}
2007 2048
2024 2065
2025 EXTEND (SP, AvFILLp (av) + 1); 2066 EXTEND (SP, AvFILLp (av) + 1);
2026 for (i = 0; i <= AvFILLp (av); ++i) 2067 for (i = 0; i <= AvFILLp (av); ++i)
2027 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2068 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2028 2069
2029 /* we have stolen the elements, so ste length to zero and free */ 2070 /* we have stolen the elements, so set length to zero and free */
2030 AvFILLp (av) = -1; 2071 AvFILLp (av) = -1;
2031 av_undef (av); 2072 av_undef (av);
2032 2073
2033 PUTBACK; 2074 PUTBACK;
2034 } 2075 }
2058 || SvTYPE (SvRV (cb)) != SVt_PVCV 2099 || SvTYPE (SvRV (cb)) != SVt_PVCV
2059 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2100 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2060 croak ("Coro::rouse_wait called with illegal callback argument,"); 2101 croak ("Coro::rouse_wait called with illegal callback argument,");
2061 2102
2062 { 2103 {
2063 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2104 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2064 SV *data = (SV *)GENSUB_ARG; 2105 SV *data = (SV *)S_GENSUB_ARG;
2065 2106
2066 frame->data = (void *)data; 2107 frame->data = (void *)data;
2067 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2108 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2068 frame->check = slf_check_rouse_wait; 2109 frame->check = slf_check_rouse_wait;
2069 } 2110 }
2073coro_new_rouse_cb (pTHX) 2114coro_new_rouse_cb (pTHX)
2074{ 2115{
2075 HV *hv = (HV *)SvRV (coro_current); 2116 HV *hv = (HV *)SvRV (coro_current);
2076 struct coro *coro = SvSTATE_hv (hv); 2117 struct coro *coro = SvSTATE_hv (hv);
2077 SV *data = newRV_inc ((SV *)hv); 2118 SV *data = newRV_inc ((SV *)hv);
2078 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2119 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2079 2120
2080 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);
2081 SvREFCNT_dec (data); /* magicext increases the refcount */ 2122 SvREFCNT_dec (data); /* magicext increases the refcount */
2082 2123
2083 SvREFCNT_dec (coro->rouse_cb); 2124 SvREFCNT_dec (coro->rouse_cb);
2454/* Coro::Semaphore & Coro::Signal */ 2495/* Coro::Semaphore & Coro::Signal */
2455 2496
2456static SV * 2497static SV *
2457coro_waitarray_new (pTHX_ int count) 2498coro_waitarray_new (pTHX_ int count)
2458{ 2499{
2459 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2500 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2460 AV *av = newAV (); 2501 AV *av = newAV ();
2461 SV **ary; 2502 SV **ary;
2462 2503
2463 /* unfortunately, building manually saves memory */ 2504 /* unfortunately, building manually saves memory */
2464 Newx (ary, 2, SV *); 2505 Newx (ary, 2, SV *);
2606{ 2647{
2607 if (items >= 2) 2648 if (items >= 2)
2608 { 2649 {
2609 /* callback form */ 2650 /* callback form */
2610 AV *av = (AV *)SvRV (arg [0]); 2651 AV *av = (AV *)SvRV (arg [0]);
2611 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2652 SV *cb_cv = s_get_cv_croak (arg [1]);
2612 2653
2613 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2654 av_push (av, SvREFCNT_inc_NN (cb_cv));
2614 2655
2615 if (SvIVX (AvARRAY (av)[0]) > 0) 2656 if (SvIVX (AvARRAY (av)[0]) > 0)
2616 coro_semaphore_adjust (aTHX_ av, 0); 2657 coro_semaphore_adjust (aTHX_ av, 0);
2617 2658
2618 frame->prepare = prepare_nop; 2659 frame->prepare = prepare_nop;
2642 AvARRAY (av)[0] = AvARRAY (av)[1]; 2683 AvARRAY (av)[0] = AvARRAY (av)[1];
2643 AvARRAY (av)[1] = cb; 2684 AvARRAY (av)[1] = cb;
2644 2685
2645 cb = av_shift (av); 2686 cb = av_shift (av);
2646 2687
2688 if (SvTYPE (cb) == SVt_PVCV)
2689 {
2690 dSP;
2691 PUSHMARK (SP);
2692 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2693 PUTBACK;
2694 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2695 }
2696 else
2697 {
2647 api_ready (aTHX_ cb); 2698 api_ready (aTHX_ cb);
2648 sv_setiv (cb, 0); /* signal waiter */ 2699 sv_setiv (cb, 0); /* signal waiter */
2700 }
2701
2649 SvREFCNT_dec (cb); 2702 SvREFCNT_dec (cb);
2650 2703
2651 --count; 2704 --count;
2652 } 2705 }
2653} 2706}
2662static void 2715static void
2663slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2716slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2664{ 2717{
2665 AV *av = (AV *)SvRV (arg [0]); 2718 AV *av = (AV *)SvRV (arg [0]);
2666 2719
2720 if (items >= 2)
2721 {
2722 SV *cb_cv = s_get_cv_croak (arg [1]);
2723 av_push (av, SvREFCNT_inc_NN (cb_cv));
2724
2667 if (SvIVX (AvARRAY (av)[0])) 2725 if (SvIVX (AvARRAY (av)[0]))
2726 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2727
2728 frame->prepare = prepare_nop;
2729 frame->check = slf_check_nop;
2730 }
2731 else if (SvIVX (AvARRAY (av)[0]))
2668 { 2732 {
2669 SvIVX (AvARRAY (av)[0]) = 0; 2733 SvIVX (AvARRAY (av)[0]) = 0;
2670 frame->prepare = prepare_nop; 2734 frame->prepare = prepare_nop;
2671 frame->check = slf_check_nop; 2735 frame->check = slf_check_nop;
2672 } 2736 }
2673 else 2737 else
2674 { 2738 {
2675 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2739 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2676 2740
2677 av_push (av, waiter); 2741 av_push (av, waiter);
2678 2742
2679 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2743 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2680 frame->prepare = prepare_schedule; 2744 frame->prepare = prepare_schedule;
2698 2762
2699static void 2763static void
2700coro_aio_callback (pTHX_ CV *cv) 2764coro_aio_callback (pTHX_ CV *cv)
2701{ 2765{
2702 dXSARGS; 2766 dXSARGS;
2703 AV *state = (AV *)GENSUB_ARG; 2767 AV *state = (AV *)S_GENSUB_ARG;
2704 SV *coro = av_pop (state); 2768 SV *coro = av_pop (state);
2705 SV *data_sv = newSV (sizeof (struct io_state)); 2769 SV *data_sv = newSV (sizeof (struct io_state));
2706 2770
2707 av_extend (state, items - 1); 2771 av_extend (state, items - 1);
2708 2772
2822 2886
2823 for (i = 0; i < items; ++i) 2887 for (i = 0; i < items; ++i)
2824 PUSHs (arg [i]); 2888 PUSHs (arg [i]);
2825 2889
2826 /* now push the callback closure */ 2890 /* now push the callback closure */
2827 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2891 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2828 2892
2829 /* now call the AIO function - we assume our request is uncancelable */ 2893 /* now call the AIO function - we assume our request is uncancelable */
2830 PUTBACK; 2894 PUTBACK;
2831 call_sv ((SV *)req, G_VOID | G_DISCARD); 2895 call_sv ((SV *)req, G_VOID | G_DISCARD);
2832 } 2896 }
2850/*****************************************************************************/ 2914/*****************************************************************************/
2851 2915
2852#if CORO_CLONE 2916#if CORO_CLONE
2853# include "clone.c" 2917# include "clone.c"
2854#endif 2918#endif
2919
2920/*****************************************************************************/
2921
2922static SV *
2923coro_new (HV *stash, SV **argv, int argc, int is_coro)
2924{
2925 SV *coro_sv;
2926 struct coro *coro;
2927 MAGIC *mg;
2928 HV *hv;
2929 SV *cb;
2930 int i;
2931
2932 if (argc > 0)
2933 {
2934 cb = s_get_cv_croak (argv [0]);
2935
2936 if (!is_coro)
2937 {
2938 if (CvISXSUB (cb))
2939 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2940
2941 if (!CvROOT (cb))
2942 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2943 }
2944 }
2945
2946 Newz (0, coro, 1, struct coro);
2947 coro->args = newAV ();
2948 coro->flags = CF_NEW;
2949
2950 if (coro_first) coro_first->prev = coro;
2951 coro->next = coro_first;
2952 coro_first = coro;
2953
2954 coro->hv = hv = newHV ();
2955 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2956 mg->mg_flags |= MGf_DUP;
2957 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
2958
2959 if (argc > 0)
2960 {
2961 av_extend (coro->args, argc + is_coro - 1);
2962
2963 if (is_coro)
2964 {
2965 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2966 cb = (SV *)cv_coro_run;
2967 }
2968
2969 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2970
2971 for (i = 1; i < argc; i++)
2972 av_push (coro->args, newSVsv (argv [i]));
2973 }
2974
2975 return coro_sv;
2976}
2855 2977
2856MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2978MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2857 2979
2858PROTOTYPES: DISABLE 2980PROTOTYPES: DISABLE
2859 2981
2919 3041
2920 if (!svp) croak ("Time::HiRes is required"); 3042 if (!svp) croak ("Time::HiRes is required");
2921 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3043 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2922 3044
2923 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3045 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3046
3047 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3048 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2924 } 3049 }
2925 3050
2926 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3051 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2927} 3052}
2928 3053
2929SV * 3054SV *
2930new (char *klass, ...) 3055new (SV *klass, ...)
2931 ALIAS: 3056 ALIAS:
2932 Coro::new = 1 3057 Coro::new = 1
2933 CODE: 3058 CODE:
2934{ 3059 RETVAL = coro_new (ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2935 struct coro *coro; 3060 OUTPUT:
2936 MAGIC *mg;
2937 HV *hv;
2938 CV *cb;
2939 int i;
2940
2941 if (items > 1)
2942 {
2943 cb = coro_sv_2cv (aTHX_ ST (1));
2944
2945 if (!ix)
2946 {
2947 if (CvISXSUB (cb))
2948 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2949
2950 if (!CvROOT (cb))
2951 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2952 }
2953 }
2954
2955 Newz (0, coro, 1, struct coro);
2956 coro->args = newAV ();
2957 coro->flags = CF_NEW;
2958
2959 if (coro_first) coro_first->prev = coro;
2960 coro->next = coro_first;
2961 coro_first = coro;
2962
2963 coro->hv = hv = newHV ();
2964 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2965 mg->mg_flags |= MGf_DUP;
2966 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2967
2968 if (items > 1)
2969 {
2970 av_extend (coro->args, items - 1 + ix - 1);
2971
2972 if (ix)
2973 {
2974 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2975 cb = cv_coro_run;
2976 }
2977
2978 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2979
2980 for (i = 2; i < items; i++)
2981 av_push (coro->args, newSVsv (ST (i)));
2982 }
2983}
2984 OUTPUT:
2985 RETVAL 3061 RETVAL
2986 3062
2987void 3063void
2988transfer (...) 3064transfer (...)
2989 PROTOTYPE: $$ 3065 PROTOTYPE: $$
3133 CODE: 3209 CODE:
3134{ 3210{
3135 struct coro *current = SvSTATE_current; 3211 struct coro *current = SvSTATE_current;
3136 SV **throwp = self == current ? &CORO_THROW : &self->except; 3212 SV **throwp = self == current ? &CORO_THROW : &self->except;
3137 SvREFCNT_dec (*throwp); 3213 SvREFCNT_dec (*throwp);
3214 SvGETMAGIC (throw);
3138 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3215 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
3139} 3216}
3140 3217
3141void 3218void
3142api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3219api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3201 CODE: 3278 CODE:
3202 coro_state_destroy (aTHX_ self); 3279 coro_state_destroy (aTHX_ self);
3203 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3280 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3204 3281
3205 3282
3283SV *
3284enable_times (int enabled = enable_times)
3285 CODE:
3286{
3287 RETVAL = boolSV (enable_times);
3288
3289 if (enabled != enable_times)
3290 {
3291 enable_times = enabled;
3292
3293 coro_times_update ();
3294 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3295 }
3296}
3297 OUTPUT:
3298 RETVAL
3299
3300void
3301times (Coro::State self)
3302 PPCODE:
3303{
3304 struct coro *current = SvSTATE (coro_current);
3305
3306 if (expect_false (current == self))
3307 {
3308 coro_times_update ();
3309 coro_times_add (SvSTATE (coro_current));
3310 }
3311
3312 EXTEND (SP, 2);
3313 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3314 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3315
3316 if (expect_false (current == self))
3317 coro_times_sub (SvSTATE (coro_current));
3318}
3319
3206MODULE = Coro::State PACKAGE = Coro 3320MODULE = Coro::State PACKAGE = Coro
3207 3321
3208BOOT: 3322BOOT:
3209{ 3323{
3210 int i;
3211
3212 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3324 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3213 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3325 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3214 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3326 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3215 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3327 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3216 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3328 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3224 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3336 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3225 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3337 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
3226 3338
3227 coro_stash = gv_stashpv ("Coro", TRUE); 3339 coro_stash = gv_stashpv ("Coro", TRUE);
3228 3340
3229 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3341 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3230 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3342 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3231 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3343 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3232 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3344 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3233 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3345 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3234 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3346 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3235
3236 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3237 coro_ready[i] = newAV ();
3238 3347
3239 { 3348 {
3240 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3349 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3241 3350
3242 coroapi.schedule = api_schedule; 3351 coroapi.schedule = api_schedule;
3252 sv_setiv (sv, (IV)&coroapi); 3361 sv_setiv (sv, (IV)&coroapi);
3253 SvREADONLY_on (sv); 3362 SvREADONLY_on (sv);
3254 } 3363 }
3255} 3364}
3256 3365
3366SV *
3367async (...)
3368 PROTOTYPE: &@
3369 CODE:
3370 RETVAL = coro_new (coro_stash, &ST (0), items, 1);
3371 api_ready (RETVAL);
3372 OUTPUT:
3373 RETVAL
3374
3257void 3375void
3258terminate (...) 3376terminate (...)
3259 CODE: 3377 CODE:
3260 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3378 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3261 3379
3294void 3412void
3295_set_readyhook (SV *hook) 3413_set_readyhook (SV *hook)
3296 PROTOTYPE: $ 3414 PROTOTYPE: $
3297 CODE: 3415 CODE:
3298 SvREFCNT_dec (coro_readyhook); 3416 SvREFCNT_dec (coro_readyhook);
3417 SvGETMAGIC (hook);
3418 if (SvOK (hook))
3419 {
3299 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3420 coro_readyhook = newSVsv (hook);
3421 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3422 }
3423 else
3424 {
3425 coro_readyhook = 0;
3426 CORO_READYHOOK = 0;
3427 }
3300 3428
3301int 3429int
3302prio (Coro::State coro, int newprio = 0) 3430prio (Coro::State coro, int newprio = 0)
3303 PROTOTYPE: $;$ 3431 PROTOTYPE: $;$
3304 ALIAS: 3432 ALIAS:
3310 if (items > 1) 3438 if (items > 1)
3311 { 3439 {
3312 if (ix) 3440 if (ix)
3313 newprio = coro->prio - newprio; 3441 newprio = coro->prio - newprio;
3314 3442
3315 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3443 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3316 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3444 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3317 3445
3318 coro->prio = newprio; 3446 coro->prio = newprio;
3319 } 3447 }
3320} 3448}
3321 OUTPUT: 3449 OUTPUT:
3334 PROTOTYPE: 3462 PROTOTYPE:
3335 CODE: 3463 CODE:
3336 RETVAL = coro_nready; 3464 RETVAL = coro_nready;
3337 OUTPUT: 3465 OUTPUT:
3338 RETVAL 3466 RETVAL
3467
3468void
3469suspend (Coro::State self)
3470 PROTOTYPE: $
3471 CODE:
3472 self->flags |= CF_SUSPENDED;
3473
3474void
3475resume (Coro::State self)
3476 PROTOTYPE: $
3477 CODE:
3478 self->flags &= ~CF_SUSPENDED;
3339 3479
3340void 3480void
3341_pool_handler (...) 3481_pool_handler (...)
3342 CODE: 3482 CODE:
3343 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3483 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3408 CODE: 3548 CODE:
3409{ 3549{
3410 struct coro *coro = SvSTATE_current; 3550 struct coro *coro = SvSTATE_current;
3411 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3551 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3412 3552
3413 block = (SV *)coro_sv_2cv (aTHX_ block); 3553 block = s_get_cv_croak (block);
3414 3554
3415 if (!*avp) 3555 if (!*avp)
3416 *avp = newAV (); 3556 *avp = newAV ();
3417 3557
3418 av_push (*avp, SvREFCNT_inc (block)); 3558 av_push (*avp, SvREFCNT_inc (block));
3419 3559
3420 if (!ix) 3560 if (!ix)
3421 on_enterleave_call (aTHX_ block); 3561 on_enterleave_call (aTHX_ block);
3422 3562
3423 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 3563 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3424 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro); 3564 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3425 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 3565 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3426} 3566}
3427 3567
3428 3568
3429MODULE = Coro::State PACKAGE = PerlIO::cede 3569MODULE = Coro::State PACKAGE = PerlIO::cede
3430 3570
3435MODULE = Coro::State PACKAGE = Coro::Semaphore 3575MODULE = Coro::State PACKAGE = Coro::Semaphore
3436 3576
3437SV * 3577SV *
3438new (SV *klass, SV *count = 0) 3578new (SV *klass, SV *count = 0)
3439 CODE: 3579 CODE:
3580{
3581 int semcnt = 1;
3582
3583 if (count)
3584 {
3585 SvGETMAGIC (count);
3586
3587 if (SvOK (count))
3588 semcnt = SvIV (count);
3589 }
3590
3440 RETVAL = sv_bless ( 3591 RETVAL = sv_bless (
3441 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3592 coro_waitarray_new (aTHX_ semcnt),
3442 GvSTASH (CvGV (cv)) 3593 GvSTASH (CvGV (cv))
3443 ); 3594 );
3595}
3444 OUTPUT: 3596 OUTPUT:
3445 RETVAL 3597 RETVAL
3446 3598
3447# helper for Coro::Channel and others 3599# helper for Coro::Channel and others
3448SV * 3600SV *
3606 3758
3607void 3759void
3608_register (char *target, char *proto, SV *req) 3760_register (char *target, char *proto, SV *req)
3609 CODE: 3761 CODE:
3610{ 3762{
3611 CV *req_cv = coro_sv_2cv (aTHX_ req); 3763 SV *req_cv = s_get_cv_croak (req);
3612 /* newXSproto doesn't return the CV on 5.8 */ 3764 /* newXSproto doesn't return the CV on 5.8 */
3613 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3765 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3614 sv_setpv ((SV *)slf_cv, proto); 3766 sv_setpv ((SV *)slf_cv, proto);
3615 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3767 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3616} 3768}
3617 3769
3770MODULE = Coro::State PACKAGE = Coro::Select
3771
3772void
3773patch_pp_sselect ()
3774 CODE:
3775 if (!coro_old_pp_sselect)
3776 {
3777 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3778 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3779 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3780 }
3781
3782void
3783unpatch_pp_sselect ()
3784 CODE:
3785 if (coro_old_pp_sselect)
3786 {
3787 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3788 coro_old_pp_sselect = 0;
3789 }
3790
3791

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines