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.383 by root, Sun Feb 13 04:39:16 2011 UTC vs.
Revision 1.393 by root, Fri Apr 29 17:38:56 2011 UTC

… …
21 21
22#ifndef SVs_PADSTALE 22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0 23# define SVs_PADSTALE 0
24#endif 24#endif
25 25
26#ifdef WIN32 26#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY
27# undef setjmp 28# undef setjmp
28# undef longjmp 29# undef longjmp
29# undef _exit 30# undef _exit
30# define setjmp _setjmp /* deep magic */ 31# define setjmp _setjmp /* deep magic */
31#else 32#else
… …
195 int valgrind_id; 196 int valgrind_id;
196#endif 197#endif
197 unsigned char flags; 198 unsigned char flags;
198} coro_cctx; 199} coro_cctx;
199 200
200coro_cctx *cctx_current; /* the currently running cctx */ 201static coro_cctx *cctx_current; /* the currently running cctx */
201 202
202/*****************************************************************************/ 203/*****************************************************************************/
203 204
204enum { 205enum {
205 CF_RUNNING = 0x0001, /* coroutine is running */ 206 CF_RUNNING = 0x0001, /* coroutine is running */
206 CF_READY = 0x0002, /* coroutine is ready */ 207 CF_READY = 0x0002, /* coroutine is ready */
207 CF_NEW = 0x0004, /* has never been switched to */ 208 CF_NEW = 0x0004, /* has never been switched to */
208 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
209 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) */
210}; 212};
211 213
212/* 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 */
213typedef struct 215typedef struct
214{ 216{
… …
240 CV *startcv; /* the CV to execute */ 242 CV *startcv; /* the CV to execute */
241 AV *args; /* data associated with this coroutine (initial args) */ 243 AV *args; /* data associated with this coroutine (initial args) */
242 int refcnt; /* coroutines are refcounted, yes */ 244 int refcnt; /* coroutines are refcounted, yes */
243 int flags; /* CF_ flags */ 245 int flags; /* CF_ flags */
244 HV *hv; /* the perl hash associated with this coro, if any */ 246 HV *hv; /* the perl hash associated with this coro, if any */
245 void (*on_destroy)(pTHX_ struct coro *coro); 247 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
246 248
247 /* statistics */ 249 /* statistics */
248 int usecount; /* number of transfers to this coro */ 250 int usecount; /* number of transfers to this coro */
249 251
250 /* coro process data */ 252 /* coro process data */
… …
274typedef struct coro *Coro__State; 276typedef struct coro *Coro__State;
275typedef struct coro *Coro__State_or_hashref; 277typedef struct coro *Coro__State_or_hashref;
276 278
277/* the following variables are effectively part of the perl context */ 279/* the following variables are effectively part of the perl context */
278/* and get copied between struct coro and these variables */ 280/* and get copied between struct coro and these variables */
279/* the mainr easonw e don't support windows process emulation */ 281/* the main reason we don't support windows process emulation */
280static struct CoroSLF slf_frame; /* the current slf frame */ 282static struct CoroSLF slf_frame; /* the current slf frame */
281 283
282/** Coro ********************************************************************/ 284/** Coro ********************************************************************/
283 285
284#define CORO_PRIO_MAX 3 286#define CORO_PRIO_MAX 3
… …
313 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */ 315 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
314 PL_op->op_flags |= OPf_STACKED; 316 PL_op->op_flags |= OPf_STACKED;
315 PL_op->op_private = 0; 317 PL_op->op_private = 0;
316 return PL_ppaddr [OP_ENTERSUB](aTHX); 318 return PL_ppaddr [OP_ENTERSUB](aTHX);
317} 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
318 372
319/** lowlevel stuff **********************************************************/ 373/** lowlevel stuff **********************************************************/
320 374
321static SV * 375static SV *
322coro_get_sv (pTHX_ const char *name, int create) 376coro_get_sv (pTHX_ const char *name, int create)
… …
586 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep); 640 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
587 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep); 641 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
588 642
589#if PERL_VERSION_ATLEAST (5,10,0) 643#if PERL_VERSION_ATLEAST (5,10,0)
590 /* 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
591 * is much faster, so no quarrels here. alternatively, we could 645 * much faster, so no quarrels here. alternatively, we could
592 * sv_upgrade to avoid this. 646 * sv_upgrade to avoid this.
593 */ 647 */
594 { 648 {
595 /* swap sv_u */ 649 /* swap sv_u */
596 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;
… …
1443cctx_destroy (coro_cctx *cctx) 1497cctx_destroy (coro_cctx *cctx)
1444{ 1498{
1445 if (!cctx) 1499 if (!cctx)
1446 return; 1500 return;
1447 1501
1448 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1502 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1449 1503
1450 --cctx_count; 1504 --cctx_count;
1451 coro_destroy (&cctx->cctx); 1505 coro_destroy (&cctx->cctx);
1452 1506
1453 /* coro_transfer creates new, empty cctx's */ 1507 /* coro_transfer creates new, empty cctx's */
… …
1620 if (coro->flags & CF_DESTROYED) 1674 if (coro->flags & CF_DESTROYED)
1621 return 0; 1675 return 0;
1622 1676
1623 if (coro->on_destroy && !PL_dirty) 1677 if (coro->on_destroy && !PL_dirty)
1624 coro->on_destroy (aTHX_ coro); 1678 coro->on_destroy (aTHX_ coro);
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;
1625 1687
1626 coro->flags |= CF_DESTROYED; 1688 coro->flags |= CF_DESTROYED;
1627 1689
1628 if (coro->flags & CF_READY) 1690 if (coro->flags & CF_READY)
1629 { 1691 {
… …
1955 2017
1956static void 2018static void
1957coro_call_on_destroy (pTHX_ struct coro *coro) 2019coro_call_on_destroy (pTHX_ struct coro *coro)
1958{ 2020{
1959 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);
1960 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1961 2022
1962 if (on_destroyp) 2023 if (on_destroyp)
1963 { 2024 {
1964 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;
1965 2028
1966 while (AvFILLp (on_destroy) >= 0) 2029 while (AvFILLp (on_destroy) >= 0)
1967 { 2030 {
1968 dSP; /* don't disturb outer sp */ 2031 dSP; /* don't disturb outer sp */
1969 SV *cb = av_pop (on_destroy); 2032 SV *cb = av_pop (on_destroy);
… …
1971 PUSHMARK (SP); 2034 PUSHMARK (SP);
1972 2035
1973 if (statusp) 2036 if (statusp)
1974 { 2037 {
1975 int i; 2038 int i;
1976 AV *status = (AV *)SvRV (*statusp);
1977 EXTEND (SP, AvFILLp (status) + 1); 2039 EXTEND (SP, AvFILLp (status) + 1);
1978 2040
1979 for (i = 0; i <= AvFILLp (status); ++i) 2041 for (i = 0; i <= AvFILLp (status); ++i)
1980 PUSHs (AvARRAY (status)[i]); 2042 PUSHs (AvARRAY (status)[i]);
1981 } 2043 }
… …
1985 } 2047 }
1986 } 2048 }
1987} 2049}
1988 2050
1989static void 2051static void
1990slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2052coro_set_status (HV *coro_hv, SV **arg, int items)
1991{ 2053{
1992 int i;
1993 HV *hv = (HV *)SvRV (coro_current);
1994 AV *av = newAV (); 2054 AV *av = newAV ();
1995 2055
1996 /* items are actually not so common, so optimise for this case */ 2056 /* items are actually not so common, so optimise for this case */
1997 if (items) 2057 if (items)
1998 { 2058 {
2059 int i;
2060
1999 av_extend (av, items - 1); 2061 av_extend (av, items - 1);
2000 2062
2001 for (i = 0; i < items; ++i) 2063 for (i = 0; i < items; ++i)
2002 av_push (av, SvREFCNT_inc_NN (arg [i])); 2064 av_push (av, SvREFCNT_inc_NN (arg [i]));
2003 } 2065 }
2004 2066
2005 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}
2006 2069
2070static void
2071slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2072{
2007 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 */
2008 api_ready (aTHX_ sv_manager); 2074 api_ready (aTHX_ sv_manager);
2009 2075
2010 frame->prepare = prepare_schedule; 2076 frame->prepare = prepare_schedule;
2011 frame->check = slf_check_repeat; 2077 frame->check = slf_check_repeat;
2012 2078
2013 /* as a minor optimisation, we could unwind all stacks here */ 2079 /* as a minor optimisation, we could unwind all stacks here */
2014 /* 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 */
2015 /*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 }
2016} 2149}
2017 2150
2018/*****************************************************************************/ 2151/*****************************************************************************/
2019/* async pool handler */ 2152/* async pool handler */
2020 2153
… …
3109 coroapi.prepare_nop = prepare_nop; 3242 coroapi.prepare_nop = prepare_nop;
3110 coroapi.prepare_schedule = prepare_schedule; 3243 coroapi.prepare_schedule = prepare_schedule;
3111 coroapi.prepare_cede = prepare_cede; 3244 coroapi.prepare_cede = prepare_cede;
3112 coroapi.prepare_cede_notself = prepare_cede_notself; 3245 coroapi.prepare_cede_notself = prepare_cede_notself;
3113 3246
3114 { 3247 time_init (aTHX);
3115 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3116
3117 if (!svp) croak ("Time::HiRes is required");
3118 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3119
3120 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3121
3122 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3123 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3124 }
3125 3248
3126 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3249 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3127} 3250}
3128 3251
3129SV * 3252SV *
… …
3138void 3261void
3139transfer (...) 3262transfer (...)
3140 PROTOTYPE: $$ 3263 PROTOTYPE: $$
3141 CODE: 3264 CODE:
3142 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3265 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3143
3144bool
3145_destroy (SV *coro_sv)
3146 CODE:
3147 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3148 OUTPUT:
3149 RETVAL
3150 3266
3151void 3267void
3152_exit (int code) 3268_exit (int code)
3153 PROTOTYPE: $ 3269 PROTOTYPE: $
3154 CODE: 3270 CODE:
… …
3230 CODE: 3346 CODE:
3231{ 3347{
3232 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3348 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3233 { 3349 {
3234 struct coro *current = SvSTATE_current; 3350 struct coro *current = SvSTATE_current;
3351 struct CoroSLF slf_save;
3235 3352
3236 if (current != coro) 3353 if (current != coro)
3237 { 3354 {
3238 PUTBACK; 3355 PUTBACK;
3239 save_perl (aTHX_ current); 3356 save_perl (aTHX_ current);
3240 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;
3241 SPAGAIN; 3367 SPAGAIN;
3242 } 3368 }
3243 3369
3244 PUSHSTACK; 3370 PUSHSTACK;
3245 3371
… …
3255 SPAGAIN; 3381 SPAGAIN;
3256 3382
3257 if (current != coro) 3383 if (current != coro)
3258 { 3384 {
3259 PUTBACK; 3385 PUTBACK;
3386 slf_frame = slf_save;
3260 save_perl (aTHX_ coro); 3387 save_perl (aTHX_ coro);
3261 load_perl (aTHX_ current); 3388 load_perl (aTHX_ current);
3262 SPAGAIN; 3389 SPAGAIN;
3263 } 3390 }
3264 } 3391 }
… …
3350 3477
3351void 3478void
3352cancel (Coro::State self) 3479cancel (Coro::State self)
3353 CODE: 3480 CODE:
3354 coro_state_destroy (aTHX_ self); 3481 coro_state_destroy (aTHX_ self);
3355 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3356
3357 3482
3358SV * 3483SV *
3359enable_times (int enabled = enable_times) 3484enable_times (int enabled = enable_times)
3360 CODE: 3485 CODE:
3361{ 3486{
… …
3466 api_ready (aTHX_ RETVAL); 3591 api_ready (aTHX_ RETVAL);
3467 OUTPUT: 3592 OUTPUT:
3468 RETVAL 3593 RETVAL
3469 3594
3470void 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
3471terminate (...) 3603terminate (...)
3472 CODE: 3604 CODE:
3473 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);
3474 3611
3475void 3612void
3476schedule (...) 3613schedule (...)
3477 CODE: 3614 CODE:
3478 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3615 CORO_EXECUTE_SLF_XS (slf_init_schedule);

Diff Legend

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