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.366 by root, Tue Jul 21 03:39:58 2009 UTC vs.
Revision 1.383 by root, Sun Feb 13 04:39:16 2011 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
11#include "schmorp.h" 16#include "schmorp.h"
12 17
13#include <stdio.h> 18#include <stdio.h>
14#include <errno.h> 19#include <errno.h>
15#include <assert.h> 20#include <assert.h>
21
22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
16 25
17#ifdef WIN32 26#ifdef WIN32
18# undef setjmp 27# undef setjmp
19# undef longjmp 28# undef longjmp
20# undef _exit 29# undef _exit
142static SV *sv_pool_size; 151static SV *sv_pool_size;
143static SV *sv_async_pool_idle; /* description string */ 152static SV *sv_async_pool_idle; /* description string */
144static AV *av_async_pool; /* idle pool */ 153static AV *av_async_pool; /* idle pool */
145static SV *sv_Coro; /* class string */ 154static SV *sv_Coro; /* class string */
146static CV *cv_pool_handler; 155static CV *cv_pool_handler;
147static CV *cv_coro_state_new;
148 156
149/* Coro::AnyEvent */ 157/* Coro::AnyEvent */
150static SV *sv_activity; 158static SV *sv_activity;
151 159
152/* enable processtime/realtime profiling */ 160/* enable processtime/realtime profiling */
251 259
252 /* on_enter/on_leave */ 260 /* on_enter/on_leave */
253 AV *on_enter; 261 AV *on_enter;
254 AV *on_leave; 262 AV *on_leave;
255 263
264 /* swap_sv */
265 AV *swap_sv;
266
256 /* times */ 267 /* times */
257 coro_ts t_cpu, t_real; 268 coro_ts t_cpu, t_real;
258 269
259 /* linked list */ 270 /* linked list */
260 struct coro *next, *prev; 271 struct coro *next, *prev;
290static OP *(*coro_old_pp_sselect) (pTHX); 301static OP *(*coro_old_pp_sselect) (pTHX);
291static SV *coro_select_select; 302static SV *coro_select_select;
292 303
293/* horrible hack, but if it works... */ 304/* horrible hack, but if it works... */
294static OP * 305static OP *
295coro_pp_sselect (aTHX) 306coro_pp_sselect (pTHX)
296{ 307{
297 dSP; 308 dSP;
298 PUSHMARK (SP - 4); /* fake argument list */ 309 PUSHMARK (SP - 4); /* fake argument list */
299 XPUSHs (coro_select_select); 310 XPUSHs (coro_select_select);
300 PUTBACK; 311 PUTBACK;
551 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 562 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
552} 563}
553 564
554/** load & save, init *******************************************************/ 565/** load & save, init *******************************************************/
555 566
567/* swap sv heads, at least logically */
568static void
569swap_svs (pTHX_ Coro__State c)
570{
571 int i;
572
573 for (i = 0; i <= AvFILLp (c->swap_sv); )
574 {
575 SV *a = AvARRAY (c->swap_sv)[i++];
576 SV *b = AvARRAY (c->swap_sv)[i++];
577
578 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
579 SV tmp;
580
581 /* swap sv_any */
582 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
583
584 /* swap sv_flags */
585 SvFLAGS (&tmp) = SvFLAGS (a);
586 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
587 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
588
589#if PERL_VERSION_ATLEAST (5,10,0)
590 /* perl 5.10 complicates this _quite_ a bit, but it also is
591 * is much faster, so no quarrels here. alternatively, we could
592 * sv_upgrade to avoid this.
593 */
594 {
595 /* swap sv_u */
596 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
597
598 /* if SvANY points to the head, we need to adjust the pointers,
599 * as the pointer for a still points to b, and maybe vice versa.
600 */
601 #define svany_in_head(type) \
602 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
603
604 if (svany_in_head (SvTYPE (a)))
605 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
606
607 if (svany_in_head (SvTYPE (b)))
608 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
609 }
610#endif
611 }
612}
613
614#define SWAP_SVS(coro) \
615 if (expect_false ((coro)->swap_sv)) \
616 swap_svs (aTHX_ (coro))
617
556static void 618static void
557on_enterleave_call (pTHX_ SV *cb); 619on_enterleave_call (pTHX_ SV *cb);
558 620
559static void 621static void
560load_perl (pTHX_ Coro__State c) 622load_perl (pTHX_ Coro__State c)
606 int i; 668 int i;
607 669
608 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 670 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 671 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
610 } 672 }
673
674 SWAP_SVS (c);
611} 675}
612 676
613static void 677static void
614save_perl (pTHX_ Coro__State c) 678save_perl (pTHX_ Coro__State c)
615{ 679{
680 SWAP_SVS (c);
681
616 if (expect_false (c->on_leave)) 682 if (expect_false (c->on_leave))
617 { 683 {
618 int i; 684 int i;
619 685
620 for (i = AvFILLp (c->on_leave); i >= 0; --i) 686 for (i = AvFILLp (c->on_leave); i >= 0; --i)
927slf_check_repeat (pTHX_ struct CoroSLF *frame) 993slf_check_repeat (pTHX_ struct CoroSLF *frame)
928{ 994{
929 return 1; 995 return 1;
930} 996}
931 997
932static UNOP coro_setup_op; 998static UNOP init_perl_op;
933 999
934static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1000static void NOINLINE /* noinline to keep it out of the transfer fast path */
935coro_setup (pTHX_ struct coro *coro) 1001init_perl (pTHX_ struct coro *coro)
936{ 1002{
937 /* 1003 /*
938 * emulate part of the perl startup here. 1004 * emulate part of the perl startup here.
939 */ 1005 */
940 coro_init_stacks (aTHX); 1006 coro_init_stacks (aTHX);
947 PL_comppad_name_fill = 0; 1013 PL_comppad_name_fill = 0;
948 PL_comppad_name_floor = 0; 1014 PL_comppad_name_floor = 0;
949 PL_curpm = 0; 1015 PL_curpm = 0;
950 PL_curpad = 0; 1016 PL_curpad = 0;
951 PL_localizing = 0; 1017 PL_localizing = 0;
952 PL_dirty = 0;
953 PL_restartop = 0; 1018 PL_restartop = 0;
954#if PERL_VERSION_ATLEAST (5,10,0) 1019#if PERL_VERSION_ATLEAST (5,10,0)
955 PL_parser = 0; 1020 PL_parser = 0;
956#endif 1021#endif
957 PL_hints = 0; 1022 PL_hints = 0;
989 */ 1054 */
990 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1055 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
991 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1056 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
992 1057
993 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1058 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
994 coro_setup_op.op_next = PL_op; 1059 init_perl_op.op_next = PL_op;
995 coro_setup_op.op_type = OP_ENTERSUB; 1060 init_perl_op.op_type = OP_ENTERSUB;
996 coro_setup_op.op_ppaddr = pp_slf; 1061 init_perl_op.op_ppaddr = pp_slf;
997 /* no flags etc. required, as an init function won't be called */ 1062 /* no flags etc. required, as an init function won't be called */
998 1063
999 PL_op = (OP *)&coro_setup_op; 1064 PL_op = (OP *)&init_perl_op;
1000 1065
1001 /* copy throw, in case it was set before coro_setup */ 1066 /* copy throw, in case it was set before init_perl */
1002 CORO_THROW = coro->except; 1067 CORO_THROW = coro->except;
1068
1069 SWAP_SVS (coro);
1003 1070
1004 if (expect_false (enable_times)) 1071 if (expect_false (enable_times))
1005 { 1072 {
1006 coro_times_update (); 1073 coro_times_update ();
1007 coro_times_sub (coro); 1074 coro_times_sub (coro);
1028 dounwind (-1); 1095 dounwind (-1);
1029 } 1096 }
1030} 1097}
1031 1098
1032static void 1099static void
1033coro_destruct_perl (pTHX_ struct coro *coro) 1100destroy_perl (pTHX_ struct coro *coro)
1034{ 1101{
1035 SV *svf [9]; 1102 SV *svf [9];
1036 1103
1037 { 1104 {
1038 struct coro *current = SvSTATE_current; 1105 struct coro *current = SvSTATE_current;
1042 save_perl (aTHX_ current); 1109 save_perl (aTHX_ current);
1043 load_perl (aTHX_ coro); 1110 load_perl (aTHX_ coro);
1044 1111
1045 coro_unwind_stacks (aTHX); 1112 coro_unwind_stacks (aTHX);
1046 coro_destruct_stacks (aTHX); 1113 coro_destruct_stacks (aTHX);
1114
1115 /* restore swapped sv's */
1116 SWAP_SVS (coro);
1047 1117
1048 // now save some sv's to be free'd later 1118 // now save some sv's to be free'd later
1049 svf [0] = GvSV (PL_defgv); 1119 svf [0] = GvSV (PL_defgv);
1050 svf [1] = (SV *)GvAV (PL_defgv); 1120 svf [1] = (SV *)GvAV (PL_defgv);
1051 svf [2] = GvSV (PL_errgv); 1121 svf [2] = GvSV (PL_errgv);
1275 /* somebody or something will hit me for both perl_run and PL_restartop */ 1345 /* somebody or something will hit me for both perl_run and PL_restartop */
1276 PL_restartop = PL_op; 1346 PL_restartop = PL_op;
1277 perl_run (PL_curinterp); 1347 perl_run (PL_curinterp);
1278 /* 1348 /*
1279 * Unfortunately, there is no way to get at the return values of the 1349 * Unfortunately, there is no way to get at the return values of the
1280 * coro body here, as perl_run destroys these 1350 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1351 * runtime errors here, as this is just a random interpreter, not a thread.
1281 */ 1352 */
1282 1353
1283 /* 1354 /*
1284 * If perl-run returns we assume exit() was being called or the coro 1355 * If perl-run returns we assume exit() was being called or the coro
1285 * fell off the end, which seems to be the only valid (non-bug) 1356 * fell off the end, which seems to be the only valid (non-bug)
1492 if (expect_false (next->flags & CF_NEW)) 1563 if (expect_false (next->flags & CF_NEW))
1493 { 1564 {
1494 /* need to start coroutine */ 1565 /* need to start coroutine */
1495 next->flags &= ~CF_NEW; 1566 next->flags &= ~CF_NEW;
1496 /* setup coroutine call */ 1567 /* setup coroutine call */
1497 coro_setup (aTHX_ next); 1568 init_perl (aTHX_ next);
1498 } 1569 }
1499 else 1570 else
1500 load_perl (aTHX_ next); 1571 load_perl (aTHX_ next);
1501 1572
1502 /* possibly untie and reuse the cctx */ 1573 /* possibly untie and reuse the cctx */
1565 1636
1566 if (coro->mainstack 1637 if (coro->mainstack
1567 && coro->mainstack != main_mainstack 1638 && coro->mainstack != main_mainstack
1568 && coro->slot 1639 && coro->slot
1569 && !PL_dirty) 1640 && !PL_dirty)
1570 coro_destruct_perl (aTHX_ coro); 1641 destroy_perl (aTHX_ coro);
1642
1643 if (coro->next) coro->next->prev = coro->prev;
1644 if (coro->prev) coro->prev->next = coro->next;
1645 if (coro == coro_first) coro_first = coro->next;
1571 1646
1572 cctx_destroy (coro->cctx); 1647 cctx_destroy (coro->cctx);
1573 SvREFCNT_dec (coro->startcv); 1648 SvREFCNT_dec (coro->startcv);
1574 SvREFCNT_dec (coro->args); 1649 SvREFCNT_dec (coro->args);
1650 SvREFCNT_dec (coro->swap_sv);
1575 SvREFCNT_dec (CORO_THROW); 1651 SvREFCNT_dec (CORO_THROW);
1576
1577 if (coro->next) coro->next->prev = coro->prev;
1578 if (coro->prev) coro->prev->next = coro->next;
1579 if (coro == coro_first) coro_first = coro->next;
1580 1652
1581 return 1; 1653 return 1;
1582} 1654}
1583 1655
1584static int 1656static int
1754 { 1826 {
1755 /* nothing to schedule: call the idle handler */ 1827 /* nothing to schedule: call the idle handler */
1756 if (SvROK (sv_idle) 1828 if (SvROK (sv_idle)
1757 && SvOBJECT (SvRV (sv_idle))) 1829 && SvOBJECT (SvRV (sv_idle)))
1758 { 1830 {
1831 if (SvRV (sv_idle) == SvRV (coro_current))
1832 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1833
1759 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1834 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1760 api_ready (aTHX_ SvRV (sv_idle)); 1835 api_ready (aTHX_ SvRV (sv_idle));
1761 --coro_nready; 1836 --coro_nready;
1762 } 1837 }
1763 else 1838 else
1764 { 1839 {
1840 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1765 dSP; 1841 dSP;
1766 1842
1767 ENTER; 1843 ENTER;
1768 SAVETMPS; 1844 SAVETMPS;
1769 1845
1915{ 1991{
1916 int i; 1992 int i;
1917 HV *hv = (HV *)SvRV (coro_current); 1993 HV *hv = (HV *)SvRV (coro_current);
1918 AV *av = newAV (); 1994 AV *av = newAV ();
1919 1995
1996 /* items are actually not so common, so optimise for this case */
1997 if (items)
1998 {
1920 av_extend (av, items - 1); 1999 av_extend (av, items - 1);
2000
1921 for (i = 0; i < items; ++i) 2001 for (i = 0; i < items; ++i)
1922 av_push (av, SvREFCNT_inc_NN (arg [i])); 2002 av_push (av, SvREFCNT_inc_NN (arg [i]));
2003 }
1923 2004
1924 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2005 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1925 2006
1926 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2007 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1927 api_ready (aTHX_ sv_manager); 2008 api_ready (aTHX_ sv_manager);
2343 if (PL_op->op_flags & OPf_STACKED) 2424 if (PL_op->op_flags & OPf_STACKED)
2344 { 2425 {
2345 if (items > slf_arga) 2426 if (items > slf_arga)
2346 { 2427 {
2347 slf_arga = items; 2428 slf_arga = items;
2348 free (slf_argv); 2429 Safefree (slf_argv);
2349 slf_argv = malloc (slf_arga * sizeof (SV *)); 2430 New (0, slf_argv, slf_arga, SV *);
2350 } 2431 }
2351 2432
2352 slf_argc = items; 2433 slf_argc = items;
2353 2434
2354 for (i = 0; i < items; ++i) 2435 for (i = 0; i < items; ++i)
2715 { 2796 {
2716 SV *cb_cv = s_get_cv_croak (arg [1]); 2797 SV *cb_cv = s_get_cv_croak (arg [1]);
2717 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2798 av_push (av, SvREFCNT_inc_NN (cb_cv));
2718 2799
2719 if (SvIVX (AvARRAY (av)[0])) 2800 if (SvIVX (AvARRAY (av)[0]))
2720 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 2801 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2721 2802
2722 frame->prepare = prepare_nop; 2803 frame->prepare = prepare_nop;
2723 frame->check = slf_check_nop; 2804 frame->check = slf_check_nop;
2724 } 2805 }
2725 else if (SvIVX (AvARRAY (av)[0])) 2806 else if (SvIVX (AvARRAY (av)[0]))
2887 /* now call the AIO function - we assume our request is uncancelable */ 2968 /* now call the AIO function - we assume our request is uncancelable */
2888 PUTBACK; 2969 PUTBACK;
2889 call_sv ((SV *)req, G_VOID | G_DISCARD); 2970 call_sv ((SV *)req, G_VOID | G_DISCARD);
2890 } 2971 }
2891 2972
2892 /* now that the requets is going, we loop toll we have a result */ 2973 /* now that the request is going, we loop till we have a result */
2893 frame->data = (void *)state; 2974 frame->data = (void *)state;
2894 frame->prepare = prepare_schedule; 2975 frame->prepare = prepare_schedule;
2895 frame->check = slf_check_aio_req; 2976 frame->check = slf_check_aio_req;
2896} 2977}
2897 2978
2908/*****************************************************************************/ 2989/*****************************************************************************/
2909 2990
2910#if CORO_CLONE 2991#if CORO_CLONE
2911# include "clone.c" 2992# include "clone.c"
2912#endif 2993#endif
2994
2995/*****************************************************************************/
2996
2997static SV *
2998coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2999{
3000 SV *coro_sv;
3001 struct coro *coro;
3002 MAGIC *mg;
3003 HV *hv;
3004 SV *cb;
3005 int i;
3006
3007 if (argc > 0)
3008 {
3009 cb = s_get_cv_croak (argv [0]);
3010
3011 if (!is_coro)
3012 {
3013 if (CvISXSUB (cb))
3014 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3015
3016 if (!CvROOT (cb))
3017 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3018 }
3019 }
3020
3021 Newz (0, coro, 1, struct coro);
3022 coro->args = newAV ();
3023 coro->flags = CF_NEW;
3024
3025 if (coro_first) coro_first->prev = coro;
3026 coro->next = coro_first;
3027 coro_first = coro;
3028
3029 coro->hv = hv = newHV ();
3030 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3031 mg->mg_flags |= MGf_DUP;
3032 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3033
3034 if (argc > 0)
3035 {
3036 av_extend (coro->args, argc + is_coro - 1);
3037
3038 if (is_coro)
3039 {
3040 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3041 cb = (SV *)cv_coro_run;
3042 }
3043
3044 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3045
3046 for (i = 1; i < argc; i++)
3047 av_push (coro->args, newSVsv (argv [i]));
3048 }
3049
3050 return coro_sv;
3051}
2913 3052
2914MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3053MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2915 3054
2916PROTOTYPES: DISABLE 3055PROTOTYPES: DISABLE
2917 3056
2986 3125
2987 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3126 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2988} 3127}
2989 3128
2990SV * 3129SV *
2991new (char *klass, ...) 3130new (SV *klass, ...)
2992 ALIAS: 3131 ALIAS:
2993 Coro::new = 1 3132 Coro::new = 1
2994 CODE: 3133 CODE:
2995{ 3134 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2996 struct coro *coro; 3135 OUTPUT:
2997 MAGIC *mg;
2998 HV *hv;
2999 SV *cb;
3000 int i;
3001
3002 if (items > 1)
3003 {
3004 cb = s_get_cv_croak (ST (1));
3005
3006 if (!ix)
3007 {
3008 if (CvISXSUB (cb))
3009 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3010
3011 if (!CvROOT (cb))
3012 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3013 }
3014 }
3015
3016 Newz (0, coro, 1, struct coro);
3017 coro->args = newAV ();
3018 coro->flags = CF_NEW;
3019
3020 if (coro_first) coro_first->prev = coro;
3021 coro->next = coro_first;
3022 coro_first = coro;
3023
3024 coro->hv = hv = newHV ();
3025 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3026 mg->mg_flags |= MGf_DUP;
3027 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3028
3029 if (items > 1)
3030 {
3031 av_extend (coro->args, items - 1 + ix - 1);
3032
3033 if (ix)
3034 {
3035 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3036 cb = (SV *)cv_coro_run;
3037 }
3038
3039 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3040
3041 for (i = 2; i < items; i++)
3042 av_push (coro->args, newSVsv (ST (i)));
3043 }
3044}
3045 OUTPUT:
3046 RETVAL 3136 RETVAL
3047 3137
3048void 3138void
3049transfer (...) 3139transfer (...)
3050 PROTOTYPE: $$ 3140 PROTOTYPE: $$
3187 RETVAL = boolSV (coro->flags & ix); 3277 RETVAL = boolSV (coro->flags & ix);
3188 OUTPUT: 3278 OUTPUT:
3189 RETVAL 3279 RETVAL
3190 3280
3191void 3281void
3192throw (Coro::State self, SV *throw = &PL_sv_undef) 3282throw (Coro::State self, SV *exception = &PL_sv_undef)
3193 PROTOTYPE: $;$ 3283 PROTOTYPE: $;$
3194 CODE: 3284 CODE:
3195{ 3285{
3196 struct coro *current = SvSTATE_current; 3286 struct coro *current = SvSTATE_current;
3197 SV **throwp = self == current ? &CORO_THROW : &self->except; 3287 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3198 SvREFCNT_dec (*throwp); 3288 SvREFCNT_dec (*exceptionp);
3199 SvGETMAGIC (throw); 3289 SvGETMAGIC (exception);
3200 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3290 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3201} 3291}
3202 3292
3203void 3293void
3204api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3294api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3205 PROTOTYPE: $;$ 3295 PROTOTYPE: $;$
3300 3390
3301 if (expect_false (current == self)) 3391 if (expect_false (current == self))
3302 coro_times_sub (SvSTATE (coro_current)); 3392 coro_times_sub (SvSTATE (coro_current));
3303} 3393}
3304 3394
3395void
3396swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3397 CODE:
3398{
3399 struct coro *current = SvSTATE_current;
3400
3401 if (current == coro)
3402 SWAP_SVS (current);
3403
3404 if (!coro->swap_sv)
3405 coro->swap_sv = newAV ();
3406
3407 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3408 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3409
3410 if (current == coro)
3411 SWAP_SVS (current);
3412}
3413
3414
3305MODULE = Coro::State PACKAGE = Coro 3415MODULE = Coro::State PACKAGE = Coro
3306 3416
3307BOOT: 3417BOOT:
3308{ 3418{
3309 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3419 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3317 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3427 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3318 3428
3319 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3429 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3320 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3430 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3321 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3431 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3322 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3432 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3323 3433
3324 coro_stash = gv_stashpv ("Coro", TRUE); 3434 coro_stash = gv_stashpv ("Coro", TRUE);
3325 3435
3326 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3436 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3327 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3437 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3328 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3438 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3345 /*GCoroAPI = &coroapi;*/ 3455 /*GCoroAPI = &coroapi;*/
3346 sv_setiv (sv, (IV)&coroapi); 3456 sv_setiv (sv, (IV)&coroapi);
3347 SvREADONLY_on (sv); 3457 SvREADONLY_on (sv);
3348 } 3458 }
3349} 3459}
3460
3461SV *
3462async (...)
3463 PROTOTYPE: &@
3464 CODE:
3465 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3466 api_ready (aTHX_ RETVAL);
3467 OUTPUT:
3468 RETVAL
3350 3469
3351void 3470void
3352terminate (...) 3471terminate (...)
3353 CODE: 3472 CODE:
3354 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3473 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3472 for (i = 1; i < items; ++i) 3591 for (i = 1; i < items; ++i)
3473 av_push (av, SvREFCNT_inc_NN (ST (i))); 3592 av_push (av, SvREFCNT_inc_NN (ST (i)));
3474 3593
3475 if ((SV *)hv == &PL_sv_undef) 3594 if ((SV *)hv == &PL_sv_undef)
3476 { 3595 {
3477 PUSHMARK (SP); 3596 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3478 EXTEND (SP, 2);
3479 PUSHs (sv_Coro);
3480 PUSHs ((SV *)cv_pool_handler);
3481 PUTBACK;
3482 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3483 SPAGAIN;
3484
3485 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3597 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3598 SvREFCNT_dec (sv);
3486 } 3599 }
3487 3600
3488 { 3601 {
3489 struct coro *coro = SvSTATE_hv (hv); 3602 struct coro *coro = SvSTATE_hv (hv);
3490 3603
3762 { 3875 {
3763 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 3876 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3764 coro_old_pp_sselect = 0; 3877 coro_old_pp_sselect = 0;
3765 } 3878 }
3766 3879
3767

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines