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.375 by root, Fri Oct 2 19:58:02 2009 UTC vs.
Revision 1.393 by root, Fri Apr 29 17:38:56 2011 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
1#define NDEBUG 1 4#define NDEBUG 1
2 5
3#include "libcoro/coro.c" 6#include "libcoro/coro.c"
4 7
5#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
… …
18 21
19#ifndef SVs_PADSTALE 22#ifndef SVs_PADSTALE
20# define SVs_PADSTALE 0 23# define SVs_PADSTALE 0
21#endif 24#endif
22 25
23#ifdef WIN32 26#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY
24# undef setjmp 28# undef setjmp
25# undef longjmp 29# undef longjmp
26# undef _exit 30# undef _exit
27# define setjmp _setjmp /* deep magic */ 31# define setjmp _setjmp /* deep magic */
28#else 32#else
… …
192 int valgrind_id; 196 int valgrind_id;
193#endif 197#endif
194 unsigned char flags; 198 unsigned char flags;
195} coro_cctx; 199} coro_cctx;
196 200
197coro_cctx *cctx_current; /* the currently running cctx */ 201static coro_cctx *cctx_current; /* the currently running cctx */
198 202
199/*****************************************************************************/ 203/*****************************************************************************/
200 204
201enum { 205enum {
202 CF_RUNNING = 0x0001, /* coroutine is running */ 206 CF_RUNNING = 0x0001, /* coroutine is running */
203 CF_READY = 0x0002, /* coroutine is ready */ 207 CF_READY = 0x0002, /* coroutine is ready */
204 CF_NEW = 0x0004, /* has never been switched to */ 208 CF_NEW = 0x0004, /* has never been switched to */
205 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
206 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
211 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
207}; 212};
208 213
209/* the structure where most of the perl state is stored, overlaid on the cxstack */ 214/* the structure where most of the perl state is stored, overlaid on the cxstack */
210typedef struct 215typedef struct
211{ 216{
… …
237 CV *startcv; /* the CV to execute */ 242 CV *startcv; /* the CV to execute */
238 AV *args; /* data associated with this coroutine (initial args) */ 243 AV *args; /* data associated with this coroutine (initial args) */
239 int refcnt; /* coroutines are refcounted, yes */ 244 int refcnt; /* coroutines are refcounted, yes */
240 int flags; /* CF_ flags */ 245 int flags; /* CF_ flags */
241 HV *hv; /* the perl hash associated with this coro, if any */ 246 HV *hv; /* the perl hash associated with this coro, if any */
242 void (*on_destroy)(pTHX_ struct coro *coro); 247 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
243 248
244 /* statistics */ 249 /* statistics */
245 int usecount; /* number of transfers to this coro */ 250 int usecount; /* number of transfers to this coro */
246 251
247 /* coro process data */ 252 /* coro process data */
… …
271typedef struct coro *Coro__State; 276typedef struct coro *Coro__State;
272typedef struct coro *Coro__State_or_hashref; 277typedef struct coro *Coro__State_or_hashref;
273 278
274/* the following variables are effectively part of the perl context */ 279/* the following variables are effectively part of the perl context */
275/* and get copied between struct coro and these variables */ 280/* and get copied between struct coro and these variables */
276/* the mainr easonw e don't support windows process emulation */ 281/* the main reason we don't support windows process emulation */
277static struct CoroSLF slf_frame; /* the current slf frame */ 282static struct CoroSLF slf_frame; /* the current slf frame */
278 283
279/** Coro ********************************************************************/ 284/** Coro ********************************************************************/
280 285
281#define CORO_PRIO_MAX 3 286#define CORO_PRIO_MAX 3
… …
310 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */ 315 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
311 PL_op->op_flags |= OPf_STACKED; 316 PL_op->op_flags |= OPf_STACKED;
312 PL_op->op_private = 0; 317 PL_op->op_private = 0;
313 return PL_ppaddr [OP_ENTERSUB](aTHX); 318 return PL_ppaddr [OP_ENTERSUB](aTHX);
314} 319}
320
321/** time stuff **************************************************************/
322
323#ifdef HAS_GETTIMEOFDAY
324
325static void
326coro_u2time (pTHX_ UV ret[2])
327{
328 struct timeval tv;
329 gettimeofday (&tv, 0);
330
331 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec;
333}
334
335static double
336coro_nvtime ()
337{
338 struct timeval tv;
339 gettimeofday (&tv, 0);
340
341 return tv.tv_sec + tv.tv_usec * 1e-6;
342}
343
344static void
345time_init (pTHX)
346{
347 nvtime = coro_nvtime;
348 u2time = coro_u2time;
349}
350
351#else
352
353static void
354time_init (pTHX)
355{
356 SV **svp;
357
358 require_pv ("Time/HiRes.pm");
359
360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
361
362 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
364
365 nvtime = INT2PTR (double (*)(), SvIV (*svp));
366
367 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
368 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
369}
370
371#endif
315 372
316/** lowlevel stuff **********************************************************/ 373/** lowlevel stuff **********************************************************/
317 374
318static SV * 375static SV *
319coro_get_sv (pTHX_ const char *name, int create) 376coro_get_sv (pTHX_ const char *name, int create)
… …
583 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep); 640 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
584 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep); 641 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
585 642
586#if PERL_VERSION_ATLEAST (5,10,0) 643#if PERL_VERSION_ATLEAST (5,10,0)
587 /* perl 5.10 complicates this _quite_ a bit, but it also is 644 /* perl 5.10 complicates this _quite_ a bit, but it also is
588 * is much faster, so no quarrels here. alternatively, we could 645 * much faster, so no quarrels here. alternatively, we could
589 * sv_upgrade to avoid this. 646 * sv_upgrade to avoid this.
590 */ 647 */
591 { 648 {
592 /* swap sv_u */ 649 /* swap sv_u */
593 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u; 650 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
… …
718 { 775 {
719 CV *cv = cx->blk_sub.cv; 776 CV *cv = cx->blk_sub.cv;
720 777
721 if (expect_true (CvDEPTH (cv))) 778 if (expect_true (CvDEPTH (cv)))
722 { 779 {
780 EXTEND (SP, 3);
723 PUSHs ((SV *)CvPADLIST (cv)); 781 PUSHs ((SV *)CvPADLIST (cv));
724 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 782 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
725 PUSHs ((SV *)cv); 783 PUSHs ((SV *)cv);
726 784
727 CvDEPTH (cv) = 0; 785 CvDEPTH (cv) = 0;
… …
1009 PL_comppad_name_fill = 0; 1067 PL_comppad_name_fill = 0;
1010 PL_comppad_name_floor = 0; 1068 PL_comppad_name_floor = 0;
1011 PL_curpm = 0; 1069 PL_curpm = 0;
1012 PL_curpad = 0; 1070 PL_curpad = 0;
1013 PL_localizing = 0; 1071 PL_localizing = 0;
1014 PL_dirty = 0;
1015 PL_restartop = 0; 1072 PL_restartop = 0;
1016#if PERL_VERSION_ATLEAST (5,10,0) 1073#if PERL_VERSION_ATLEAST (5,10,0)
1017 PL_parser = 0; 1074 PL_parser = 0;
1018#endif 1075#endif
1019 PL_hints = 0; 1076 PL_hints = 0;
… …
1135 1192
1136 SvREFCNT_dec (coro->saved_deffh); 1193 SvREFCNT_dec (coro->saved_deffh);
1137 SvREFCNT_dec (coro->rouse_cb); 1194 SvREFCNT_dec (coro->rouse_cb);
1138 SvREFCNT_dec (coro->invoke_cb); 1195 SvREFCNT_dec (coro->invoke_cb);
1139 SvREFCNT_dec (coro->invoke_av); 1196 SvREFCNT_dec (coro->invoke_av);
1140 SvREFCNT_dec (coro->swap_sv);
1141 } 1197 }
1142} 1198}
1143 1199
1144INLINE void 1200INLINE void
1145free_coro_mortal (pTHX) 1201free_coro_mortal (pTHX)
… …
1441cctx_destroy (coro_cctx *cctx) 1497cctx_destroy (coro_cctx *cctx)
1442{ 1498{
1443 if (!cctx) 1499 if (!cctx)
1444 return; 1500 return;
1445 1501
1446 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1502 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1447 1503
1448 --cctx_count; 1504 --cctx_count;
1449 coro_destroy (&cctx->cctx); 1505 coro_destroy (&cctx->cctx);
1450 1506
1451 /* coro_transfer creates new, empty cctx's */ 1507 /* coro_transfer creates new, empty cctx's */
… …
1619 return 0; 1675 return 0;
1620 1676
1621 if (coro->on_destroy && !PL_dirty) 1677 if (coro->on_destroy && !PL_dirty)
1622 coro->on_destroy (aTHX_ coro); 1678 coro->on_destroy (aTHX_ coro);
1623 1679
1680 /*
1681 * The on_destroy above most likely is from an SLF call.
1682 * Since by definition the SLF call will not finish when we destroy
1683 * the coro, we will have to force-finish it here, otherwise
1684 * cleanup functions cannot call SLF functions.
1685 */
1686 coro->slf_frame.prepare = 0;
1687
1624 coro->flags |= CF_DESTROYED; 1688 coro->flags |= CF_DESTROYED;
1625 1689
1626 if (coro->flags & CF_READY) 1690 if (coro->flags & CF_READY)
1627 { 1691 {
1628 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1692 /* reduce nready, as destroying a ready coro effectively unreadies it */
… …
1636 && coro->mainstack != main_mainstack 1700 && coro->mainstack != main_mainstack
1637 && coro->slot 1701 && coro->slot
1638 && !PL_dirty) 1702 && !PL_dirty)
1639 destroy_perl (aTHX_ coro); 1703 destroy_perl (aTHX_ coro);
1640 1704
1705 if (coro->next) coro->next->prev = coro->prev;
1706 if (coro->prev) coro->prev->next = coro->next;
1707 if (coro == coro_first) coro_first = coro->next;
1708
1641 cctx_destroy (coro->cctx); 1709 cctx_destroy (coro->cctx);
1642 SvREFCNT_dec (coro->startcv); 1710 SvREFCNT_dec (coro->startcv);
1643 SvREFCNT_dec (coro->args); 1711 SvREFCNT_dec (coro->args);
1712 SvREFCNT_dec (coro->swap_sv);
1644 SvREFCNT_dec (CORO_THROW); 1713 SvREFCNT_dec (CORO_THROW);
1645
1646 if (coro->next) coro->next->prev = coro->prev;
1647 if (coro->prev) coro->prev->next = coro->next;
1648 if (coro == coro_first) coro_first = coro->next;
1649 1714
1650 return 1; 1715 return 1;
1651} 1716}
1652 1717
1653static int 1718static int
… …
1823 { 1888 {
1824 /* nothing to schedule: call the idle handler */ 1889 /* nothing to schedule: call the idle handler */
1825 if (SvROK (sv_idle) 1890 if (SvROK (sv_idle)
1826 && SvOBJECT (SvRV (sv_idle))) 1891 && SvOBJECT (SvRV (sv_idle)))
1827 { 1892 {
1893 if (SvRV (sv_idle) == SvRV (coro_current))
1894 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1895
1828 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1896 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1829 api_ready (aTHX_ SvRV (sv_idle)); 1897 api_ready (aTHX_ SvRV (sv_idle));
1830 --coro_nready; 1898 --coro_nready;
1831 } 1899 }
1832 else 1900 else
… …
1949 2017
1950static void 2018static void
1951coro_call_on_destroy (pTHX_ struct coro *coro) 2019coro_call_on_destroy (pTHX_ struct coro *coro)
1952{ 2020{
1953 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2021 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1954 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1955 2022
1956 if (on_destroyp) 2023 if (on_destroyp)
1957 { 2024 {
1958 AV *on_destroy = (AV *)SvRV (*on_destroyp); 2025 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2026 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2027 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
1959 2028
1960 while (AvFILLp (on_destroy) >= 0) 2029 while (AvFILLp (on_destroy) >= 0)
1961 { 2030 {
1962 dSP; /* don't disturb outer sp */ 2031 dSP; /* don't disturb outer sp */
1963 SV *cb = av_pop (on_destroy); 2032 SV *cb = av_pop (on_destroy);
… …
1965 PUSHMARK (SP); 2034 PUSHMARK (SP);
1966 2035
1967 if (statusp) 2036 if (statusp)
1968 { 2037 {
1969 int i; 2038 int i;
1970 AV *status = (AV *)SvRV (*statusp);
1971 EXTEND (SP, AvFILLp (status) + 1); 2039 EXTEND (SP, AvFILLp (status) + 1);
1972 2040
1973 for (i = 0; i <= AvFILLp (status); ++i) 2041 for (i = 0; i <= AvFILLp (status); ++i)
1974 PUSHs (AvARRAY (status)[i]); 2042 PUSHs (AvARRAY (status)[i]);
1975 } 2043 }
… …
1979 } 2047 }
1980 } 2048 }
1981} 2049}
1982 2050
1983static void 2051static void
1984slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2052coro_set_status (HV *coro_hv, SV **arg, int items)
1985{ 2053{
1986 int i;
1987 HV *hv = (HV *)SvRV (coro_current);
1988 AV *av = newAV (); 2054 AV *av = newAV ();
1989 2055
1990 /* items are actually not so common, so optimise for this case */ 2056 /* items are actually not so common, so optimise for this case */
1991 if (items) 2057 if (items)
1992 { 2058 {
2059 int i;
2060
1993 av_extend (av, items - 1); 2061 av_extend (av, items - 1);
1994 2062
1995 for (i = 0; i < items; ++i) 2063 for (i = 0; i < items; ++i)
1996 av_push (av, SvREFCNT_inc_NN (arg [i])); 2064 av_push (av, SvREFCNT_inc_NN (arg [i]));
1997 } 2065 }
1998 2066
1999 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2067 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2068}
2000 2069
2070static void
2071slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2072{
2001 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2073 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2002 api_ready (aTHX_ sv_manager); 2074 api_ready (aTHX_ sv_manager);
2003 2075
2004 frame->prepare = prepare_schedule; 2076 frame->prepare = prepare_schedule;
2005 frame->check = slf_check_repeat; 2077 frame->check = slf_check_repeat;
2006 2078
2007 /* as a minor optimisation, we could unwind all stacks here */ 2079 /* as a minor optimisation, we could unwind all stacks here */
2008 /* but that puts extra pressure on pp_slf, and is not worth much */ 2080 /* but that puts extra pressure on pp_slf, and is not worth much */
2009 /*coro_unwind_stacks (aTHX);*/ 2081 /*coro_unwind_stacks (aTHX);*/
2082}
2083
2084static void
2085slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2086{
2087 HV *coro_hv = (HV *)SvRV (coro_current);
2088
2089 coro_set_status (coro_hv, arg, items);
2090 slf_init_terminate_cancel_common (frame, coro_hv);
2091}
2092
2093static void
2094slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2095{
2096 HV *coro_hv;
2097 struct coro *coro;
2098
2099 if (items <= 0)
2100 croak ("Coro::cancel called without coro object,");
2101
2102 coro = SvSTATE (arg [0]);
2103 coro_hv = coro->hv;
2104
2105 coro_set_status (coro_hv, arg + 1, items - 1);
2106
2107 if (expect_false (coro->flags & CF_NOCANCEL))
2108 {
2109 /* coro currently busy cancelling something, so just notify it */
2110 coro->slf_frame.data = (void *)coro;
2111
2112 frame->prepare = prepare_nop;
2113 frame->check = slf_check_nop;
2114 }
2115 else if (coro_hv == (HV *)SvRV (coro_current))
2116 {
2117 /* cancelling the current coro is allowed, and equals terminate */
2118 slf_init_terminate_cancel_common (frame, coro_hv);
2119 }
2120 else
2121 {
2122 struct coro *self = SvSTATE_current;
2123
2124 /* otherwise we cancel directly, purely for speed reasons
2125 * unfortunately, this requires some magic trickery, as
2126 * somebody else could cancel us, so we have to fight the cancellation.
2127 * this is ugly, and hopefully fully worth the extra speed.
2128 * besides, I can't get the slow-but-safe version working...
2129 */
2130 slf_frame.data = 0;
2131 self->flags |= CF_NOCANCEL;
2132
2133 coro_state_destroy (aTHX_ coro);
2134 coro_call_on_destroy (aTHX_ coro);
2135
2136 self->flags &= ~CF_NOCANCEL;
2137
2138 if (slf_frame.data)
2139 {
2140 /* while we were busy we have been cancelled, so terminate */
2141 slf_init_terminate_cancel_common (frame, self->hv);
2142 }
2143 else
2144 {
2145 frame->prepare = prepare_nop;
2146 frame->check = slf_check_nop;
2147 }
2148 }
2010} 2149}
2011 2150
2012/*****************************************************************************/ 2151/*****************************************************************************/
2013/* async pool handler */ 2152/* async pool handler */
2014 2153
… …
2418 if (PL_op->op_flags & OPf_STACKED) 2557 if (PL_op->op_flags & OPf_STACKED)
2419 { 2558 {
2420 if (items > slf_arga) 2559 if (items > slf_arga)
2421 { 2560 {
2422 slf_arga = items; 2561 slf_arga = items;
2423 free (slf_argv); 2562 Safefree (slf_argv);
2424 slf_argv = malloc (slf_arga * sizeof (SV *)); 2563 New (0, slf_argv, slf_arga, SV *);
2425 } 2564 }
2426 2565
2427 slf_argc = items; 2566 slf_argc = items;
2428 2567
2429 for (i = 0; i < items; ++i) 2568 for (i = 0; i < items; ++i)
… …
2790 { 2929 {
2791 SV *cb_cv = s_get_cv_croak (arg [1]); 2930 SV *cb_cv = s_get_cv_croak (arg [1]);
2792 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2931 av_push (av, SvREFCNT_inc_NN (cb_cv));
2793 2932
2794 if (SvIVX (AvARRAY (av)[0])) 2933 if (SvIVX (AvARRAY (av)[0]))
2795 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 2934 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2796 2935
2797 frame->prepare = prepare_nop; 2936 frame->prepare = prepare_nop;
2798 frame->check = slf_check_nop; 2937 frame->check = slf_check_nop;
2799 } 2938 }
2800 else if (SvIVX (AvARRAY (av)[0])) 2939 else if (SvIVX (AvARRAY (av)[0]))
… …
2962 /* now call the AIO function - we assume our request is uncancelable */ 3101 /* now call the AIO function - we assume our request is uncancelable */
2963 PUTBACK; 3102 PUTBACK;
2964 call_sv ((SV *)req, G_VOID | G_DISCARD); 3103 call_sv ((SV *)req, G_VOID | G_DISCARD);
2965 } 3104 }
2966 3105
2967 /* now that the requets is going, we loop toll we have a result */ 3106 /* now that the request is going, we loop till we have a result */
2968 frame->data = (void *)state; 3107 frame->data = (void *)state;
2969 frame->prepare = prepare_schedule; 3108 frame->prepare = prepare_schedule;
2970 frame->check = slf_check_aio_req; 3109 frame->check = slf_check_aio_req;
2971} 3110}
2972 3111
… …
3103 coroapi.prepare_nop = prepare_nop; 3242 coroapi.prepare_nop = prepare_nop;
3104 coroapi.prepare_schedule = prepare_schedule; 3243 coroapi.prepare_schedule = prepare_schedule;
3105 coroapi.prepare_cede = prepare_cede; 3244 coroapi.prepare_cede = prepare_cede;
3106 coroapi.prepare_cede_notself = prepare_cede_notself; 3245 coroapi.prepare_cede_notself = prepare_cede_notself;
3107 3246
3108 { 3247 time_init (aTHX);
3109 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3110
3111 if (!svp) croak ("Time::HiRes is required");
3112 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3113
3114 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3115
3116 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3117 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3118 }
3119 3248
3120 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3249 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3121} 3250}
3122 3251
3123SV * 3252SV *
… …
3132void 3261void
3133transfer (...) 3262transfer (...)
3134 PROTOTYPE: $$ 3263 PROTOTYPE: $$
3135 CODE: 3264 CODE:
3136 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3265 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3137
3138bool
3139_destroy (SV *coro_sv)
3140 CODE:
3141 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3142 OUTPUT:
3143 RETVAL
3144 3266
3145void 3267void
3146_exit (int code) 3268_exit (int code)
3147 PROTOTYPE: $ 3269 PROTOTYPE: $
3148 CODE: 3270 CODE:
… …
3224 CODE: 3346 CODE:
3225{ 3347{
3226 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3348 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3227 { 3349 {
3228 struct coro *current = SvSTATE_current; 3350 struct coro *current = SvSTATE_current;
3351 struct CoroSLF slf_save;
3229 3352
3230 if (current != coro) 3353 if (current != coro)
3231 { 3354 {
3232 PUTBACK; 3355 PUTBACK;
3233 save_perl (aTHX_ current); 3356 save_perl (aTHX_ current);
3234 load_perl (aTHX_ coro); 3357 load_perl (aTHX_ coro);
3358 /* the coro is most likely in an active SLF call.
3359 * while not strictly required (the code we execute is
3360 * not allowed to call any SLF functions), it's cleaner
3361 * to reinitialise the slf_frame and restore it later.
3362 * This might one day allow us to actually do SLF calls
3363 * from code executed here.
3364 */
3365 slf_save = slf_frame;
3366 slf_frame.prepare = 0;
3235 SPAGAIN; 3367 SPAGAIN;
3236 } 3368 }
3237 3369
3238 PUSHSTACK; 3370 PUSHSTACK;
3239 3371
… …
3249 SPAGAIN; 3381 SPAGAIN;
3250 3382
3251 if (current != coro) 3383 if (current != coro)
3252 { 3384 {
3253 PUTBACK; 3385 PUTBACK;
3386 slf_frame = slf_save;
3254 save_perl (aTHX_ coro); 3387 save_perl (aTHX_ coro);
3255 load_perl (aTHX_ current); 3388 load_perl (aTHX_ current);
3256 SPAGAIN; 3389 SPAGAIN;
3257 } 3390 }
3258 } 3391 }
… …
3271 RETVAL = boolSV (coro->flags & ix); 3404 RETVAL = boolSV (coro->flags & ix);
3272 OUTPUT: 3405 OUTPUT:
3273 RETVAL 3406 RETVAL
3274 3407
3275void 3408void
3276throw (Coro::State self, SV *throw = &PL_sv_undef) 3409throw (Coro::State self, SV *exception = &PL_sv_undef)
3277 PROTOTYPE: $;$ 3410 PROTOTYPE: $;$
3278 CODE: 3411 CODE:
3279{ 3412{
3280 struct coro *current = SvSTATE_current; 3413 struct coro *current = SvSTATE_current;
3281 SV **throwp = self == current ? &CORO_THROW : &self->except; 3414 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3282 SvREFCNT_dec (*throwp); 3415 SvREFCNT_dec (*exceptionp);
3283 SvGETMAGIC (throw); 3416 SvGETMAGIC (exception);
3284 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3417 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3285} 3418}
3286 3419
3287void 3420void
3288api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3421api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3289 PROTOTYPE: $;$ 3422 PROTOTYPE: $;$
… …
3344 3477
3345void 3478void
3346cancel (Coro::State self) 3479cancel (Coro::State self)
3347 CODE: 3480 CODE:
3348 coro_state_destroy (aTHX_ self); 3481 coro_state_destroy (aTHX_ self);
3349 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3350
3351 3482
3352SV * 3483SV *
3353enable_times (int enabled = enable_times) 3484enable_times (int enabled = enable_times)
3354 CODE: 3485 CODE:
3355{ 3486{
… …
3460 api_ready (aTHX_ RETVAL); 3591 api_ready (aTHX_ RETVAL);
3461 OUTPUT: 3592 OUTPUT:
3462 RETVAL 3593 RETVAL
3463 3594
3464void 3595void
3596_destroy (Coro::State coro)
3597 CODE:
3598 /* used by the manager thread */
3599 coro_state_destroy (aTHX_ coro);
3600 coro_call_on_destroy (aTHX_ coro);
3601
3602void
3465terminate (...) 3603terminate (...)
3466 CODE: 3604 CODE:
3467 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3605 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3606
3607void
3608cancel (...)
3609 CODE:
3610 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3468 3611
3469void 3612void
3470schedule (...) 3613schedule (...)
3471 CODE: 3614 CODE:
3472 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3615 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3869 { 4012 {
3870 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4013 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3871 coro_old_pp_sselect = 0; 4014 coro_old_pp_sselect = 0;
3872 } 4015 }
3873 4016
3874

Diff Legend

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