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.337 by root, Fri Dec 5 18:26:10 2008 UTC vs.
Revision 1.346 by root, Tue Jun 9 18:56:45 2009 UTC

… …
238enum { 238enum {
239 CF_RUNNING = 0x0001, /* coroutine is running */ 239 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 240 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 241 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
243 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
243}; 244};
244 245
245/* the structure where most of the perl state is stored, overlaid on the cxstack */ 246/* the structure where most of the perl state is stored, overlaid on the cxstack */
246typedef struct 247typedef struct
247{ 248{
… …
285 /* async_pool */ 286 /* async_pool */
286 SV *saved_deffh; 287 SV *saved_deffh;
287 SV *invoke_cb; 288 SV *invoke_cb;
288 AV *invoke_av; 289 AV *invoke_av;
289 290
291 /* on_enter/on_leave */
292 AV *on_enter;
293 AV *on_leave;
294
290 /* linked list */ 295 /* linked list */
291 struct coro *next, *prev; 296 struct coro *next, *prev;
292}; 297};
293 298
294typedef struct coro *Coro__State; 299typedef struct coro *Coro__State;
… …
352INLINE CV * 357INLINE CV *
353coro_sv_2cv (pTHX_ SV *sv) 358coro_sv_2cv (pTHX_ SV *sv)
354{ 359{
355 HV *st; 360 HV *st;
356 GV *gvp; 361 GV *gvp;
357 return sv_2cv (sv, &st, &gvp, 0); 362 CV *cv = sv_2cv (sv, &st, &gvp, 0);
363
364 if (!cv)
365 croak ("code reference expected");
366
367 return cv;
358} 368}
359 369
360/*****************************************************************************/ 370/*****************************************************************************/
361/* magic glue */ 371/* magic glue */
362 372
… …
521} 531}
522 532
523/** load & save, init *******************************************************/ 533/** load & save, init *******************************************************/
524 534
525static void 535static void
536on_enterleave_call (pTHX_ SV *cb);
537
538static void
526load_perl (pTHX_ Coro__State c) 539load_perl (pTHX_ Coro__State c)
527{ 540{
528 perl_slots *slot = c->slot; 541 perl_slots *slot = c->slot;
529 c->slot = 0; 542 c->slot = 0;
530 543
… …
556 PUTBACK; 569 PUTBACK;
557 } 570 }
558 571
559 slf_frame = c->slf_frame; 572 slf_frame = c->slf_frame;
560 CORO_THROW = c->except; 573 CORO_THROW = c->except;
574
575 if (expect_false (c->on_enter))
576 {
577 int i;
578
579 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
580 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
581 }
561} 582}
562 583
563static void 584static void
564save_perl (pTHX_ Coro__State c) 585save_perl (pTHX_ Coro__State c)
565{ 586{
587 if (expect_false (c->on_leave))
588 {
589 int i;
590
591 for (i = AvFILLp (c->on_leave); i >= 0; --i)
592 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
593 }
594
566 c->except = CORO_THROW; 595 c->except = CORO_THROW;
567 c->slf_frame = slf_frame; 596 c->slf_frame = slf_frame;
568 597
569 { 598 {
570 dSP; 599 dSP;
… …
769#endif 798#endif
770 799
771/* 800/*
772 * This overrides the default magic get method of %SIG elements. 801 * This overrides the default magic get method of %SIG elements.
773 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 802 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
774 * and instead of tryign to save and restore the hash elements, we just provide 803 * and instead of trying to save and restore the hash elements, we just provide
775 * readback here. 804 * readback here.
776 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
777 * not expecting this to actually change the hook. This is a potential problem
778 * when a schedule happens then, but we ignore this.
779 */ 805 */
780static int 806static int
781coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 807coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
782{ 808{
783 const char *s = MgPV_nolen_const (mg); 809 const char *s = MgPV_nolen_const (mg);
… …
836 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 862 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
837 863
838 if (svp) 864 if (svp)
839 { 865 {
840 SV *old = *svp; 866 SV *old = *svp;
841 *svp = newSVsv (sv); 867 *svp = SvOK (sv) ? newSVsv (sv) : 0;
842 SvREFCNT_dec (old); 868 SvREFCNT_dec (old);
843 return 0; 869 return 0;
844 } 870 }
845 } 871 }
846 872
… …
1357 /* TODO: throwing up here is considered harmful */ 1383 /* TODO: throwing up here is considered harmful */
1358 1384
1359 if (expect_true (prev != next)) 1385 if (expect_true (prev != next))
1360 { 1386 {
1361 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1387 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1362 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,"); 1388 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1363 1389
1364 if (expect_false (next->flags & CF_RUNNING))
1365 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1366
1367 if (expect_false (next->flags & CF_DESTROYED)) 1390 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1368 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1391 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1369 1392
1370#if !PERL_VERSION_ATLEAST (5,10,0) 1393#if !PERL_VERSION_ATLEAST (5,10,0)
1371 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1394 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1372 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1395 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1373#endif 1396#endif
… …
1461coro_state_destroy (pTHX_ struct coro *coro) 1484coro_state_destroy (pTHX_ struct coro *coro)
1462{ 1485{
1463 if (coro->flags & CF_DESTROYED) 1486 if (coro->flags & CF_DESTROYED)
1464 return 0; 1487 return 0;
1465 1488
1466 if (coro->on_destroy) 1489 if (coro->on_destroy && !PL_dirty)
1467 coro->on_destroy (aTHX_ coro); 1490 coro->on_destroy (aTHX_ coro);
1468 1491
1469 coro->flags |= CF_DESTROYED; 1492 coro->flags |= CF_DESTROYED;
1470 1493
1471 if (coro->flags & CF_READY) 1494 if (coro->flags & CF_READY)
… …
1480 if (coro->mainstack 1503 if (coro->mainstack
1481 && coro->mainstack != main_mainstack 1504 && coro->mainstack != main_mainstack
1482 && coro->slot 1505 && coro->slot
1483 && !PL_dirty) 1506 && !PL_dirty)
1484 { 1507 {
1485 struct coro temp; 1508 struct coro *current = SvSTATE_current;
1486 1509
1487 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1510 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1488 1511
1489 save_perl (aTHX_ &temp); 1512 save_perl (aTHX_ current);
1490 load_perl (aTHX_ coro); 1513 load_perl (aTHX_ coro);
1491 1514
1492 coro_destruct_perl (aTHX_ coro); 1515 coro_destruct_perl (aTHX_ coro);
1493 1516
1494 load_perl (aTHX_ &temp); 1517 load_perl (aTHX_ current);
1495 1518
1496 coro->slot = 0; 1519 coro->slot = 0;
1497 } 1520 }
1498 1521
1499 cctx_destroy (coro->cctx); 1522 cctx_destroy (coro->cctx);
… …
1680 if (expect_true (next_sv)) 1703 if (expect_true (next_sv))
1681 { 1704 {
1682 struct coro *next = SvSTATE_hv (next_sv); 1705 struct coro *next = SvSTATE_hv (next_sv);
1683 1706
1684 /* cannot transfer to destroyed coros, skip and look for next */ 1707 /* cannot transfer to destroyed coros, skip and look for next */
1685 if (expect_false (next->flags & CF_DESTROYED)) 1708 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1686 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1709 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */
1687 else 1710 else
1688 { 1711 {
1689 next->flags &= ~CF_READY; 1712 next->flags &= ~CF_READY;
1690 --coro_nready; 1713 --coro_nready;
… …
1965 SV *data = (SV *)GENSUB_ARG; 1988 SV *data = (SV *)GENSUB_ARG;
1966 1989
1967 if (SvTYPE (SvRV (data)) != SVt_PVAV) 1990 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1968 { 1991 {
1969 /* first call, set args */ 1992 /* first call, set args */
1993 SV *coro = SvRV (data);
1970 AV *av = newAV (); 1994 AV *av = newAV ();
1971 SV *coro = SvRV (data);
1972 1995
1973 SvRV_set (data, (SV *)av); 1996 SvRV_set (data, (SV *)av);
1974 api_ready (aTHX_ coro);
1975 SvREFCNT_dec (coro);
1976 1997
1977 /* better take a full copy of the arguments */ 1998 /* better take a full copy of the arguments */
1978 while (items--) 1999 while (items--)
1979 av_store (av, items, newSVsv (ST (items))); 2000 av_store (av, items, newSVsv (ST (items)));
2001
2002 api_ready (aTHX_ coro);
2003 SvREFCNT_dec (coro);
1980 } 2004 }
1981 2005
1982 XSRETURN_EMPTY; 2006 XSRETURN_EMPTY;
1983} 2007}
1984 2008
… …
2001 2025
2002 EXTEND (SP, AvFILLp (av) + 1); 2026 EXTEND (SP, AvFILLp (av) + 1);
2003 for (i = 0; i <= AvFILLp (av); ++i) 2027 for (i = 0; i <= AvFILLp (av); ++i)
2004 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2028 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2005 2029
2006 /* we have stolen the elements, so ste length to zero and free */ 2030 /* we have stolen the elements, so set length to zero and free */
2007 AvFILLp (av) = -1; 2031 AvFILLp (av) = -1;
2008 av_undef (av); 2032 av_undef (av);
2009 2033
2010 PUTBACK; 2034 PUTBACK;
2011 } 2035 }
… …
2301 2325
2302 PL_op->op_ppaddr = pp_slf; 2326 PL_op->op_ppaddr = pp_slf;
2303 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2327 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2304 2328
2305 PL_op = (OP *)&slf_restore; 2329 PL_op = (OP *)&slf_restore;
2330}
2331
2332/*****************************************************************************/
2333/* dynamic wind */
2334
2335static void
2336on_enterleave_call (pTHX_ SV *cb)
2337{
2338 dSP;
2339
2340 PUSHSTACK;
2341
2342 PUSHMARK (SP);
2343 PUTBACK;
2344 call_sv (cb, G_VOID | G_DISCARD);
2345 SPAGAIN;
2346
2347 POPSTACK;
2348}
2349
2350static SV *
2351coro_avp_pop_and_free (pTHX_ AV **avp)
2352{
2353 AV *av = *avp;
2354 SV *res = av_pop (av);
2355
2356 if (AvFILLp (av) < 0)
2357 {
2358 *avp = 0;
2359 SvREFCNT_dec (av);
2360 }
2361
2362 return res;
2363}
2364
2365static void
2366coro_pop_on_enter (pTHX_ void *coro)
2367{
2368 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2369 SvREFCNT_dec (cb);
2370}
2371
2372static void
2373coro_pop_on_leave (pTHX_ void *coro)
2374{
2375 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2376 on_enterleave_call (aTHX_ sv_2mortal (cb));
2306} 2377}
2307 2378
2308/*****************************************************************************/ 2379/*****************************************************************************/
2309/* PerlIO::cede */ 2380/* PerlIO::cede */
2310 2381
… …
3008 eval = 1 3079 eval = 1
3009 CODE: 3080 CODE:
3010{ 3081{
3011 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3082 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3012 { 3083 {
3013 struct coro temp; 3084 struct coro *current = SvSTATE_current;
3014 3085
3015 if (!(coro->flags & CF_RUNNING)) 3086 if (current != coro)
3016 { 3087 {
3017 PUTBACK; 3088 PUTBACK;
3018 save_perl (aTHX_ &temp); 3089 save_perl (aTHX_ current);
3019 load_perl (aTHX_ coro); 3090 load_perl (aTHX_ coro);
3091 SPAGAIN;
3020 } 3092 }
3021 3093
3022 {
3023 dSP;
3024 ENTER;
3025 SAVETMPS;
3026 PUTBACK;
3027 PUSHSTACK; 3094 PUSHSTACK;
3095
3028 PUSHMARK (SP); 3096 PUSHMARK (SP);
3097 PUTBACK;
3029 3098
3030 if (ix) 3099 if (ix)
3031 eval_sv (coderef, 0); 3100 eval_sv (coderef, 0);
3032 else 3101 else
3033 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3102 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3034 3103
3035 POPSTACK; 3104 POPSTACK;
3036 SPAGAIN; 3105 SPAGAIN;
3037 FREETMPS;
3038 LEAVE;
3039 PUTBACK;
3040 }
3041 3106
3042 if (!(coro->flags & CF_RUNNING)) 3107 if (current != coro)
3043 { 3108 {
3109 PUTBACK;
3044 save_perl (aTHX_ coro); 3110 save_perl (aTHX_ coro);
3045 load_perl (aTHX_ &temp); 3111 load_perl (aTHX_ current);
3046 SPAGAIN; 3112 SPAGAIN;
3047 } 3113 }
3048 } 3114 }
3049} 3115}
3050 3116
… …
3054 ALIAS: 3120 ALIAS:
3055 is_ready = CF_READY 3121 is_ready = CF_READY
3056 is_running = CF_RUNNING 3122 is_running = CF_RUNNING
3057 is_new = CF_NEW 3123 is_new = CF_NEW
3058 is_destroyed = CF_DESTROYED 3124 is_destroyed = CF_DESTROYED
3125 is_suspended = CF_SUSPENDED
3059 CODE: 3126 CODE:
3060 RETVAL = boolSV (coro->flags & ix); 3127 RETVAL = boolSV (coro->flags & ix);
3061 OUTPUT: 3128 OUTPUT:
3062 RETVAL 3129 RETVAL
3063 3130
… …
3128 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3195 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3129 3196
3130 SV *tmp = *src; *src = *dst; *dst = tmp; 3197 SV *tmp = *src; *src = *dst; *dst = tmp;
3131 } 3198 }
3132 3199
3200void
3201cancel (Coro::State self)
3202 CODE:
3203 coro_state_destroy (aTHX_ self);
3204 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3205
3133 3206
3134MODULE = Coro::State PACKAGE = Coro 3207MODULE = Coro::State PACKAGE = Coro
3135 3208
3136BOOT: 3209BOOT:
3137{ 3210{
… …
3211cede_notself (...) 3284cede_notself (...)
3212 CODE: 3285 CODE:
3213 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3286 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3214 3287
3215void 3288void
3216_cancel (Coro::State self)
3217 CODE:
3218 coro_state_destroy (aTHX_ self);
3219 coro_call_on_destroy (aTHX_ self);
3220
3221void
3222_set_current (SV *current) 3289_set_current (SV *current)
3223 PROTOTYPE: $ 3290 PROTOTYPE: $
3224 CODE: 3291 CODE:
3225 SvREFCNT_dec (SvRV (coro_current)); 3292 SvREFCNT_dec (SvRV (coro_current));
3226 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 3293 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
… …
3268 PROTOTYPE: 3335 PROTOTYPE:
3269 CODE: 3336 CODE:
3270 RETVAL = coro_nready; 3337 RETVAL = coro_nready;
3271 OUTPUT: 3338 OUTPUT:
3272 RETVAL 3339 RETVAL
3340
3341void
3342suspend (Coro::State self)
3343 PROTOTYPE: $
3344 CODE:
3345 self->flags |= CF_SUSPENDED;
3346
3347void
3348resume (Coro::State self)
3349 PROTOTYPE: $
3350 CODE:
3351 self->flags &= ~CF_SUSPENDED;
3273 3352
3274void 3353void
3275_pool_handler (...) 3354_pool_handler (...)
3276 CODE: 3355 CODE:
3277 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3356 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
… …
3332rouse_wait (...) 3411rouse_wait (...)
3333 PROTOTYPE: ;$ 3412 PROTOTYPE: ;$
3334 PPCODE: 3413 PPCODE:
3335 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3414 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3336 3415
3416void
3417on_enter (SV *block)
3418 ALIAS:
3419 on_leave = 1
3420 PROTOTYPE: &
3421 CODE:
3422{
3423 struct coro *coro = SvSTATE_current;
3424 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3425
3426 block = (SV *)coro_sv_2cv (aTHX_ block);
3427
3428 if (!*avp)
3429 *avp = newAV ();
3430
3431 av_push (*avp, SvREFCNT_inc (block));
3432
3433 if (!ix)
3434 on_enterleave_call (aTHX_ block);
3435
3436 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3437 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3438 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3439}
3440
3337 3441
3338MODULE = Coro::State PACKAGE = PerlIO::cede 3442MODULE = Coro::State PACKAGE = PerlIO::cede
3339 3443
3340BOOT: 3444BOOT:
3341 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3445 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3351 GvSTASH (CvGV (cv)) 3455 GvSTASH (CvGV (cv))
3352 ); 3456 );
3353 OUTPUT: 3457 OUTPUT:
3354 RETVAL 3458 RETVAL
3355 3459
3356# helper for Coro::Channel 3460# helper for Coro::Channel and others
3357SV * 3461SV *
3358_alloc (int count) 3462_alloc (int count)
3359 CODE: 3463 CODE:
3360 RETVAL = coro_waitarray_new (aTHX_ count); 3464 RETVAL = coro_waitarray_new (aTHX_ count);
3361 OUTPUT: 3465 OUTPUT:
… …
3419 for (i = 1; i <= wcount; ++i) 3523 for (i = 1; i <= wcount; ++i)
3420 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3524 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3421 } 3525 }
3422} 3526}
3423 3527
3528MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3529
3530void
3531_may_delete (SV *sem, int count, int extra_refs)
3532 PPCODE:
3533{
3534 AV *av = (AV *)SvRV (sem);
3535
3536 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3537 && AvFILLp (av) == 0 /* no waiters, just count */
3538 && SvIV (AvARRAY (av)[0]) == count)
3539 XSRETURN_YES;
3540
3541 XSRETURN_NO;
3542}
3543
3424MODULE = Coro::State PACKAGE = Coro::Signal 3544MODULE = Coro::State PACKAGE = Coro::Signal
3425 3545
3426SV * 3546SV *
3427new (SV *klass) 3547new (SV *klass)
3428 CODE: 3548 CODE:

Diff Legend

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