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.332 by root, Thu Nov 27 12:20:31 2008 UTC vs.
Revision 1.358 by root, Mon Jun 29 04:30:25 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
156#define GCoroAPI (&coroapi) /* very sneaky */ 156#define GCoroAPI (&coroapi) /* very sneaky */
157 157
158#ifdef USE_ITHREADS 158#ifdef USE_ITHREADS
159# if CORO_PTHREAD 159# if CORO_PTHREAD
160static void *coro_thx; 160static void *coro_thx;
161# endif
162#endif
163
164#ifdef __linux
165# include <time.h> /* for timespec */
166# include <syscall.h> /* for SYS_* */
167# ifdef SYS_clock_gettime
168# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
169# define CORO_CLOCK_MONOTONIC 1
170# define CORO_CLOCK_THREAD_CPUTIME_ID 3
161# endif 171# endif
162#endif 172#endif
163 173
164static double (*nvtime)(); /* so why doesn't it take void? */ 174static double (*nvtime)(); /* so why doesn't it take void? */
165 175
238enum { 248enum {
239 CF_RUNNING = 0x0001, /* coroutine is running */ 249 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 250 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 251 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 252 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
253 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
243}; 254};
244 255
245/* the structure where most of the perl state is stored, overlaid on the cxstack */ 256/* the structure where most of the perl state is stored, overlaid on the cxstack */
246typedef struct 257typedef struct
247{ 258{
260/* this is a structure representing a perl-level coroutine */ 271/* this is a structure representing a perl-level coroutine */
261struct coro { 272struct coro {
262 /* the C coroutine allocated to this perl coroutine, if any */ 273 /* the C coroutine allocated to this perl coroutine, if any */
263 coro_cctx *cctx; 274 coro_cctx *cctx;
264 275
276 /* ready queue */
277 struct coro *next_ready;
278
265 /* state data */ 279 /* state data */
266 struct CoroSLF slf_frame; /* saved slf frame */ 280 struct CoroSLF slf_frame; /* saved slf frame */
267 AV *mainstack; 281 AV *mainstack;
268 perl_slots *slot; /* basically the saved sp */ 282 perl_slots *slot; /* basically the saved sp */
269 283
285 /* async_pool */ 299 /* async_pool */
286 SV *saved_deffh; 300 SV *saved_deffh;
287 SV *invoke_cb; 301 SV *invoke_cb;
288 AV *invoke_av; 302 AV *invoke_av;
289 303
304 /* on_enter/on_leave */
305 AV *on_enter;
306 AV *on_leave;
307
290 /* linked list */ 308 /* linked list */
291 struct coro *next, *prev; 309 struct coro *next, *prev;
292}; 310};
293 311
294typedef struct coro *Coro__State; 312typedef struct coro *Coro__State;
299/* the mainr easonw e don't support windows process emulation */ 317/* the mainr easonw e don't support windows process emulation */
300static struct CoroSLF slf_frame; /* the current slf frame */ 318static struct CoroSLF slf_frame; /* the current slf frame */
301 319
302/** Coro ********************************************************************/ 320/** Coro ********************************************************************/
303 321
304#define PRIO_MAX 3 322#define CORO_PRIO_MAX 3
305#define PRIO_HIGH 1 323#define CORO_PRIO_HIGH 1
306#define PRIO_NORMAL 0 324#define CORO_PRIO_NORMAL 0
307#define PRIO_LOW -1 325#define CORO_PRIO_LOW -1
308#define PRIO_IDLE -3 326#define CORO_PRIO_IDLE -3
309#define PRIO_MIN -4 327#define CORO_PRIO_MIN -4
310 328
311/* for Coro.pm */ 329/* for Coro.pm */
312static SV *coro_current; 330static SV *coro_current;
313static SV *coro_readyhook; 331static SV *coro_readyhook;
314static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 332static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
315static CV *cv_coro_run, *cv_coro_terminate; 333static CV *cv_coro_run, *cv_coro_terminate;
316static struct coro *coro_first; 334static struct coro *coro_first;
317#define coro_nready coroapi.nready 335#define coro_nready coroapi.nready
318 336
319/** lowlevel stuff **********************************************************/ 337/** lowlevel stuff **********************************************************/
352INLINE CV * 370INLINE CV *
353coro_sv_2cv (pTHX_ SV *sv) 371coro_sv_2cv (pTHX_ SV *sv)
354{ 372{
355 HV *st; 373 HV *st;
356 GV *gvp; 374 GV *gvp;
357 return sv_2cv (sv, &st, &gvp, 0); 375 CV *cv = sv_2cv (sv, &st, &gvp, 0);
376
377 if (!cv)
378 croak ("code reference expected");
379
380 return cv;
358} 381}
359 382
360/*****************************************************************************/ 383/*****************************************************************************/
361/* magic glue */ 384/* magic glue */
362 385
462static int 485static int
463coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 486coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
464{ 487{
465 AV *padlist; 488 AV *padlist;
466 AV *av = (AV *)mg->mg_obj; 489 AV *av = (AV *)mg->mg_obj;
490
491 /* perl manages to free our internal AV and _then_ call us */
492 if (IN_DESTRUCT)
493 return;
467 494
468 /* casting is fun. */ 495 /* casting is fun. */
469 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 496 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
470 free_padlist (aTHX_ padlist); 497 free_padlist (aTHX_ padlist);
471 498
521} 548}
522 549
523/** load & save, init *******************************************************/ 550/** load & save, init *******************************************************/
524 551
525static void 552static void
553on_enterleave_call (pTHX_ SV *cb);
554
555static void
526load_perl (pTHX_ Coro__State c) 556load_perl (pTHX_ Coro__State c)
527{ 557{
528 perl_slots *slot = c->slot; 558 perl_slots *slot = c->slot;
529 c->slot = 0; 559 c->slot = 0;
530 560
556 PUTBACK; 586 PUTBACK;
557 } 587 }
558 588
559 slf_frame = c->slf_frame; 589 slf_frame = c->slf_frame;
560 CORO_THROW = c->except; 590 CORO_THROW = c->except;
591
592 if (expect_false (c->on_enter))
593 {
594 int i;
595
596 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
597 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
598 }
561} 599}
562 600
563static void 601static void
564save_perl (pTHX_ Coro__State c) 602save_perl (pTHX_ Coro__State c)
565{ 603{
604 if (expect_false (c->on_leave))
605 {
606 int i;
607
608 for (i = AvFILLp (c->on_leave); i >= 0; --i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
610 }
611
566 c->except = CORO_THROW; 612 c->except = CORO_THROW;
567 c->slf_frame = slf_frame; 613 c->slf_frame = slf_frame;
568 614
569 { 615 {
570 dSP; 616 dSP;
583 { 629 {
584 while (expect_true (cxix >= 0)) 630 while (expect_true (cxix >= 0))
585 { 631 {
586 PERL_CONTEXT *cx = &ccstk[cxix--]; 632 PERL_CONTEXT *cx = &ccstk[cxix--];
587 633
588 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 634 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
589 { 635 {
590 CV *cv = cx->blk_sub.cv; 636 CV *cv = cx->blk_sub.cv;
591 637
592 if (expect_true (CvDEPTH (cv))) 638 if (expect_true (CvDEPTH (cv)))
593 { 639 {
769#endif 815#endif
770 816
771/* 817/*
772 * This overrides the default magic get method of %SIG elements. 818 * 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 819 * 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 820 * and instead of trying to save and restore the hash elements, we just provide
775 * readback here. 821 * 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 */ 822 */
780static int 823static int
781coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 824coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
782{ 825{
783 const char *s = MgPV_nolen_const (mg); 826 const char *s = MgPV_nolen_const (mg);
836 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 879 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
837 880
838 if (svp) 881 if (svp)
839 { 882 {
840 SV *old = *svp; 883 SV *old = *svp;
841 *svp = newSVsv (sv); 884 *svp = SvOK (sv) ? newSVsv (sv) : 0;
842 SvREFCNT_dec (old); 885 SvREFCNT_dec (old);
843 return 0; 886 return 0;
844 } 887 }
845 } 888 }
846 889
938 /* copy throw, in case it was set before coro_setup */ 981 /* copy throw, in case it was set before coro_setup */
939 CORO_THROW = coro->except; 982 CORO_THROW = coro->except;
940} 983}
941 984
942static void 985static void
943coro_destruct (pTHX_ struct coro *coro) 986coro_unwind_stacks (pTHX)
944{ 987{
945 if (!IN_DESTRUCT) 988 if (!IN_DESTRUCT)
946 { 989 {
947 /* restore all saved variables and stuff */ 990 /* restore all saved variables and stuff */
948 LEAVE_SCOPE (0); 991 LEAVE_SCOPE (0);
956 POPSTACK_TO (PL_mainstack); 999 POPSTACK_TO (PL_mainstack);
957 1000
958 /* unwind main stack */ 1001 /* unwind main stack */
959 dounwind (-1); 1002 dounwind (-1);
960 } 1003 }
1004}
961 1005
962 SvREFCNT_dec (GvSV (PL_defgv)); 1006static void
963 SvREFCNT_dec (GvAV (PL_defgv)); 1007coro_destruct_perl (pTHX_ struct coro *coro)
964 SvREFCNT_dec (GvSV (PL_errgv)); 1008{
965 SvREFCNT_dec (PL_defoutgv); 1009 SV *svf [9];
966 SvREFCNT_dec (PL_rs);
967 SvREFCNT_dec (GvSV (irsgv));
968 SvREFCNT_dec (GvHV (PL_hintgv));
969 1010
970 SvREFCNT_dec (PL_diehook);
971 SvREFCNT_dec (PL_warnhook);
972 1011 {
1012 struct coro *current = SvSTATE_current;
1013
1014 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1015
1016 save_perl (aTHX_ current);
1017 load_perl (aTHX_ coro);
1018
1019 coro_unwind_stacks (aTHX);
1020 coro_destruct_stacks (aTHX);
1021
1022 // now save some sv's to be free'd later
1023 svf [0] = GvSV (PL_defgv);
1024 svf [1] = (SV *)GvAV (PL_defgv);
1025 svf [2] = GvSV (PL_errgv);
1026 svf [3] = (SV *)PL_defoutgv;
1027 svf [4] = PL_rs;
1028 svf [5] = GvSV (irsgv);
1029 svf [6] = (SV *)GvHV (PL_hintgv);
1030 svf [7] = PL_diehook;
1031 svf [8] = PL_warnhook;
1032 assert (9 == sizeof (svf) / sizeof (*svf));
1033
1034 load_perl (aTHX_ current);
1035 }
1036
1037 {
1038 int i;
1039
1040 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1041 SvREFCNT_dec (svf [i]);
1042
973 SvREFCNT_dec (coro->saved_deffh); 1043 SvREFCNT_dec (coro->saved_deffh);
974 SvREFCNT_dec (coro->rouse_cb); 1044 SvREFCNT_dec (coro->rouse_cb);
975 SvREFCNT_dec (coro->invoke_cb); 1045 SvREFCNT_dec (coro->invoke_cb);
976 SvREFCNT_dec (coro->invoke_av); 1046 SvREFCNT_dec (coro->invoke_av);
977 1047 }
978 coro_destruct_stacks (aTHX);
979} 1048}
980 1049
981INLINE void 1050INLINE void
982free_coro_mortal (pTHX) 1051free_coro_mortal (pTHX)
983{ 1052{
1277cctx_destroy (coro_cctx *cctx) 1346cctx_destroy (coro_cctx *cctx)
1278{ 1347{
1279 if (!cctx) 1348 if (!cctx)
1280 return; 1349 return;
1281 1350
1282 assert (cctx != cctx_current);//D temporary 1351 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1283 1352
1284 --cctx_count; 1353 --cctx_count;
1285 coro_destroy (&cctx->cctx); 1354 coro_destroy (&cctx->cctx);
1286 1355
1287 /* coro_transfer creates new, empty cctx's */ 1356 /* coro_transfer creates new, empty cctx's */
1351 /* TODO: throwing up here is considered harmful */ 1420 /* TODO: throwing up here is considered harmful */
1352 1421
1353 if (expect_true (prev != next)) 1422 if (expect_true (prev != next))
1354 { 1423 {
1355 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1424 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,"); 1425 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1357 1426
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)) 1427 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,"); 1428 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1363 1429
1364#if !PERL_VERSION_ATLEAST (5,10,0) 1430#if !PERL_VERSION_ATLEAST (5,10,0)
1365 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1431 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,"); 1432 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1367#endif 1433#endif
1405 coro_setup (aTHX_ next); 1471 coro_setup (aTHX_ next);
1406 } 1472 }
1407 else 1473 else
1408 load_perl (aTHX_ next); 1474 load_perl (aTHX_ next);
1409 1475
1410 assert (!prev->cctx);//D temporary
1411
1412 /* possibly untie and reuse the cctx */ 1476 /* possibly untie and reuse the cctx */
1413 if (expect_true ( 1477 if (expect_true (
1414 cctx_current->idle_sp == STACKLEVEL 1478 cctx_current->idle_sp == STACKLEVEL
1415 && !(cctx_current->flags & CC_TRACE) 1479 && !(cctx_current->flags & CC_TRACE)
1416 && !force_cctx 1480 && !force_cctx
1457coro_state_destroy (pTHX_ struct coro *coro) 1521coro_state_destroy (pTHX_ struct coro *coro)
1458{ 1522{
1459 if (coro->flags & CF_DESTROYED) 1523 if (coro->flags & CF_DESTROYED)
1460 return 0; 1524 return 0;
1461 1525
1462 if (coro->on_destroy) 1526 if (coro->on_destroy && !PL_dirty)
1463 coro->on_destroy (aTHX_ coro); 1527 coro->on_destroy (aTHX_ coro);
1464 1528
1465 coro->flags |= CF_DESTROYED; 1529 coro->flags |= CF_DESTROYED;
1466 1530
1467 if (coro->flags & CF_READY) 1531 if (coro->flags & CF_READY)
1471 --coro_nready; 1535 --coro_nready;
1472 } 1536 }
1473 else 1537 else
1474 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1538 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1475 1539
1476 if (coro->mainstack && coro->mainstack != main_mainstack) 1540 if (coro->mainstack
1477 { 1541 && coro->mainstack != main_mainstack
1478 struct coro temp; 1542 && coro->slot
1479 1543 && !PL_dirty)
1480 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1481
1482 save_perl (aTHX_ &temp);
1483 load_perl (aTHX_ coro);
1484
1485 coro_destruct (aTHX_ coro); 1544 coro_destruct_perl (aTHX_ coro);
1486
1487 load_perl (aTHX_ &temp);
1488
1489 coro->slot = 0;
1490 }
1491 1545
1492 cctx_destroy (coro->cctx); 1546 cctx_destroy (coro->cctx);
1493 SvREFCNT_dec (coro->startcv); 1547 SvREFCNT_dec (coro->startcv);
1494 SvREFCNT_dec (coro->args); 1548 SvREFCNT_dec (coro->args);
1495 SvREFCNT_dec (CORO_THROW); 1549 SvREFCNT_dec (CORO_THROW);
1582/** Coro ********************************************************************/ 1636/** Coro ********************************************************************/
1583 1637
1584INLINE void 1638INLINE void
1585coro_enq (pTHX_ struct coro *coro) 1639coro_enq (pTHX_ struct coro *coro)
1586{ 1640{
1587 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1641 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1588}
1589 1642
1590INLINE SV * 1643 SvREFCNT_inc_NN (coro->hv);
1644
1645 coro->next_ready = 0;
1646 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1647 ready [1] = coro;
1648}
1649
1650INLINE struct coro *
1591coro_deq (pTHX) 1651coro_deq (pTHX)
1592{ 1652{
1593 int prio; 1653 int prio;
1594 1654
1595 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1655 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1596 if (AvFILLp (coro_ready [prio]) >= 0) 1656 {
1597 return av_shift (coro_ready [prio]); 1657 struct coro **ready = coro_ready [prio];
1658
1659 if (ready [0])
1660 {
1661 struct coro *coro = ready [0];
1662 ready [0] = coro->next_ready;
1663 return coro;
1664 }
1665 }
1598 1666
1599 return 0; 1667 return 0;
1600} 1668}
1601 1669
1602static int 1670static int
1666static void 1734static void
1667prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1735prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1668{ 1736{
1669 for (;;) 1737 for (;;)
1670 { 1738 {
1671 SV *next_sv = coro_deq (aTHX); 1739 struct coro *next = coro_deq (aTHX);
1672 1740
1673 if (expect_true (next_sv)) 1741 if (expect_true (next))
1674 { 1742 {
1675 struct coro *next = SvSTATE_hv (next_sv);
1676
1677 /* cannot transfer to destroyed coros, skip and look for next */ 1743 /* cannot transfer to destroyed coros, skip and look for next */
1678 if (expect_false (next->flags & CF_DESTROYED)) 1744 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1679 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1745 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1680 else 1746 else
1681 { 1747 {
1682 next->flags &= ~CF_READY; 1748 next->flags &= ~CF_READY;
1683 --coro_nready; 1749 --coro_nready;
1684 1750
1862 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 1928 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1863 api_ready (aTHX_ sv_manager); 1929 api_ready (aTHX_ sv_manager);
1864 1930
1865 frame->prepare = prepare_schedule; 1931 frame->prepare = prepare_schedule;
1866 frame->check = slf_check_repeat; 1932 frame->check = slf_check_repeat;
1933
1934 /* as a minor optimisation, we could unwind all stacks here */
1935 /* but that puts extra pressure on pp_slf, and is not worth much */
1936 /*coro_unwind_stacks (aTHX);*/
1867} 1937}
1868 1938
1869/*****************************************************************************/ 1939/*****************************************************************************/
1870/* async pool handler */ 1940/* async pool handler */
1871 1941
1954 SV *data = (SV *)GENSUB_ARG; 2024 SV *data = (SV *)GENSUB_ARG;
1955 2025
1956 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2026 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1957 { 2027 {
1958 /* first call, set args */ 2028 /* first call, set args */
2029 SV *coro = SvRV (data);
1959 AV *av = newAV (); 2030 AV *av = newAV ();
1960 SV *coro = SvRV (data);
1961 2031
1962 SvRV_set (data, (SV *)av); 2032 SvRV_set (data, (SV *)av);
1963 api_ready (aTHX_ coro);
1964 SvREFCNT_dec (coro);
1965 2033
1966 /* better take a full copy of the arguments */ 2034 /* better take a full copy of the arguments */
1967 while (items--) 2035 while (items--)
1968 av_store (av, items, newSVsv (ST (items))); 2036 av_store (av, items, newSVsv (ST (items)));
2037
2038 api_ready (aTHX_ coro);
2039 SvREFCNT_dec (coro);
1969 } 2040 }
1970 2041
1971 XSRETURN_EMPTY; 2042 XSRETURN_EMPTY;
1972} 2043}
1973 2044
1990 2061
1991 EXTEND (SP, AvFILLp (av) + 1); 2062 EXTEND (SP, AvFILLp (av) + 1);
1992 for (i = 0; i <= AvFILLp (av); ++i) 2063 for (i = 0; i <= AvFILLp (av); ++i)
1993 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2064 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1994 2065
1995 /* we have stolen the elements, so ste length to zero and free */ 2066 /* we have stolen the elements, so set length to zero and free */
1996 AvFILLp (av) = -1; 2067 AvFILLp (av) = -1;
1997 av_undef (av); 2068 av_undef (av);
1998 2069
1999 PUTBACK; 2070 PUTBACK;
2000 } 2071 }
2290 2361
2291 PL_op->op_ppaddr = pp_slf; 2362 PL_op->op_ppaddr = pp_slf;
2292 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2363 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2293 2364
2294 PL_op = (OP *)&slf_restore; 2365 PL_op = (OP *)&slf_restore;
2366}
2367
2368/*****************************************************************************/
2369/* dynamic wind */
2370
2371static void
2372on_enterleave_call (pTHX_ SV *cb)
2373{
2374 dSP;
2375
2376 PUSHSTACK;
2377
2378 PUSHMARK (SP);
2379 PUTBACK;
2380 call_sv (cb, G_VOID | G_DISCARD);
2381 SPAGAIN;
2382
2383 POPSTACK;
2384}
2385
2386static SV *
2387coro_avp_pop_and_free (pTHX_ AV **avp)
2388{
2389 AV *av = *avp;
2390 SV *res = av_pop (av);
2391
2392 if (AvFILLp (av) < 0)
2393 {
2394 *avp = 0;
2395 SvREFCNT_dec (av);
2396 }
2397
2398 return res;
2399}
2400
2401static void
2402coro_pop_on_enter (pTHX_ void *coro)
2403{
2404 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2405 SvREFCNT_dec (cb);
2406}
2407
2408static void
2409coro_pop_on_leave (pTHX_ void *coro)
2410{
2411 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2412 on_enterleave_call (aTHX_ sv_2mortal (cb));
2295} 2413}
2296 2414
2297/*****************************************************************************/ 2415/*****************************************************************************/
2298/* PerlIO::cede */ 2416/* PerlIO::cede */
2299 2417
2373/* Coro::Semaphore & Coro::Signal */ 2491/* Coro::Semaphore & Coro::Signal */
2374 2492
2375static SV * 2493static SV *
2376coro_waitarray_new (pTHX_ int count) 2494coro_waitarray_new (pTHX_ int count)
2377{ 2495{
2378 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2496 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2379 AV *av = newAV (); 2497 AV *av = newAV ();
2380 SV **ary; 2498 SV **ary;
2381 2499
2382 /* unfortunately, building manually saves memory */ 2500 /* unfortunately, building manually saves memory */
2383 Newx (ary, 2, SV *); 2501 Newx (ary, 2, SV *);
2527 { 2645 {
2528 /* callback form */ 2646 /* callback form */
2529 AV *av = (AV *)SvRV (arg [0]); 2647 AV *av = (AV *)SvRV (arg [0]);
2530 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2648 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2531 2649
2532 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2650 av_push (av, SvREFCNT_inc_NN (cb_cv));
2533 2651
2534 if (SvIVX (AvARRAY (av)[0]) > 0) 2652 if (SvIVX (AvARRAY (av)[0]) > 0)
2535 coro_semaphore_adjust (aTHX_ av, 0); 2653 coro_semaphore_adjust (aTHX_ av, 0);
2536 2654
2537 frame->prepare = prepare_nop; 2655 frame->prepare = prepare_nop;
2561 AvARRAY (av)[0] = AvARRAY (av)[1]; 2679 AvARRAY (av)[0] = AvARRAY (av)[1];
2562 AvARRAY (av)[1] = cb; 2680 AvARRAY (av)[1] = cb;
2563 2681
2564 cb = av_shift (av); 2682 cb = av_shift (av);
2565 2683
2684 if (SvTYPE (cb) == SVt_PVCV)
2685 {
2686 dSP;
2687 PUSHMARK (SP);
2688 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2689 PUTBACK;
2690 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2691 }
2692 else
2693 {
2566 api_ready (aTHX_ cb); 2694 api_ready (aTHX_ cb);
2567 sv_setiv (cb, 0); /* signal waiter */ 2695 sv_setiv (cb, 0); /* signal waiter */
2696 }
2697
2568 SvREFCNT_dec (cb); 2698 SvREFCNT_dec (cb);
2569 2699
2570 --count; 2700 --count;
2571 } 2701 }
2572} 2702}
2581static void 2711static void
2582slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2712slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2583{ 2713{
2584 AV *av = (AV *)SvRV (arg [0]); 2714 AV *av = (AV *)SvRV (arg [0]);
2585 2715
2716 if (items >= 2)
2717 {
2718 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2719 av_push (av, SvREFCNT_inc_NN (cb_cv));
2720
2586 if (SvIVX (AvARRAY (av)[0])) 2721 if (SvIVX (AvARRAY (av)[0]))
2722 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2723
2724 frame->prepare = prepare_nop;
2725 frame->check = slf_check_nop;
2726 }
2727 else if (SvIVX (AvARRAY (av)[0]))
2587 { 2728 {
2588 SvIVX (AvARRAY (av)[0]) = 0; 2729 SvIVX (AvARRAY (av)[0]) = 0;
2589 frame->prepare = prepare_nop; 2730 frame->prepare = prepare_nop;
2590 frame->check = slf_check_nop; 2731 frame->check = slf_check_nop;
2591 } 2732 }
2592 else 2733 else
2593 { 2734 {
2594 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2735 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2595 2736
2596 av_push (av, waiter); 2737 av_push (av, waiter);
2597 2738
2598 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2739 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2599 frame->prepare = prepare_schedule; 2740 frame->prepare = prepare_schedule;
2840 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 2981 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2841 2982
2842 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 2983 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2843 } 2984 }
2844 2985
2845 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2986 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2846} 2987}
2847 2988
2848SV * 2989SV *
2849new (char *klass, ...) 2990new (char *klass, ...)
2850 ALIAS: 2991 ALIAS:
2925SV * 3066SV *
2926clone (Coro::State coro) 3067clone (Coro::State coro)
2927 CODE: 3068 CODE:
2928{ 3069{
2929#if CORO_CLONE 3070#if CORO_CLONE
2930 struct coro *ncoro = coro_clone (coro); 3071 struct coro *ncoro = coro_clone (aTHX_ coro);
2931 MAGIC *mg; 3072 MAGIC *mg;
2932 /* TODO: too much duplication */ 3073 /* TODO: too much duplication */
2933 ncoro->hv = newHV (); 3074 ncoro->hv = newHV ();
2934 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3075 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2935 mg->mg_flags |= MGf_DUP; 3076 mg->mg_flags |= MGf_DUP;
2997 eval = 1 3138 eval = 1
2998 CODE: 3139 CODE:
2999{ 3140{
3000 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3141 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3001 { 3142 {
3002 struct coro temp; 3143 struct coro *current = SvSTATE_current;
3003 3144
3004 if (!(coro->flags & CF_RUNNING)) 3145 if (current != coro)
3005 { 3146 {
3006 PUTBACK; 3147 PUTBACK;
3007 save_perl (aTHX_ &temp); 3148 save_perl (aTHX_ current);
3008 load_perl (aTHX_ coro); 3149 load_perl (aTHX_ coro);
3150 SPAGAIN;
3009 } 3151 }
3010 3152
3011 {
3012 dSP;
3013 ENTER;
3014 SAVETMPS;
3015 PUTBACK;
3016 PUSHSTACK; 3153 PUSHSTACK;
3154
3017 PUSHMARK (SP); 3155 PUSHMARK (SP);
3156 PUTBACK;
3018 3157
3019 if (ix) 3158 if (ix)
3020 eval_sv (coderef, 0); 3159 eval_sv (coderef, 0);
3021 else 3160 else
3022 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3161 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3023 3162
3024 POPSTACK; 3163 POPSTACK;
3025 SPAGAIN; 3164 SPAGAIN;
3026 FREETMPS;
3027 LEAVE;
3028 PUTBACK;
3029 }
3030 3165
3031 if (!(coro->flags & CF_RUNNING)) 3166 if (current != coro)
3032 { 3167 {
3168 PUTBACK;
3033 save_perl (aTHX_ coro); 3169 save_perl (aTHX_ coro);
3034 load_perl (aTHX_ &temp); 3170 load_perl (aTHX_ current);
3035 SPAGAIN; 3171 SPAGAIN;
3036 } 3172 }
3037 } 3173 }
3038} 3174}
3039 3175
3043 ALIAS: 3179 ALIAS:
3044 is_ready = CF_READY 3180 is_ready = CF_READY
3045 is_running = CF_RUNNING 3181 is_running = CF_RUNNING
3046 is_new = CF_NEW 3182 is_new = CF_NEW
3047 is_destroyed = CF_DESTROYED 3183 is_destroyed = CF_DESTROYED
3184 is_suspended = CF_SUSPENDED
3048 CODE: 3185 CODE:
3049 RETVAL = boolSV (coro->flags & ix); 3186 RETVAL = boolSV (coro->flags & ix);
3050 OUTPUT: 3187 OUTPUT:
3051 RETVAL 3188 RETVAL
3052 3189
3056 CODE: 3193 CODE:
3057{ 3194{
3058 struct coro *current = SvSTATE_current; 3195 struct coro *current = SvSTATE_current;
3059 SV **throwp = self == current ? &CORO_THROW : &self->except; 3196 SV **throwp = self == current ? &CORO_THROW : &self->except;
3060 SvREFCNT_dec (*throwp); 3197 SvREFCNT_dec (*throwp);
3198 SvGETMAGIC (throw);
3061 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3199 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
3062} 3200}
3063 3201
3064void 3202void
3065api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3203api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3117 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3255 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3118 3256
3119 SV *tmp = *src; *src = *dst; *dst = tmp; 3257 SV *tmp = *src; *src = *dst; *dst = tmp;
3120 } 3258 }
3121 3259
3260void
3261cancel (Coro::State self)
3262 CODE:
3263 coro_state_destroy (aTHX_ self);
3264 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3265
3122 3266
3123MODULE = Coro::State PACKAGE = Coro 3267MODULE = Coro::State PACKAGE = Coro
3124 3268
3125BOOT: 3269BOOT:
3126{ 3270{
3127 int i;
3128
3129 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3271 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3130 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3272 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3131 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3273 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3132 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3274 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3133 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3275 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3134 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3276 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3135 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3277 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3136 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3278 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3141 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3283 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3142 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3284 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
3143 3285
3144 coro_stash = gv_stashpv ("Coro", TRUE); 3286 coro_stash = gv_stashpv ("Coro", TRUE);
3145 3287
3146 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3288 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3147 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3289 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3148 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3290 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3149 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3291 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3150 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3292 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3151 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3293 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3152
3153 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3154 coro_ready[i] = newAV ();
3155 3294
3156 { 3295 {
3157 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3296 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3158 3297
3159 coroapi.schedule = api_schedule; 3298 coroapi.schedule = api_schedule;
3200cede_notself (...) 3339cede_notself (...)
3201 CODE: 3340 CODE:
3202 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3341 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3203 3342
3204void 3343void
3205_cancel (Coro::State self)
3206 CODE:
3207 coro_state_destroy (aTHX_ self);
3208 coro_call_on_destroy (aTHX_ self);
3209
3210void
3211_set_current (SV *current) 3344_set_current (SV *current)
3212 PROTOTYPE: $ 3345 PROTOTYPE: $
3213 CODE: 3346 CODE:
3214 SvREFCNT_dec (SvRV (coro_current)); 3347 SvREFCNT_dec (SvRV (coro_current));
3215 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 3348 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3217void 3350void
3218_set_readyhook (SV *hook) 3351_set_readyhook (SV *hook)
3219 PROTOTYPE: $ 3352 PROTOTYPE: $
3220 CODE: 3353 CODE:
3221 SvREFCNT_dec (coro_readyhook); 3354 SvREFCNT_dec (coro_readyhook);
3355 SvGETMAGIC (hook);
3222 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3356 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
3223 3357
3224int 3358int
3225prio (Coro::State coro, int newprio = 0) 3359prio (Coro::State coro, int newprio = 0)
3226 PROTOTYPE: $;$ 3360 PROTOTYPE: $;$
3257 PROTOTYPE: 3391 PROTOTYPE:
3258 CODE: 3392 CODE:
3259 RETVAL = coro_nready; 3393 RETVAL = coro_nready;
3260 OUTPUT: 3394 OUTPUT:
3261 RETVAL 3395 RETVAL
3396
3397void
3398suspend (Coro::State self)
3399 PROTOTYPE: $
3400 CODE:
3401 self->flags |= CF_SUSPENDED;
3402
3403void
3404resume (Coro::State self)
3405 PROTOTYPE: $
3406 CODE:
3407 self->flags &= ~CF_SUSPENDED;
3262 3408
3263void 3409void
3264_pool_handler (...) 3410_pool_handler (...)
3265 CODE: 3411 CODE:
3266 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3412 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3321rouse_wait (...) 3467rouse_wait (...)
3322 PROTOTYPE: ;$ 3468 PROTOTYPE: ;$
3323 PPCODE: 3469 PPCODE:
3324 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3470 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3325 3471
3472void
3473on_enter (SV *block)
3474 ALIAS:
3475 on_leave = 1
3476 PROTOTYPE: &
3477 CODE:
3478{
3479 struct coro *coro = SvSTATE_current;
3480 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3481
3482 block = (SV *)coro_sv_2cv (aTHX_ block);
3483
3484 if (!*avp)
3485 *avp = newAV ();
3486
3487 av_push (*avp, SvREFCNT_inc (block));
3488
3489 if (!ix)
3490 on_enterleave_call (aTHX_ block);
3491
3492 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3493 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3494 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3495}
3496
3326 3497
3327MODULE = Coro::State PACKAGE = PerlIO::cede 3498MODULE = Coro::State PACKAGE = PerlIO::cede
3328 3499
3329BOOT: 3500BOOT:
3330 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3501 PerlIO_define_layer (aTHX_ &PerlIO_cede);
3333MODULE = Coro::State PACKAGE = Coro::Semaphore 3504MODULE = Coro::State PACKAGE = Coro::Semaphore
3334 3505
3335SV * 3506SV *
3336new (SV *klass, SV *count = 0) 3507new (SV *klass, SV *count = 0)
3337 CODE: 3508 CODE:
3509{
3510 int semcnt = 1;
3511
3512 if (count)
3513 {
3514 SvGETMAGIC (count);
3515
3516 if (SvOK (count))
3517 semcnt = SvIV (count);
3518 }
3519
3338 RETVAL = sv_bless ( 3520 RETVAL = sv_bless (
3339 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3521 coro_waitarray_new (aTHX_ semcnt),
3340 GvSTASH (CvGV (cv)) 3522 GvSTASH (CvGV (cv))
3341 ); 3523 );
3524}
3342 OUTPUT: 3525 OUTPUT:
3343 RETVAL 3526 RETVAL
3344 3527
3345# helper for Coro::Channel 3528# helper for Coro::Channel and others
3346SV * 3529SV *
3347_alloc (int count) 3530_alloc (int count)
3348 CODE: 3531 CODE:
3349 RETVAL = coro_waitarray_new (aTHX_ count); 3532 RETVAL = coro_waitarray_new (aTHX_ count);
3350 OUTPUT: 3533 OUTPUT:
3408 for (i = 1; i <= wcount; ++i) 3591 for (i = 1; i <= wcount; ++i)
3409 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3592 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3410 } 3593 }
3411} 3594}
3412 3595
3596MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3597
3598void
3599_may_delete (SV *sem, int count, int extra_refs)
3600 PPCODE:
3601{
3602 AV *av = (AV *)SvRV (sem);
3603
3604 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3605 && AvFILLp (av) == 0 /* no waiters, just count */
3606 && SvIV (AvARRAY (av)[0]) == count)
3607 XSRETURN_YES;
3608
3609 XSRETURN_NO;
3610}
3611
3413MODULE = Coro::State PACKAGE = Coro::Signal 3612MODULE = Coro::State PACKAGE = Coro::Signal
3414 3613
3415SV * 3614SV *
3416new (SV *klass) 3615new (SV *klass)
3417 CODE: 3616 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines