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.378 by root, Sat Dec 12 01:30:26 2009 UTC vs.
Revision 1.396 by root, Fri May 6 18:01:13 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;
… …
1010 PL_comppad_name_fill = 0; 1067 PL_comppad_name_fill = 0;
1011 PL_comppad_name_floor = 0; 1068 PL_comppad_name_floor = 0;
1012 PL_curpm = 0; 1069 PL_curpm = 0;
1013 PL_curpad = 0; 1070 PL_curpad = 0;
1014 PL_localizing = 0; 1071 PL_localizing = 0;
1015 PL_dirty = 0;
1016 PL_restartop = 0; 1072 PL_restartop = 0;
1017#if PERL_VERSION_ATLEAST (5,10,0) 1073#if PERL_VERSION_ATLEAST (5,10,0)
1018 PL_parser = 0; 1074 PL_parser = 0;
1019#endif 1075#endif
1020 PL_hints = 0; 1076 PL_hints = 0;
… …
1103 struct coro *current = SvSTATE_current; 1159 struct coro *current = SvSTATE_current;
1104 1160
1105 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1161 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1106 1162
1107 save_perl (aTHX_ current); 1163 save_perl (aTHX_ current);
1164 SvRV_set (coro_current, (SV *)coro->hv); /* this will cause acroak in transfer_check */
1108 load_perl (aTHX_ coro); 1165 load_perl (aTHX_ coro);
1109 1166
1110 coro_unwind_stacks (aTHX); 1167 coro_unwind_stacks (aTHX);
1111 coro_destruct_stacks (aTHX); 1168 coro_destruct_stacks (aTHX);
1112 1169
… …
1123 svf [6] = (SV *)GvHV (PL_hintgv); 1180 svf [6] = (SV *)GvHV (PL_hintgv);
1124 svf [7] = PL_diehook; 1181 svf [7] = PL_diehook;
1125 svf [8] = PL_warnhook; 1182 svf [8] = PL_warnhook;
1126 assert (9 == sizeof (svf) / sizeof (*svf)); 1183 assert (9 == sizeof (svf) / sizeof (*svf));
1127 1184
1185 SvRV_set (coro_current, (SV *)current->hv);
1128 load_perl (aTHX_ current); 1186 load_perl (aTHX_ current);
1129 } 1187 }
1130 1188
1131 { 1189 {
1132 unsigned int i; 1190 unsigned int i;
… …
1441cctx_destroy (coro_cctx *cctx) 1499cctx_destroy (coro_cctx *cctx)
1442{ 1500{
1443 if (!cctx) 1501 if (!cctx)
1444 return; 1502 return;
1445 1503
1446 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1504 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1447 1505
1448 --cctx_count; 1506 --cctx_count;
1449 coro_destroy (&cctx->cctx); 1507 coro_destroy (&cctx->cctx);
1450 1508
1451 /* coro_transfer creates new, empty cctx's */ 1509 /* coro_transfer creates new, empty cctx's */
… …
1610#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1668#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1611#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1669#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1612 1670
1613/** high level stuff ********************************************************/ 1671/** high level stuff ********************************************************/
1614 1672
1615static int 1673static void
1616coro_state_destroy (pTHX_ struct coro *coro) 1674coro_state_destroy (pTHX_ struct coro *coro)
1617{ 1675{
1618 if (coro->flags & CF_DESTROYED) 1676 if (coro->flags & CF_DESTROYED)
1619 return 0; 1677 return;
1620 1678
1679 /* this callback is reserved for slf functions needing to do cleanup */
1621 if (coro->on_destroy && !PL_dirty) 1680 if (coro->on_destroy && !PL_dirty)
1622 coro->on_destroy (aTHX_ coro); 1681 coro->on_destroy (aTHX_ coro);
1682
1683 /*
1684 * The on_destroy above most likely is from an SLF call.
1685 * Since by definition the SLF call will not finish when we destroy
1686 * the coro, we will have to force-finish it here, otherwise
1687 * cleanup functions cannot call SLF functions.
1688 */
1689 coro->slf_frame.prepare = 0;
1623 1690
1624 coro->flags |= CF_DESTROYED; 1691 coro->flags |= CF_DESTROYED;
1625 1692
1626 if (coro->flags & CF_READY) 1693 if (coro->flags & CF_READY)
1627 { 1694 {
… …
1645 cctx_destroy (coro->cctx); 1712 cctx_destroy (coro->cctx);
1646 SvREFCNT_dec (coro->startcv); 1713 SvREFCNT_dec (coro->startcv);
1647 SvREFCNT_dec (coro->args); 1714 SvREFCNT_dec (coro->args);
1648 SvREFCNT_dec (coro->swap_sv); 1715 SvREFCNT_dec (coro->swap_sv);
1649 SvREFCNT_dec (CORO_THROW); 1716 SvREFCNT_dec (CORO_THROW);
1650
1651 return 1;
1652} 1717}
1653 1718
1654static int 1719static int
1655coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1720coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1656{ 1721{
… …
1953 2018
1954static void 2019static void
1955coro_call_on_destroy (pTHX_ struct coro *coro) 2020coro_call_on_destroy (pTHX_ struct coro *coro)
1956{ 2021{
1957 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2022 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1958 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1959 2023
1960 if (on_destroyp) 2024 if (on_destroyp)
1961 { 2025 {
1962 AV *on_destroy = (AV *)SvRV (*on_destroyp); 2026 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2027 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2028 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
1963 2029
1964 while (AvFILLp (on_destroy) >= 0) 2030 while (AvFILLp (on_destroy) >= 0)
1965 { 2031 {
1966 dSP; /* don't disturb outer sp */ 2032 dSP; /* don't disturb outer sp */
1967 SV *cb = av_pop (on_destroy); 2033 SV *cb = av_pop (on_destroy);
… …
1969 PUSHMARK (SP); 2035 PUSHMARK (SP);
1970 2036
1971 if (statusp) 2037 if (statusp)
1972 { 2038 {
1973 int i; 2039 int i;
1974 AV *status = (AV *)SvRV (*statusp);
1975 EXTEND (SP, AvFILLp (status) + 1); 2040 EXTEND (SP, AvFILLp (status) + 1);
1976 2041
1977 for (i = 0; i <= AvFILLp (status); ++i) 2042 for (i = 0; i <= AvFILLp (status); ++i)
1978 PUSHs (AvARRAY (status)[i]); 2043 PUSHs (AvARRAY (status)[i]);
1979 } 2044 }
… …
1983 } 2048 }
1984 } 2049 }
1985} 2050}
1986 2051
1987static void 2052static void
1988slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2053coro_set_status (HV *coro_hv, SV **arg, int items)
1989{ 2054{
1990 int i;
1991 HV *hv = (HV *)SvRV (coro_current);
1992 AV *av = newAV (); 2055 AV *av = newAV ();
1993 2056
1994 /* items are actually not so common, so optimise for this case */ 2057 /* items are actually not so common, so optimise for this case */
1995 if (items) 2058 if (items)
1996 { 2059 {
2060 int i;
2061
1997 av_extend (av, items - 1); 2062 av_extend (av, items - 1);
1998 2063
1999 for (i = 0; i < items; ++i) 2064 for (i = 0; i < items; ++i)
2000 av_push (av, SvREFCNT_inc_NN (arg [i])); 2065 av_push (av, SvREFCNT_inc_NN (arg [i]));
2001 } 2066 }
2002 2067
2003 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2068 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2069}
2004 2070
2071static void
2072slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2073{
2005 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2074 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2006 api_ready (aTHX_ sv_manager); 2075 api_ready (aTHX_ sv_manager);
2007 2076
2008 frame->prepare = prepare_schedule; 2077 frame->prepare = prepare_schedule;
2009 frame->check = slf_check_repeat; 2078 frame->check = slf_check_repeat;
2010 2079
2011 /* as a minor optimisation, we could unwind all stacks here */ 2080 /* as a minor optimisation, we could unwind all stacks here */
2012 /* but that puts extra pressure on pp_slf, and is not worth much */ 2081 /* but that puts extra pressure on pp_slf, and is not worth much */
2013 /*coro_unwind_stacks (aTHX);*/ 2082 /*coro_unwind_stacks (aTHX);*/
2083}
2084
2085static void
2086slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2087{
2088 HV *coro_hv = (HV *)SvRV (coro_current);
2089
2090 coro_set_status (coro_hv, arg, items);
2091 slf_init_terminate_cancel_common (frame, coro_hv);
2092}
2093
2094static void
2095slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2096{
2097 HV *coro_hv;
2098 struct coro *coro;
2099
2100 if (items <= 0)
2101 croak ("Coro::cancel called without coro object,");
2102
2103 coro = SvSTATE (arg [0]);
2104 coro_hv = coro->hv;
2105
2106 coro_set_status (coro_hv, arg + 1, items - 1);
2107
2108 if (expect_false (coro->flags & CF_NOCANCEL))
2109 {
2110 /* coro currently busy cancelling something, so just notify it */
2111 coro->slf_frame.data = (void *)coro;
2112
2113 frame->prepare = prepare_nop;
2114 frame->check = slf_check_nop;
2115 }
2116 else if (coro_hv == (HV *)SvRV (coro_current))
2117 {
2118 /* cancelling the current coro is allowed, and equals terminate */
2119 slf_init_terminate_cancel_common (frame, coro_hv);
2120 }
2121 else
2122 {
2123 struct coro *self = SvSTATE_current;
2124
2125 /* otherwise we cancel directly, purely for speed reasons
2126 * unfortunately, this requires some magic trickery, as
2127 * somebody else could cancel us, so we have to fight the cancellation.
2128 * this is ugly, and hopefully fully worth the extra speed.
2129 * besides, I can't get the slow-but-safe version working...
2130 */
2131 slf_frame.data = 0;
2132 self->flags |= CF_NOCANCEL;
2133
2134 coro_state_destroy (aTHX_ coro);
2135 coro_call_on_destroy (aTHX_ coro);
2136
2137 self->flags &= ~CF_NOCANCEL;
2138
2139 if (slf_frame.data)
2140 {
2141 /* while we were busy we have been cancelled, so terminate */
2142 slf_init_terminate_cancel_common (frame, self->hv);
2143 }
2144 else
2145 {
2146 frame->prepare = prepare_nop;
2147 frame->check = slf_check_nop;
2148 }
2149 }
2014} 2150}
2015 2151
2016/*****************************************************************************/ 2152/*****************************************************************************/
2017/* async pool handler */ 2153/* async pool handler */
2018 2154
… …
2422 if (PL_op->op_flags & OPf_STACKED) 2558 if (PL_op->op_flags & OPf_STACKED)
2423 { 2559 {
2424 if (items > slf_arga) 2560 if (items > slf_arga)
2425 { 2561 {
2426 slf_arga = items; 2562 slf_arga = items;
2427 free (slf_argv); 2563 Safefree (slf_argv);
2428 slf_argv = malloc (slf_arga * sizeof (SV *)); 2564 New (0, slf_argv, slf_arga, SV *);
2429 } 2565 }
2430 2566
2431 slf_argc = items; 2567 slf_argc = items;
2432 2568
2433 for (i = 0; i < items; ++i) 2569 for (i = 0; i < items; ++i)
… …
2794 { 2930 {
2795 SV *cb_cv = s_get_cv_croak (arg [1]); 2931 SV *cb_cv = s_get_cv_croak (arg [1]);
2796 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2932 av_push (av, SvREFCNT_inc_NN (cb_cv));
2797 2933
2798 if (SvIVX (AvARRAY (av)[0])) 2934 if (SvIVX (AvARRAY (av)[0]))
2799 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 2935 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2800 2936
2801 frame->prepare = prepare_nop; 2937 frame->prepare = prepare_nop;
2802 frame->check = slf_check_nop; 2938 frame->check = slf_check_nop;
2803 } 2939 }
2804 else if (SvIVX (AvARRAY (av)[0])) 2940 else if (SvIVX (AvARRAY (av)[0]))
… …
2966 /* now call the AIO function - we assume our request is uncancelable */ 3102 /* now call the AIO function - we assume our request is uncancelable */
2967 PUTBACK; 3103 PUTBACK;
2968 call_sv ((SV *)req, G_VOID | G_DISCARD); 3104 call_sv ((SV *)req, G_VOID | G_DISCARD);
2969 } 3105 }
2970 3106
2971 /* now that the requets is going, we loop toll we have a result */ 3107 /* now that the request is going, we loop till we have a result */
2972 frame->data = (void *)state; 3108 frame->data = (void *)state;
2973 frame->prepare = prepare_schedule; 3109 frame->prepare = prepare_schedule;
2974 frame->check = slf_check_aio_req; 3110 frame->check = slf_check_aio_req;
2975} 3111}
2976 3112
… …
3107 coroapi.prepare_nop = prepare_nop; 3243 coroapi.prepare_nop = prepare_nop;
3108 coroapi.prepare_schedule = prepare_schedule; 3244 coroapi.prepare_schedule = prepare_schedule;
3109 coroapi.prepare_cede = prepare_cede; 3245 coroapi.prepare_cede = prepare_cede;
3110 coroapi.prepare_cede_notself = prepare_cede_notself; 3246 coroapi.prepare_cede_notself = prepare_cede_notself;
3111 3247
3112 { 3248 time_init (aTHX);
3113 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3114
3115 if (!svp) croak ("Time::HiRes is required");
3116 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3117
3118 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3119
3120 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3121 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3122 }
3123 3249
3124 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3250 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3125} 3251}
3126 3252
3127SV * 3253SV *
… …
3136void 3262void
3137transfer (...) 3263transfer (...)
3138 PROTOTYPE: $$ 3264 PROTOTYPE: $$
3139 CODE: 3265 CODE:
3140 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3266 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3141
3142bool
3143_destroy (SV *coro_sv)
3144 CODE:
3145 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3146 OUTPUT:
3147 RETVAL
3148 3267
3149void 3268void
3150_exit (int code) 3269_exit (int code)
3151 PROTOTYPE: $ 3270 PROTOTYPE: $
3152 CODE: 3271 CODE:
… …
3228 CODE: 3347 CODE:
3229{ 3348{
3230 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3349 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3231 { 3350 {
3232 struct coro *current = SvSTATE_current; 3351 struct coro *current = SvSTATE_current;
3352 struct CoroSLF slf_save;
3233 3353
3234 if (current != coro) 3354 if (current != coro)
3235 { 3355 {
3236 PUTBACK; 3356 PUTBACK;
3237 save_perl (aTHX_ current); 3357 save_perl (aTHX_ current);
3238 load_perl (aTHX_ coro); 3358 load_perl (aTHX_ coro);
3359 /* the coro is most likely in an active SLF call.
3360 * while not strictly required (the code we execute is
3361 * not allowed to call any SLF functions), it's cleaner
3362 * to reinitialise the slf_frame and restore it later.
3363 * This might one day allow us to actually do SLF calls
3364 * from code executed here.
3365 */
3366 slf_save = slf_frame;
3367 slf_frame.prepare = 0;
3239 SPAGAIN; 3368 SPAGAIN;
3240 } 3369 }
3241 3370
3242 PUSHSTACK; 3371 PUSHSTACK;
3243 3372
… …
3253 SPAGAIN; 3382 SPAGAIN;
3254 3383
3255 if (current != coro) 3384 if (current != coro)
3256 { 3385 {
3257 PUTBACK; 3386 PUTBACK;
3387 slf_frame = slf_save;
3258 save_perl (aTHX_ coro); 3388 save_perl (aTHX_ coro);
3259 load_perl (aTHX_ current); 3389 load_perl (aTHX_ current);
3260 SPAGAIN; 3390 SPAGAIN;
3261 } 3391 }
3262 } 3392 }
… …
3275 RETVAL = boolSV (coro->flags & ix); 3405 RETVAL = boolSV (coro->flags & ix);
3276 OUTPUT: 3406 OUTPUT:
3277 RETVAL 3407 RETVAL
3278 3408
3279void 3409void
3280throw (Coro::State self, SV *throw = &PL_sv_undef) 3410throw (Coro::State self, SV *exception = &PL_sv_undef)
3281 PROTOTYPE: $;$ 3411 PROTOTYPE: $;$
3282 CODE: 3412 CODE:
3283{ 3413{
3284 struct coro *current = SvSTATE_current; 3414 struct coro *current = SvSTATE_current;
3285 SV **throwp = self == current ? &CORO_THROW : &self->except; 3415 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3286 SvREFCNT_dec (*throwp); 3416 SvREFCNT_dec (*exceptionp);
3287 SvGETMAGIC (throw); 3417 SvGETMAGIC (exception);
3288 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3418 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3289} 3419}
3290 3420
3291void 3421void
3292api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3422api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3293 PROTOTYPE: $;$ 3423 PROTOTYPE: $;$
… …
3348 3478
3349void 3479void
3350cancel (Coro::State self) 3480cancel (Coro::State self)
3351 CODE: 3481 CODE:
3352 coro_state_destroy (aTHX_ self); 3482 coro_state_destroy (aTHX_ self);
3353 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3354
3355 3483
3356SV * 3484SV *
3357enable_times (int enabled = enable_times) 3485enable_times (int enabled = enable_times)
3358 CODE: 3486 CODE:
3359{ 3487{
… …
3464 api_ready (aTHX_ RETVAL); 3592 api_ready (aTHX_ RETVAL);
3465 OUTPUT: 3593 OUTPUT:
3466 RETVAL 3594 RETVAL
3467 3595
3468void 3596void
3597_destroy (Coro::State coro)
3598 CODE:
3599 /* used by the manager thread */
3600 coro_state_destroy (aTHX_ coro);
3601 coro_call_on_destroy (aTHX_ coro);
3602
3603void
3469terminate (...) 3604terminate (...)
3470 CODE: 3605 CODE:
3471 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3606 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3607
3608void
3609cancel (...)
3610 CODE:
3611 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3472 3612
3473void 3613void
3474schedule (...) 3614schedule (...)
3475 CODE: 3615 CODE:
3476 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3616 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3873 { 4013 {
3874 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4014 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3875 coro_old_pp_sselect = 0; 4015 coro_old_pp_sselect = 0;
3876 } 4016 }
3877 4017
3878

Diff Legend

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