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.357 by root, Sat Jun 27 14:09:28 2009 UTC vs.
Revision 1.368 by root, Thu Aug 13 02:35:41 2009 UTC

… …
6#include "EXTERN.h" 6#include "EXTERN.h"
7#include "perl.h" 7#include "perl.h"
8#include "XSUB.h" 8#include "XSUB.h"
9#include "perliol.h" 9#include "perliol.h"
10 10
11#include "patchlevel.h" 11#include "schmorp.h"
12 12
13#include <stdio.h> 13#include <stdio.h>
14#include <errno.h> 14#include <errno.h>
15#include <assert.h> 15#include <assert.h>
16 16
… …
51#endif 51#endif
52 52
53/* the maximum number of idle cctx that will be pooled */ 53/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 54static int cctx_max_idle = 4;
55 55
56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif
114
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 56#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 57# undef CORO_STACKGUARD
117#endif 58#endif
118 59
119#ifndef CORO_STACKGUARD 60#ifndef CORO_STACKGUARD
… …
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
… …
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{
… …
1019 1059
1020 load_perl (aTHX_ current); 1060 load_perl (aTHX_ current);
1021 } 1061 }
1022 1062
1023 { 1063 {
1024 int i; 1064 unsigned int i;
1025 1065
1026 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1066 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1027 SvREFCNT_dec (svf [i]); 1067 SvREFCNT_dec (svf [i]);
1028 1068
1029 SvREFCNT_dec (coro->saved_deffh); 1069 SvREFCNT_dec (coro->saved_deffh);
… …
1235 /* somebody or something will hit me for both perl_run and PL_restartop */ 1275 /* somebody or something will hit me for both perl_run and PL_restartop */
1236 PL_restartop = PL_op; 1276 PL_restartop = PL_op;
1237 perl_run (PL_curinterp); 1277 perl_run (PL_curinterp);
1238 /* 1278 /*
1239 * Unfortunately, there is no way to get at the return values of the 1279 * Unfortunately, there is no way to get at the return values of the
1240 * coro body here, as perl_run destroys these 1280 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1281 * runtime errors here, as this is just a random interpreter, not a thread.
1241 */ 1282 */
1242 1283
1243 /* 1284 /*
1244 * If perl-run returns we assume exit() was being called or the coro 1285 * If perl-run returns we assume exit() was being called or the coro
1245 * fell off the end, which seems to be the only valid (non-bug) 1286 * fell off the end, which seems to be the only valid (non-bug)
… …
1594 1635
1595 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1636 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1596 TRANSFER (ta, 1); 1637 TRANSFER (ta, 1);
1597} 1638}
1598 1639
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 ********************************************************************/ 1640/** Coro ********************************************************************/
1623 1641
1624INLINE void 1642INLINE void
1625coro_enq (pTHX_ struct coro *coro) 1643coro_enq (pTHX_ struct coro *coro)
1626{ 1644{
1627 struct coro **ready = coro_ready [coro->prio - PRIO_MIN]; 1645 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1628 1646
1629 SvREFCNT_inc_NN (coro->hv); 1647 SvREFCNT_inc_NN (coro->hv);
1630 1648
1631 coro->next_ready = 0; 1649 coro->next_ready = 0;
1632 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1650 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
… …
1636INLINE struct coro * 1654INLINE struct coro *
1637coro_deq (pTHX) 1655coro_deq (pTHX)
1638{ 1656{
1639 int prio; 1657 int prio;
1640 1658
1641 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1659 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1642 { 1660 {
1643 struct coro **ready = coro_ready [prio]; 1661 struct coro **ready = coro_ready [prio];
1644 1662
1645 if (ready [0]) 1663 if (ready [0])
1646 { 1664 {
… …
1651 } 1669 }
1652 1670
1653 return 0; 1671 return 0;
1654} 1672}
1655 1673
1674static void
1675invoke_sv_ready_hook_helper (void)
1676{
1677 dTHX;
1678 dSP;
1679
1680 ENTER;
1681 SAVETMPS;
1682
1683 PUSHMARK (SP);
1684 PUTBACK;
1685 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1686
1687 FREETMPS;
1688 LEAVE;
1689}
1690
1656static int 1691static int
1657api_ready (pTHX_ SV *coro_sv) 1692api_ready (pTHX_ SV *coro_sv)
1658{ 1693{
1659 struct coro *coro;
1660 SV *sv_hook;
1661 void (*xs_hook)(void);
1662
1663 coro = SvSTATE (coro_sv); 1694 struct coro *coro = SvSTATE (coro_sv);
1664 1695
1665 if (coro->flags & CF_READY) 1696 if (coro->flags & CF_READY)
1666 return 0; 1697 return 0;
1667 1698
1668 coro->flags |= CF_READY; 1699 coro->flags |= CF_READY;
1669 1700
1670 sv_hook = coro_nready ? 0 : coro_readyhook;
1671 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1672
1673 coro_enq (aTHX_ coro); 1701 coro_enq (aTHX_ coro);
1674 ++coro_nready;
1675 1702
1676 if (sv_hook) 1703 if (!coro_nready++)
1677 { 1704 if (coroapi.readyhook)
1678 dSP; 1705 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 1706
1694 return 1; 1707 return 1;
1695} 1708}
1696 1709
1697static int 1710static int
… …
1903{ 1916{
1904 int i; 1917 int i;
1905 HV *hv = (HV *)SvRV (coro_current); 1918 HV *hv = (HV *)SvRV (coro_current);
1906 AV *av = newAV (); 1919 AV *av = newAV ();
1907 1920
1921 /* items are actually not so common, so optimise for this case */
1922 if (items)
1923 {
1908 av_extend (av, items - 1); 1924 av_extend (av, items - 1);
1925
1909 for (i = 0; i < items; ++i) 1926 for (i = 0; i < items; ++i)
1910 av_push (av, SvREFCNT_inc_NN (arg [i])); 1927 av_push (av, SvREFCNT_inc_NN (arg [i]));
1928 }
1911 1929
1912 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 1930 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1913 1931
1914 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 1932 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1915 api_ready (aTHX_ sv_manager); 1933 api_ready (aTHX_ sv_manager);
… …
2005 2023
2006static void 2024static void
2007coro_rouse_callback (pTHX_ CV *cv) 2025coro_rouse_callback (pTHX_ CV *cv)
2008{ 2026{
2009 dXSARGS; 2027 dXSARGS;
2010 SV *data = (SV *)GENSUB_ARG; 2028 SV *data = (SV *)S_GENSUB_ARG;
2011 2029
2012 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2030 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2013 { 2031 {
2014 /* first call, set args */ 2032 /* first call, set args */
2015 SV *coro = SvRV (data); 2033 SV *coro = SvRV (data);
… …
2081 || SvTYPE (SvRV (cb)) != SVt_PVCV 2099 || SvTYPE (SvRV (cb)) != SVt_PVCV
2082 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2100 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2083 croak ("Coro::rouse_wait called with illegal callback argument,"); 2101 croak ("Coro::rouse_wait called with illegal callback argument,");
2084 2102
2085 { 2103 {
2086 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2104 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2087 SV *data = (SV *)GENSUB_ARG; 2105 SV *data = (SV *)S_GENSUB_ARG;
2088 2106
2089 frame->data = (void *)data; 2107 frame->data = (void *)data;
2090 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2108 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2091 frame->check = slf_check_rouse_wait; 2109 frame->check = slf_check_rouse_wait;
2092 } 2110 }
… …
2096coro_new_rouse_cb (pTHX) 2114coro_new_rouse_cb (pTHX)
2097{ 2115{
2098 HV *hv = (HV *)SvRV (coro_current); 2116 HV *hv = (HV *)SvRV (coro_current);
2099 struct coro *coro = SvSTATE_hv (hv); 2117 struct coro *coro = SvSTATE_hv (hv);
2100 SV *data = newRV_inc ((SV *)hv); 2118 SV *data = newRV_inc ((SV *)hv);
2101 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2119 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2102 2120
2103 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2121 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2104 SvREFCNT_dec (data); /* magicext increases the refcount */ 2122 SvREFCNT_dec (data); /* magicext increases the refcount */
2105 2123
2106 SvREFCNT_dec (coro->rouse_cb); 2124 SvREFCNT_dec (coro->rouse_cb);
… …
2629{ 2647{
2630 if (items >= 2) 2648 if (items >= 2)
2631 { 2649 {
2632 /* callback form */ 2650 /* callback form */
2633 AV *av = (AV *)SvRV (arg [0]); 2651 AV *av = (AV *)SvRV (arg [0]);
2634 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2652 SV *cb_cv = s_get_cv_croak (arg [1]);
2635 2653
2636 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2654 av_push (av, SvREFCNT_inc_NN (cb_cv));
2637 2655
2638 if (SvIVX (AvARRAY (av)[0]) > 0) 2656 if (SvIVX (AvARRAY (av)[0]) > 0)
2639 coro_semaphore_adjust (aTHX_ av, 0); 2657 coro_semaphore_adjust (aTHX_ av, 0);
… …
2699{ 2717{
2700 AV *av = (AV *)SvRV (arg [0]); 2718 AV *av = (AV *)SvRV (arg [0]);
2701 2719
2702 if (items >= 2) 2720 if (items >= 2)
2703 { 2721 {
2704 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2722 SV *cb_cv = s_get_cv_croak (arg [1]);
2705 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2723 av_push (av, SvREFCNT_inc_NN (cb_cv));
2706 2724
2707 if (SvIVX (AvARRAY (av)[0])) 2725 if (SvIVX (AvARRAY (av)[0]))
2708 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 2726 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2709 2727
… …
2744 2762
2745static void 2763static void
2746coro_aio_callback (pTHX_ CV *cv) 2764coro_aio_callback (pTHX_ CV *cv)
2747{ 2765{
2748 dXSARGS; 2766 dXSARGS;
2749 AV *state = (AV *)GENSUB_ARG; 2767 AV *state = (AV *)S_GENSUB_ARG;
2750 SV *coro = av_pop (state); 2768 SV *coro = av_pop (state);
2751 SV *data_sv = newSV (sizeof (struct io_state)); 2769 SV *data_sv = newSV (sizeof (struct io_state));
2752 2770
2753 av_extend (state, items - 1); 2771 av_extend (state, items - 1);
2754 2772
… …
2868 2886
2869 for (i = 0; i < items; ++i) 2887 for (i = 0; i < items; ++i)
2870 PUSHs (arg [i]); 2888 PUSHs (arg [i]);
2871 2889
2872 /* now push the callback closure */ 2890 /* now push the callback closure */
2873 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2891 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2874 2892
2875 /* now call the AIO function - we assume our request is uncancelable */ 2893 /* now call the AIO function - we assume our request is uncancelable */
2876 PUTBACK; 2894 PUTBACK;
2877 call_sv ((SV *)req, G_VOID | G_DISCARD); 2895 call_sv ((SV *)req, G_VOID | G_DISCARD);
2878 } 2896 }
… …
2896/*****************************************************************************/ 2914/*****************************************************************************/
2897 2915
2898#if CORO_CLONE 2916#if CORO_CLONE
2899# include "clone.c" 2917# include "clone.c"
2900#endif 2918#endif
2919
2920/*****************************************************************************/
2921
2922static SV *
2923coro_new (HV *stash, SV **argv, int argc, int is_coro)
2924{
2925 SV *coro_sv;
2926 struct coro *coro;
2927 MAGIC *mg;
2928 HV *hv;
2929 SV *cb;
2930 int i;
2931
2932 if (argc > 0)
2933 {
2934 cb = s_get_cv_croak (argv [0]);
2935
2936 if (!is_coro)
2937 {
2938 if (CvISXSUB (cb))
2939 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2940
2941 if (!CvROOT (cb))
2942 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2943 }
2944 }
2945
2946 Newz (0, coro, 1, struct coro);
2947 coro->args = newAV ();
2948 coro->flags = CF_NEW;
2949
2950 if (coro_first) coro_first->prev = coro;
2951 coro->next = coro_first;
2952 coro_first = coro;
2953
2954 coro->hv = hv = newHV ();
2955 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2956 mg->mg_flags |= MGf_DUP;
2957 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
2958
2959 if (argc > 0)
2960 {
2961 av_extend (coro->args, argc + is_coro - 1);
2962
2963 if (is_coro)
2964 {
2965 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2966 cb = (SV *)cv_coro_run;
2967 }
2968
2969 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2970
2971 for (i = 1; i < argc; i++)
2972 av_push (coro->args, newSVsv (argv [i]));
2973 }
2974
2975 return coro_sv;
2976}
2901 2977
2902MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2978MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2903 2979
2904PROTOTYPES: DISABLE 2980PROTOTYPES: DISABLE
2905 2981
… …
2965 3041
2966 if (!svp) croak ("Time::HiRes is required"); 3042 if (!svp) croak ("Time::HiRes is required");
2967 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3043 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2968 3044
2969 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3045 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3046
3047 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3048 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2970 } 3049 }
2971 3050
2972 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3051 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2973} 3052}
2974 3053
2975SV * 3054SV *
2976new (char *klass, ...) 3055new (SV *klass, ...)
2977 ALIAS: 3056 ALIAS:
2978 Coro::new = 1 3057 Coro::new = 1
2979 CODE: 3058 CODE:
2980{ 3059 RETVAL = coro_new (ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2981 struct coro *coro; 3060 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 3061 RETVAL
3032 3062
3033void 3063void
3034transfer (...) 3064transfer (...)
3035 PROTOTYPE: $$ 3065 PROTOTYPE: $$
… …
3248 CODE: 3278 CODE:
3249 coro_state_destroy (aTHX_ self); 3279 coro_state_destroy (aTHX_ self);
3250 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3280 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3251 3281
3252 3282
3283SV *
3284enable_times (int enabled = enable_times)
3285 CODE:
3286{
3287 RETVAL = boolSV (enable_times);
3288
3289 if (enabled != enable_times)
3290 {
3291 enable_times = enabled;
3292
3293 coro_times_update ();
3294 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3295 }
3296}
3297 OUTPUT:
3298 RETVAL
3299
3300void
3301times (Coro::State self)
3302 PPCODE:
3303{
3304 struct coro *current = SvSTATE (coro_current);
3305
3306 if (expect_false (current == self))
3307 {
3308 coro_times_update ();
3309 coro_times_add (SvSTATE (coro_current));
3310 }
3311
3312 EXTEND (SP, 2);
3313 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3314 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3315
3316 if (expect_false (current == self))
3317 coro_times_sub (SvSTATE (coro_current));
3318}
3319
3253MODULE = Coro::State PACKAGE = Coro 3320MODULE = Coro::State PACKAGE = Coro
3254 3321
3255BOOT: 3322BOOT:
3256{ 3323{
3257 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3324 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
… …
3269 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3336 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3270 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3337 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
3271 3338
3272 coro_stash = gv_stashpv ("Coro", TRUE); 3339 coro_stash = gv_stashpv ("Coro", TRUE);
3273 3340
3274 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3341 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3275 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3342 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3276 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3343 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3277 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3344 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3278 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3345 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3279 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3346 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3280 3347
3281 { 3348 {
3282 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3349 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3283 3350
3284 coroapi.schedule = api_schedule; 3351 coroapi.schedule = api_schedule;
… …
3294 sv_setiv (sv, (IV)&coroapi); 3361 sv_setiv (sv, (IV)&coroapi);
3295 SvREADONLY_on (sv); 3362 SvREADONLY_on (sv);
3296 } 3363 }
3297} 3364}
3298 3365
3366SV *
3367async (...)
3368 PROTOTYPE: &@
3369 CODE:
3370 RETVAL = coro_new (coro_stash, &ST (0), items, 1);
3371 api_ready (RETVAL);
3372 OUTPUT:
3373 RETVAL
3374
3299void 3375void
3300terminate (...) 3376terminate (...)
3301 CODE: 3377 CODE:
3302 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3378 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3303 3379
… …
3337_set_readyhook (SV *hook) 3413_set_readyhook (SV *hook)
3338 PROTOTYPE: $ 3414 PROTOTYPE: $
3339 CODE: 3415 CODE:
3340 SvREFCNT_dec (coro_readyhook); 3416 SvREFCNT_dec (coro_readyhook);
3341 SvGETMAGIC (hook); 3417 SvGETMAGIC (hook);
3418 if (SvOK (hook))
3419 {
3342 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3420 coro_readyhook = newSVsv (hook);
3421 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3422 }
3423 else
3424 {
3425 coro_readyhook = 0;
3426 CORO_READYHOOK = 0;
3427 }
3343 3428
3344int 3429int
3345prio (Coro::State coro, int newprio = 0) 3430prio (Coro::State coro, int newprio = 0)
3346 PROTOTYPE: $;$ 3431 PROTOTYPE: $;$
3347 ALIAS: 3432 ALIAS:
… …
3353 if (items > 1) 3438 if (items > 1)
3354 { 3439 {
3355 if (ix) 3440 if (ix)
3356 newprio = coro->prio - newprio; 3441 newprio = coro->prio - newprio;
3357 3442
3358 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3443 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3359 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3444 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3360 3445
3361 coro->prio = newprio; 3446 coro->prio = newprio;
3362 } 3447 }
3363} 3448}
3364 OUTPUT: 3449 OUTPUT:
… …
3463 CODE: 3548 CODE:
3464{ 3549{
3465 struct coro *coro = SvSTATE_current; 3550 struct coro *coro = SvSTATE_current;
3466 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3551 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3467 3552
3468 block = (SV *)coro_sv_2cv (aTHX_ block); 3553 block = s_get_cv_croak (block);
3469 3554
3470 if (!*avp) 3555 if (!*avp)
3471 *avp = newAV (); 3556 *avp = newAV ();
3472 3557
3473 av_push (*avp, SvREFCNT_inc (block)); 3558 av_push (*avp, SvREFCNT_inc (block));
… …
3673 3758
3674void 3759void
3675_register (char *target, char *proto, SV *req) 3760_register (char *target, char *proto, SV *req)
3676 CODE: 3761 CODE:
3677{ 3762{
3678 CV *req_cv = coro_sv_2cv (aTHX_ req); 3763 SV *req_cv = s_get_cv_croak (req);
3679 /* newXSproto doesn't return the CV on 5.8 */ 3764 /* newXSproto doesn't return the CV on 5.8 */
3680 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3765 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3681 sv_setpv ((SV *)slf_cv, proto); 3766 sv_setpv ((SV *)slf_cv, proto);
3682 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3767 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3683} 3768}
3684 3769
3770MODULE = Coro::State PACKAGE = Coro::Select
3771
3772void
3773patch_pp_sselect ()
3774 CODE:
3775 if (!coro_old_pp_sselect)
3776 {
3777 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3778 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3779 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3780 }
3781
3782void
3783unpatch_pp_sselect ()
3784 CODE:
3785 if (coro_old_pp_sselect)
3786 {
3787 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3788 coro_old_pp_sselect = 0;
3789 }
3790
3791

Diff Legend

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