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.363 by root, Tue Jul 14 00:55:10 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
323 287
324/** lowlevel stuff **********************************************************/ 288/** lowlevel stuff **********************************************************/
… …
351 get_hv (name, create); 315 get_hv (name, create);
352#endif 316#endif
353 return get_hv (name, create); 317 return get_hv (name, create);
354} 318}
355 319
356/* may croak */ 320INLINE void
357INLINE CV * 321coro_times_update ()
358coro_sv_2cv (pTHX_ SV *sv)
359{ 322{
360 HV *st; 323#ifdef coro_clock_gettime
361 GV *gvp; 324 struct timespec ts;
362 CV *cv = sv_2cv (sv, &st, &gvp, 0);
363 325
364 if (!cv) 326 ts.tv_sec = ts.tv_nsec = 0;
365 croak ("code reference expected"); 327 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
328 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
366 329
367 return cv; 330 ts.tv_sec = ts.tv_nsec = 0;
331 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
332 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
333#else
334 dTHX;
335 UV tv[2];
336
337 u2time (aTHX_ tv);
338 time_real [0] = tv [0];
339 time_real [1] = tv [1] * 1000;
340#endif
341}
342
343INLINE void
344coro_times_add (struct coro *c)
345{
346 c->t_real [1] += time_real [1];
347 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
348 c->t_real [0] += time_real [0];
349
350 c->t_cpu [1] += time_cpu [1];
351 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
352 c->t_cpu [0] += time_cpu [0];
353}
354
355INLINE void
356coro_times_sub (struct coro *c)
357{
358 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
359 c->t_real [1] -= time_real [1];
360 c->t_real [0] -= time_real [0];
361
362 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
363 c->t_cpu [1] -= time_cpu [1];
364 c->t_cpu [0] -= time_cpu [0];
368} 365}
369 366
370/*****************************************************************************/ 367/*****************************************************************************/
371/* magic glue */ 368/* magic glue */
372 369
… …
472static int 469static int
473coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 470coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
474{ 471{
475 AV *padlist; 472 AV *padlist;
476 AV *av = (AV *)mg->mg_obj; 473 AV *av = (AV *)mg->mg_obj;
474
475 /* perl manages to free our internal AV and _then_ call us */
476 if (IN_DESTRUCT)
477 return 0;
477 478
478 /* casting is fun. */ 479 /* casting is fun. */
479 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 480 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
480 free_padlist (aTHX_ padlist); 481 free_padlist (aTHX_ padlist);
481 482
… …
570 } 571 }
571 572
572 slf_frame = c->slf_frame; 573 slf_frame = c->slf_frame;
573 CORO_THROW = c->except; 574 CORO_THROW = c->except;
574 575
576 if (expect_false (enable_times))
577 {
578 if (expect_false (!times_valid))
579 coro_times_update ();
580
581 coro_times_sub (c);
582 }
583
575 if (expect_false (c->on_enter)) 584 if (expect_false (c->on_enter))
576 { 585 {
577 int i; 586 int i;
578 587
579 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 588 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
… …
588 { 597 {
589 int i; 598 int i;
590 599
591 for (i = AvFILLp (c->on_leave); i >= 0; --i) 600 for (i = AvFILLp (c->on_leave); i >= 0; --i)
592 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 601 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
602 }
603
604 times_valid = 0;
605
606 if (expect_false (enable_times))
607 {
608 coro_times_update (); times_valid = 1;
609 coro_times_add (c);
593 } 610 }
594 611
595 c->except = CORO_THROW; 612 c->except = CORO_THROW;
596 c->slf_frame = slf_frame; 613 c->slf_frame = slf_frame;
597 614
… …
612 { 629 {
613 while (expect_true (cxix >= 0)) 630 while (expect_true (cxix >= 0))
614 { 631 {
615 PERL_CONTEXT *cx = &ccstk[cxix--]; 632 PERL_CONTEXT *cx = &ccstk[cxix--];
616 633
617 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 634 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
618 { 635 {
619 CV *cv = cx->blk_sub.cv; 636 CV *cv = cx->blk_sub.cv;
620 637
621 if (expect_true (CvDEPTH (cv))) 638 if (expect_true (CvDEPTH (cv)))
622 { 639 {
… …
646 /* we manually unroll here, as usually 2 slots is enough */ 663 /* we manually unroll here, as usually 2 slots is enough */
647 if (SLOT_COUNT >= 1) CXINC; 664 if (SLOT_COUNT >= 1) CXINC;
648 if (SLOT_COUNT >= 2) CXINC; 665 if (SLOT_COUNT >= 2) CXINC;
649 if (SLOT_COUNT >= 3) CXINC; 666 if (SLOT_COUNT >= 3) CXINC;
650 { 667 {
651 int i; 668 unsigned int i;
652 for (i = 3; i < SLOT_COUNT; ++i) 669 for (i = 3; i < SLOT_COUNT; ++i)
653 CXINC; 670 CXINC;
654 } 671 }
655 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 672 cxstack_ix -= SLOT_COUNT; /* undo allocation */
656 673
… …
961 978
962 PL_op = (OP *)&coro_setup_op; 979 PL_op = (OP *)&coro_setup_op;
963 980
964 /* copy throw, in case it was set before coro_setup */ 981 /* copy throw, in case it was set before coro_setup */
965 CORO_THROW = coro->except; 982 CORO_THROW = coro->except;
983
984 if (expect_false (enable_times))
985 {
986 coro_times_update ();
987 coro_times_sub (coro);
988 }
966} 989}
967 990
968static void 991static void
969coro_unwind_stacks (pTHX) 992coro_unwind_stacks (pTHX)
970{ 993{
… …
987} 1010}
988 1011
989static void 1012static void
990coro_destruct_perl (pTHX_ struct coro *coro) 1013coro_destruct_perl (pTHX_ struct coro *coro)
991{ 1014{
1015 SV *svf [9];
1016
1017 {
1018 struct coro *current = SvSTATE_current;
1019
1020 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1021
1022 save_perl (aTHX_ current);
1023 load_perl (aTHX_ coro);
1024
992 coro_unwind_stacks (aTHX); 1025 coro_unwind_stacks (aTHX);
1026 coro_destruct_stacks (aTHX);
993 1027
994 SvREFCNT_dec (GvSV (PL_defgv)); 1028 // now save some sv's to be free'd later
995 SvREFCNT_dec (GvAV (PL_defgv)); 1029 svf [0] = GvSV (PL_defgv);
996 SvREFCNT_dec (GvSV (PL_errgv)); 1030 svf [1] = (SV *)GvAV (PL_defgv);
997 SvREFCNT_dec (PL_defoutgv); 1031 svf [2] = GvSV (PL_errgv);
998 SvREFCNT_dec (PL_rs); 1032 svf [3] = (SV *)PL_defoutgv;
999 SvREFCNT_dec (GvSV (irsgv)); 1033 svf [4] = PL_rs;
1000 SvREFCNT_dec (GvHV (PL_hintgv)); 1034 svf [5] = GvSV (irsgv);
1035 svf [6] = (SV *)GvHV (PL_hintgv);
1036 svf [7] = PL_diehook;
1037 svf [8] = PL_warnhook;
1038 assert (9 == sizeof (svf) / sizeof (*svf));
1001 1039
1002 SvREFCNT_dec (PL_diehook); 1040 load_perl (aTHX_ current);
1003 SvREFCNT_dec (PL_warnhook);
1004 1041 }
1042
1043 {
1044 unsigned int i;
1045
1046 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1047 SvREFCNT_dec (svf [i]);
1048
1005 SvREFCNT_dec (coro->saved_deffh); 1049 SvREFCNT_dec (coro->saved_deffh);
1006 SvREFCNT_dec (coro->rouse_cb); 1050 SvREFCNT_dec (coro->rouse_cb);
1007 SvREFCNT_dec (coro->invoke_cb); 1051 SvREFCNT_dec (coro->invoke_cb);
1008 SvREFCNT_dec (coro->invoke_av); 1052 SvREFCNT_dec (coro->invoke_av);
1009 1053 }
1010 coro_destruct_stacks (aTHX);
1011} 1054}
1012 1055
1013INLINE void 1056INLINE void
1014free_coro_mortal (pTHX) 1057free_coro_mortal (pTHX)
1015{ 1058{
… …
1502 1545
1503 if (coro->mainstack 1546 if (coro->mainstack
1504 && coro->mainstack != main_mainstack 1547 && coro->mainstack != main_mainstack
1505 && coro->slot 1548 && coro->slot
1506 && !PL_dirty) 1549 && !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); 1550 coro_destruct_perl (aTHX_ coro);
1516
1517 load_perl (aTHX_ current);
1518
1519 coro->slot = 0;
1520 }
1521 1551
1522 cctx_destroy (coro->cctx); 1552 cctx_destroy (coro->cctx);
1523 SvREFCNT_dec (coro->startcv); 1553 SvREFCNT_dec (coro->startcv);
1524 SvREFCNT_dec (coro->args); 1554 SvREFCNT_dec (coro->args);
1525 SvREFCNT_dec (CORO_THROW); 1555 SvREFCNT_dec (CORO_THROW);
… …
1584 1614
1585 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1615 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1586 TRANSFER (ta, 1); 1616 TRANSFER (ta, 1);
1587} 1617}
1588 1618
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 ********************************************************************/ 1619/** Coro ********************************************************************/
1613 1620
1614INLINE void 1621INLINE void
1615coro_enq (pTHX_ struct coro *coro) 1622coro_enq (pTHX_ struct coro *coro)
1616{ 1623{
1617 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1624 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1618}
1619 1625
1620INLINE SV * 1626 SvREFCNT_inc_NN (coro->hv);
1627
1628 coro->next_ready = 0;
1629 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1630 ready [1] = coro;
1631}
1632
1633INLINE struct coro *
1621coro_deq (pTHX) 1634coro_deq (pTHX)
1622{ 1635{
1623 int prio; 1636 int prio;
1624 1637
1625 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1638 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1626 if (AvFILLp (coro_ready [prio]) >= 0) 1639 {
1627 return av_shift (coro_ready [prio]); 1640 struct coro **ready = coro_ready [prio];
1641
1642 if (ready [0])
1643 {
1644 struct coro *coro = ready [0];
1645 ready [0] = coro->next_ready;
1646 return coro;
1647 }
1648 }
1628 1649
1629 return 0; 1650 return 0;
1630} 1651}
1631 1652
1632static int 1653static int
… …
1696static void 1717static void
1697prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1718prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1698{ 1719{
1699 for (;;) 1720 for (;;)
1700 { 1721 {
1701 SV *next_sv = coro_deq (aTHX); 1722 struct coro *next = coro_deq (aTHX);
1702 1723
1703 if (expect_true (next_sv)) 1724 if (expect_true (next))
1704 { 1725 {
1705 struct coro *next = SvSTATE_hv (next_sv);
1706
1707 /* cannot transfer to destroyed coros, skip and look for next */ 1726 /* cannot transfer to destroyed coros, skip and look for next */
1708 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1727 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1709 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1728 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1710 else 1729 else
1711 { 1730 {
1712 next->flags &= ~CF_READY; 1731 next->flags &= ~CF_READY;
1713 --coro_nready; 1732 --coro_nready;
1714 1733
… …
1983 2002
1984static void 2003static void
1985coro_rouse_callback (pTHX_ CV *cv) 2004coro_rouse_callback (pTHX_ CV *cv)
1986{ 2005{
1987 dXSARGS; 2006 dXSARGS;
1988 SV *data = (SV *)GENSUB_ARG; 2007 SV *data = (SV *)S_GENSUB_ARG;
1989 2008
1990 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2009 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1991 { 2010 {
1992 /* first call, set args */ 2011 /* first call, set args */
2012 SV *coro = SvRV (data);
1993 AV *av = newAV (); 2013 AV *av = newAV ();
1994 SV *coro = SvRV (data);
1995 2014
1996 SvRV_set (data, (SV *)av); 2015 SvRV_set (data, (SV *)av);
1997 api_ready (aTHX_ coro);
1998 SvREFCNT_dec (coro);
1999 2016
2000 /* better take a full copy of the arguments */ 2017 /* better take a full copy of the arguments */
2001 while (items--) 2018 while (items--)
2002 av_store (av, items, newSVsv (ST (items))); 2019 av_store (av, items, newSVsv (ST (items)));
2020
2021 api_ready (aTHX_ coro);
2022 SvREFCNT_dec (coro);
2003 } 2023 }
2004 2024
2005 XSRETURN_EMPTY; 2025 XSRETURN_EMPTY;
2006} 2026}
2007 2027
… …
2024 2044
2025 EXTEND (SP, AvFILLp (av) + 1); 2045 EXTEND (SP, AvFILLp (av) + 1);
2026 for (i = 0; i <= AvFILLp (av); ++i) 2046 for (i = 0; i <= AvFILLp (av); ++i)
2027 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2047 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2028 2048
2029 /* we have stolen the elements, so ste length to zero and free */ 2049 /* we have stolen the elements, so set length to zero and free */
2030 AvFILLp (av) = -1; 2050 AvFILLp (av) = -1;
2031 av_undef (av); 2051 av_undef (av);
2032 2052
2033 PUTBACK; 2053 PUTBACK;
2034 } 2054 }
… …
2058 || SvTYPE (SvRV (cb)) != SVt_PVCV 2078 || SvTYPE (SvRV (cb)) != SVt_PVCV
2059 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2079 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2060 croak ("Coro::rouse_wait called with illegal callback argument,"); 2080 croak ("Coro::rouse_wait called with illegal callback argument,");
2061 2081
2062 { 2082 {
2063 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2083 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2064 SV *data = (SV *)GENSUB_ARG; 2084 SV *data = (SV *)S_GENSUB_ARG;
2065 2085
2066 frame->data = (void *)data; 2086 frame->data = (void *)data;
2067 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2087 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2068 frame->check = slf_check_rouse_wait; 2088 frame->check = slf_check_rouse_wait;
2069 } 2089 }
… …
2073coro_new_rouse_cb (pTHX) 2093coro_new_rouse_cb (pTHX)
2074{ 2094{
2075 HV *hv = (HV *)SvRV (coro_current); 2095 HV *hv = (HV *)SvRV (coro_current);
2076 struct coro *coro = SvSTATE_hv (hv); 2096 struct coro *coro = SvSTATE_hv (hv);
2077 SV *data = newRV_inc ((SV *)hv); 2097 SV *data = newRV_inc ((SV *)hv);
2078 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2098 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2079 2099
2080 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2100 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2081 SvREFCNT_dec (data); /* magicext increases the refcount */ 2101 SvREFCNT_dec (data); /* magicext increases the refcount */
2082 2102
2083 SvREFCNT_dec (coro->rouse_cb); 2103 SvREFCNT_dec (coro->rouse_cb);
… …
2454/* Coro::Semaphore & Coro::Signal */ 2474/* Coro::Semaphore & Coro::Signal */
2455 2475
2456static SV * 2476static SV *
2457coro_waitarray_new (pTHX_ int count) 2477coro_waitarray_new (pTHX_ int count)
2458{ 2478{
2459 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2479 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2460 AV *av = newAV (); 2480 AV *av = newAV ();
2461 SV **ary; 2481 SV **ary;
2462 2482
2463 /* unfortunately, building manually saves memory */ 2483 /* unfortunately, building manually saves memory */
2464 Newx (ary, 2, SV *); 2484 Newx (ary, 2, SV *);
… …
2606{ 2626{
2607 if (items >= 2) 2627 if (items >= 2)
2608 { 2628 {
2609 /* callback form */ 2629 /* callback form */
2610 AV *av = (AV *)SvRV (arg [0]); 2630 AV *av = (AV *)SvRV (arg [0]);
2611 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2631 SV *cb_cv = s_get_cv_croak (arg [1]);
2612 2632
2613 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2633 av_push (av, SvREFCNT_inc_NN (cb_cv));
2614 2634
2615 if (SvIVX (AvARRAY (av)[0]) > 0) 2635 if (SvIVX (AvARRAY (av)[0]) > 0)
2616 coro_semaphore_adjust (aTHX_ av, 0); 2636 coro_semaphore_adjust (aTHX_ av, 0);
2617 2637
2618 frame->prepare = prepare_nop; 2638 frame->prepare = prepare_nop;
… …
2642 AvARRAY (av)[0] = AvARRAY (av)[1]; 2662 AvARRAY (av)[0] = AvARRAY (av)[1];
2643 AvARRAY (av)[1] = cb; 2663 AvARRAY (av)[1] = cb;
2644 2664
2645 cb = av_shift (av); 2665 cb = av_shift (av);
2646 2666
2667 if (SvTYPE (cb) == SVt_PVCV)
2668 {
2669 dSP;
2670 PUSHMARK (SP);
2671 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2672 PUTBACK;
2673 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2674 }
2675 else
2676 {
2647 api_ready (aTHX_ cb); 2677 api_ready (aTHX_ cb);
2648 sv_setiv (cb, 0); /* signal waiter */ 2678 sv_setiv (cb, 0); /* signal waiter */
2679 }
2680
2649 SvREFCNT_dec (cb); 2681 SvREFCNT_dec (cb);
2650 2682
2651 --count; 2683 --count;
2652 } 2684 }
2653} 2685}
… …
2662static void 2694static void
2663slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2695slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2664{ 2696{
2665 AV *av = (AV *)SvRV (arg [0]); 2697 AV *av = (AV *)SvRV (arg [0]);
2666 2698
2699 if (items >= 2)
2700 {
2701 SV *cb_cv = s_get_cv_croak (arg [1]);
2702 av_push (av, SvREFCNT_inc_NN (cb_cv));
2703
2667 if (SvIVX (AvARRAY (av)[0])) 2704 if (SvIVX (AvARRAY (av)[0]))
2705 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2706
2707 frame->prepare = prepare_nop;
2708 frame->check = slf_check_nop;
2709 }
2710 else if (SvIVX (AvARRAY (av)[0]))
2668 { 2711 {
2669 SvIVX (AvARRAY (av)[0]) = 0; 2712 SvIVX (AvARRAY (av)[0]) = 0;
2670 frame->prepare = prepare_nop; 2713 frame->prepare = prepare_nop;
2671 frame->check = slf_check_nop; 2714 frame->check = slf_check_nop;
2672 } 2715 }
2673 else 2716 else
2674 { 2717 {
2675 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2718 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2676 2719
2677 av_push (av, waiter); 2720 av_push (av, waiter);
2678 2721
2679 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2722 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2680 frame->prepare = prepare_schedule; 2723 frame->prepare = prepare_schedule;
… …
2698 2741
2699static void 2742static void
2700coro_aio_callback (pTHX_ CV *cv) 2743coro_aio_callback (pTHX_ CV *cv)
2701{ 2744{
2702 dXSARGS; 2745 dXSARGS;
2703 AV *state = (AV *)GENSUB_ARG; 2746 AV *state = (AV *)S_GENSUB_ARG;
2704 SV *coro = av_pop (state); 2747 SV *coro = av_pop (state);
2705 SV *data_sv = newSV (sizeof (struct io_state)); 2748 SV *data_sv = newSV (sizeof (struct io_state));
2706 2749
2707 av_extend (state, items - 1); 2750 av_extend (state, items - 1);
2708 2751
… …
2822 2865
2823 for (i = 0; i < items; ++i) 2866 for (i = 0; i < items; ++i)
2824 PUSHs (arg [i]); 2867 PUSHs (arg [i]);
2825 2868
2826 /* now push the callback closure */ 2869 /* now push the callback closure */
2827 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2870 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2828 2871
2829 /* now call the AIO function - we assume our request is uncancelable */ 2872 /* now call the AIO function - we assume our request is uncancelable */
2830 PUTBACK; 2873 PUTBACK;
2831 call_sv ((SV *)req, G_VOID | G_DISCARD); 2874 call_sv ((SV *)req, G_VOID | G_DISCARD);
2832 } 2875 }
… …
2919 2962
2920 if (!svp) croak ("Time::HiRes is required"); 2963 if (!svp) croak ("Time::HiRes is required");
2921 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 2964 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2922 2965
2923 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 2966 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2967
2968 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
2969 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2924 } 2970 }
2925 2971
2926 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2972 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2927} 2973}
2928 2974
2929SV * 2975SV *
2930new (char *klass, ...) 2976new (char *klass, ...)
2931 ALIAS: 2977 ALIAS:
… …
2933 CODE: 2979 CODE:
2934{ 2980{
2935 struct coro *coro; 2981 struct coro *coro;
2936 MAGIC *mg; 2982 MAGIC *mg;
2937 HV *hv; 2983 HV *hv;
2938 CV *cb; 2984 SV *cb;
2939 int i; 2985 int i;
2940 2986
2941 if (items > 1) 2987 if (items > 1)
2942 { 2988 {
2943 cb = coro_sv_2cv (aTHX_ ST (1)); 2989 cb = s_get_cv_croak (ST (1));
2944 2990
2945 if (!ix) 2991 if (!ix)
2946 { 2992 {
2947 if (CvISXSUB (cb)) 2993 if (CvISXSUB (cb))
2948 croak ("Coro::State doesn't support XS functions as coroutine start, caught"); 2994 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
… …
2970 av_extend (coro->args, items - 1 + ix - 1); 3016 av_extend (coro->args, items - 1 + ix - 1);
2971 3017
2972 if (ix) 3018 if (ix)
2973 { 3019 {
2974 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb)); 3020 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2975 cb = cv_coro_run; 3021 cb = (SV *)cv_coro_run;
2976 } 3022 }
2977 3023
2978 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb); 3024 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2979 3025
2980 for (i = 2; i < items; i++) 3026 for (i = 2; i < items; i++)
… …
3133 CODE: 3179 CODE:
3134{ 3180{
3135 struct coro *current = SvSTATE_current; 3181 struct coro *current = SvSTATE_current;
3136 SV **throwp = self == current ? &CORO_THROW : &self->except; 3182 SV **throwp = self == current ? &CORO_THROW : &self->except;
3137 SvREFCNT_dec (*throwp); 3183 SvREFCNT_dec (*throwp);
3184 SvGETMAGIC (throw);
3138 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3185 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
3139} 3186}
3140 3187
3141void 3188void
3142api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3189api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
3201 CODE: 3248 CODE:
3202 coro_state_destroy (aTHX_ self); 3249 coro_state_destroy (aTHX_ self);
3203 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3250 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3204 3251
3205 3252
3253SV *
3254enable_times (int enabled = enable_times)
3255 CODE:
3256{
3257 RETVAL = boolSV (enable_times);
3258
3259 if (enabled != enable_times)
3260 {
3261 enable_times = enabled;
3262
3263 coro_times_update ();
3264 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3265 }
3266}
3267 OUTPUT:
3268 RETVAL
3269
3270void
3271times (Coro::State self)
3272 PPCODE:
3273{
3274 struct coro *current = SvSTATE (coro_current);
3275
3276 if (expect_false (current == self))
3277 {
3278 coro_times_update ();
3279 coro_times_add (SvSTATE (coro_current));
3280 }
3281
3282 EXTEND (SP, 2);
3283 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3284 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3285
3286 if (expect_false (current == self))
3287 coro_times_sub (SvSTATE (coro_current));
3288}
3289
3206MODULE = Coro::State PACKAGE = Coro 3290MODULE = Coro::State PACKAGE = Coro
3207 3291
3208BOOT: 3292BOOT:
3209{ 3293{
3210 int i;
3211
3212 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3294 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3213 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3295 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3214 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3296 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3215 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3297 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3216 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3298 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); 3306 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); 3307 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
3226 3308
3227 coro_stash = gv_stashpv ("Coro", TRUE); 3309 coro_stash = gv_stashpv ("Coro", TRUE);
3228 3310
3229 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3311 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3230 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3312 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3231 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3313 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3232 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3314 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3233 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3315 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3234 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3316 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 3317
3239 { 3318 {
3240 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3319 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3241 3320
3242 coroapi.schedule = api_schedule; 3321 coroapi.schedule = api_schedule;
… …
3294void 3373void
3295_set_readyhook (SV *hook) 3374_set_readyhook (SV *hook)
3296 PROTOTYPE: $ 3375 PROTOTYPE: $
3297 CODE: 3376 CODE:
3298 SvREFCNT_dec (coro_readyhook); 3377 SvREFCNT_dec (coro_readyhook);
3378 SvGETMAGIC (hook);
3299 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3379 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
3300 3380
3301int 3381int
3302prio (Coro::State coro, int newprio = 0) 3382prio (Coro::State coro, int newprio = 0)
3303 PROTOTYPE: $;$ 3383 PROTOTYPE: $;$
… …
3310 if (items > 1) 3390 if (items > 1)
3311 { 3391 {
3312 if (ix) 3392 if (ix)
3313 newprio = coro->prio - newprio; 3393 newprio = coro->prio - newprio;
3314 3394
3315 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3395 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3316 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3396 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3317 3397
3318 coro->prio = newprio; 3398 coro->prio = newprio;
3319 } 3399 }
3320} 3400}
3321 OUTPUT: 3401 OUTPUT:
… …
3334 PROTOTYPE: 3414 PROTOTYPE:
3335 CODE: 3415 CODE:
3336 RETVAL = coro_nready; 3416 RETVAL = coro_nready;
3337 OUTPUT: 3417 OUTPUT:
3338 RETVAL 3418 RETVAL
3419
3420void
3421suspend (Coro::State self)
3422 PROTOTYPE: $
3423 CODE:
3424 self->flags |= CF_SUSPENDED;
3425
3426void
3427resume (Coro::State self)
3428 PROTOTYPE: $
3429 CODE:
3430 self->flags &= ~CF_SUSPENDED;
3339 3431
3340void 3432void
3341_pool_handler (...) 3433_pool_handler (...)
3342 CODE: 3434 CODE:
3343 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3435 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
… …
3408 CODE: 3500 CODE:
3409{ 3501{
3410 struct coro *coro = SvSTATE_current; 3502 struct coro *coro = SvSTATE_current;
3411 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3503 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3412 3504
3413 block = (SV *)coro_sv_2cv (aTHX_ block); 3505 block = s_get_cv_croak (block);
3414 3506
3415 if (!*avp) 3507 if (!*avp)
3416 *avp = newAV (); 3508 *avp = newAV ();
3417 3509
3418 av_push (*avp, SvREFCNT_inc (block)); 3510 av_push (*avp, SvREFCNT_inc (block));
3419 3511
3420 if (!ix) 3512 if (!ix)
3421 on_enterleave_call (aTHX_ block); 3513 on_enterleave_call (aTHX_ block);
3422 3514
3423 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 3515 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); 3516 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 */ 3517 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3426} 3518}
3427 3519
3428 3520
3429MODULE = Coro::State PACKAGE = PerlIO::cede 3521MODULE = Coro::State PACKAGE = PerlIO::cede
3430 3522
… …
3435MODULE = Coro::State PACKAGE = Coro::Semaphore 3527MODULE = Coro::State PACKAGE = Coro::Semaphore
3436 3528
3437SV * 3529SV *
3438new (SV *klass, SV *count = 0) 3530new (SV *klass, SV *count = 0)
3439 CODE: 3531 CODE:
3532{
3533 int semcnt = 1;
3534
3535 if (count)
3536 {
3537 SvGETMAGIC (count);
3538
3539 if (SvOK (count))
3540 semcnt = SvIV (count);
3541 }
3542
3440 RETVAL = sv_bless ( 3543 RETVAL = sv_bless (
3441 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3544 coro_waitarray_new (aTHX_ semcnt),
3442 GvSTASH (CvGV (cv)) 3545 GvSTASH (CvGV (cv))
3443 ); 3546 );
3547}
3444 OUTPUT: 3548 OUTPUT:
3445 RETVAL 3549 RETVAL
3446 3550
3447# helper for Coro::Channel and others 3551# helper for Coro::Channel and others
3448SV * 3552SV *
… …
3606 3710
3607void 3711void
3608_register (char *target, char *proto, SV *req) 3712_register (char *target, char *proto, SV *req)
3609 CODE: 3713 CODE:
3610{ 3714{
3611 CV *req_cv = coro_sv_2cv (aTHX_ req); 3715 SV *req_cv = s_get_cv_croak (req);
3612 /* newXSproto doesn't return the CV on 5.8 */ 3716 /* newXSproto doesn't return the CV on 5.8 */
3613 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3717 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3614 sv_setpv ((SV *)slf_cv, proto); 3718 sv_setpv ((SV *)slf_cv, proto);
3615 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3719 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3616} 3720}

Diff Legend

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