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.359 by root, Mon Jun 29 05:07:19 2009 UTC vs.
Revision 1.372 by root, Thu Oct 1 23:50: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
… …
170# define CORO_CLOCK_THREAD_CPUTIME_ID 3 111# define CORO_CLOCK_THREAD_CPUTIME_ID 3
171# endif 112# endif
172#endif 113#endif
173 114
174static 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]);
175 117
176/* we hijack an hopefully unused CV flag for our purposes */ 118/* we hijack an hopefully unused CV flag for our purposes */
177#define CVf_SLF 0x4000 119#define CVf_SLF 0x4000
178static OP *pp_slf (pTHX); 120static OP *pp_slf (pTHX);
179 121
… …
200static SV *sv_pool_size; 142static SV *sv_pool_size;
201static SV *sv_async_pool_idle; /* description string */ 143static SV *sv_async_pool_idle; /* description string */
202static AV *av_async_pool; /* idle pool */ 144static AV *av_async_pool; /* idle pool */
203static SV *sv_Coro; /* class string */ 145static SV *sv_Coro; /* class string */
204static CV *cv_pool_handler; 146static CV *cv_pool_handler;
205static CV *cv_coro_state_new;
206 147
207/* Coro::AnyEvent */ 148/* Coro::AnyEvent */
208static SV *sv_activity; 149static SV *sv_activity;
209 150
210/* enable processtime/realtime profiling */ 151/* enable processtime/realtime profiling */
211static char profile_times; 152static char enable_times;
212typedef U32 coro_ts[2]; 153typedef U32 coro_ts[2];
154static coro_ts time_real, time_cpu;
155static char times_valid;
213 156
214static struct coro_cctx *cctx_first; 157static struct coro_cctx *cctx_first;
215static int cctx_count, cctx_idle; 158static int cctx_count, cctx_idle;
216 159
217enum { 160enum {
… …
307 250
308 /* on_enter/on_leave */ 251 /* on_enter/on_leave */
309 AV *on_enter; 252 AV *on_enter;
310 AV *on_leave; 253 AV *on_leave;
311 254
255 /* times */
256 coro_ts t_cpu, t_real;
257
312 /* linked list */ 258 /* linked list */
313 struct coro *next, *prev; 259 struct coro *next, *prev;
314}; 260};
315 261
316typedef struct coro *Coro__State; 262typedef struct coro *Coro__State;
… …
336static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 282static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
337static CV *cv_coro_run, *cv_coro_terminate; 283static CV *cv_coro_run, *cv_coro_terminate;
338static struct coro *coro_first; 284static struct coro *coro_first;
339#define coro_nready coroapi.nready 285#define coro_nready coroapi.nready
340 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}
306
341/** lowlevel stuff **********************************************************/ 307/** lowlevel stuff **********************************************************/
342 308
343static SV * 309static SV *
344coro_get_sv (pTHX_ const char *name, int create) 310coro_get_sv (pTHX_ const char *name, int create)
345{ 311{
… …
368 get_hv (name, create); 334 get_hv (name, create);
369#endif 335#endif
370 return get_hv (name, create); 336 return get_hv (name, create);
371} 337}
372 338
373/* may croak */ 339INLINE void
374INLINE CV * 340coro_times_update ()
375coro_sv_2cv (pTHX_ SV *sv)
376{ 341{
377 HV *st; 342#ifdef coro_clock_gettime
378 GV *gvp; 343 struct timespec ts;
379 CV *cv = sv_2cv (sv, &st, &gvp, 0);
380 344
381 if (!cv) 345 ts.tv_sec = ts.tv_nsec = 0;
382 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;
383 348
384 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];
385} 384}
386 385
387/*****************************************************************************/ 386/*****************************************************************************/
388/* magic glue */ 387/* magic glue */
389 388
… …
492 AV *padlist; 491 AV *padlist;
493 AV *av = (AV *)mg->mg_obj; 492 AV *av = (AV *)mg->mg_obj;
494 493
495 /* perl manages to free our internal AV and _then_ call us */ 494 /* perl manages to free our internal AV and _then_ call us */
496 if (IN_DESTRUCT) 495 if (IN_DESTRUCT)
497 return; 496 return 0;
498 497
499 /* casting is fun. */ 498 /* casting is fun. */
500 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 499 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
501 free_padlist (aTHX_ padlist); 500 free_padlist (aTHX_ padlist);
502 501
… …
591 } 590 }
592 591
593 slf_frame = c->slf_frame; 592 slf_frame = c->slf_frame;
594 CORO_THROW = c->except; 593 CORO_THROW = c->except;
595 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
596 if (expect_false (c->on_enter)) 603 if (expect_false (c->on_enter))
597 { 604 {
598 int i; 605 int i;
599 606
600 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 607 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
… …
609 { 616 {
610 int i; 617 int i;
611 618
612 for (i = AvFILLp (c->on_leave); i >= 0; --i) 619 for (i = AvFILLp (c->on_leave); i >= 0; --i)
613 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);
614 } 629 }
615 630
616 c->except = CORO_THROW; 631 c->except = CORO_THROW;
617 c->slf_frame = slf_frame; 632 c->slf_frame = slf_frame;
618 633
… …
667 /* we manually unroll here, as usually 2 slots is enough */ 682 /* we manually unroll here, as usually 2 slots is enough */
668 if (SLOT_COUNT >= 1) CXINC; 683 if (SLOT_COUNT >= 1) CXINC;
669 if (SLOT_COUNT >= 2) CXINC; 684 if (SLOT_COUNT >= 2) CXINC;
670 if (SLOT_COUNT >= 3) CXINC; 685 if (SLOT_COUNT >= 3) CXINC;
671 { 686 {
672 int i; 687 unsigned int i;
673 for (i = 3; i < SLOT_COUNT; ++i) 688 for (i = 3; i < SLOT_COUNT; ++i)
674 CXINC; 689 CXINC;
675 } 690 }
676 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 691 cxstack_ix -= SLOT_COUNT; /* undo allocation */
677 692
… …
982 997
983 PL_op = (OP *)&coro_setup_op; 998 PL_op = (OP *)&coro_setup_op;
984 999
985 /* copy throw, in case it was set before coro_setup */ 1000 /* copy throw, in case it was set before coro_setup */
986 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 }
987} 1008}
988 1009
989static void 1010static void
990coro_unwind_stacks (pTHX) 1011coro_unwind_stacks (pTHX)
991{ 1012{
… …
1037 1058
1038 load_perl (aTHX_ current); 1059 load_perl (aTHX_ current);
1039 } 1060 }
1040 1061
1041 { 1062 {
1042 int i; 1063 unsigned int i;
1043 1064
1044 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1065 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1045 SvREFCNT_dec (svf [i]); 1066 SvREFCNT_dec (svf [i]);
1046 1067
1047 SvREFCNT_dec (coro->saved_deffh); 1068 SvREFCNT_dec (coro->saved_deffh);
… …
1253 /* 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 */
1254 PL_restartop = PL_op; 1275 PL_restartop = PL_op;
1255 perl_run (PL_curinterp); 1276 perl_run (PL_curinterp);
1256 /* 1277 /*
1257 * 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
1258 * 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.
1259 */ 1281 */
1260 1282
1261 /* 1283 /*
1262 * 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
1263 * 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)
… …
1612 1634
1613 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1635 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1614 TRANSFER (ta, 1); 1636 TRANSFER (ta, 1);
1615} 1637}
1616 1638
1617/*****************************************************************************/
1618/* gensub: simple closure generation utility */
1619
1620#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1621
1622/* create a closure from XS, returns a code reference */
1623/* the arg can be accessed via GENSUB_ARG from the callback */
1624/* the callback must use dXSARGS/XSRETURN */
1625static SV *
1626gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1627{
1628 CV *cv = (CV *)newSV (0);
1629
1630 sv_upgrade ((SV *)cv, SVt_PVCV);
1631
1632 CvANON_on (cv);
1633 CvISXSUB_on (cv);
1634 CvXSUB (cv) = xsub;
1635 GENSUB_ARG = arg;
1636
1637 return newRV_noinc ((SV *)cv);
1638}
1639
1640/** Coro ********************************************************************/ 1639/** Coro ********************************************************************/
1641 1640
1642INLINE void 1641INLINE void
1643coro_enq (pTHX_ struct coro *coro) 1642coro_enq (pTHX_ struct coro *coro)
1644{ 1643{
… …
1669 } 1668 }
1670 1669
1671 return 0; 1670 return 0;
1672} 1671}
1673 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
1674static int 1690static int
1675api_ready (pTHX_ SV *coro_sv) 1691api_ready (pTHX_ SV *coro_sv)
1676{ 1692{
1677 struct coro *coro;
1678 SV *sv_hook;
1679 void (*xs_hook)(void);
1680
1681 coro = SvSTATE (coro_sv); 1693 struct coro *coro = SvSTATE (coro_sv);
1682 1694
1683 if (coro->flags & CF_READY) 1695 if (coro->flags & CF_READY)
1684 return 0; 1696 return 0;
1685 1697
1686 coro->flags |= CF_READY; 1698 coro->flags |= CF_READY;
1687 1699
1688 sv_hook = coro_nready ? 0 : coro_readyhook;
1689 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1690
1691 coro_enq (aTHX_ coro); 1700 coro_enq (aTHX_ coro);
1692 ++coro_nready;
1693 1701
1694 if (sv_hook) 1702 if (!coro_nready++)
1695 { 1703 if (coroapi.readyhook)
1696 dSP; 1704 coroapi.readyhook ();
1697
1698 ENTER;
1699 SAVETMPS;
1700
1701 PUSHMARK (SP);
1702 PUTBACK;
1703 call_sv (sv_hook, G_VOID | G_DISCARD);
1704
1705 FREETMPS;
1706 LEAVE;
1707 }
1708
1709 if (xs_hook)
1710 xs_hook ();
1711 1705
1712 return 1; 1706 return 1;
1713} 1707}
1714 1708
1715static int 1709static int
… …
1766 api_ready (aTHX_ SvRV (sv_idle)); 1760 api_ready (aTHX_ SvRV (sv_idle));
1767 --coro_nready; 1761 --coro_nready;
1768 } 1762 }
1769 else 1763 else
1770 { 1764 {
1765 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1771 dSP; 1766 dSP;
1772 1767
1773 ENTER; 1768 ENTER;
1774 SAVETMPS; 1769 SAVETMPS;
1775 1770
… …
1921{ 1916{
1922 int i; 1917 int i;
1923 HV *hv = (HV *)SvRV (coro_current); 1918 HV *hv = (HV *)SvRV (coro_current);
1924 AV *av = newAV (); 1919 AV *av = newAV ();
1925 1920
1921 /* items are actually not so common, so optimise for this case */
1922 if (items)
1923 {
1926 av_extend (av, items - 1); 1924 av_extend (av, items - 1);
1925
1927 for (i = 0; i < items; ++i) 1926 for (i = 0; i < items; ++i)
1928 av_push (av, SvREFCNT_inc_NN (arg [i])); 1927 av_push (av, SvREFCNT_inc_NN (arg [i]));
1928 }
1929 1929
1930 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);
1931 1931
1932 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 */
1933 api_ready (aTHX_ sv_manager); 1933 api_ready (aTHX_ sv_manager);
… …
2023 2023
2024static void 2024static void
2025coro_rouse_callback (pTHX_ CV *cv) 2025coro_rouse_callback (pTHX_ CV *cv)
2026{ 2026{
2027 dXSARGS; 2027 dXSARGS;
2028 SV *data = (SV *)GENSUB_ARG; 2028 SV *data = (SV *)S_GENSUB_ARG;
2029 2029
2030 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2030 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2031 { 2031 {
2032 /* first call, set args */ 2032 /* first call, set args */
2033 SV *coro = SvRV (data); 2033 SV *coro = SvRV (data);
… …
2099 || SvTYPE (SvRV (cb)) != SVt_PVCV 2099 || SvTYPE (SvRV (cb)) != SVt_PVCV
2100 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2100 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2101 croak ("Coro::rouse_wait called with illegal callback argument,"); 2101 croak ("Coro::rouse_wait called with illegal callback argument,");
2102 2102
2103 { 2103 {
2104 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2104 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2105 SV *data = (SV *)GENSUB_ARG; 2105 SV *data = (SV *)S_GENSUB_ARG;
2106 2106
2107 frame->data = (void *)data; 2107 frame->data = (void *)data;
2108 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2108 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2109 frame->check = slf_check_rouse_wait; 2109 frame->check = slf_check_rouse_wait;
2110 } 2110 }
… …
2114coro_new_rouse_cb (pTHX) 2114coro_new_rouse_cb (pTHX)
2115{ 2115{
2116 HV *hv = (HV *)SvRV (coro_current); 2116 HV *hv = (HV *)SvRV (coro_current);
2117 struct coro *coro = SvSTATE_hv (hv); 2117 struct coro *coro = SvSTATE_hv (hv);
2118 SV *data = newRV_inc ((SV *)hv); 2118 SV *data = newRV_inc ((SV *)hv);
2119 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2119 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2120 2120
2121 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);
2122 SvREFCNT_dec (data); /* magicext increases the refcount */ 2122 SvREFCNT_dec (data); /* magicext increases the refcount */
2123 2123
2124 SvREFCNT_dec (coro->rouse_cb); 2124 SvREFCNT_dec (coro->rouse_cb);
… …
2331 if (PL_op->op_ppaddr != PL_ppaddr [OP_ENTERSUB] 2331 if (PL_op->op_ppaddr != PL_ppaddr [OP_ENTERSUB]
2332 && PL_op->op_ppaddr != pp_slf) 2332 && PL_op->op_ppaddr != pp_slf)
2333 croak ("FATAL: Coro SLF calls can only be made normally, not via goto or any other means, caught"); 2333 croak ("FATAL: Coro SLF calls can only be made normally, not via goto or any other means, caught");
2334 2334
2335 CvFLAGS (cv) |= CVf_SLF; 2335 CvFLAGS (cv) |= CVf_SLF;
2336 CvNODEBUG_on (cv);
2336 CvXSUBANY (cv).any_ptr = (void *)init_cb; 2337 CvXSUBANY (cv).any_ptr = (void *)init_cb;
2337 slf_cv = cv; 2338 slf_cv = cv;
2338 2339
2339 /* we patch the op, and then re-run the whole call */ 2340 /* we patch the op, and then re-run the whole call */
2340 /* we have to put the same argument on the stack for this to work */ 2341 /* we have to put the same argument on the stack for this to work */
… …
2647{ 2648{
2648 if (items >= 2) 2649 if (items >= 2)
2649 { 2650 {
2650 /* callback form */ 2651 /* callback form */
2651 AV *av = (AV *)SvRV (arg [0]); 2652 AV *av = (AV *)SvRV (arg [0]);
2652 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2653 SV *cb_cv = s_get_cv_croak (arg [1]);
2653 2654
2654 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2655 av_push (av, SvREFCNT_inc_NN (cb_cv));
2655 2656
2656 if (SvIVX (AvARRAY (av)[0]) > 0) 2657 if (SvIVX (AvARRAY (av)[0]) > 0)
2657 coro_semaphore_adjust (aTHX_ av, 0); 2658 coro_semaphore_adjust (aTHX_ av, 0);
… …
2717{ 2718{
2718 AV *av = (AV *)SvRV (arg [0]); 2719 AV *av = (AV *)SvRV (arg [0]);
2719 2720
2720 if (items >= 2) 2721 if (items >= 2)
2721 { 2722 {
2722 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2723 SV *cb_cv = s_get_cv_croak (arg [1]);
2723 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2724 av_push (av, SvREFCNT_inc_NN (cb_cv));
2724 2725
2725 if (SvIVX (AvARRAY (av)[0])) 2726 if (SvIVX (AvARRAY (av)[0]))
2726 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 2727 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2727 2728
… …
2762 2763
2763static void 2764static void
2764coro_aio_callback (pTHX_ CV *cv) 2765coro_aio_callback (pTHX_ CV *cv)
2765{ 2766{
2766 dXSARGS; 2767 dXSARGS;
2767 AV *state = (AV *)GENSUB_ARG; 2768 AV *state = (AV *)S_GENSUB_ARG;
2768 SV *coro = av_pop (state); 2769 SV *coro = av_pop (state);
2769 SV *data_sv = newSV (sizeof (struct io_state)); 2770 SV *data_sv = newSV (sizeof (struct io_state));
2770 2771
2771 av_extend (state, items - 1); 2772 av_extend (state, items - 1);
2772 2773
… …
2886 2887
2887 for (i = 0; i < items; ++i) 2888 for (i = 0; i < items; ++i)
2888 PUSHs (arg [i]); 2889 PUSHs (arg [i]);
2889 2890
2890 /* now push the callback closure */ 2891 /* now push the callback closure */
2891 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2892 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2892 2893
2893 /* now call the AIO function - we assume our request is uncancelable */ 2894 /* now call the AIO function - we assume our request is uncancelable */
2894 PUTBACK; 2895 PUTBACK;
2895 call_sv ((SV *)req, G_VOID | G_DISCARD); 2896 call_sv ((SV *)req, G_VOID | G_DISCARD);
2896 } 2897 }
… …
2914/*****************************************************************************/ 2915/*****************************************************************************/
2915 2916
2916#if CORO_CLONE 2917#if CORO_CLONE
2917# include "clone.c" 2918# include "clone.c"
2918#endif 2919#endif
2920
2921/*****************************************************************************/
2922
2923static SV *
2924coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2925{
2926 SV *coro_sv;
2927 struct coro *coro;
2928 MAGIC *mg;
2929 HV *hv;
2930 SV *cb;
2931 int i;
2932
2933 if (argc > 0)
2934 {
2935 cb = s_get_cv_croak (argv [0]);
2936
2937 if (!is_coro)
2938 {
2939 if (CvISXSUB (cb))
2940 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2941
2942 if (!CvROOT (cb))
2943 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2944 }
2945 }
2946
2947 Newz (0, coro, 1, struct coro);
2948 coro->args = newAV ();
2949 coro->flags = CF_NEW;
2950
2951 if (coro_first) coro_first->prev = coro;
2952 coro->next = coro_first;
2953 coro_first = coro;
2954
2955 coro->hv = hv = newHV ();
2956 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2957 mg->mg_flags |= MGf_DUP;
2958 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
2959
2960 if (argc > 0)
2961 {
2962 av_extend (coro->args, argc + is_coro - 1);
2963
2964 if (is_coro)
2965 {
2966 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2967 cb = (SV *)cv_coro_run;
2968 }
2969
2970 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2971
2972 for (i = 1; i < argc; i++)
2973 av_push (coro->args, newSVsv (argv [i]));
2974 }
2975
2976 return coro_sv;
2977}
2919 2978
2920MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2979MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2921 2980
2922PROTOTYPES: DISABLE 2981PROTOTYPES: DISABLE
2923 2982
… …
2983 3042
2984 if (!svp) croak ("Time::HiRes is required"); 3043 if (!svp) croak ("Time::HiRes is required");
2985 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3044 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2986 3045
2987 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3046 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3047
3048 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3049 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2988 } 3050 }
2989 3051
2990 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3052 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2991} 3053}
2992 3054
2993SV * 3055SV *
2994new (char *klass, ...) 3056new (SV *klass, ...)
2995 ALIAS: 3057 ALIAS:
2996 Coro::new = 1 3058 Coro::new = 1
2997 CODE: 3059 CODE:
2998{ 3060 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2999 struct coro *coro; 3061 OUTPUT:
3000 MAGIC *mg;
3001 HV *hv;
3002 CV *cb;
3003 int i;
3004
3005 if (items > 1)
3006 {
3007 cb = coro_sv_2cv (aTHX_ ST (1));
3008
3009 if (!ix)
3010 {
3011 if (CvISXSUB (cb))
3012 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3013
3014 if (!CvROOT (cb))
3015 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3016 }
3017 }
3018
3019 Newz (0, coro, 1, struct coro);
3020 coro->args = newAV ();
3021 coro->flags = CF_NEW;
3022
3023 if (coro_first) coro_first->prev = coro;
3024 coro->next = coro_first;
3025 coro_first = coro;
3026
3027 coro->hv = hv = newHV ();
3028 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3029 mg->mg_flags |= MGf_DUP;
3030 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3031
3032 if (items > 1)
3033 {
3034 av_extend (coro->args, items - 1 + ix - 1);
3035
3036 if (ix)
3037 {
3038 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3039 cb = cv_coro_run;
3040 }
3041
3042 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3043
3044 for (i = 2; i < items; i++)
3045 av_push (coro->args, newSVsv (ST (i)));
3046 }
3047}
3048 OUTPUT:
3049 RETVAL 3062 RETVAL
3050 3063
3051void 3064void
3052transfer (...) 3065transfer (...)
3053 PROTOTYPE: $$ 3066 PROTOTYPE: $$
… …
3266 CODE: 3279 CODE:
3267 coro_state_destroy (aTHX_ self); 3280 coro_state_destroy (aTHX_ self);
3268 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3281 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3269 3282
3270 3283
3284SV *
3285enable_times (int enabled = enable_times)
3286 CODE:
3287{
3288 RETVAL = boolSV (enable_times);
3289
3290 if (enabled != enable_times)
3291 {
3292 enable_times = enabled;
3293
3294 coro_times_update ();
3295 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3296 }
3297}
3298 OUTPUT:
3299 RETVAL
3300
3301void
3302times (Coro::State self)
3303 PPCODE:
3304{
3305 struct coro *current = SvSTATE (coro_current);
3306
3307 if (expect_false (current == self))
3308 {
3309 coro_times_update ();
3310 coro_times_add (SvSTATE (coro_current));
3311 }
3312
3313 EXTEND (SP, 2);
3314 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3315 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3316
3317 if (expect_false (current == self))
3318 coro_times_sub (SvSTATE (coro_current));
3319}
3320
3271MODULE = Coro::State PACKAGE = Coro 3321MODULE = Coro::State PACKAGE = Coro
3272 3322
3273BOOT: 3323BOOT:
3274{ 3324{
3275 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3325 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
… …
3283 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3333 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3284 3334
3285 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3335 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3286 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3336 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3287 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3337 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3288 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3338 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3289 3339
3290 coro_stash = gv_stashpv ("Coro", TRUE); 3340 coro_stash = gv_stashpv ("Coro", TRUE);
3291 3341
3292 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3342 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3293 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3343 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3294 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3344 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3312 sv_setiv (sv, (IV)&coroapi); 3362 sv_setiv (sv, (IV)&coroapi);
3313 SvREADONLY_on (sv); 3363 SvREADONLY_on (sv);
3314 } 3364 }
3315} 3365}
3316 3366
3367SV *
3368async (...)
3369 PROTOTYPE: &@
3370 CODE:
3371 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3372 api_ready (aTHX_ RETVAL);
3373 OUTPUT:
3374 RETVAL
3375
3317void 3376void
3318terminate (...) 3377terminate (...)
3319 CODE: 3378 CODE:
3320 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3379 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3321 3380
… …
3355_set_readyhook (SV *hook) 3414_set_readyhook (SV *hook)
3356 PROTOTYPE: $ 3415 PROTOTYPE: $
3357 CODE: 3416 CODE:
3358 SvREFCNT_dec (coro_readyhook); 3417 SvREFCNT_dec (coro_readyhook);
3359 SvGETMAGIC (hook); 3418 SvGETMAGIC (hook);
3419 if (SvOK (hook))
3420 {
3360 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3421 coro_readyhook = newSVsv (hook);
3422 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3423 }
3424 else
3425 {
3426 coro_readyhook = 0;
3427 CORO_READYHOOK = 0;
3428 }
3361 3429
3362int 3430int
3363prio (Coro::State coro, int newprio = 0) 3431prio (Coro::State coro, int newprio = 0)
3364 PROTOTYPE: $;$ 3432 PROTOTYPE: $;$
3365 ALIAS: 3433 ALIAS:
… …
3429 for (i = 1; i < items; ++i) 3497 for (i = 1; i < items; ++i)
3430 av_push (av, SvREFCNT_inc_NN (ST (i))); 3498 av_push (av, SvREFCNT_inc_NN (ST (i)));
3431 3499
3432 if ((SV *)hv == &PL_sv_undef) 3500 if ((SV *)hv == &PL_sv_undef)
3433 { 3501 {
3434 PUSHMARK (SP); 3502 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3435 EXTEND (SP, 2);
3436 PUSHs (sv_Coro);
3437 PUSHs ((SV *)cv_pool_handler);
3438 PUTBACK;
3439 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3440 SPAGAIN;
3441
3442 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3503 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3504 SvREFCNT_dec (sv);
3443 } 3505 }
3444 3506
3445 { 3507 {
3446 struct coro *coro = SvSTATE_hv (hv); 3508 struct coro *coro = SvSTATE_hv (hv);
3447 3509
… …
3481 CODE: 3543 CODE:
3482{ 3544{
3483 struct coro *coro = SvSTATE_current; 3545 struct coro *coro = SvSTATE_current;
3484 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3546 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3485 3547
3486 block = (SV *)coro_sv_2cv (aTHX_ block); 3548 block = s_get_cv_croak (block);
3487 3549
3488 if (!*avp) 3550 if (!*avp)
3489 *avp = newAV (); 3551 *avp = newAV ();
3490 3552
3491 av_push (*avp, SvREFCNT_inc (block)); 3553 av_push (*avp, SvREFCNT_inc (block));
… …
3691 3753
3692void 3754void
3693_register (char *target, char *proto, SV *req) 3755_register (char *target, char *proto, SV *req)
3694 CODE: 3756 CODE:
3695{ 3757{
3696 CV *req_cv = coro_sv_2cv (aTHX_ req); 3758 SV *req_cv = s_get_cv_croak (req);
3697 /* newXSproto doesn't return the CV on 5.8 */ 3759 /* newXSproto doesn't return the CV on 5.8 */
3698 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3760 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3699 sv_setpv ((SV *)slf_cv, proto); 3761 sv_setpv ((SV *)slf_cv, proto);
3700 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3762 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3701} 3763}
3702 3764
3765MODULE = Coro::State PACKAGE = Coro::Select
3766
3767void
3768patch_pp_sselect ()
3769 CODE:
3770 if (!coro_old_pp_sselect)
3771 {
3772 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3773 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3774 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3775 }
3776
3777void
3778unpatch_pp_sselect ()
3779 CODE:
3780 if (coro_old_pp_sselect)
3781 {
3782 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3783 coro_old_pp_sselect = 0;
3784 }
3785
3786

Diff Legend

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