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.442 by root, Tue Mar 4 06:13:24 2014 UTC vs.
Revision 1.456 by root, Sun Mar 6 06:26:21 2016 UTC

21 21
22#include <stddef.h> 22#include <stddef.h>
23#include <stdio.h> 23#include <stdio.h>
24#include <errno.h> 24#include <errno.h>
25#include <assert.h> 25#include <assert.h>
26
27#ifndef SvREFCNT_dec_NN
28 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
29#endif
30
31#ifndef SvREFCNT_inc_NN
32 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
33#endif
26 34
27#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
28# define SVs_PADSTALE 0 36# define SVs_PADSTALE 0
29#endif 37#endif
30 38
42# define PadlistNAMES(pl) (*PadlistARRAY (pl)) 50# define PadlistNAMES(pl) (*PadlistARRAY (pl))
43# define PadARRAY AvARRAY 51# define PadARRAY AvARRAY
44# define PadMAX AvFILLp 52# define PadMAX AvFILLp
45# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1)) 53# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
46#endif 54#endif
55#ifndef PadnamelistREFCNT
56# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
57#endif
58#ifndef PadnamelistREFCNT_dec
59# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
60#endif
47 61
48/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */ 62/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
49/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */ 63/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
50#if PERL_VERSION_ATLEAST(5,19,0) 64#if PERL_VERSION_ATLEAST(5,19,0)
51# define SVt_BIND SVt_IV 65# define SVt_BIND SVt_IV
126 140
127static GV *irsgv; /* $/ */ 141static GV *irsgv; /* $/ */
128static GV *stdoutgv; /* *STDOUT */ 142static GV *stdoutgv; /* *STDOUT */
129static SV *rv_diehook; 143static SV *rv_diehook;
130static SV *rv_warnhook; 144static SV *rv_warnhook;
131static HV *hv_sig; /* %SIG */
132 145
133/* async_pool helper stuff */ 146/* async_pool helper stuff */
134static SV *sv_pool_rss; 147static SV *sv_pool_rss;
135static SV *sv_pool_size; 148static SV *sv_pool_size;
136static SV *sv_async_pool_idle; /* description string */ 149static SV *sv_async_pool_idle; /* description string */
242 SV *saved_deffh; 255 SV *saved_deffh;
243 SV *invoke_cb; 256 SV *invoke_cb;
244 AV *invoke_av; 257 AV *invoke_av;
245 258
246 /* on_enter/on_leave */ 259 /* on_enter/on_leave */
247 AV *on_enter; 260 AV *on_enter; AV *on_enter_xs;
248 AV *on_leave; 261 AV *on_leave; AV *on_leave_xs;
249 262
250 /* swap_sv */ 263 /* swap_sv */
251 AV *swap_sv; 264 AV *swap_sv;
252 265
253 /* times */ 266 /* times */
489 502
490 return 0; 503 return 0;
491} 504}
492 505
493ecb_inline struct coro * 506ecb_inline struct coro *
494SvSTATE_ (pTHX_ SV *coro) 507SvSTATE_ (pTHX_ SV *coro_sv)
495{ 508{
496 MAGIC *mg; 509 MAGIC *mg;
497 510
498 if (SvROK (coro)) 511 if (SvROK (coro_sv))
499 coro = SvRV (coro); 512 coro_sv = SvRV (coro_sv);
500 513
501 mg = SvSTATEhv_p (aTHX_ coro); 514 mg = SvSTATEhv_p (aTHX_ coro_sv);
502 if (!mg) 515 if (!mg)
503 croak ("Coro::State object required"); 516 croak ("Coro::State object required");
504 517
505 return (struct coro *)mg->mg_ptr; 518 return (struct coro *)mg->mg_ptr;
506} 519}
517ecb_inline PADLIST * 530ecb_inline PADLIST *
518coro_derive_padlist (pTHX_ CV *cv) 531coro_derive_padlist (pTHX_ CV *cv)
519{ 532{
520 PADLIST *padlist = CvPADLIST (cv); 533 PADLIST *padlist = CvPADLIST (cv);
521 PADLIST *newpadlist; 534 PADLIST *newpadlist;
535 PADNAMELIST *padnames;
522 PAD *newpad; 536 PAD *newpad;
523 PADOFFSET off = PadlistMAX (padlist) + 1; 537 PADOFFSET off = PadlistMAX (padlist) + 1;
524 538
525#if NEWPADAPI 539#if NEWPADAPI
526 540
553 AvREAL_off (newpadlist); 567 AvREAL_off (newpadlist);
554#endif 568#endif
555 569
556 /* Already extended to 2 elements by newPADLIST. */ 570 /* Already extended to 2 elements by newPADLIST. */
557 PadlistMAX (newpadlist) = 1; 571 PadlistMAX (newpadlist) = 1;
558 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 572
573 padnames = PadlistNAMES (padlist);
574 ++PadnamelistREFCNT (padnames);
575 PadlistNAMES (newpadlist) = padnames;
576
559 PadlistARRAY (newpadlist)[1] = newpad; 577 PadlistARRAY (newpadlist)[1] = newpad;
560 578
561 return newpadlist; 579 return newpadlist;
562} 580}
563 581
584 PadMAX (pad) = -1; 602 PadMAX (pad) = -1;
585 SvREFCNT_dec (pad); 603 SvREFCNT_dec (pad);
586 } 604 }
587 } 605 }
588 606
589 SvREFCNT_dec (PadlistNAMES (padlist)); 607 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
590 608
591#if NEWPADAPI 609#if NEWPADAPI
592 Safefree (PadlistARRAY (padlist)); 610 Safefree (PadlistARRAY (padlist));
593 Safefree (padlist); 611 Safefree (padlist);
594#else 612#else
690 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u; 708 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
691 709
692 /* if SvANY points to the head, we need to adjust the pointers, 710 /* if SvANY points to the head, we need to adjust the pointers,
693 * as the pointer for a still points to b, and maybe vice versa. 711 * as the pointer for a still points to b, and maybe vice versa.
694 */ 712 */
695 #define svany_in_head(type) \ 713 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
696 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type))) 714 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
715 svany_in_head_set |= 1 << SVt_NV;
716 #endif
717
718 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
697 719
698 if (svany_in_head (SvTYPE (a))) 720 if (svany_in_head (SvTYPE (a)))
699 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 721 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
700 722
701 if (svany_in_head (SvTYPE (b))) 723 if (svany_in_head (SvTYPE (b)))
769 791
770 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 792 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
771 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 793 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
772 } 794 }
773 795
796 if (ecb_expect_false (c->on_enter_xs))
797 {
798 int i;
799
800 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
801 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
802 }
803
774 SWAP_SVS (c); 804 SWAP_SVS (c);
775} 805}
776 806
777static void 807static void
778save_perl (pTHX_ Coro__State c) 808save_perl (pTHX_ Coro__State c)
779{ 809{
780 SWAP_SVS (c); 810 SWAP_SVS (c);
811
812 if (ecb_expect_false (c->on_leave_xs))
813 {
814 int i;
815
816 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
817 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
818 }
781 819
782 if (ecb_expect_false (c->on_leave)) 820 if (ecb_expect_false (c->on_leave))
783 { 821 {
784 int i; 822 int i;
785 823
1138 1176
1139 GvSV (PL_defgv) = newSV (0); 1177 GvSV (PL_defgv) = newSV (0);
1140 GvAV (PL_defgv) = coro->args; coro->args = 0; 1178 GvAV (PL_defgv) = coro->args; coro->args = 0;
1141 GvSV (PL_errgv) = newSV (0); 1179 GvSV (PL_errgv) = newSV (0);
1142 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1180 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1143 GvHV (PL_hintgv) = 0; 1181 GvHV (PL_hintgv) = newHV ();
1182#if PERL_VERSION_ATLEAST (5,10,0)
1183 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1184#endif
1144 PL_rs = newSVsv (GvSV (irsgv)); 1185 PL_rs = newSVsv (GvSV (irsgv));
1145 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1186 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1146 1187
1147 { 1188 {
1148 dSP; 1189 dSP;
1258 1299
1259 SvREFCNT_dec (coro->saved_deffh); 1300 SvREFCNT_dec (coro->saved_deffh);
1260 SvREFCNT_dec (coro->rouse_cb); 1301 SvREFCNT_dec (coro->rouse_cb);
1261 SvREFCNT_dec (coro->invoke_cb); 1302 SvREFCNT_dec (coro->invoke_cb);
1262 SvREFCNT_dec (coro->invoke_av); 1303 SvREFCNT_dec (coro->invoke_av);
1304 SvREFCNT_dec (coro->on_enter_xs);
1305 SvREFCNT_dec (coro->on_leave_xs);
1263 } 1306 }
1264} 1307}
1265 1308
1266ecb_inline void 1309ecb_inline void
1267free_coro_mortal (pTHX) 1310free_coro_mortal (pTHX)
1330 1373
1331 if (PL_curcop != &PL_compiling) 1374 if (PL_curcop != &PL_compiling)
1332 { 1375 {
1333 SV **cb; 1376 SV **cb;
1334 1377
1335 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1378 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1336 { 1379 {
1337 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1380 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1338 1381
1339 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1382 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1340 { 1383 {
1927 1970
1928 ENTER; 1971 ENTER;
1929 SAVETMPS; 1972 SAVETMPS;
1930 1973
1931 PUSHMARK (SP); 1974 PUSHMARK (SP);
1932 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught", 0))); 1975 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1933 PUTBACK; 1976 PUTBACK;
1934 call_pv ("Carp::confess", G_VOID | G_DISCARD); 1977 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1935 1978
1936 FREETMPS; 1979 FREETMPS;
1937 LEAVE; 1980 LEAVE;
2248 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2291 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2249 } 2292 }
2250 else 2293 else
2251 { 2294 {
2252 struct coro *self = SvSTATE_current; 2295 struct coro *self = SvSTATE_current;
2296
2297 if (!self)
2298 croak ("Coro::cancel called outside of thread content,");
2253 2299
2254 /* otherwise we cancel directly, purely for speed reasons 2300 /* otherwise we cancel directly, purely for speed reasons
2255 * unfortunately, this requires some magic trickery, as 2301 * unfortunately, this requires some magic trickery, as
2256 * somebody else could cancel us, so we have to fight the cancellation. 2302 * somebody else could cancel us, so we have to fight the cancellation.
2257 * this is ugly, and hopefully fully worth the extra speed. 2303 * this is ugly, and hopefully fully worth the extra speed.
2804static void 2850static void
2805coro_pop_on_leave (pTHX_ void *coro) 2851coro_pop_on_leave (pTHX_ void *coro)
2806{ 2852{
2807 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2853 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2808 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2854 on_enterleave_call (aTHX_ sv_2mortal (cb));
2855}
2856
2857static void
2858enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2859{
2860 if (!hook)
2861 return;
2862
2863 if (!*avp)
2864 {
2865 *avp = newAV ();
2866 AvREAL_off (*avp);
2867 }
2868
2869 av_push (*avp, (SV *)hook);
2870 av_push (*avp, (SV *)arg);
2871}
2872
2873static void
2874enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2875{
2876 AV *av = *avp;
2877 int i;
2878
2879 if (!av)
2880 return;
2881
2882 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2883 if (AvARRAY (av)[i] == (SV *)hook)
2884 {
2885 if (execute)
2886 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2887
2888 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2889 av_pop (av);
2890 av_pop (av);
2891 break;
2892 }
2893
2894 if (AvFILLp (av) >= 0)
2895 {
2896 *avp = 0;
2897 SvREFCNT_dec_NN (av);
2898 }
2899}
2900
2901static void
2902api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2903{
2904 struct coro *coro = SvSTATE (coro_sv);
2905
2906 if (SvSTATE_current == coro)
2907 if (enter)
2908 enter (aTHX_ enter_arg);
2909
2910 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2911 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2912}
2913
2914static void
2915api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2916{
2917 struct coro *coro = SvSTATE (coro_sv);
2918
2919 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2920 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2921}
2922
2923static void
2924savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2925{
2926 struct coro *coro = SvSTATE_current;
2927
2928 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2929}
2930
2931static void
2932savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2933{
2934 struct coro *coro = SvSTATE_current;
2935
2936 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2937}
2938
2939static void
2940api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2941{
2942 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2943
2944 /* this ought to be much cheaper than malloc + a single destructor call */
2945 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2946 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2809} 2947}
2810 2948
2811/*****************************************************************************/ 2949/*****************************************************************************/
2812/* PerlIO::cede */ 2950/* PerlIO::cede */
2813 2951
2943 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3081 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2944 PUTBACK; 3082 PUTBACK;
2945 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3083 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2946 } 3084 }
2947 3085
2948 SvREFCNT_dec (cb); 3086 SvREFCNT_dec_NN (cb);
2949 } 3087 }
2950} 3088}
2951 3089
2952static void 3090static void
2953coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3091coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
3093 { 3231 {
3094 api_ready (aTHX_ cb); 3232 api_ready (aTHX_ cb);
3095 sv_setiv (cb, 0); /* signal waiter */ 3233 sv_setiv (cb, 0); /* signal waiter */
3096 } 3234 }
3097 3235
3098 SvREFCNT_dec (cb); 3236 SvREFCNT_dec_NN (cb);
3099 3237
3100 --count; 3238 --count;
3101 } 3239 }
3102} 3240}
3103 3241
3188 } 3326 }
3189 3327
3190 av_push (state, data_sv); 3328 av_push (state, data_sv);
3191 3329
3192 api_ready (aTHX_ coro); 3330 api_ready (aTHX_ coro);
3193 SvREFCNT_dec (coro); 3331 SvREFCNT_dec_NN (coro);
3194 SvREFCNT_dec ((AV *)state); 3332 SvREFCNT_dec_NN ((AV *)state);
3195} 3333}
3196 3334
3197static int 3335static int
3198slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3336slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3199{ 3337{
3217 errno = data->errorno; 3355 errno = data->errorno;
3218 PL_laststype = data->laststype; 3356 PL_laststype = data->laststype;
3219 PL_laststatval = data->laststatval; 3357 PL_laststatval = data->laststatval;
3220 PL_statcache = data->statcache; 3358 PL_statcache = data->statcache;
3221 3359
3222 SvREFCNT_dec (data_sv); 3360 SvREFCNT_dec_NN (data_sv);
3223 } 3361 }
3224 3362
3225 /* push result values */ 3363 /* push result values */
3226 { 3364 {
3227 dSP; 3365 dSP;
3442 3580
3443PROTOTYPES: DISABLE 3581PROTOTYPES: DISABLE
3444 3582
3445BOOT: 3583BOOT:
3446{ 3584{
3585#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3586#include "state.h"
3447#ifdef USE_ITHREADS 3587#ifdef USE_ITHREADS
3448# if CORO_PTHREAD 3588# if CORO_PTHREAD
3449 coro_thx = PERL_GET_CONTEXT; 3589 coro_thx = PERL_GET_CONTEXT;
3450# endif 3590# endif
3451#endif 3591#endif
3463 3603
3464 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3604 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
3465 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3605 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
3466 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3606 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
3467 3607
3468 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3469 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3608 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3470 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3609 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3471 3610
3472 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3611 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3473 3612
3802 3941
3803MODULE = Coro::State PACKAGE = Coro 3942MODULE = Coro::State PACKAGE = Coro
3804 3943
3805BOOT: 3944BOOT:
3806{ 3945{
3946 if (SVt_LAST > 32)
3947 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3948
3807 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3949 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3808 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3950 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3809 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3951 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3810 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3952 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3811 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3953 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3837 coroapi.ready = api_ready; 3979 coroapi.ready = api_ready;
3838 coroapi.is_ready = api_is_ready; 3980 coroapi.is_ready = api_is_ready;
3839 coroapi.nready = coro_nready; 3981 coroapi.nready = coro_nready;
3840 coroapi.current = coro_current; 3982 coroapi.current = coro_current;
3841 3983
3984 coroapi.enterleave_hook = api_enterleave_hook;
3985 coroapi.enterleave_unhook = api_enterleave_unhook;
3986 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3987
3842 /*GCoroAPI = &coroapi;*/ 3988 /*GCoroAPI = &coroapi;*/
3843 sv_setiv (sv, (IV)&coroapi); 3989 sv_setiv (sv, (IV)&coroapi);
3844 SvREADONLY_on (sv); 3990 SvREADONLY_on (sv);
3845 } 3991 }
3846} 3992}
3911 4057
3912void 4058void
3913_set_current (SV *current) 4059_set_current (SV *current)
3914 PROTOTYPE: $ 4060 PROTOTYPE: $
3915 CODE: 4061 CODE:
3916 SvREFCNT_dec (SvRV (coro_current)); 4062 SvREFCNT_dec_NN (SvRV (coro_current));
3917 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4063 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3918 4064
3919void 4065void
3920_set_readyhook (SV *hook) 4066_set_readyhook (SV *hook)
3921 PROTOTYPE: $ 4067 PROTOTYPE: $
4005 4151
4006 if ((SV *)hv == &PL_sv_undef) 4152 if ((SV *)hv == &PL_sv_undef)
4007 { 4153 {
4008 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4154 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
4009 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4155 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4010 SvREFCNT_dec (sv); 4156 SvREFCNT_dec_NN (sv);
4011 } 4157 }
4012 4158
4013 { 4159 {
4014 struct coro *coro = SvSTATE_hv (hv); 4160 struct coro *coro = SvSTATE_hv (hv);
4015 4161
4022 api_ready (aTHX_ (SV *)hv); 4168 api_ready (aTHX_ (SV *)hv);
4023 4169
4024 if (GIMME_V != G_VOID) 4170 if (GIMME_V != G_VOID)
4025 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4171 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4026 else 4172 else
4027 SvREFCNT_dec (hv); 4173 SvREFCNT_dec_NN (hv);
4028} 4174}
4029 4175
4030SV * 4176SV *
4031rouse_cb () 4177rouse_cb ()
4032 PROTOTYPE: 4178 PROTOTYPE:
4111 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4257 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4112 OUTPUT: 4258 OUTPUT:
4113 RETVAL 4259 RETVAL
4114 4260
4115void 4261void
4116up (SV *self, int adjust = 1) 4262up (SV *self)
4117 ALIAS:
4118 adjust = 1
4119 CODE: 4263 CODE:
4264 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4265
4266void
4267adjust (SV *self, int adjust)
4268 CODE:
4120 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4269 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4121 4270
4122void 4271void
4123down (...) 4272down (...)
4124 CODE: 4273 CODE:
4125 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4274 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines