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.448 by root, Thu Jun 4 22:58:28 2015 UTC vs.
Revision 1.460 by root, Fri Jun 17 05:28:22 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
… …
132 140
133static GV *irsgv; /* $/ */ 141static GV *irsgv; /* $/ */
134static GV *stdoutgv; /* *STDOUT */ 142static GV *stdoutgv; /* *STDOUT */
135static SV *rv_diehook; 143static SV *rv_diehook;
136static SV *rv_warnhook; 144static SV *rv_warnhook;
137static HV *hv_sig; /* %SIG */
138 145
139/* async_pool helper stuff */ 146/* async_pool helper stuff */
140static SV *sv_pool_rss; 147static SV *sv_pool_rss;
141static SV *sv_pool_size; 148static SV *sv_pool_size;
142static SV *sv_async_pool_idle; /* description string */ 149static SV *sv_async_pool_idle; /* description string */
… …
248 SV *saved_deffh; 255 SV *saved_deffh;
249 SV *invoke_cb; 256 SV *invoke_cb;
250 AV *invoke_av; 257 AV *invoke_av;
251 258
252 /* on_enter/on_leave */ 259 /* on_enter/on_leave */
253 AV *on_enter; 260 AV *on_enter; AV *on_enter_xs;
254 AV *on_leave; 261 AV *on_leave; AV *on_leave_xs;
255 262
256 /* swap_sv */ 263 /* swap_sv */
257 AV *swap_sv; 264 AV *swap_sv;
258 265
259 /* times */ 266 /* times */
… …
495 502
496 return 0; 503 return 0;
497} 504}
498 505
499ecb_inline struct coro * 506ecb_inline struct coro *
500SvSTATE_ (pTHX_ SV *coro) 507SvSTATE_ (pTHX_ SV *coro_sv)
501{ 508{
502 MAGIC *mg; 509 MAGIC *mg;
503 510
504 if (SvROK (coro)) 511 if (SvROK (coro_sv))
505 coro = SvRV (coro); 512 coro_sv = SvRV (coro_sv);
506 513
507 mg = SvSTATEhv_p (aTHX_ coro); 514 mg = SvSTATEhv_p (aTHX_ coro_sv);
508 if (!mg) 515 if (!mg)
509 croak ("Coro::State object required"); 516 croak ("Coro::State object required");
510 517
511 return (struct coro *)mg->mg_ptr; 518 return (struct coro *)mg->mg_ptr;
512} 519}
… …
701 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;
702 709
703 /* 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,
704 * 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.
705 */ 712 */
706 #define svany_in_head(type) \ 713 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
707 (((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)))
708 719
709 if (svany_in_head (SvTYPE (a))) 720 if (svany_in_head (SvTYPE (a)))
710 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 721 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
711 722
712 if (svany_in_head (SvTYPE (b))) 723 if (svany_in_head (SvTYPE (b)))
… …
715#endif 726#endif
716} 727}
717 728
718/* swap sv heads, at least logically */ 729/* swap sv heads, at least logically */
719static void 730static void
720swap_svs (pTHX_ Coro__State c) 731swap_svs_enter (pTHX_ Coro__State c)
721{ 732{
722 int i; 733 int i;
723 734
724 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 735 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
725 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]); 736 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
726} 737}
727 738
739static void
740swap_svs_leave (pTHX_ Coro__State c)
741{
742 int i;
743
744 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
745 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
746}
747
728#define SWAP_SVS(coro) \ 748#define SWAP_SVS_ENTER(coro) \
729 if (ecb_expect_false ((coro)->swap_sv)) \ 749 if (ecb_expect_false ((coro)->swap_sv)) \
730 swap_svs (aTHX_ (coro)) 750 swap_svs_enter (aTHX_ (coro))
751
752#define SWAP_SVS_LEAVE(coro) \
753 if (ecb_expect_false ((coro)->swap_sv)) \
754 swap_svs_leave (aTHX_ (coro))
731 755
732static void 756static void
733on_enterleave_call (pTHX_ SV *cb); 757on_enterleave_call (pTHX_ SV *cb);
734 758
735static void 759static void
… …
780 804
781 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 805 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
782 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 806 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
783 } 807 }
784 808
809 if (ecb_expect_false (c->on_enter_xs))
810 {
811 int i;
812
813 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
814 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
815 }
816
785 SWAP_SVS (c); 817 SWAP_SVS_ENTER (c);
786} 818}
787 819
788static void 820static void
789save_perl (pTHX_ Coro__State c) 821save_perl (pTHX_ Coro__State c)
790{ 822{
791 SWAP_SVS (c); 823 SWAP_SVS_LEAVE (c);
824
825 if (ecb_expect_false (c->on_leave_xs))
826 {
827 int i;
828
829 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
830 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
831 }
792 832
793 if (ecb_expect_false (c->on_leave)) 833 if (ecb_expect_false (c->on_leave))
794 { 834 {
795 int i; 835 int i;
796 836
… …
1190 PL_op = (OP *)&init_perl_op; 1230 PL_op = (OP *)&init_perl_op;
1191 1231
1192 /* copy throw, in case it was set before init_perl */ 1232 /* copy throw, in case it was set before init_perl */
1193 CORO_THROW = coro->except; 1233 CORO_THROW = coro->except;
1194 1234
1195 SWAP_SVS (coro); 1235 SWAP_SVS_ENTER (coro);
1196 1236
1197 if (ecb_expect_false (enable_times)) 1237 if (ecb_expect_false (enable_times))
1198 { 1238 {
1199 coro_times_update (); 1239 coro_times_update ();
1200 coro_times_sub (coro); 1240 coro_times_sub (coro);
… …
1238 /* this will cause transfer_check to croak on block*/ 1278 /* this will cause transfer_check to croak on block*/
1239 SvRV_set (coro_current, (SV *)coro->hv); 1279 SvRV_set (coro_current, (SV *)coro->hv);
1240 1280
1241 load_perl (aTHX_ coro); 1281 load_perl (aTHX_ coro);
1242 1282
1283 /* restore swapped sv's */
1284 SWAP_SVS_LEAVE (coro);
1285
1243 coro_unwind_stacks (aTHX); 1286 coro_unwind_stacks (aTHX);
1244
1245 /* restore swapped sv's */
1246 SWAP_SVS (coro);
1247 1287
1248 coro_destruct_stacks (aTHX); 1288 coro_destruct_stacks (aTHX);
1249 1289
1250 /* now save some sv's to be free'd later */ 1290 /* now save some sv's to be free'd later */
1251 svf [0] = GvSV (PL_defgv); 1291 svf [0] = GvSV (PL_defgv);
… …
1272 1312
1273 SvREFCNT_dec (coro->saved_deffh); 1313 SvREFCNT_dec (coro->saved_deffh);
1274 SvREFCNT_dec (coro->rouse_cb); 1314 SvREFCNT_dec (coro->rouse_cb);
1275 SvREFCNT_dec (coro->invoke_cb); 1315 SvREFCNT_dec (coro->invoke_cb);
1276 SvREFCNT_dec (coro->invoke_av); 1316 SvREFCNT_dec (coro->invoke_av);
1317 SvREFCNT_dec (coro->on_enter_xs);
1318 SvREFCNT_dec (coro->on_leave_xs);
1277 } 1319 }
1278} 1320}
1279 1321
1280ecb_inline void 1322ecb_inline void
1281free_coro_mortal (pTHX) 1323free_coro_mortal (pTHX)
… …
1344 1386
1345 if (PL_curcop != &PL_compiling) 1387 if (PL_curcop != &PL_compiling)
1346 { 1388 {
1347 SV **cb; 1389 SV **cb;
1348 1390
1349 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1391 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1350 { 1392 {
1351 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1393 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1352 1394
1353 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1395 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1354 { 1396 {
… …
2384 else 2426 else
2385 { 2427 {
2386 av_clear (GvAV (PL_defgv)); 2428 av_clear (GvAV (PL_defgv));
2387 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2429 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2388 2430
2431 if (ecb_expect_false (coro->swap_sv))
2432 {
2433 swap_svs_leave (coro);
2434 SvREFCNT_dec_NN (coro->swap_sv);
2435 coro->swap_sv = 0;
2436 }
2437
2389 coro->prio = 0; 2438 coro->prio = 0;
2390 2439
2391 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2440 if (coro->cctx && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2392 api_trace (aTHX_ coro_current, 0); 2441 api_trace (aTHX_ coro_current, 0);
2393 2442
2394 frame->prepare = prepare_schedule; 2443 frame->prepare = prepare_schedule;
2395 av_push (av_async_pool, SvREFCNT_inc (hv)); 2444 av_push (av_async_pool, SvREFCNT_inc (hv));
2396 } 2445 }
… …
2821static void 2870static void
2822coro_pop_on_leave (pTHX_ void *coro) 2871coro_pop_on_leave (pTHX_ void *coro)
2823{ 2872{
2824 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2873 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2825 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2874 on_enterleave_call (aTHX_ sv_2mortal (cb));
2875}
2876
2877static void
2878enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2879{
2880 if (!hook)
2881 return;
2882
2883 if (!*avp)
2884 {
2885 *avp = newAV ();
2886 AvREAL_off (*avp);
2887 }
2888
2889 av_push (*avp, (SV *)hook);
2890 av_push (*avp, (SV *)arg);
2891}
2892
2893static void
2894enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2895{
2896 AV *av = *avp;
2897 int i;
2898
2899 if (!av)
2900 return;
2901
2902 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2903 if (AvARRAY (av)[i] == (SV *)hook)
2904 {
2905 if (execute)
2906 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2907
2908 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2909 av_pop (av);
2910 av_pop (av);
2911 break;
2912 }
2913
2914 if (AvFILLp (av) >= 0)
2915 {
2916 *avp = 0;
2917 SvREFCNT_dec_NN (av);
2918 }
2919}
2920
2921static void
2922api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2923{
2924 struct coro *coro = SvSTATE (coro_sv);
2925
2926 if (SvSTATE_current == coro)
2927 if (enter)
2928 enter (aTHX_ enter_arg);
2929
2930 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2931 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2932}
2933
2934static void
2935api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2936{
2937 struct coro *coro = SvSTATE (coro_sv);
2938
2939 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2940 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2941}
2942
2943static void
2944savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2945{
2946 struct coro *coro = SvSTATE_current;
2947
2948 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2949}
2950
2951static void
2952savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2953{
2954 struct coro *coro = SvSTATE_current;
2955
2956 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2957}
2958
2959static void
2960api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2961{
2962 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2963
2964 /* this ought to be much cheaper than malloc + a single destructor call */
2965 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2966 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2826} 2967}
2827 2968
2828/*****************************************************************************/ 2969/*****************************************************************************/
2829/* PerlIO::cede */ 2970/* PerlIO::cede */
2830 2971
… …
2960 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3101 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2961 PUTBACK; 3102 PUTBACK;
2962 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3103 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2963 } 3104 }
2964 3105
2965 SvREFCNT_dec (cb); 3106 SvREFCNT_dec_NN (cb);
2966 } 3107 }
2967} 3108}
2968 3109
2969static void 3110static void
2970coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3111coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
3110 { 3251 {
3111 api_ready (aTHX_ cb); 3252 api_ready (aTHX_ cb);
3112 sv_setiv (cb, 0); /* signal waiter */ 3253 sv_setiv (cb, 0); /* signal waiter */
3113 } 3254 }
3114 3255
3115 SvREFCNT_dec (cb); 3256 SvREFCNT_dec_NN (cb);
3116 3257
3117 --count; 3258 --count;
3118 } 3259 }
3119} 3260}
3120 3261
… …
3205 } 3346 }
3206 3347
3207 av_push (state, data_sv); 3348 av_push (state, data_sv);
3208 3349
3209 api_ready (aTHX_ coro); 3350 api_ready (aTHX_ coro);
3210 SvREFCNT_dec (coro); 3351 SvREFCNT_dec_NN (coro);
3211 SvREFCNT_dec ((AV *)state); 3352 SvREFCNT_dec_NN ((AV *)state);
3212} 3353}
3213 3354
3214static int 3355static int
3215slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3356slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3216{ 3357{
… …
3234 errno = data->errorno; 3375 errno = data->errorno;
3235 PL_laststype = data->laststype; 3376 PL_laststype = data->laststype;
3236 PL_laststatval = data->laststatval; 3377 PL_laststatval = data->laststatval;
3237 PL_statcache = data->statcache; 3378 PL_statcache = data->statcache;
3238 3379
3239 SvREFCNT_dec (data_sv); 3380 SvREFCNT_dec_NN (data_sv);
3240 } 3381 }
3241 3382
3242 /* push result values */ 3383 /* push result values */
3243 { 3384 {
3244 dSP; 3385 dSP;
… …
3482 3623
3483 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3624 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
3484 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3625 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
3485 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3626 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
3486 3627
3487 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3488 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3628 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3489 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3629 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3490 3630
3491 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3631 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3492 3632
… …
3798 if (ecb_expect_false (current == self)) 3938 if (ecb_expect_false (current == self))
3799 coro_times_sub (SvSTATE (coro_current)); 3939 coro_times_sub (SvSTATE (coro_current));
3800} 3940}
3801 3941
3802void 3942void
3803swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3943swap_sv (Coro::State coro, SV *sva, SV *svb)
3804 CODE: 3944 CODE:
3805{ 3945{
3806 struct coro *current = SvSTATE_current; 3946 struct coro *current = SvSTATE_current;
3947 AV *swap_sv;
3948 int i;
3949
3950 sva = SvRV (sva);
3951 svb = SvRV (svb);
3807 3952
3808 if (current == coro) 3953 if (current == coro)
3809 SWAP_SVS (current); 3954 SWAP_SVS_LEAVE (current);
3810 3955
3811 if (!coro->swap_sv) 3956 if (!coro->swap_sv)
3812 coro->swap_sv = newAV (); 3957 coro->swap_sv = newAV ();
3813 3958
3959 swap_sv = coro->swap_sv;
3960
3961 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
3962 {
3963 SV *a = AvARRAY (swap_sv)[i ];
3964 SV *b = AvARRAY (swap_sv)[i + 1];
3965
3966 if (a == sva && b == svb)
3967 {
3968 SvREFCNT_dec_NN (a);
3969 SvREFCNT_dec_NN (b);
3970
3971 for (; i <= AvFILLp (swap_sv) - 2; i++)
3972 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
3973
3974 AvFILLp (swap_sv) -= 2;
3975
3976 goto removed;
3977 }
3978 }
3979
3814 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 3980 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3815 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 3981 av_push (swap_sv, SvREFCNT_inc_NN (svb));
3982
3983 removed:
3816 3984
3817 if (current == coro) 3985 if (current == coro)
3818 SWAP_SVS (current); 3986 SWAP_SVS_ENTER (current);
3819} 3987}
3820 3988
3821 3989
3822MODULE = Coro::State PACKAGE = Coro 3990MODULE = Coro::State PACKAGE = Coro
3823 3991
3824BOOT: 3992BOOT:
3825{ 3993{
3994 if (SVt_LAST > 32)
3995 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3996
3826 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3997 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3827 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3998 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3828 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3999 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3829 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4000 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3830 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4001 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3856 coroapi.ready = api_ready; 4027 coroapi.ready = api_ready;
3857 coroapi.is_ready = api_is_ready; 4028 coroapi.is_ready = api_is_ready;
3858 coroapi.nready = coro_nready; 4029 coroapi.nready = coro_nready;
3859 coroapi.current = coro_current; 4030 coroapi.current = coro_current;
3860 4031
4032 coroapi.enterleave_hook = api_enterleave_hook;
4033 coroapi.enterleave_unhook = api_enterleave_unhook;
4034 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4035
3861 /*GCoroAPI = &coroapi;*/ 4036 /*GCoroAPI = &coroapi;*/
3862 sv_setiv (sv, (IV)&coroapi); 4037 sv_setiv (sv, (IV)&coroapi);
3863 SvREADONLY_on (sv); 4038 SvREADONLY_on (sv);
3864 } 4039 }
3865} 4040}
… …
3930 4105
3931void 4106void
3932_set_current (SV *current) 4107_set_current (SV *current)
3933 PROTOTYPE: $ 4108 PROTOTYPE: $
3934 CODE: 4109 CODE:
3935 SvREFCNT_dec (SvRV (coro_current)); 4110 SvREFCNT_dec_NN (SvRV (coro_current));
3936 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4111 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3937 4112
3938void 4113void
3939_set_readyhook (SV *hook) 4114_set_readyhook (SV *hook)
3940 PROTOTYPE: $ 4115 PROTOTYPE: $
… …
4024 4199
4025 if ((SV *)hv == &PL_sv_undef) 4200 if ((SV *)hv == &PL_sv_undef)
4026 { 4201 {
4027 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4202 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
4028 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4203 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4029 SvREFCNT_dec (sv); 4204 SvREFCNT_dec_NN (sv);
4030 } 4205 }
4031 4206
4032 { 4207 {
4033 struct coro *coro = SvSTATE_hv (hv); 4208 struct coro *coro = SvSTATE_hv (hv);
4034 4209
… …
4041 api_ready (aTHX_ (SV *)hv); 4216 api_ready (aTHX_ (SV *)hv);
4042 4217
4043 if (GIMME_V != G_VOID) 4218 if (GIMME_V != G_VOID)
4044 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4219 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4045 else 4220 else
4046 SvREFCNT_dec (hv); 4221 SvREFCNT_dec_NN (hv);
4047} 4222}
4048 4223
4049SV * 4224SV *
4050rouse_cb () 4225rouse_cb ()
4051 PROTOTYPE: 4226 PROTOTYPE:
… …
4130 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4305 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4131 OUTPUT: 4306 OUTPUT:
4132 RETVAL 4307 RETVAL
4133 4308
4134void 4309void
4135up (SV *self, int adjust = 1) 4310up (SV *self)
4136 ALIAS:
4137 adjust = 1
4138 CODE: 4311 CODE:
4312 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4313
4314void
4315adjust (SV *self, int adjust)
4316 CODE:
4139 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4317 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4140 4318
4141void 4319void
4142down (...) 4320down (...)
4143 CODE: 4321 CODE:
4144 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4322 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);

Diff Legend

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