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.356 by root, Sat Jun 27 14:06:59 2009 UTC vs.
Revision 1.371 by root, Sat Aug 22 22:36:23 2009 UTC

… …
6#include "EXTERN.h" 6#include "EXTERN.h"
7#include "perl.h" 7#include "perl.h"
8#include "XSUB.h" 8#include "XSUB.h"
9#include "perliol.h" 9#include "perliol.h"
10 10
11#include "patchlevel.h" 11#include "schmorp.h"
12 12
13#include <stdio.h> 13#include <stdio.h>
14#include <errno.h> 14#include <errno.h>
15#include <assert.h> 15#include <assert.h>
16 16
… …
51#endif 51#endif
52 52
53/* the maximum number of idle cctx that will be pooled */ 53/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 54static int cctx_max_idle = 4;
55 55
56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif
114
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 56#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 57# undef CORO_STACKGUARD
117#endif 58#endif
118 59
119#ifndef CORO_STACKGUARD 60#ifndef CORO_STACKGUARD
… …
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 (pTHX)
295{
296 dSP;
297 PUSHMARK (SP - 4); /* fake argument list */
298 XPUSHs (coro_select_select);
299 PUTBACK;
300
301 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
302 PL_op->op_flags |= OPf_STACKED;
303 PL_op->op_private = 0;
304 return PL_ppaddr [OP_ENTERSUB](aTHX);
305}
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
… …
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{
… …
1019 1058
1020 load_perl (aTHX_ current); 1059 load_perl (aTHX_ current);
1021 } 1060 }
1022 1061
1023 { 1062 {
1024 int i; 1063 unsigned int i;
1025 1064
1026 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1065 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1027 SvREFCNT_dec (svf [i]); 1066 SvREFCNT_dec (svf [i]);
1028 1067
1029 SvREFCNT_dec (coro->saved_deffh); 1068 SvREFCNT_dec (coro->saved_deffh);
… …
1235 /* 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 */
1236 PL_restartop = PL_op; 1275 PL_restartop = PL_op;
1237 perl_run (PL_curinterp); 1276 perl_run (PL_curinterp);
1238 /* 1277 /*
1239 * 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
1240 * 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.
1241 */ 1281 */
1242 1282
1243 /* 1283 /*
1244 * 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
1245 * 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)
… …
1594 1634
1595 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1635 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1596 TRANSFER (ta, 1); 1636 TRANSFER (ta, 1);
1597} 1637}
1598 1638
1599/*****************************************************************************/
1600/* gensub: simple closure generation utility */
1601
1602#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1603
1604/* create a closure from XS, returns a code reference */
1605/* the arg can be accessed via GENSUB_ARG from the callback */
1606/* the callback must use dXSARGS/XSRETURN */
1607static SV *
1608gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1609{
1610 CV *cv = (CV *)newSV (0);
1611
1612 sv_upgrade ((SV *)cv, SVt_PVCV);
1613
1614 CvANON_on (cv);
1615 CvISXSUB_on (cv);
1616 CvXSUB (cv) = xsub;
1617 GENSUB_ARG = arg;
1618
1619 return newRV_noinc ((SV *)cv);
1620}
1621
1622/** Coro ********************************************************************/ 1639/** Coro ********************************************************************/
1623 1640
1624INLINE void 1641INLINE void
1625coro_enq (pTHX_ struct coro *coro) 1642coro_enq (pTHX_ struct coro *coro)
1626{ 1643{
1627 struct coro **ready = coro_ready [coro->prio - PRIO_MIN]; 1644 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1628 1645
1629 SvREFCNT_inc_NN (coro->hv); 1646 SvREFCNT_inc_NN (coro->hv);
1630 1647
1631 coro->next_ready = 0; 1648 coro->next_ready = 0;
1632 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1649 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
… …
1636INLINE struct coro * 1653INLINE struct coro *
1637coro_deq (pTHX) 1654coro_deq (pTHX)
1638{ 1655{
1639 int prio; 1656 int prio;
1640 1657
1641 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1658 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1642 { 1659 {
1643 struct coro **ready = coro_ready [prio]; 1660 struct coro **ready = coro_ready [prio];
1644 1661
1645 if (ready [0]) 1662 if (ready [0])
1646 { 1663 {
… …
1651 } 1668 }
1652 1669
1653 return 0; 1670 return 0;
1654} 1671}
1655 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
1656static int 1690static int
1657api_ready (pTHX_ SV *coro_sv) 1691api_ready (pTHX_ SV *coro_sv)
1658{ 1692{
1659 struct coro *coro;
1660 SV *sv_hook;
1661 void (*xs_hook)(void);
1662
1663 coro = SvSTATE (coro_sv); 1693 struct coro *coro = SvSTATE (coro_sv);
1664 1694
1665 if (coro->flags & CF_READY) 1695 if (coro->flags & CF_READY)
1666 return 0; 1696 return 0;
1667 1697
1668 coro->flags |= CF_READY; 1698 coro->flags |= CF_READY;
1669 1699
1670 sv_hook = coro_nready ? 0 : coro_readyhook;
1671 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1672
1673 coro_enq (aTHX_ coro); 1700 coro_enq (aTHX_ coro);
1674 ++coro_nready;
1675 1701
1676 if (sv_hook) 1702 if (!coro_nready++)
1677 { 1703 if (coroapi.readyhook)
1678 dSP; 1704 coroapi.readyhook ();
1679
1680 ENTER;
1681 SAVETMPS;
1682
1683 PUSHMARK (SP);
1684 PUTBACK;
1685 call_sv (sv_hook, G_VOID | G_DISCARD);
1686
1687 FREETMPS;
1688 LEAVE;
1689 }
1690
1691 if (xs_hook)
1692 xs_hook ();
1693 1705
1694 return 1; 1706 return 1;
1695} 1707}
1696 1708
1697static int 1709static int
… …
1903{ 1915{
1904 int i; 1916 int i;
1905 HV *hv = (HV *)SvRV (coro_current); 1917 HV *hv = (HV *)SvRV (coro_current);
1906 AV *av = newAV (); 1918 AV *av = newAV ();
1907 1919
1920 /* items are actually not so common, so optimise for this case */
1921 if (items)
1922 {
1908 av_extend (av, items - 1); 1923 av_extend (av, items - 1);
1924
1909 for (i = 0; i < items; ++i) 1925 for (i = 0; i < items; ++i)
1910 av_push (av, SvREFCNT_inc_NN (arg [i])); 1926 av_push (av, SvREFCNT_inc_NN (arg [i]));
1927 }
1911 1928
1912 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);
1913 1930
1914 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 */
1915 api_ready (aTHX_ sv_manager); 1932 api_ready (aTHX_ sv_manager);
… …
2005 2022
2006static void 2023static void
2007coro_rouse_callback (pTHX_ CV *cv) 2024coro_rouse_callback (pTHX_ CV *cv)
2008{ 2025{
2009 dXSARGS; 2026 dXSARGS;
2010 SV *data = (SV *)GENSUB_ARG; 2027 SV *data = (SV *)S_GENSUB_ARG;
2011 2028
2012 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2029 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2013 { 2030 {
2014 /* first call, set args */ 2031 /* first call, set args */
2015 SV *coro = SvRV (data); 2032 SV *coro = SvRV (data);
… …
2081 || SvTYPE (SvRV (cb)) != SVt_PVCV 2098 || SvTYPE (SvRV (cb)) != SVt_PVCV
2082 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2099 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2083 croak ("Coro::rouse_wait called with illegal callback argument,"); 2100 croak ("Coro::rouse_wait called with illegal callback argument,");
2084 2101
2085 { 2102 {
2086 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2103 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2087 SV *data = (SV *)GENSUB_ARG; 2104 SV *data = (SV *)S_GENSUB_ARG;
2088 2105
2089 frame->data = (void *)data; 2106 frame->data = (void *)data;
2090 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2107 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2091 frame->check = slf_check_rouse_wait; 2108 frame->check = slf_check_rouse_wait;
2092 } 2109 }
… …
2096coro_new_rouse_cb (pTHX) 2113coro_new_rouse_cb (pTHX)
2097{ 2114{
2098 HV *hv = (HV *)SvRV (coro_current); 2115 HV *hv = (HV *)SvRV (coro_current);
2099 struct coro *coro = SvSTATE_hv (hv); 2116 struct coro *coro = SvSTATE_hv (hv);
2100 SV *data = newRV_inc ((SV *)hv); 2117 SV *data = newRV_inc ((SV *)hv);
2101 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2118 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2102 2119
2103 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);
2104 SvREFCNT_dec (data); /* magicext increases the refcount */ 2121 SvREFCNT_dec (data); /* magicext increases the refcount */
2105 2122
2106 SvREFCNT_dec (coro->rouse_cb); 2123 SvREFCNT_dec (coro->rouse_cb);
… …
2629{ 2646{
2630 if (items >= 2) 2647 if (items >= 2)
2631 { 2648 {
2632 /* callback form */ 2649 /* callback form */
2633 AV *av = (AV *)SvRV (arg [0]); 2650 AV *av = (AV *)SvRV (arg [0]);
2634 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2651 SV *cb_cv = s_get_cv_croak (arg [1]);
2635 2652
2636 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2653 av_push (av, SvREFCNT_inc_NN (cb_cv));
2637 2654
2638 if (SvIVX (AvARRAY (av)[0]) > 0) 2655 if (SvIVX (AvARRAY (av)[0]) > 0)
2639 coro_semaphore_adjust (aTHX_ av, 0); 2656 coro_semaphore_adjust (aTHX_ av, 0);
… …
2699{ 2716{
2700 AV *av = (AV *)SvRV (arg [0]); 2717 AV *av = (AV *)SvRV (arg [0]);
2701 2718
2702 if (items >= 2) 2719 if (items >= 2)
2703 { 2720 {
2704 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2721 SV *cb_cv = s_get_cv_croak (arg [1]);
2705 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2722 av_push (av, SvREFCNT_inc_NN (cb_cv));
2706 2723
2707 if (SvIVX (AvARRAY (av)[0])) 2724 if (SvIVX (AvARRAY (av)[0]))
2708 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 2725 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2709 2726
… …
2744 2761
2745static void 2762static void
2746coro_aio_callback (pTHX_ CV *cv) 2763coro_aio_callback (pTHX_ CV *cv)
2747{ 2764{
2748 dXSARGS; 2765 dXSARGS;
2749 AV *state = (AV *)GENSUB_ARG; 2766 AV *state = (AV *)S_GENSUB_ARG;
2750 SV *coro = av_pop (state); 2767 SV *coro = av_pop (state);
2751 SV *data_sv = newSV (sizeof (struct io_state)); 2768 SV *data_sv = newSV (sizeof (struct io_state));
2752 2769
2753 av_extend (state, items - 1); 2770 av_extend (state, items - 1);
2754 2771
… …
2868 2885
2869 for (i = 0; i < items; ++i) 2886 for (i = 0; i < items; ++i)
2870 PUSHs (arg [i]); 2887 PUSHs (arg [i]);
2871 2888
2872 /* now push the callback closure */ 2889 /* now push the callback closure */
2873 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))));
2874 2891
2875 /* now call the AIO function - we assume our request is uncancelable */ 2892 /* now call the AIO function - we assume our request is uncancelable */
2876 PUTBACK; 2893 PUTBACK;
2877 call_sv ((SV *)req, G_VOID | G_DISCARD); 2894 call_sv ((SV *)req, G_VOID | G_DISCARD);
2878 } 2895 }
… …
2896/*****************************************************************************/ 2913/*****************************************************************************/
2897 2914
2898#if CORO_CLONE 2915#if CORO_CLONE
2899# include "clone.c" 2916# include "clone.c"
2900#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}
2901 2976
2902MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2977MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2903 2978
2904PROTOTYPES: DISABLE 2979PROTOTYPES: DISABLE
2905 2980
… …
2965 3040
2966 if (!svp) croak ("Time::HiRes is required"); 3041 if (!svp) croak ("Time::HiRes is required");
2967 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3042 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2968 3043
2969 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));
2970 } 3048 }
2971 3049
2972 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3050 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2973} 3051}
2974 3052
2975SV * 3053SV *
2976new (char *klass, ...) 3054new (SV *klass, ...)
2977 ALIAS: 3055 ALIAS:
2978 Coro::new = 1 3056 Coro::new = 1
2979 CODE: 3057 CODE:
2980{ 3058 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2981 struct coro *coro; 3059 OUTPUT:
2982 MAGIC *mg;
2983 HV *hv;
2984 CV *cb;
2985 int i;
2986
2987 if (items > 1)
2988 {
2989 cb = coro_sv_2cv (aTHX_ ST (1));
2990
2991 if (!ix)
2992 {
2993 if (CvISXSUB (cb))
2994 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2995
2996 if (!CvROOT (cb))
2997 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2998 }
2999 }
3000
3001 Newz (0, coro, 1, struct coro);
3002 coro->args = newAV ();
3003 coro->flags = CF_NEW;
3004
3005 if (coro_first) coro_first->prev = coro;
3006 coro->next = coro_first;
3007 coro_first = coro;
3008
3009 coro->hv = hv = newHV ();
3010 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3011 mg->mg_flags |= MGf_DUP;
3012 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3013
3014 if (items > 1)
3015 {
3016 av_extend (coro->args, items - 1 + ix - 1);
3017
3018 if (ix)
3019 {
3020 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3021 cb = cv_coro_run;
3022 }
3023
3024 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3025
3026 for (i = 2; i < items; i++)
3027 av_push (coro->args, newSVsv (ST (i)));
3028 }
3029}
3030 OUTPUT:
3031 RETVAL 3060 RETVAL
3032 3061
3033void 3062void
3034transfer (...) 3063transfer (...)
3035 PROTOTYPE: $$ 3064 PROTOTYPE: $$
… …
3179 CODE: 3208 CODE:
3180{ 3209{
3181 struct coro *current = SvSTATE_current; 3210 struct coro *current = SvSTATE_current;
3182 SV **throwp = self == current ? &CORO_THROW : &self->except; 3211 SV **throwp = self == current ? &CORO_THROW : &self->except;
3183 SvREFCNT_dec (*throwp); 3212 SvREFCNT_dec (*throwp);
3213 SvGETMAGIC (throw);
3184 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3214 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
3185} 3215}
3186 3216
3187void 3217void
3188api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3218api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
3247 CODE: 3277 CODE:
3248 coro_state_destroy (aTHX_ self); 3278 coro_state_destroy (aTHX_ self);
3249 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3279 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3250 3280
3251 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
3252MODULE = Coro::State PACKAGE = Coro 3319MODULE = Coro::State PACKAGE = Coro
3253 3320
3254BOOT: 3321BOOT:
3255{ 3322{
3256 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3323 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
… …
3264 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3331 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3265 3332
3266 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);
3267 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3334 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3268 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);
3269 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3336 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3270 3337
3271 coro_stash = gv_stashpv ("Coro", TRUE); 3338 coro_stash = gv_stashpv ("Coro", TRUE);
3272 3339
3273 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3340 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3274 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3341 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3275 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3342 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3276 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3343 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3277 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3344 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3278 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3345 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3279 3346
3280 { 3347 {
3281 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3348 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3282 3349
3283 coroapi.schedule = api_schedule; 3350 coroapi.schedule = api_schedule;
… …
3293 sv_setiv (sv, (IV)&coroapi); 3360 sv_setiv (sv, (IV)&coroapi);
3294 SvREADONLY_on (sv); 3361 SvREADONLY_on (sv);
3295 } 3362 }
3296} 3363}
3297 3364
3365SV *
3366async (...)
3367 PROTOTYPE: &@
3368 CODE:
3369 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3370 api_ready (aTHX_ RETVAL);
3371 OUTPUT:
3372 RETVAL
3373
3298void 3374void
3299terminate (...) 3375terminate (...)
3300 CODE: 3376 CODE:
3301 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3377 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3302 3378
… …
3335void 3411void
3336_set_readyhook (SV *hook) 3412_set_readyhook (SV *hook)
3337 PROTOTYPE: $ 3413 PROTOTYPE: $
3338 CODE: 3414 CODE:
3339 SvREFCNT_dec (coro_readyhook); 3415 SvREFCNT_dec (coro_readyhook);
3416 SvGETMAGIC (hook);
3417 if (SvOK (hook))
3418 {
3340 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3419 coro_readyhook = newSVsv (hook);
3420 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3421 }
3422 else
3423 {
3424 coro_readyhook = 0;
3425 CORO_READYHOOK = 0;
3426 }
3341 3427
3342int 3428int
3343prio (Coro::State coro, int newprio = 0) 3429prio (Coro::State coro, int newprio = 0)
3344 PROTOTYPE: $;$ 3430 PROTOTYPE: $;$
3345 ALIAS: 3431 ALIAS:
… …
3351 if (items > 1) 3437 if (items > 1)
3352 { 3438 {
3353 if (ix) 3439 if (ix)
3354 newprio = coro->prio - newprio; 3440 newprio = coro->prio - newprio;
3355 3441
3356 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3442 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3357 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3443 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3358 3444
3359 coro->prio = newprio; 3445 coro->prio = newprio;
3360 } 3446 }
3361} 3447}
3362 OUTPUT: 3448 OUTPUT:
… …
3409 for (i = 1; i < items; ++i) 3495 for (i = 1; i < items; ++i)
3410 av_push (av, SvREFCNT_inc_NN (ST (i))); 3496 av_push (av, SvREFCNT_inc_NN (ST (i)));
3411 3497
3412 if ((SV *)hv == &PL_sv_undef) 3498 if ((SV *)hv == &PL_sv_undef)
3413 { 3499 {
3414 PUSHMARK (SP); 3500 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3415 EXTEND (SP, 2);
3416 PUSHs (sv_Coro);
3417 PUSHs ((SV *)cv_pool_handler);
3418 PUTBACK;
3419 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3420 SPAGAIN;
3421
3422 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3501 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3502 SvREFCNT_dec (sv);
3423 } 3503 }
3424 3504
3425 { 3505 {
3426 struct coro *coro = SvSTATE_hv (hv); 3506 struct coro *coro = SvSTATE_hv (hv);
3427 3507
… …
3461 CODE: 3541 CODE:
3462{ 3542{
3463 struct coro *coro = SvSTATE_current; 3543 struct coro *coro = SvSTATE_current;
3464 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3544 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3465 3545
3466 block = (SV *)coro_sv_2cv (aTHX_ block); 3546 block = s_get_cv_croak (block);
3467 3547
3468 if (!*avp) 3548 if (!*avp)
3469 *avp = newAV (); 3549 *avp = newAV ();
3470 3550
3471 av_push (*avp, SvREFCNT_inc (block)); 3551 av_push (*avp, SvREFCNT_inc (block));
… …
3671 3751
3672void 3752void
3673_register (char *target, char *proto, SV *req) 3753_register (char *target, char *proto, SV *req)
3674 CODE: 3754 CODE:
3675{ 3755{
3676 CV *req_cv = coro_sv_2cv (aTHX_ req); 3756 SV *req_cv = s_get_cv_croak (req);
3677 /* newXSproto doesn't return the CV on 5.8 */ 3757 /* newXSproto doesn't return the CV on 5.8 */
3678 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3758 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3679 sv_setpv ((SV *)slf_cv, proto); 3759 sv_setpv ((SV *)slf_cv, proto);
3680 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3760 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3681} 3761}
3682 3762
3763MODULE = Coro::State PACKAGE = Coro::Select
3764
3765void
3766patch_pp_sselect ()
3767 CODE:
3768 if (!coro_old_pp_sselect)
3769 {
3770 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3771 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3772 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3773 }
3774
3775void
3776unpatch_pp_sselect ()
3777 CODE:
3778 if (coro_old_pp_sselect)
3779 {
3780 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3781 coro_old_pp_sselect = 0;
3782 }
3783
3784

Diff Legend

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