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.365 by root, Mon Jul 20 16:18:30 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 {
… …
293 251
294 /* on_enter/on_leave */ 252 /* on_enter/on_leave */
295 AV *on_enter; 253 AV *on_enter;
296 AV *on_leave; 254 AV *on_leave;
297 255
256 /* times */
257 coro_ts t_cpu, t_real;
258
298 /* linked list */ 259 /* linked list */
299 struct coro *next, *prev; 260 struct coro *next, *prev;
300}; 261};
301 262
302typedef struct coro *Coro__State; 263typedef struct coro *Coro__State;
… …
307/* the mainr easonw e don't support windows process emulation */ 268/* the mainr easonw e don't support windows process emulation */
308static struct CoroSLF slf_frame; /* the current slf frame */ 269static struct CoroSLF slf_frame; /* the current slf frame */
309 270
310/** Coro ********************************************************************/ 271/** Coro ********************************************************************/
311 272
312#define PRIO_MAX 3 273#define CORO_PRIO_MAX 3
313#define PRIO_HIGH 1 274#define CORO_PRIO_HIGH 1
314#define PRIO_NORMAL 0 275#define CORO_PRIO_NORMAL 0
315#define PRIO_LOW -1 276#define CORO_PRIO_LOW -1
316#define PRIO_IDLE -3 277#define CORO_PRIO_IDLE -3
317#define PRIO_MIN -4 278#define CORO_PRIO_MIN -4
318 279
319/* for Coro.pm */ 280/* for Coro.pm */
320static SV *coro_current; 281static SV *coro_current;
321static SV *coro_readyhook; 282static SV *coro_readyhook;
322static struct coro *coro_ready [PRIO_MAX - PRIO_MIN + 1][2]; /* head|tail */ 283static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
323static CV *cv_coro_run, *cv_coro_terminate; 284static CV *cv_coro_run, *cv_coro_terminate;
324static struct coro *coro_first; 285static struct coro *coro_first;
325#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}
326 307
327/** lowlevel stuff **********************************************************/ 308/** lowlevel stuff **********************************************************/
328 309
329static SV * 310static SV *
330coro_get_sv (pTHX_ const char *name, int create) 311coro_get_sv (pTHX_ const char *name, int create)
… …
354 get_hv (name, create); 335 get_hv (name, create);
355#endif 336#endif
356 return get_hv (name, create); 337 return get_hv (name, create);
357} 338}
358 339
359/* may croak */ 340INLINE void
360INLINE CV * 341coro_times_update ()
361coro_sv_2cv (pTHX_ SV *sv)
362{ 342{
363 HV *st; 343#ifdef coro_clock_gettime
364 GV *gvp; 344 struct timespec ts;
365 CV *cv = sv_2cv (sv, &st, &gvp, 0);
366 345
367 if (!cv) 346 ts.tv_sec = ts.tv_nsec = 0;
368 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;
369 349
370 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];
371} 385}
372 386
373/*****************************************************************************/ 387/*****************************************************************************/
374/* magic glue */ 388/* magic glue */
375 389
… …
475static int 489static int
476coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 490coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
477{ 491{
478 AV *padlist; 492 AV *padlist;
479 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;
480 498
481 /* casting is fun. */ 499 /* casting is fun. */
482 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 500 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
483 free_padlist (aTHX_ padlist); 501 free_padlist (aTHX_ padlist);
484 502
… …
573 } 591 }
574 592
575 slf_frame = c->slf_frame; 593 slf_frame = c->slf_frame;
576 CORO_THROW = c->except; 594 CORO_THROW = c->except;
577 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
578 if (expect_false (c->on_enter)) 604 if (expect_false (c->on_enter))
579 { 605 {
580 int i; 606 int i;
581 607
582 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 608 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
… …
591 { 617 {
592 int i; 618 int i;
593 619
594 for (i = AvFILLp (c->on_leave); i >= 0; --i) 620 for (i = AvFILLp (c->on_leave); i >= 0; --i)
595 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);
596 } 630 }
597 631
598 c->except = CORO_THROW; 632 c->except = CORO_THROW;
599 c->slf_frame = slf_frame; 633 c->slf_frame = slf_frame;
600 634
… …
615 { 649 {
616 while (expect_true (cxix >= 0)) 650 while (expect_true (cxix >= 0))
617 { 651 {
618 PERL_CONTEXT *cx = &ccstk[cxix--]; 652 PERL_CONTEXT *cx = &ccstk[cxix--];
619 653
620 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))
621 { 655 {
622 CV *cv = cx->blk_sub.cv; 656 CV *cv = cx->blk_sub.cv;
623 657
624 if (expect_true (CvDEPTH (cv))) 658 if (expect_true (CvDEPTH (cv)))
625 { 659 {
… …
649 /* we manually unroll here, as usually 2 slots is enough */ 683 /* we manually unroll here, as usually 2 slots is enough */
650 if (SLOT_COUNT >= 1) CXINC; 684 if (SLOT_COUNT >= 1) CXINC;
651 if (SLOT_COUNT >= 2) CXINC; 685 if (SLOT_COUNT >= 2) CXINC;
652 if (SLOT_COUNT >= 3) CXINC; 686 if (SLOT_COUNT >= 3) CXINC;
653 { 687 {
654 int i; 688 unsigned int i;
655 for (i = 3; i < SLOT_COUNT; ++i) 689 for (i = 3; i < SLOT_COUNT; ++i)
656 CXINC; 690 CXINC;
657 } 691 }
658 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 692 cxstack_ix -= SLOT_COUNT; /* undo allocation */
659 693
… …
964 998
965 PL_op = (OP *)&coro_setup_op; 999 PL_op = (OP *)&coro_setup_op;
966 1000
967 /* copy throw, in case it was set before coro_setup */ 1001 /* copy throw, in case it was set before coro_setup */
968 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 }
969} 1009}
970 1010
971static void 1011static void
972coro_unwind_stacks (pTHX) 1012coro_unwind_stacks (pTHX)
973{ 1013{
… …
999 1039
1000 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1040 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1001 1041
1002 save_perl (aTHX_ current); 1042 save_perl (aTHX_ current);
1003 load_perl (aTHX_ coro); 1043 load_perl (aTHX_ coro);
1044
1004 coro_unwind_stacks (aTHX); 1045 coro_unwind_stacks (aTHX);
1005 coro_destruct_stacks (aTHX); 1046 coro_destruct_stacks (aTHX);
1006 1047
1007 // now save some sv's to be free'd later 1048 // now save some sv's to be free'd later
1008 svf [0] = GvSV (PL_defgv); 1049 svf [0] = GvSV (PL_defgv);
… …
1018 1059
1019 load_perl (aTHX_ current); 1060 load_perl (aTHX_ current);
1020 } 1061 }
1021 1062
1022 { 1063 {
1023 int i; 1064 unsigned int i;
1024 1065
1025 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1066 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1026 SvREFCNT_dec (svf [i]); 1067 SvREFCNT_dec (svf [i]);
1027 1068
1028 SvREFCNT_dec (coro->saved_deffh); 1069 SvREFCNT_dec (coro->saved_deffh);
… …
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
… …
2004 2017
2005static void 2018static void
2006coro_rouse_callback (pTHX_ CV *cv) 2019coro_rouse_callback (pTHX_ CV *cv)
2007{ 2020{
2008 dXSARGS; 2021 dXSARGS;
2009 SV *data = (SV *)GENSUB_ARG; 2022 SV *data = (SV *)S_GENSUB_ARG;
2010 2023
2011 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2024 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2012 { 2025 {
2013 /* first call, set args */ 2026 /* first call, set args */
2014 SV *coro = SvRV (data); 2027 SV *coro = SvRV (data);
… …
2080 || SvTYPE (SvRV (cb)) != SVt_PVCV 2093 || SvTYPE (SvRV (cb)) != SVt_PVCV
2081 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2094 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2082 croak ("Coro::rouse_wait called with illegal callback argument,"); 2095 croak ("Coro::rouse_wait called with illegal callback argument,");
2083 2096
2084 { 2097 {
2085 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2098 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2086 SV *data = (SV *)GENSUB_ARG; 2099 SV *data = (SV *)S_GENSUB_ARG;
2087 2100
2088 frame->data = (void *)data; 2101 frame->data = (void *)data;
2089 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2102 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2090 frame->check = slf_check_rouse_wait; 2103 frame->check = slf_check_rouse_wait;
2091 } 2104 }
… …
2095coro_new_rouse_cb (pTHX) 2108coro_new_rouse_cb (pTHX)
2096{ 2109{
2097 HV *hv = (HV *)SvRV (coro_current); 2110 HV *hv = (HV *)SvRV (coro_current);
2098 struct coro *coro = SvSTATE_hv (hv); 2111 struct coro *coro = SvSTATE_hv (hv);
2099 SV *data = newRV_inc ((SV *)hv); 2112 SV *data = newRV_inc ((SV *)hv);
2100 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2113 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2101 2114
2102 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2115 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2103 SvREFCNT_dec (data); /* magicext increases the refcount */ 2116 SvREFCNT_dec (data); /* magicext increases the refcount */
2104 2117
2105 SvREFCNT_dec (coro->rouse_cb); 2118 SvREFCNT_dec (coro->rouse_cb);
… …
2476/* Coro::Semaphore & Coro::Signal */ 2489/* Coro::Semaphore & Coro::Signal */
2477 2490
2478static SV * 2491static SV *
2479coro_waitarray_new (pTHX_ int count) 2492coro_waitarray_new (pTHX_ int count)
2480{ 2493{
2481 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2494 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2482 AV *av = newAV (); 2495 AV *av = newAV ();
2483 SV **ary; 2496 SV **ary;
2484 2497
2485 /* unfortunately, building manually saves memory */ 2498 /* unfortunately, building manually saves memory */
2486 Newx (ary, 2, SV *); 2499 Newx (ary, 2, SV *);
… …
2628{ 2641{
2629 if (items >= 2) 2642 if (items >= 2)
2630 { 2643 {
2631 /* callback form */ 2644 /* callback form */
2632 AV *av = (AV *)SvRV (arg [0]); 2645 AV *av = (AV *)SvRV (arg [0]);
2633 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2646 SV *cb_cv = s_get_cv_croak (arg [1]);
2634 2647
2635 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2648 av_push (av, SvREFCNT_inc_NN (cb_cv));
2636 2649
2637 if (SvIVX (AvARRAY (av)[0]) > 0) 2650 if (SvIVX (AvARRAY (av)[0]) > 0)
2638 coro_semaphore_adjust (aTHX_ av, 0); 2651 coro_semaphore_adjust (aTHX_ av, 0);
2639 2652
2640 frame->prepare = prepare_nop; 2653 frame->prepare = prepare_nop;
… …
2664 AvARRAY (av)[0] = AvARRAY (av)[1]; 2677 AvARRAY (av)[0] = AvARRAY (av)[1];
2665 AvARRAY (av)[1] = cb; 2678 AvARRAY (av)[1] = cb;
2666 2679
2667 cb = av_shift (av); 2680 cb = av_shift (av);
2668 2681
2682 if (SvTYPE (cb) == SVt_PVCV)
2683 {
2684 dSP;
2685 PUSHMARK (SP);
2686 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2687 PUTBACK;
2688 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2689 }
2690 else
2691 {
2669 api_ready (aTHX_ cb); 2692 api_ready (aTHX_ cb);
2670 sv_setiv (cb, 0); /* signal waiter */ 2693 sv_setiv (cb, 0); /* signal waiter */
2694 }
2695
2671 SvREFCNT_dec (cb); 2696 SvREFCNT_dec (cb);
2672 2697
2673 --count; 2698 --count;
2674 } 2699 }
2675} 2700}
… …
2684static void 2709static void
2685slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2710slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2686{ 2711{
2687 AV *av = (AV *)SvRV (arg [0]); 2712 AV *av = (AV *)SvRV (arg [0]);
2688 2713
2714 if (items >= 2)
2715 {
2716 SV *cb_cv = s_get_cv_croak (arg [1]);
2717 av_push (av, SvREFCNT_inc_NN (cb_cv));
2718
2689 if (SvIVX (AvARRAY (av)[0])) 2719 if (SvIVX (AvARRAY (av)[0]))
2720 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2721
2722 frame->prepare = prepare_nop;
2723 frame->check = slf_check_nop;
2724 }
2725 else if (SvIVX (AvARRAY (av)[0]))
2690 { 2726 {
2691 SvIVX (AvARRAY (av)[0]) = 0; 2727 SvIVX (AvARRAY (av)[0]) = 0;
2692 frame->prepare = prepare_nop; 2728 frame->prepare = prepare_nop;
2693 frame->check = slf_check_nop; 2729 frame->check = slf_check_nop;
2694 } 2730 }
2695 else 2731 else
2696 { 2732 {
2697 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2733 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2698 2734
2699 av_push (av, waiter); 2735 av_push (av, waiter);
2700 2736
2701 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2737 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2702 frame->prepare = prepare_schedule; 2738 frame->prepare = prepare_schedule;
… …
2720 2756
2721static void 2757static void
2722coro_aio_callback (pTHX_ CV *cv) 2758coro_aio_callback (pTHX_ CV *cv)
2723{ 2759{
2724 dXSARGS; 2760 dXSARGS;
2725 AV *state = (AV *)GENSUB_ARG; 2761 AV *state = (AV *)S_GENSUB_ARG;
2726 SV *coro = av_pop (state); 2762 SV *coro = av_pop (state);
2727 SV *data_sv = newSV (sizeof (struct io_state)); 2763 SV *data_sv = newSV (sizeof (struct io_state));
2728 2764
2729 av_extend (state, items - 1); 2765 av_extend (state, items - 1);
2730 2766
… …
2844 2880
2845 for (i = 0; i < items; ++i) 2881 for (i = 0; i < items; ++i)
2846 PUSHs (arg [i]); 2882 PUSHs (arg [i]);
2847 2883
2848 /* now push the callback closure */ 2884 /* now push the callback closure */
2849 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2885 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2850 2886
2851 /* now call the AIO function - we assume our request is uncancelable */ 2887 /* now call the AIO function - we assume our request is uncancelable */
2852 PUTBACK; 2888 PUTBACK;
2853 call_sv ((SV *)req, G_VOID | G_DISCARD); 2889 call_sv ((SV *)req, G_VOID | G_DISCARD);
2854 } 2890 }
… …
2941 2977
2942 if (!svp) croak ("Time::HiRes is required"); 2978 if (!svp) croak ("Time::HiRes is required");
2943 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 2979 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2944 2980
2945 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 2981 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2982
2983 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
2984 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2946 } 2985 }
2947 2986
2948 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2987 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2949} 2988}
2950 2989
2951SV * 2990SV *
2952new (char *klass, ...) 2991new (char *klass, ...)
2953 ALIAS: 2992 ALIAS:
… …
2955 CODE: 2994 CODE:
2956{ 2995{
2957 struct coro *coro; 2996 struct coro *coro;
2958 MAGIC *mg; 2997 MAGIC *mg;
2959 HV *hv; 2998 HV *hv;
2960 CV *cb; 2999 SV *cb;
2961 int i; 3000 int i;
2962 3001
2963 if (items > 1) 3002 if (items > 1)
2964 { 3003 {
2965 cb = coro_sv_2cv (aTHX_ ST (1)); 3004 cb = s_get_cv_croak (ST (1));
2966 3005
2967 if (!ix) 3006 if (!ix)
2968 { 3007 {
2969 if (CvISXSUB (cb)) 3008 if (CvISXSUB (cb))
2970 croak ("Coro::State doesn't support XS functions as coroutine start, caught"); 3009 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
… …
2992 av_extend (coro->args, items - 1 + ix - 1); 3031 av_extend (coro->args, items - 1 + ix - 1);
2993 3032
2994 if (ix) 3033 if (ix)
2995 { 3034 {
2996 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb)); 3035 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2997 cb = cv_coro_run; 3036 cb = (SV *)cv_coro_run;
2998 } 3037 }
2999 3038
3000 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb); 3039 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3001 3040
3002 for (i = 2; i < items; i++) 3041 for (i = 2; i < items; i++)
… …
3155 CODE: 3194 CODE:
3156{ 3195{
3157 struct coro *current = SvSTATE_current; 3196 struct coro *current = SvSTATE_current;
3158 SV **throwp = self == current ? &CORO_THROW : &self->except; 3197 SV **throwp = self == current ? &CORO_THROW : &self->except;
3159 SvREFCNT_dec (*throwp); 3198 SvREFCNT_dec (*throwp);
3199 SvGETMAGIC (throw);
3160 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3200 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
3161} 3201}
3162 3202
3163void 3203void
3164api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3204api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
3223 CODE: 3263 CODE:
3224 coro_state_destroy (aTHX_ self); 3264 coro_state_destroy (aTHX_ self);
3225 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3265 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3226 3266
3227 3267
3268SV *
3269enable_times (int enabled = enable_times)
3270 CODE:
3271{
3272 RETVAL = boolSV (enable_times);
3273
3274 if (enabled != enable_times)
3275 {
3276 enable_times = enabled;
3277
3278 coro_times_update ();
3279 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3280 }
3281}
3282 OUTPUT:
3283 RETVAL
3284
3285void
3286times (Coro::State self)
3287 PPCODE:
3288{
3289 struct coro *current = SvSTATE (coro_current);
3290
3291 if (expect_false (current == self))
3292 {
3293 coro_times_update ();
3294 coro_times_add (SvSTATE (coro_current));
3295 }
3296
3297 EXTEND (SP, 2);
3298 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3299 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3300
3301 if (expect_false (current == self))
3302 coro_times_sub (SvSTATE (coro_current));
3303}
3304
3228MODULE = Coro::State PACKAGE = Coro 3305MODULE = Coro::State PACKAGE = Coro
3229 3306
3230BOOT: 3307BOOT:
3231{ 3308{
3232 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3309 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
… …
3244 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3321 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); 3322 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
3246 3323
3247 coro_stash = gv_stashpv ("Coro", TRUE); 3324 coro_stash = gv_stashpv ("Coro", TRUE);
3248 3325
3249 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3326 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3250 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3327 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3251 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3328 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3252 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3329 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3253 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3330 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3254 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3331 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3255 3332
3256 { 3333 {
3257 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3334 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3258 3335
3259 coroapi.schedule = api_schedule; 3336 coroapi.schedule = api_schedule;
… …
3311void 3388void
3312_set_readyhook (SV *hook) 3389_set_readyhook (SV *hook)
3313 PROTOTYPE: $ 3390 PROTOTYPE: $
3314 CODE: 3391 CODE:
3315 SvREFCNT_dec (coro_readyhook); 3392 SvREFCNT_dec (coro_readyhook);
3393 SvGETMAGIC (hook);
3394 if (SvOK (hook))
3395 {
3316 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3396 coro_readyhook = newSVsv (hook);
3397 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3398 CORO_READYHOOK ();
3399 }
3400 else
3401 {
3402 coro_readyhook = 0;
3403 CORO_READYHOOK = 0;
3404 }
3317 3405
3318int 3406int
3319prio (Coro::State coro, int newprio = 0) 3407prio (Coro::State coro, int newprio = 0)
3320 PROTOTYPE: $;$ 3408 PROTOTYPE: $;$
3321 ALIAS: 3409 ALIAS:
… …
3327 if (items > 1) 3415 if (items > 1)
3328 { 3416 {
3329 if (ix) 3417 if (ix)
3330 newprio = coro->prio - newprio; 3418 newprio = coro->prio - newprio;
3331 3419
3332 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3420 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3333 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3421 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3334 3422
3335 coro->prio = newprio; 3423 coro->prio = newprio;
3336 } 3424 }
3337} 3425}
3338 OUTPUT: 3426 OUTPUT:
… …
3437 CODE: 3525 CODE:
3438{ 3526{
3439 struct coro *coro = SvSTATE_current; 3527 struct coro *coro = SvSTATE_current;
3440 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3528 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3441 3529
3442 block = (SV *)coro_sv_2cv (aTHX_ block); 3530 block = s_get_cv_croak (block);
3443 3531
3444 if (!*avp) 3532 if (!*avp)
3445 *avp = newAV (); 3533 *avp = newAV ();
3446 3534
3447 av_push (*avp, SvREFCNT_inc (block)); 3535 av_push (*avp, SvREFCNT_inc (block));
… …
3464MODULE = Coro::State PACKAGE = Coro::Semaphore 3552MODULE = Coro::State PACKAGE = Coro::Semaphore
3465 3553
3466SV * 3554SV *
3467new (SV *klass, SV *count = 0) 3555new (SV *klass, SV *count = 0)
3468 CODE: 3556 CODE:
3557{
3558 int semcnt = 1;
3559
3560 if (count)
3561 {
3562 SvGETMAGIC (count);
3563
3564 if (SvOK (count))
3565 semcnt = SvIV (count);
3566 }
3567
3469 RETVAL = sv_bless ( 3568 RETVAL = sv_bless (
3470 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3569 coro_waitarray_new (aTHX_ semcnt),
3471 GvSTASH (CvGV (cv)) 3570 GvSTASH (CvGV (cv))
3472 ); 3571 );
3572}
3473 OUTPUT: 3573 OUTPUT:
3474 RETVAL 3574 RETVAL
3475 3575
3476# helper for Coro::Channel and others 3576# helper for Coro::Channel and others
3477SV * 3577SV *
… …
3635 3735
3636void 3736void
3637_register (char *target, char *proto, SV *req) 3737_register (char *target, char *proto, SV *req)
3638 CODE: 3738 CODE:
3639{ 3739{
3640 CV *req_cv = coro_sv_2cv (aTHX_ req); 3740 SV *req_cv = s_get_cv_croak (req);
3641 /* newXSproto doesn't return the CV on 5.8 */ 3741 /* newXSproto doesn't return the CV on 5.8 */
3642 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3742 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3643 sv_setpv ((SV *)slf_cv, proto); 3743 sv_setpv ((SV *)slf_cv, proto);
3644 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3744 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3645} 3745}
3646 3746
3747MODULE = Coro::State PACKAGE = Coro::Select
3748
3749void
3750patch_pp_sselect ()
3751 CODE:
3752 if (!coro_old_pp_sselect)
3753 {
3754 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3755 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3756 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3757 }
3758
3759void
3760unpatch_pp_sselect ()
3761 CODE:
3762 if (coro_old_pp_sselect)
3763 {
3764 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3765 coro_old_pp_sselect = 0;
3766 }
3767
3768

Diff Legend

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