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.336 by root, Thu Dec 4 17:29:40 2008 UTC vs.
Revision 1.357 by root, Sat Jun 27 14:09:28 2009 UTC

… …
137 137
138#define IN_DESTRUCT PL_dirty 138#define IN_DESTRUCT PL_dirty
139 139
140#if __GNUC__ >= 3 140#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x) 141# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value)) 142# define expect(expr,value) __builtin_expect ((expr), (value))
143# define INLINE static inline 143# define INLINE static inline
144#else 144#else
145# define attribute(x) 145# define attribute(x)
146# define expect(expr,value) (expr) 146# define expect(expr,value) (expr)
147# define INLINE static 147# define INLINE static
… …
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{
… …
260/* this is a structure representing a perl-level coroutine */ 261/* this is a structure representing a perl-level coroutine */
261struct coro { 262struct coro {
262 /* the C coroutine allocated to this perl coroutine, if any */ 263 /* the C coroutine allocated to this perl coroutine, if any */
263 coro_cctx *cctx; 264 coro_cctx *cctx;
264 265
266 /* ready queue */
267 struct coro *next_ready;
268
265 /* state data */ 269 /* state data */
266 struct CoroSLF slf_frame; /* saved slf frame */ 270 struct CoroSLF slf_frame; /* saved slf frame */
267 AV *mainstack; 271 AV *mainstack;
268 perl_slots *slot; /* basically the saved sp */ 272 perl_slots *slot; /* basically the saved sp */
269 273
… …
285 /* async_pool */ 289 /* async_pool */
286 SV *saved_deffh; 290 SV *saved_deffh;
287 SV *invoke_cb; 291 SV *invoke_cb;
288 AV *invoke_av; 292 AV *invoke_av;
289 293
294 /* on_enter/on_leave */
295 AV *on_enter;
296 AV *on_leave;
297
290 /* linked list */ 298 /* linked list */
291 struct coro *next, *prev; 299 struct coro *next, *prev;
292}; 300};
293 301
294typedef struct coro *Coro__State; 302typedef struct coro *Coro__State;
… …
309#define PRIO_MIN -4 317#define PRIO_MIN -4
310 318
311/* for Coro.pm */ 319/* for Coro.pm */
312static SV *coro_current; 320static SV *coro_current;
313static SV *coro_readyhook; 321static SV *coro_readyhook;
314static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 322static struct coro *coro_ready [PRIO_MAX - PRIO_MIN + 1][2]; /* head|tail */
315static CV *cv_coro_run, *cv_coro_terminate; 323static CV *cv_coro_run, *cv_coro_terminate;
316static struct coro *coro_first; 324static struct coro *coro_first;
317#define coro_nready coroapi.nready 325#define coro_nready coroapi.nready
318 326
319/** lowlevel stuff **********************************************************/ 327/** lowlevel stuff **********************************************************/
… …
352INLINE CV * 360INLINE CV *
353coro_sv_2cv (pTHX_ SV *sv) 361coro_sv_2cv (pTHX_ SV *sv)
354{ 362{
355 HV *st; 363 HV *st;
356 GV *gvp; 364 GV *gvp;
357 return sv_2cv (sv, &st, &gvp, 0); 365 CV *cv = sv_2cv (sv, &st, &gvp, 0);
366
367 if (!cv)
368 croak ("code reference expected");
369
370 return cv;
358} 371}
359 372
360/*****************************************************************************/ 373/*****************************************************************************/
361/* magic glue */ 374/* magic glue */
362 375
… …
521} 534}
522 535
523/** load & save, init *******************************************************/ 536/** load & save, init *******************************************************/
524 537
525static void 538static void
539on_enterleave_call (pTHX_ SV *cb);
540
541static void
526load_perl (pTHX_ Coro__State c) 542load_perl (pTHX_ Coro__State c)
527{ 543{
528 perl_slots *slot = c->slot; 544 perl_slots *slot = c->slot;
529 c->slot = 0; 545 c->slot = 0;
530 546
… …
556 PUTBACK; 572 PUTBACK;
557 } 573 }
558 574
559 slf_frame = c->slf_frame; 575 slf_frame = c->slf_frame;
560 CORO_THROW = c->except; 576 CORO_THROW = c->except;
577
578 if (expect_false (c->on_enter))
579 {
580 int i;
581
582 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
583 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
584 }
561} 585}
562 586
563static void 587static void
564save_perl (pTHX_ Coro__State c) 588save_perl (pTHX_ Coro__State c)
565{ 589{
590 if (expect_false (c->on_leave))
591 {
592 int i;
593
594 for (i = AvFILLp (c->on_leave); i >= 0; --i)
595 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
596 }
597
566 c->except = CORO_THROW; 598 c->except = CORO_THROW;
567 c->slf_frame = slf_frame; 599 c->slf_frame = slf_frame;
568 600
569 { 601 {
570 dSP; 602 dSP;
… …
583 { 615 {
584 while (expect_true (cxix >= 0)) 616 while (expect_true (cxix >= 0))
585 { 617 {
586 PERL_CONTEXT *cx = &ccstk[cxix--]; 618 PERL_CONTEXT *cx = &ccstk[cxix--];
587 619
588 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 620 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
589 { 621 {
590 CV *cv = cx->blk_sub.cv; 622 CV *cv = cx->blk_sub.cv;
591 623
592 if (expect_true (CvDEPTH (cv))) 624 if (expect_true (CvDEPTH (cv)))
593 { 625 {
… …
769#endif 801#endif
770 802
771/* 803/*
772 * This overrides the default magic get method of %SIG elements. 804 * 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 805 * 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 806 * and instead of trying to save and restore the hash elements, we just provide
775 * readback here. 807 * 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 */ 808 */
780static int 809static int
781coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 810coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
782{ 811{
783 const char *s = MgPV_nolen_const (mg); 812 const char *s = MgPV_nolen_const (mg);
… …
836 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 865 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
837 866
838 if (svp) 867 if (svp)
839 { 868 {
840 SV *old = *svp; 869 SV *old = *svp;
841 *svp = newSVsv (sv); 870 *svp = SvOK (sv) ? newSVsv (sv) : 0;
842 SvREFCNT_dec (old); 871 SvREFCNT_dec (old);
843 return 0; 872 return 0;
844 } 873 }
845 } 874 }
846 875
… …
938 /* copy throw, in case it was set before coro_setup */ 967 /* copy throw, in case it was set before coro_setup */
939 CORO_THROW = coro->except; 968 CORO_THROW = coro->except;
940} 969}
941 970
942static void 971static void
943coro_destruct_perl (pTHX_ struct coro *coro) 972coro_unwind_stacks (pTHX)
944{ 973{
945 if (!IN_DESTRUCT) 974 if (!IN_DESTRUCT)
946 { 975 {
947 /* restore all saved variables and stuff */ 976 /* restore all saved variables and stuff */
948 LEAVE_SCOPE (0); 977 LEAVE_SCOPE (0);
… …
956 POPSTACK_TO (PL_mainstack); 985 POPSTACK_TO (PL_mainstack);
957 986
958 /* unwind main stack */ 987 /* unwind main stack */
959 dounwind (-1); 988 dounwind (-1);
960 } 989 }
990}
961 991
962 SvREFCNT_dec (GvSV (PL_defgv)); 992static void
963 SvREFCNT_dec (GvAV (PL_defgv)); 993coro_destruct_perl (pTHX_ struct coro *coro)
964 SvREFCNT_dec (GvSV (PL_errgv)); 994{
965 SvREFCNT_dec (PL_defoutgv); 995 SV *svf [9];
966 SvREFCNT_dec (PL_rs);
967 SvREFCNT_dec (GvSV (irsgv));
968 SvREFCNT_dec (GvHV (PL_hintgv));
969 996
970 SvREFCNT_dec (PL_diehook);
971 SvREFCNT_dec (PL_warnhook);
972 997 {
998 struct coro *current = SvSTATE_current;
999
1000 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1001
1002 save_perl (aTHX_ current);
1003 load_perl (aTHX_ coro);
1004
1005 coro_unwind_stacks (aTHX);
1006 coro_destruct_stacks (aTHX);
1007
1008 // now save some sv's to be free'd later
1009 svf [0] = GvSV (PL_defgv);
1010 svf [1] = (SV *)GvAV (PL_defgv);
1011 svf [2] = GvSV (PL_errgv);
1012 svf [3] = (SV *)PL_defoutgv;
1013 svf [4] = PL_rs;
1014 svf [5] = GvSV (irsgv);
1015 svf [6] = (SV *)GvHV (PL_hintgv);
1016 svf [7] = PL_diehook;
1017 svf [8] = PL_warnhook;
1018 assert (9 == sizeof (svf) / sizeof (*svf));
1019
1020 load_perl (aTHX_ current);
1021 }
1022
1023 {
1024 int i;
1025
1026 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1027 SvREFCNT_dec (svf [i]);
1028
973 SvREFCNT_dec (coro->saved_deffh); 1029 SvREFCNT_dec (coro->saved_deffh);
974 SvREFCNT_dec (coro->rouse_cb); 1030 SvREFCNT_dec (coro->rouse_cb);
975 SvREFCNT_dec (coro->invoke_cb); 1031 SvREFCNT_dec (coro->invoke_cb);
976 SvREFCNT_dec (coro->invoke_av); 1032 SvREFCNT_dec (coro->invoke_av);
977 1033 }
978 coro_destruct_stacks (aTHX);
979} 1034}
980 1035
981INLINE void 1036INLINE void
982free_coro_mortal (pTHX) 1037free_coro_mortal (pTHX)
983{ 1038{
… …
1351 /* TODO: throwing up here is considered harmful */ 1406 /* TODO: throwing up here is considered harmful */
1352 1407
1353 if (expect_true (prev != next)) 1408 if (expect_true (prev != next))
1354 { 1409 {
1355 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1410 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1356 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,"); 1411 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1357 1412
1358 if (expect_false (next->flags & CF_RUNNING))
1359 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1360
1361 if (expect_false (next->flags & CF_DESTROYED)) 1413 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1362 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1414 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1363 1415
1364#if !PERL_VERSION_ATLEAST (5,10,0) 1416#if !PERL_VERSION_ATLEAST (5,10,0)
1365 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1417 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1366 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1418 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1367#endif 1419#endif
… …
1455coro_state_destroy (pTHX_ struct coro *coro) 1507coro_state_destroy (pTHX_ struct coro *coro)
1456{ 1508{
1457 if (coro->flags & CF_DESTROYED) 1509 if (coro->flags & CF_DESTROYED)
1458 return 0; 1510 return 0;
1459 1511
1460 if (coro->on_destroy) 1512 if (coro->on_destroy && !PL_dirty)
1461 coro->on_destroy (aTHX_ coro); 1513 coro->on_destroy (aTHX_ coro);
1462 1514
1463 coro->flags |= CF_DESTROYED; 1515 coro->flags |= CF_DESTROYED;
1464 1516
1465 if (coro->flags & CF_READY) 1517 if (coro->flags & CF_READY)
… …
1473 1525
1474 if (coro->mainstack 1526 if (coro->mainstack
1475 && coro->mainstack != main_mainstack 1527 && coro->mainstack != main_mainstack
1476 && coro->slot 1528 && coro->slot
1477 && !PL_dirty) 1529 && !PL_dirty)
1478 {
1479 struct coro temp;
1480
1481 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1482
1483 save_perl (aTHX_ &temp);
1484 load_perl (aTHX_ coro);
1485
1486 coro_destruct_perl (aTHX_ coro); 1530 coro_destruct_perl (aTHX_ coro);
1487
1488 load_perl (aTHX_ &temp);
1489
1490 coro->slot = 0;
1491 }
1492 1531
1493 cctx_destroy (coro->cctx); 1532 cctx_destroy (coro->cctx);
1494 SvREFCNT_dec (coro->startcv); 1533 SvREFCNT_dec (coro->startcv);
1495 SvREFCNT_dec (coro->args); 1534 SvREFCNT_dec (coro->args);
1496 SvREFCNT_dec (CORO_THROW); 1535 SvREFCNT_dec (CORO_THROW);
… …
1583/** Coro ********************************************************************/ 1622/** Coro ********************************************************************/
1584 1623
1585INLINE void 1624INLINE void
1586coro_enq (pTHX_ struct coro *coro) 1625coro_enq (pTHX_ struct coro *coro)
1587{ 1626{
1588 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1627 struct coro **ready = coro_ready [coro->prio - PRIO_MIN];
1589}
1590 1628
1591INLINE SV * 1629 SvREFCNT_inc_NN (coro->hv);
1630
1631 coro->next_ready = 0;
1632 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1633 ready [1] = coro;
1634}
1635
1636INLINE struct coro *
1592coro_deq (pTHX) 1637coro_deq (pTHX)
1593{ 1638{
1594 int prio; 1639 int prio;
1595 1640
1596 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1641 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1597 if (AvFILLp (coro_ready [prio]) >= 0) 1642 {
1598 return av_shift (coro_ready [prio]); 1643 struct coro **ready = coro_ready [prio];
1644
1645 if (ready [0])
1646 {
1647 struct coro *coro = ready [0];
1648 ready [0] = coro->next_ready;
1649 return coro;
1650 }
1651 }
1599 1652
1600 return 0; 1653 return 0;
1601} 1654}
1602 1655
1603static int 1656static int
… …
1667static void 1720static void
1668prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1721prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1669{ 1722{
1670 for (;;) 1723 for (;;)
1671 { 1724 {
1672 SV *next_sv = coro_deq (aTHX); 1725 struct coro *next = coro_deq (aTHX);
1673 1726
1674 if (expect_true (next_sv)) 1727 if (expect_true (next))
1675 { 1728 {
1676 struct coro *next = SvSTATE_hv (next_sv);
1677
1678 /* cannot transfer to destroyed coros, skip and look for next */ 1729 /* cannot transfer to destroyed coros, skip and look for next */
1679 if (expect_false (next->flags & CF_DESTROYED)) 1730 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1680 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1731 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1681 else 1732 else
1682 { 1733 {
1683 next->flags &= ~CF_READY; 1734 next->flags &= ~CF_READY;
1684 --coro_nready; 1735 --coro_nready;
1685 1736
… …
1863 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 1914 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1864 api_ready (aTHX_ sv_manager); 1915 api_ready (aTHX_ sv_manager);
1865 1916
1866 frame->prepare = prepare_schedule; 1917 frame->prepare = prepare_schedule;
1867 frame->check = slf_check_repeat; 1918 frame->check = slf_check_repeat;
1919
1920 /* as a minor optimisation, we could unwind all stacks here */
1921 /* but that puts extra pressure on pp_slf, and is not worth much */
1922 /*coro_unwind_stacks (aTHX);*/
1868} 1923}
1869 1924
1870/*****************************************************************************/ 1925/*****************************************************************************/
1871/* async pool handler */ 1926/* async pool handler */
1872 1927
… …
1955 SV *data = (SV *)GENSUB_ARG; 2010 SV *data = (SV *)GENSUB_ARG;
1956 2011
1957 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2012 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1958 { 2013 {
1959 /* first call, set args */ 2014 /* first call, set args */
2015 SV *coro = SvRV (data);
1960 AV *av = newAV (); 2016 AV *av = newAV ();
1961 SV *coro = SvRV (data);
1962 2017
1963 SvRV_set (data, (SV *)av); 2018 SvRV_set (data, (SV *)av);
1964 api_ready (aTHX_ coro);
1965 SvREFCNT_dec (coro);
1966 2019
1967 /* better take a full copy of the arguments */ 2020 /* better take a full copy of the arguments */
1968 while (items--) 2021 while (items--)
1969 av_store (av, items, newSVsv (ST (items))); 2022 av_store (av, items, newSVsv (ST (items)));
2023
2024 api_ready (aTHX_ coro);
2025 SvREFCNT_dec (coro);
1970 } 2026 }
1971 2027
1972 XSRETURN_EMPTY; 2028 XSRETURN_EMPTY;
1973} 2029}
1974 2030
… …
1991 2047
1992 EXTEND (SP, AvFILLp (av) + 1); 2048 EXTEND (SP, AvFILLp (av) + 1);
1993 for (i = 0; i <= AvFILLp (av); ++i) 2049 for (i = 0; i <= AvFILLp (av); ++i)
1994 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2050 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1995 2051
1996 /* we have stolen the elements, so ste length to zero and free */ 2052 /* we have stolen the elements, so set length to zero and free */
1997 AvFILLp (av) = -1; 2053 AvFILLp (av) = -1;
1998 av_undef (av); 2054 av_undef (av);
1999 2055
2000 PUTBACK; 2056 PUTBACK;
2001 } 2057 }
… …
2291 2347
2292 PL_op->op_ppaddr = pp_slf; 2348 PL_op->op_ppaddr = pp_slf;
2293 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2349 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2294 2350
2295 PL_op = (OP *)&slf_restore; 2351 PL_op = (OP *)&slf_restore;
2352}
2353
2354/*****************************************************************************/
2355/* dynamic wind */
2356
2357static void
2358on_enterleave_call (pTHX_ SV *cb)
2359{
2360 dSP;
2361
2362 PUSHSTACK;
2363
2364 PUSHMARK (SP);
2365 PUTBACK;
2366 call_sv (cb, G_VOID | G_DISCARD);
2367 SPAGAIN;
2368
2369 POPSTACK;
2370}
2371
2372static SV *
2373coro_avp_pop_and_free (pTHX_ AV **avp)
2374{
2375 AV *av = *avp;
2376 SV *res = av_pop (av);
2377
2378 if (AvFILLp (av) < 0)
2379 {
2380 *avp = 0;
2381 SvREFCNT_dec (av);
2382 }
2383
2384 return res;
2385}
2386
2387static void
2388coro_pop_on_enter (pTHX_ void *coro)
2389{
2390 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2391 SvREFCNT_dec (cb);
2392}
2393
2394static void
2395coro_pop_on_leave (pTHX_ void *coro)
2396{
2397 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2398 on_enterleave_call (aTHX_ sv_2mortal (cb));
2296} 2399}
2297 2400
2298/*****************************************************************************/ 2401/*****************************************************************************/
2299/* PerlIO::cede */ 2402/* PerlIO::cede */
2300 2403
… …
2374/* Coro::Semaphore & Coro::Signal */ 2477/* Coro::Semaphore & Coro::Signal */
2375 2478
2376static SV * 2479static SV *
2377coro_waitarray_new (pTHX_ int count) 2480coro_waitarray_new (pTHX_ int count)
2378{ 2481{
2379 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2482 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2380 AV *av = newAV (); 2483 AV *av = newAV ();
2381 SV **ary; 2484 SV **ary;
2382 2485
2383 /* unfortunately, building manually saves memory */ 2486 /* unfortunately, building manually saves memory */
2384 Newx (ary, 2, SV *); 2487 Newx (ary, 2, SV *);
… …
2528 { 2631 {
2529 /* callback form */ 2632 /* callback form */
2530 AV *av = (AV *)SvRV (arg [0]); 2633 AV *av = (AV *)SvRV (arg [0]);
2531 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2634 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2532 2635
2533 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2636 av_push (av, SvREFCNT_inc_NN (cb_cv));
2534 2637
2535 if (SvIVX (AvARRAY (av)[0]) > 0) 2638 if (SvIVX (AvARRAY (av)[0]) > 0)
2536 coro_semaphore_adjust (aTHX_ av, 0); 2639 coro_semaphore_adjust (aTHX_ av, 0);
2537 2640
2538 frame->prepare = prepare_nop; 2641 frame->prepare = prepare_nop;
… …
2562 AvARRAY (av)[0] = AvARRAY (av)[1]; 2665 AvARRAY (av)[0] = AvARRAY (av)[1];
2563 AvARRAY (av)[1] = cb; 2666 AvARRAY (av)[1] = cb;
2564 2667
2565 cb = av_shift (av); 2668 cb = av_shift (av);
2566 2669
2670 if (SvTYPE (cb) == SVt_PVCV)
2671 {
2672 dSP;
2673 PUSHMARK (SP);
2674 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2675 PUTBACK;
2676 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2677 }
2678 else
2679 {
2567 api_ready (aTHX_ cb); 2680 api_ready (aTHX_ cb);
2568 sv_setiv (cb, 0); /* signal waiter */ 2681 sv_setiv (cb, 0); /* signal waiter */
2682 }
2683
2569 SvREFCNT_dec (cb); 2684 SvREFCNT_dec (cb);
2570 2685
2571 --count; 2686 --count;
2572 } 2687 }
2573} 2688}
… …
2582static void 2697static void
2583slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2698slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2584{ 2699{
2585 AV *av = (AV *)SvRV (arg [0]); 2700 AV *av = (AV *)SvRV (arg [0]);
2586 2701
2702 if (items >= 2)
2703 {
2704 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2705 av_push (av, SvREFCNT_inc_NN (cb_cv));
2706
2587 if (SvIVX (AvARRAY (av)[0])) 2707 if (SvIVX (AvARRAY (av)[0]))
2708 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2709
2710 frame->prepare = prepare_nop;
2711 frame->check = slf_check_nop;
2712 }
2713 else if (SvIVX (AvARRAY (av)[0]))
2588 { 2714 {
2589 SvIVX (AvARRAY (av)[0]) = 0; 2715 SvIVX (AvARRAY (av)[0]) = 0;
2590 frame->prepare = prepare_nop; 2716 frame->prepare = prepare_nop;
2591 frame->check = slf_check_nop; 2717 frame->check = slf_check_nop;
2592 } 2718 }
2593 else 2719 else
2594 { 2720 {
2595 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2721 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2596 2722
2597 av_push (av, waiter); 2723 av_push (av, waiter);
2598 2724
2599 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2725 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2600 frame->prepare = prepare_schedule; 2726 frame->prepare = prepare_schedule;
… …
2998 eval = 1 3124 eval = 1
2999 CODE: 3125 CODE:
3000{ 3126{
3001 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3127 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3002 { 3128 {
3003 struct coro temp; 3129 struct coro *current = SvSTATE_current;
3004 3130
3005 if (!(coro->flags & CF_RUNNING)) 3131 if (current != coro)
3006 { 3132 {
3007 PUTBACK; 3133 PUTBACK;
3008 save_perl (aTHX_ &temp); 3134 save_perl (aTHX_ current);
3009 load_perl (aTHX_ coro); 3135 load_perl (aTHX_ coro);
3136 SPAGAIN;
3010 } 3137 }
3011 3138
3012 {
3013 dSP;
3014 ENTER;
3015 SAVETMPS;
3016 PUTBACK;
3017 PUSHSTACK; 3139 PUSHSTACK;
3140
3018 PUSHMARK (SP); 3141 PUSHMARK (SP);
3142 PUTBACK;
3019 3143
3020 if (ix) 3144 if (ix)
3021 eval_sv (coderef, 0); 3145 eval_sv (coderef, 0);
3022 else 3146 else
3023 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3147 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3024 3148
3025 POPSTACK; 3149 POPSTACK;
3026 SPAGAIN; 3150 SPAGAIN;
3027 FREETMPS;
3028 LEAVE;
3029 PUTBACK;
3030 }
3031 3151
3032 if (!(coro->flags & CF_RUNNING)) 3152 if (current != coro)
3033 { 3153 {
3154 PUTBACK;
3034 save_perl (aTHX_ coro); 3155 save_perl (aTHX_ coro);
3035 load_perl (aTHX_ &temp); 3156 load_perl (aTHX_ current);
3036 SPAGAIN; 3157 SPAGAIN;
3037 } 3158 }
3038 } 3159 }
3039} 3160}
3040 3161
… …
3044 ALIAS: 3165 ALIAS:
3045 is_ready = CF_READY 3166 is_ready = CF_READY
3046 is_running = CF_RUNNING 3167 is_running = CF_RUNNING
3047 is_new = CF_NEW 3168 is_new = CF_NEW
3048 is_destroyed = CF_DESTROYED 3169 is_destroyed = CF_DESTROYED
3170 is_suspended = CF_SUSPENDED
3049 CODE: 3171 CODE:
3050 RETVAL = boolSV (coro->flags & ix); 3172 RETVAL = boolSV (coro->flags & ix);
3051 OUTPUT: 3173 OUTPUT:
3052 RETVAL 3174 RETVAL
3053 3175
… …
3057 CODE: 3179 CODE:
3058{ 3180{
3059 struct coro *current = SvSTATE_current; 3181 struct coro *current = SvSTATE_current;
3060 SV **throwp = self == current ? &CORO_THROW : &self->except; 3182 SV **throwp = self == current ? &CORO_THROW : &self->except;
3061 SvREFCNT_dec (*throwp); 3183 SvREFCNT_dec (*throwp);
3184 SvGETMAGIC (throw);
3062 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3185 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
3063} 3186}
3064 3187
3065void 3188void
3066api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3189api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
3118 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3241 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3119 3242
3120 SV *tmp = *src; *src = *dst; *dst = tmp; 3243 SV *tmp = *src; *src = *dst; *dst = tmp;
3121 } 3244 }
3122 3245
3246void
3247cancel (Coro::State self)
3248 CODE:
3249 coro_state_destroy (aTHX_ self);
3250 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3251
3123 3252
3124MODULE = Coro::State PACKAGE = Coro 3253MODULE = Coro::State PACKAGE = Coro
3125 3254
3126BOOT: 3255BOOT:
3127{ 3256{
3128 int i;
3129
3130 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3257 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3131 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3258 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3132 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3259 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3133 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3260 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3134 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3261 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
… …
3149 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3276 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
3150 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3277 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
3151 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3278 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
3152 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3279 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
3153 3280
3154 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3155 coro_ready[i] = newAV ();
3156
3157 { 3281 {
3158 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3282 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3159 3283
3160 coroapi.schedule = api_schedule; 3284 coroapi.schedule = api_schedule;
3161 coroapi.schedule_to = api_schedule_to; 3285 coroapi.schedule_to = api_schedule_to;
… …
3201cede_notself (...) 3325cede_notself (...)
3202 CODE: 3326 CODE:
3203 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3327 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3204 3328
3205void 3329void
3206_cancel (Coro::State self)
3207 CODE:
3208 coro_state_destroy (aTHX_ self);
3209 coro_call_on_destroy (aTHX_ self);
3210
3211void
3212_set_current (SV *current) 3330_set_current (SV *current)
3213 PROTOTYPE: $ 3331 PROTOTYPE: $
3214 CODE: 3332 CODE:
3215 SvREFCNT_dec (SvRV (coro_current)); 3333 SvREFCNT_dec (SvRV (coro_current));
3216 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 3334 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
… …
3218void 3336void
3219_set_readyhook (SV *hook) 3337_set_readyhook (SV *hook)
3220 PROTOTYPE: $ 3338 PROTOTYPE: $
3221 CODE: 3339 CODE:
3222 SvREFCNT_dec (coro_readyhook); 3340 SvREFCNT_dec (coro_readyhook);
3341 SvGETMAGIC (hook);
3223 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3342 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
3224 3343
3225int 3344int
3226prio (Coro::State coro, int newprio = 0) 3345prio (Coro::State coro, int newprio = 0)
3227 PROTOTYPE: $;$ 3346 PROTOTYPE: $;$
… …
3258 PROTOTYPE: 3377 PROTOTYPE:
3259 CODE: 3378 CODE:
3260 RETVAL = coro_nready; 3379 RETVAL = coro_nready;
3261 OUTPUT: 3380 OUTPUT:
3262 RETVAL 3381 RETVAL
3382
3383void
3384suspend (Coro::State self)
3385 PROTOTYPE: $
3386 CODE:
3387 self->flags |= CF_SUSPENDED;
3388
3389void
3390resume (Coro::State self)
3391 PROTOTYPE: $
3392 CODE:
3393 self->flags &= ~CF_SUSPENDED;
3263 3394
3264void 3395void
3265_pool_handler (...) 3396_pool_handler (...)
3266 CODE: 3397 CODE:
3267 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3398 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
… …
3322rouse_wait (...) 3453rouse_wait (...)
3323 PROTOTYPE: ;$ 3454 PROTOTYPE: ;$
3324 PPCODE: 3455 PPCODE:
3325 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3456 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3326 3457
3458void
3459on_enter (SV *block)
3460 ALIAS:
3461 on_leave = 1
3462 PROTOTYPE: &
3463 CODE:
3464{
3465 struct coro *coro = SvSTATE_current;
3466 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3467
3468 block = (SV *)coro_sv_2cv (aTHX_ block);
3469
3470 if (!*avp)
3471 *avp = newAV ();
3472
3473 av_push (*avp, SvREFCNT_inc (block));
3474
3475 if (!ix)
3476 on_enterleave_call (aTHX_ block);
3477
3478 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3479 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3480 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3481}
3482
3327 3483
3328MODULE = Coro::State PACKAGE = PerlIO::cede 3484MODULE = Coro::State PACKAGE = PerlIO::cede
3329 3485
3330BOOT: 3486BOOT:
3331 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3487 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3334MODULE = Coro::State PACKAGE = Coro::Semaphore 3490MODULE = Coro::State PACKAGE = Coro::Semaphore
3335 3491
3336SV * 3492SV *
3337new (SV *klass, SV *count = 0) 3493new (SV *klass, SV *count = 0)
3338 CODE: 3494 CODE:
3495{
3496 int semcnt = 1;
3497
3498 if (count)
3499 {
3500 SvGETMAGIC (count);
3501
3502 if (SvOK (count))
3503 semcnt = SvIV (count);
3504 }
3505
3339 RETVAL = sv_bless ( 3506 RETVAL = sv_bless (
3340 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3507 coro_waitarray_new (aTHX_ semcnt),
3341 GvSTASH (CvGV (cv)) 3508 GvSTASH (CvGV (cv))
3342 ); 3509 );
3510}
3343 OUTPUT: 3511 OUTPUT:
3344 RETVAL 3512 RETVAL
3345 3513
3346# helper for Coro::Channel 3514# helper for Coro::Channel and others
3347SV * 3515SV *
3348_alloc (int count) 3516_alloc (int count)
3349 CODE: 3517 CODE:
3350 RETVAL = coro_waitarray_new (aTHX_ count); 3518 RETVAL = coro_waitarray_new (aTHX_ count);
3351 OUTPUT: 3519 OUTPUT:
… …
3409 for (i = 1; i <= wcount; ++i) 3577 for (i = 1; i <= wcount; ++i)
3410 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3578 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3411 } 3579 }
3412} 3580}
3413 3581
3582MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3583
3584void
3585_may_delete (SV *sem, int count, int extra_refs)
3586 PPCODE:
3587{
3588 AV *av = (AV *)SvRV (sem);
3589
3590 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3591 && AvFILLp (av) == 0 /* no waiters, just count */
3592 && SvIV (AvARRAY (av)[0]) == count)
3593 XSRETURN_YES;
3594
3595 XSRETURN_NO;
3596}
3597
3414MODULE = Coro::State PACKAGE = Coro::Signal 3598MODULE = Coro::State PACKAGE = Coro::Signal
3415 3599
3416SV * 3600SV *
3417new (SV *klass) 3601new (SV *klass)
3418 CODE: 3602 CODE:

Diff Legend

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