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.351 by root, Sat Jun 20 08:58:25 2009 UTC vs.
Revision 1.369 by root, Thu Aug 13 02:48:32 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 {
… …
293 250
294 /* on_enter/on_leave */ 251 /* on_enter/on_leave */
295 AV *on_enter; 252 AV *on_enter;
296 AV *on_leave; 253 AV *on_leave;
297 254
255 /* times */
256 coro_ts t_cpu, t_real;
257
298 /* linked list */ 258 /* linked list */
299 struct coro *next, *prev; 259 struct coro *next, *prev;
300}; 260};
301 261
302typedef struct coro *Coro__State; 262typedef struct coro *Coro__State;
… …
307/* the mainr easonw e don't support windows process emulation */ 267/* the mainr easonw e don't support windows process emulation */
308static struct CoroSLF slf_frame; /* the current slf frame */ 268static struct CoroSLF slf_frame; /* the current slf frame */
309 269
310/** Coro ********************************************************************/ 270/** Coro ********************************************************************/
311 271
312#define PRIO_MAX 3 272#define CORO_PRIO_MAX 3
313#define PRIO_HIGH 1 273#define CORO_PRIO_HIGH 1
314#define PRIO_NORMAL 0 274#define CORO_PRIO_NORMAL 0
315#define PRIO_LOW -1 275#define CORO_PRIO_LOW -1
316#define PRIO_IDLE -3 276#define CORO_PRIO_IDLE -3
317#define PRIO_MIN -4 277#define CORO_PRIO_MIN -4
318 278
319/* for Coro.pm */ 279/* for Coro.pm */
320static SV *coro_current; 280static SV *coro_current;
321static SV *coro_readyhook; 281static SV *coro_readyhook;
322static struct coro *coro_ready [PRIO_MAX - PRIO_MIN + 1][2]; /* head|tail */ 282static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
323static CV *cv_coro_run, *cv_coro_terminate; 283static CV *cv_coro_run, *cv_coro_terminate;
324static struct coro *coro_first; 284static struct coro *coro_first;
325#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 (aTHX)
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}
326 306
327/** lowlevel stuff **********************************************************/ 307/** lowlevel stuff **********************************************************/
328 308
329static SV * 309static SV *
330coro_get_sv (pTHX_ const char *name, int create) 310coro_get_sv (pTHX_ const char *name, int create)
… …
354 get_hv (name, create); 334 get_hv (name, create);
355#endif 335#endif
356 return get_hv (name, create); 336 return get_hv (name, create);
357} 337}
358 338
359/* may croak */ 339INLINE void
360INLINE CV * 340coro_times_update ()
361coro_sv_2cv (pTHX_ SV *sv)
362{ 341{
363 HV *st; 342#ifdef coro_clock_gettime
364 GV *gvp; 343 struct timespec ts;
365 CV *cv = sv_2cv (sv, &st, &gvp, 0);
366 344
367 if (!cv) 345 ts.tv_sec = ts.tv_nsec = 0;
368 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;
369 348
370 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];
371} 384}
372 385
373/*****************************************************************************/ 386/*****************************************************************************/
374/* magic glue */ 387/* magic glue */
375 388
… …
475static int 488static int
476coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 489coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
477{ 490{
478 AV *padlist; 491 AV *padlist;
479 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;
480 497
481 /* casting is fun. */ 498 /* casting is fun. */
482 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 499 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
483 free_padlist (aTHX_ padlist); 500 free_padlist (aTHX_ padlist);
484 501
… …
573 } 590 }
574 591
575 slf_frame = c->slf_frame; 592 slf_frame = c->slf_frame;
576 CORO_THROW = c->except; 593 CORO_THROW = c->except;
577 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
578 if (expect_false (c->on_enter)) 603 if (expect_false (c->on_enter))
579 { 604 {
580 int i; 605 int i;
581 606
582 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 607 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
… …
591 { 616 {
592 int i; 617 int i;
593 618
594 for (i = AvFILLp (c->on_leave); i >= 0; --i) 619 for (i = AvFILLp (c->on_leave); i >= 0; --i)
595 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);
596 } 629 }
597 630
598 c->except = CORO_THROW; 631 c->except = CORO_THROW;
599 c->slf_frame = slf_frame; 632 c->slf_frame = slf_frame;
600 633
… …
615 { 648 {
616 while (expect_true (cxix >= 0)) 649 while (expect_true (cxix >= 0))
617 { 650 {
618 PERL_CONTEXT *cx = &ccstk[cxix--]; 651 PERL_CONTEXT *cx = &ccstk[cxix--];
619 652
620 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))
621 { 654 {
622 CV *cv = cx->blk_sub.cv; 655 CV *cv = cx->blk_sub.cv;
623 656
624 if (expect_true (CvDEPTH (cv))) 657 if (expect_true (CvDEPTH (cv)))
625 { 658 {
… …
649 /* we manually unroll here, as usually 2 slots is enough */ 682 /* we manually unroll here, as usually 2 slots is enough */
650 if (SLOT_COUNT >= 1) CXINC; 683 if (SLOT_COUNT >= 1) CXINC;
651 if (SLOT_COUNT >= 2) CXINC; 684 if (SLOT_COUNT >= 2) CXINC;
652 if (SLOT_COUNT >= 3) CXINC; 685 if (SLOT_COUNT >= 3) CXINC;
653 { 686 {
654 int i; 687 unsigned int i;
655 for (i = 3; i < SLOT_COUNT; ++i) 688 for (i = 3; i < SLOT_COUNT; ++i)
656 CXINC; 689 CXINC;
657 } 690 }
658 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 691 cxstack_ix -= SLOT_COUNT; /* undo allocation */
659 692
… …
964 997
965 PL_op = (OP *)&coro_setup_op; 998 PL_op = (OP *)&coro_setup_op;
966 999
967 /* copy throw, in case it was set before coro_setup */ 1000 /* copy throw, in case it was set before coro_setup */
968 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 }
969} 1008}
970 1009
971static void 1010static void
972coro_unwind_stacks (pTHX) 1011coro_unwind_stacks (pTHX)
973{ 1012{
… …
999 1038
1000 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1039 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1001 1040
1002 save_perl (aTHX_ current); 1041 save_perl (aTHX_ current);
1003 load_perl (aTHX_ coro); 1042 load_perl (aTHX_ coro);
1043
1004 coro_unwind_stacks (aTHX); 1044 coro_unwind_stacks (aTHX);
1005 coro_destruct_stacks (aTHX); 1045 coro_destruct_stacks (aTHX);
1006 1046
1007 // now save some sv's to be free'd later 1047 // now save some sv's to be free'd later
1008 svf [0] = GvSV (PL_defgv); 1048 svf [0] = GvSV (PL_defgv);
… …
1018 1058
1019 load_perl (aTHX_ current); 1059 load_perl (aTHX_ current);
1020 } 1060 }
1021 1061
1022 { 1062 {
1023 int i; 1063 unsigned int i;
1024 1064
1025 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1065 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1026 SvREFCNT_dec (svf [i]); 1066 SvREFCNT_dec (svf [i]);
1027 1067
1028 SvREFCNT_dec (coro->saved_deffh); 1068 SvREFCNT_dec (coro->saved_deffh);
… …
1234 /* 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 */
1235 PL_restartop = PL_op; 1275 PL_restartop = PL_op;
1236 perl_run (PL_curinterp); 1276 perl_run (PL_curinterp);
1237 /* 1277 /*
1238 * 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
1239 * 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.
1240 */ 1281 */
1241 1282
1242 /* 1283 /*
1243 * 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
1244 * 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)
… …
1593 1634
1594 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1635 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1595 TRANSFER (ta, 1); 1636 TRANSFER (ta, 1);
1596} 1637}
1597 1638
1598/*****************************************************************************/
1599/* gensub: simple closure generation utility */
1600
1601#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1602
1603/* create a closure from XS, returns a code reference */
1604/* the arg can be accessed via GENSUB_ARG from the callback */
1605/* the callback must use dXSARGS/XSRETURN */
1606static SV *
1607gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1608{
1609 CV *cv = (CV *)newSV (0);
1610
1611 sv_upgrade ((SV *)cv, SVt_PVCV);
1612
1613 CvANON_on (cv);
1614 CvISXSUB_on (cv);
1615 CvXSUB (cv) = xsub;
1616 GENSUB_ARG = arg;
1617
1618 return newRV_noinc ((SV *)cv);
1619}
1620
1621/** Coro ********************************************************************/ 1639/** Coro ********************************************************************/
1622 1640
1623INLINE void 1641INLINE void
1624coro_enq (pTHX_ struct coro *coro) 1642coro_enq (pTHX_ struct coro *coro)
1625{ 1643{
1626 struct coro **ready = coro_ready [coro->prio - PRIO_MIN]; 1644 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1627 1645
1628 SvREFCNT_inc_NN (coro->hv); 1646 SvREFCNT_inc_NN (coro->hv);
1629 1647
1630 coro->next_ready = 0; 1648 coro->next_ready = 0;
1631 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1649 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
… …
1635INLINE struct coro * 1653INLINE struct coro *
1636coro_deq (pTHX) 1654coro_deq (pTHX)
1637{ 1655{
1638 int prio; 1656 int prio;
1639 1657
1640 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1658 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1641 { 1659 {
1642 struct coro **ready = coro_ready [prio]; 1660 struct coro **ready = coro_ready [prio];
1643 1661
1644 if (ready [0]) 1662 if (ready [0])
1645 { 1663 {
… …
1650 } 1668 }
1651 1669
1652 return 0; 1670 return 0;
1653} 1671}
1654 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;
1688}
1689
1655static int 1690static int
1656api_ready (pTHX_ SV *coro_sv) 1691api_ready (pTHX_ SV *coro_sv)
1657{ 1692{
1658 struct coro *coro;
1659 SV *sv_hook;
1660 void (*xs_hook)(void);
1661
1662 coro = SvSTATE (coro_sv); 1693 struct coro *coro = SvSTATE (coro_sv);
1663 1694
1664 if (coro->flags & CF_READY) 1695 if (coro->flags & CF_READY)
1665 return 0; 1696 return 0;
1666 1697
1667 coro->flags |= CF_READY; 1698 coro->flags |= CF_READY;
1668 1699
1669 sv_hook = coro_nready ? 0 : coro_readyhook;
1670 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1671
1672 coro_enq (aTHX_ coro); 1700 coro_enq (aTHX_ coro);
1673 ++coro_nready;
1674 1701
1675 if (sv_hook) 1702 if (!coro_nready++)
1676 { 1703 if (coroapi.readyhook)
1677 dSP; 1704 coroapi.readyhook ();
1678
1679 ENTER;
1680 SAVETMPS;
1681
1682 PUSHMARK (SP);
1683 PUTBACK;
1684 call_sv (sv_hook, G_VOID | G_DISCARD);
1685
1686 FREETMPS;
1687 LEAVE;
1688 }
1689
1690 if (xs_hook)
1691 xs_hook ();
1692 1705
1693 return 1; 1706 return 1;
1694} 1707}
1695 1708
1696static int 1709static int
… …
1902{ 1915{
1903 int i; 1916 int i;
1904 HV *hv = (HV *)SvRV (coro_current); 1917 HV *hv = (HV *)SvRV (coro_current);
1905 AV *av = newAV (); 1918 AV *av = newAV ();
1906 1919
1920 /* items are actually not so common, so optimise for this case */
1921 if (items)
1922 {
1907 av_extend (av, items - 1); 1923 av_extend (av, items - 1);
1924
1908 for (i = 0; i < items; ++i) 1925 for (i = 0; i < items; ++i)
1909 av_push (av, SvREFCNT_inc_NN (arg [i])); 1926 av_push (av, SvREFCNT_inc_NN (arg [i]));
1927 }
1910 1928
1911 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 1929 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1912 1930
1913 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 1931 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1914 api_ready (aTHX_ sv_manager); 1932 api_ready (aTHX_ sv_manager);
… …
2004 2022
2005static void 2023static void
2006coro_rouse_callback (pTHX_ CV *cv) 2024coro_rouse_callback (pTHX_ CV *cv)
2007{ 2025{
2008 dXSARGS; 2026 dXSARGS;
2009 SV *data = (SV *)GENSUB_ARG; 2027 SV *data = (SV *)S_GENSUB_ARG;
2010 2028
2011 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2029 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2012 { 2030 {
2013 /* first call, set args */ 2031 /* first call, set args */
2014 SV *coro = SvRV (data); 2032 SV *coro = SvRV (data);
… …
2080 || SvTYPE (SvRV (cb)) != SVt_PVCV 2098 || SvTYPE (SvRV (cb)) != SVt_PVCV
2081 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2099 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2082 croak ("Coro::rouse_wait called with illegal callback argument,"); 2100 croak ("Coro::rouse_wait called with illegal callback argument,");
2083 2101
2084 { 2102 {
2085 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2103 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2086 SV *data = (SV *)GENSUB_ARG; 2104 SV *data = (SV *)S_GENSUB_ARG;
2087 2105
2088 frame->data = (void *)data; 2106 frame->data = (void *)data;
2089 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2107 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2090 frame->check = slf_check_rouse_wait; 2108 frame->check = slf_check_rouse_wait;
2091 } 2109 }
… …
2095coro_new_rouse_cb (pTHX) 2113coro_new_rouse_cb (pTHX)
2096{ 2114{
2097 HV *hv = (HV *)SvRV (coro_current); 2115 HV *hv = (HV *)SvRV (coro_current);
2098 struct coro *coro = SvSTATE_hv (hv); 2116 struct coro *coro = SvSTATE_hv (hv);
2099 SV *data = newRV_inc ((SV *)hv); 2117 SV *data = newRV_inc ((SV *)hv);
2100 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2118 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2101 2119
2102 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2120 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2103 SvREFCNT_dec (data); /* magicext increases the refcount */ 2121 SvREFCNT_dec (data); /* magicext increases the refcount */
2104 2122
2105 SvREFCNT_dec (coro->rouse_cb); 2123 SvREFCNT_dec (coro->rouse_cb);
… …
2476/* Coro::Semaphore & Coro::Signal */ 2494/* Coro::Semaphore & Coro::Signal */
2477 2495
2478static SV * 2496static SV *
2479coro_waitarray_new (pTHX_ int count) 2497coro_waitarray_new (pTHX_ int count)
2480{ 2498{
2481 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2499 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2482 AV *av = newAV (); 2500 AV *av = newAV ();
2483 SV **ary; 2501 SV **ary;
2484 2502
2485 /* unfortunately, building manually saves memory */ 2503 /* unfortunately, building manually saves memory */
2486 Newx (ary, 2, SV *); 2504 Newx (ary, 2, SV *);
… …
2628{ 2646{
2629 if (items >= 2) 2647 if (items >= 2)
2630 { 2648 {
2631 /* callback form */ 2649 /* callback form */
2632 AV *av = (AV *)SvRV (arg [0]); 2650 AV *av = (AV *)SvRV (arg [0]);
2633 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2651 SV *cb_cv = s_get_cv_croak (arg [1]);
2634 2652
2635 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2653 av_push (av, SvREFCNT_inc_NN (cb_cv));
2636 2654
2637 if (SvIVX (AvARRAY (av)[0]) > 0) 2655 if (SvIVX (AvARRAY (av)[0]) > 0)
2638 coro_semaphore_adjust (aTHX_ av, 0); 2656 coro_semaphore_adjust (aTHX_ av, 0);
2639 2657
2640 frame->prepare = prepare_nop; 2658 frame->prepare = prepare_nop;
… …
2664 AvARRAY (av)[0] = AvARRAY (av)[1]; 2682 AvARRAY (av)[0] = AvARRAY (av)[1];
2665 AvARRAY (av)[1] = cb; 2683 AvARRAY (av)[1] = cb;
2666 2684
2667 cb = av_shift (av); 2685 cb = av_shift (av);
2668 2686
2687 if (SvTYPE (cb) == SVt_PVCV)
2688 {
2689 dSP;
2690 PUSHMARK (SP);
2691 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2692 PUTBACK;
2693 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2694 }
2695 else
2696 {
2669 api_ready (aTHX_ cb); 2697 api_ready (aTHX_ cb);
2670 sv_setiv (cb, 0); /* signal waiter */ 2698 sv_setiv (cb, 0); /* signal waiter */
2699 }
2700
2671 SvREFCNT_dec (cb); 2701 SvREFCNT_dec (cb);
2672 2702
2673 --count; 2703 --count;
2674 } 2704 }
2675} 2705}
… …
2684static void 2714static void
2685slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2715slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2686{ 2716{
2687 AV *av = (AV *)SvRV (arg [0]); 2717 AV *av = (AV *)SvRV (arg [0]);
2688 2718
2719 if (items >= 2)
2720 {
2721 SV *cb_cv = s_get_cv_croak (arg [1]);
2722 av_push (av, SvREFCNT_inc_NN (cb_cv));
2723
2689 if (SvIVX (AvARRAY (av)[0])) 2724 if (SvIVX (AvARRAY (av)[0]))
2725 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2726
2727 frame->prepare = prepare_nop;
2728 frame->check = slf_check_nop;
2729 }
2730 else if (SvIVX (AvARRAY (av)[0]))
2690 { 2731 {
2691 SvIVX (AvARRAY (av)[0]) = 0; 2732 SvIVX (AvARRAY (av)[0]) = 0;
2692 frame->prepare = prepare_nop; 2733 frame->prepare = prepare_nop;
2693 frame->check = slf_check_nop; 2734 frame->check = slf_check_nop;
2694 } 2735 }
2695 else 2736 else
2696 { 2737 {
2697 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2738 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2698 2739
2699 av_push (av, waiter); 2740 av_push (av, waiter);
2700 2741
2701 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2742 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2702 frame->prepare = prepare_schedule; 2743 frame->prepare = prepare_schedule;
… …
2720 2761
2721static void 2762static void
2722coro_aio_callback (pTHX_ CV *cv) 2763coro_aio_callback (pTHX_ CV *cv)
2723{ 2764{
2724 dXSARGS; 2765 dXSARGS;
2725 AV *state = (AV *)GENSUB_ARG; 2766 AV *state = (AV *)S_GENSUB_ARG;
2726 SV *coro = av_pop (state); 2767 SV *coro = av_pop (state);
2727 SV *data_sv = newSV (sizeof (struct io_state)); 2768 SV *data_sv = newSV (sizeof (struct io_state));
2728 2769
2729 av_extend (state, items - 1); 2770 av_extend (state, items - 1);
2730 2771
… …
2844 2885
2845 for (i = 0; i < items; ++i) 2886 for (i = 0; i < items; ++i)
2846 PUSHs (arg [i]); 2887 PUSHs (arg [i]);
2847 2888
2848 /* now push the callback closure */ 2889 /* now push the callback closure */
2849 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2890 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2850 2891
2851 /* now call the AIO function - we assume our request is uncancelable */ 2892 /* now call the AIO function - we assume our request is uncancelable */
2852 PUTBACK; 2893 PUTBACK;
2853 call_sv ((SV *)req, G_VOID | G_DISCARD); 2894 call_sv ((SV *)req, G_VOID | G_DISCARD);
2854 } 2895 }
… …
2872/*****************************************************************************/ 2913/*****************************************************************************/
2873 2914
2874#if CORO_CLONE 2915#if CORO_CLONE
2875# include "clone.c" 2916# include "clone.c"
2876#endif 2917#endif
2918
2919/*****************************************************************************/
2920
2921static SV *
2922coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2923{
2924 SV *coro_sv;
2925 struct coro *coro;
2926 MAGIC *mg;
2927 HV *hv;
2928 SV *cb;
2929 int i;
2930
2931 if (argc > 0)
2932 {
2933 cb = s_get_cv_croak (argv [0]);
2934
2935 if (!is_coro)
2936 {
2937 if (CvISXSUB (cb))
2938 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2939
2940 if (!CvROOT (cb))
2941 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2942 }
2943 }
2944
2945 Newz (0, coro, 1, struct coro);
2946 coro->args = newAV ();
2947 coro->flags = CF_NEW;
2948
2949 if (coro_first) coro_first->prev = coro;
2950 coro->next = coro_first;
2951 coro_first = coro;
2952
2953 coro->hv = hv = newHV ();
2954 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2955 mg->mg_flags |= MGf_DUP;
2956 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
2957
2958 if (argc > 0)
2959 {
2960 av_extend (coro->args, argc + is_coro - 1);
2961
2962 if (is_coro)
2963 {
2964 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2965 cb = (SV *)cv_coro_run;
2966 }
2967
2968 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2969
2970 for (i = 1; i < argc; i++)
2971 av_push (coro->args, newSVsv (argv [i]));
2972 }
2973
2974 return coro_sv;
2975}
2877 2976
2878MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2977MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2879 2978
2880PROTOTYPES: DISABLE 2979PROTOTYPES: DISABLE
2881 2980
… …
2941 3040
2942 if (!svp) croak ("Time::HiRes is required"); 3041 if (!svp) croak ("Time::HiRes is required");
2943 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3042 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2944 3043
2945 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3044 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3045
3046 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3047 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2946 } 3048 }
2947 3049
2948 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3050 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2949} 3051}
2950 3052
2951SV * 3053SV *
2952new (char *klass, ...) 3054new (SV *klass, ...)
2953 ALIAS: 3055 ALIAS:
2954 Coro::new = 1 3056 Coro::new = 1
2955 CODE: 3057 CODE:
2956{ 3058 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2957 struct coro *coro; 3059 OUTPUT:
2958 MAGIC *mg;
2959 HV *hv;
2960 CV *cb;
2961 int i;
2962
2963 if (items > 1)
2964 {
2965 cb = coro_sv_2cv (aTHX_ ST (1));
2966
2967 if (!ix)
2968 {
2969 if (CvISXSUB (cb))
2970 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2971
2972 if (!CvROOT (cb))
2973 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2974 }
2975 }
2976
2977 Newz (0, coro, 1, struct coro);
2978 coro->args = newAV ();
2979 coro->flags = CF_NEW;
2980
2981 if (coro_first) coro_first->prev = coro;
2982 coro->next = coro_first;
2983 coro_first = coro;
2984
2985 coro->hv = hv = newHV ();
2986 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2987 mg->mg_flags |= MGf_DUP;
2988 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2989
2990 if (items > 1)
2991 {
2992 av_extend (coro->args, items - 1 + ix - 1);
2993
2994 if (ix)
2995 {
2996 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2997 cb = cv_coro_run;
2998 }
2999
3000 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3001
3002 for (i = 2; i < items; i++)
3003 av_push (coro->args, newSVsv (ST (i)));
3004 }
3005}
3006 OUTPUT:
3007 RETVAL 3060 RETVAL
3008 3061
3009void 3062void
3010transfer (...) 3063transfer (...)
3011 PROTOTYPE: $$ 3064 PROTOTYPE: $$
… …
3155 CODE: 3208 CODE:
3156{ 3209{
3157 struct coro *current = SvSTATE_current; 3210 struct coro *current = SvSTATE_current;
3158 SV **throwp = self == current ? &CORO_THROW : &self->except; 3211 SV **throwp = self == current ? &CORO_THROW : &self->except;
3159 SvREFCNT_dec (*throwp); 3212 SvREFCNT_dec (*throwp);
3213 SvGETMAGIC (throw);
3160 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3214 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
3161} 3215}
3162 3216
3163void 3217void
3164api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3218api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
3223 CODE: 3277 CODE:
3224 coro_state_destroy (aTHX_ self); 3278 coro_state_destroy (aTHX_ self);
3225 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3279 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3226 3280
3227 3281
3282SV *
3283enable_times (int enabled = enable_times)
3284 CODE:
3285{
3286 RETVAL = boolSV (enable_times);
3287
3288 if (enabled != enable_times)
3289 {
3290 enable_times = enabled;
3291
3292 coro_times_update ();
3293 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3294 }
3295}
3296 OUTPUT:
3297 RETVAL
3298
3299void
3300times (Coro::State self)
3301 PPCODE:
3302{
3303 struct coro *current = SvSTATE (coro_current);
3304
3305 if (expect_false (current == self))
3306 {
3307 coro_times_update ();
3308 coro_times_add (SvSTATE (coro_current));
3309 }
3310
3311 EXTEND (SP, 2);
3312 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3313 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3314
3315 if (expect_false (current == self))
3316 coro_times_sub (SvSTATE (coro_current));
3317}
3318
3228MODULE = Coro::State PACKAGE = Coro 3319MODULE = Coro::State PACKAGE = Coro
3229 3320
3230BOOT: 3321BOOT:
3231{ 3322{
3232 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3323 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
… …
3240 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3331 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3241 3332
3242 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3333 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3243 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3334 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3244 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3335 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3245 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
3246 3336
3247 coro_stash = gv_stashpv ("Coro", TRUE); 3337 coro_stash = gv_stashpv ("Coro", TRUE);
3248 3338
3249 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3339 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3250 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3340 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3251 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3341 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3252 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3342 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3253 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3343 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3254 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3344 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3255 3345
3256 { 3346 {
3257 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3347 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3258 3348
3259 coroapi.schedule = api_schedule; 3349 coroapi.schedule = api_schedule;
… …
3269 sv_setiv (sv, (IV)&coroapi); 3359 sv_setiv (sv, (IV)&coroapi);
3270 SvREADONLY_on (sv); 3360 SvREADONLY_on (sv);
3271 } 3361 }
3272} 3362}
3273 3363
3364SV *
3365async (...)
3366 PROTOTYPE: &@
3367 CODE:
3368 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3369 api_ready (RETVAL);
3370 OUTPUT:
3371 RETVAL
3372
3274void 3373void
3275terminate (...) 3374terminate (...)
3276 CODE: 3375 CODE:
3277 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3376 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3278 3377
… …
3311void 3410void
3312_set_readyhook (SV *hook) 3411_set_readyhook (SV *hook)
3313 PROTOTYPE: $ 3412 PROTOTYPE: $
3314 CODE: 3413 CODE:
3315 SvREFCNT_dec (coro_readyhook); 3414 SvREFCNT_dec (coro_readyhook);
3415 SvGETMAGIC (hook);
3416 if (SvOK (hook))
3417 {
3316 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3418 coro_readyhook = newSVsv (hook);
3419 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3420 }
3421 else
3422 {
3423 coro_readyhook = 0;
3424 CORO_READYHOOK = 0;
3425 }
3317 3426
3318int 3427int
3319prio (Coro::State coro, int newprio = 0) 3428prio (Coro::State coro, int newprio = 0)
3320 PROTOTYPE: $;$ 3429 PROTOTYPE: $;$
3321 ALIAS: 3430 ALIAS:
… …
3327 if (items > 1) 3436 if (items > 1)
3328 { 3437 {
3329 if (ix) 3438 if (ix)
3330 newprio = coro->prio - newprio; 3439 newprio = coro->prio - newprio;
3331 3440
3332 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3441 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3333 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3442 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3334 3443
3335 coro->prio = newprio; 3444 coro->prio = newprio;
3336 } 3445 }
3337} 3446}
3338 OUTPUT: 3447 OUTPUT:
… …
3385 for (i = 1; i < items; ++i) 3494 for (i = 1; i < items; ++i)
3386 av_push (av, SvREFCNT_inc_NN (ST (i))); 3495 av_push (av, SvREFCNT_inc_NN (ST (i)));
3387 3496
3388 if ((SV *)hv == &PL_sv_undef) 3497 if ((SV *)hv == &PL_sv_undef)
3389 { 3498 {
3390 PUSHMARK (SP); 3499 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3391 EXTEND (SP, 2);
3392 PUSHs (sv_Coro);
3393 PUSHs ((SV *)cv_pool_handler);
3394 PUTBACK;
3395 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3396 SPAGAIN;
3397
3398 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3500 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3501 SvREFCNT_dec (sv);
3399 } 3502 }
3400 3503
3401 { 3504 {
3402 struct coro *coro = SvSTATE_hv (hv); 3505 struct coro *coro = SvSTATE_hv (hv);
3403 3506
… …
3437 CODE: 3540 CODE:
3438{ 3541{
3439 struct coro *coro = SvSTATE_current; 3542 struct coro *coro = SvSTATE_current;
3440 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3543 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3441 3544
3442 block = (SV *)coro_sv_2cv (aTHX_ block); 3545 block = s_get_cv_croak (block);
3443 3546
3444 if (!*avp) 3547 if (!*avp)
3445 *avp = newAV (); 3548 *avp = newAV ();
3446 3549
3447 av_push (*avp, SvREFCNT_inc (block)); 3550 av_push (*avp, SvREFCNT_inc (block));
… …
3464MODULE = Coro::State PACKAGE = Coro::Semaphore 3567MODULE = Coro::State PACKAGE = Coro::Semaphore
3465 3568
3466SV * 3569SV *
3467new (SV *klass, SV *count = 0) 3570new (SV *klass, SV *count = 0)
3468 CODE: 3571 CODE:
3572{
3573 int semcnt = 1;
3574
3575 if (count)
3576 {
3577 SvGETMAGIC (count);
3578
3579 if (SvOK (count))
3580 semcnt = SvIV (count);
3581 }
3582
3469 RETVAL = sv_bless ( 3583 RETVAL = sv_bless (
3470 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3584 coro_waitarray_new (aTHX_ semcnt),
3471 GvSTASH (CvGV (cv)) 3585 GvSTASH (CvGV (cv))
3472 ); 3586 );
3587}
3473 OUTPUT: 3588 OUTPUT:
3474 RETVAL 3589 RETVAL
3475 3590
3476# helper for Coro::Channel and others 3591# helper for Coro::Channel and others
3477SV * 3592SV *
… …
3635 3750
3636void 3751void
3637_register (char *target, char *proto, SV *req) 3752_register (char *target, char *proto, SV *req)
3638 CODE: 3753 CODE:
3639{ 3754{
3640 CV *req_cv = coro_sv_2cv (aTHX_ req); 3755 SV *req_cv = s_get_cv_croak (req);
3641 /* newXSproto doesn't return the CV on 5.8 */ 3756 /* newXSproto doesn't return the CV on 5.8 */
3642 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3757 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3643 sv_setpv ((SV *)slf_cv, proto); 3758 sv_setpv ((SV *)slf_cv, proto);
3644 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3759 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3645} 3760}
3646 3761
3762MODULE = Coro::State PACKAGE = Coro::Select
3763
3764void
3765patch_pp_sselect ()
3766 CODE:
3767 if (!coro_old_pp_sselect)
3768 {
3769 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3770 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3771 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3772 }
3773
3774void
3775unpatch_pp_sselect ()
3776 CODE:
3777 if (coro_old_pp_sselect)
3778 {
3779 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3780 coro_old_pp_sselect = 0;
3781 }
3782
3783

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines