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.462 by root, Wed Jun 22 20:24:38 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
… …
923#endif 963#endif
924 964
925 New(54,PL_savestack,24,ANY); 965 New(54,PL_savestack,24,ANY);
926 PL_savestack_ix = 0; 966 PL_savestack_ix = 0;
927 PL_savestack_max = 24; 967 PL_savestack_max = 24;
968#if !PERL_VERSION_ATLEAST (5,24,0)
969 /* perl 5.24 moves SS_MAXPUSH optimisation from */
970 /* the header macros to PL_savestack_max */
971 PL_savestack_max -= SS_MAXPUSH;
972#endif
928 973
929#if !PERL_VERSION_ATLEAST (5,10,0) 974#if !PERL_VERSION_ATLEAST (5,10,0)
930 New(54,PL_retstack,4,OP*); 975 New(54,PL_retstack,4,OP*);
931 PL_retstack_ix = 0; 976 PL_retstack_ix = 0;
932 PL_retstack_max = 4; 977 PL_retstack_max = 4;
… …
1190 PL_op = (OP *)&init_perl_op; 1235 PL_op = (OP *)&init_perl_op;
1191 1236
1192 /* copy throw, in case it was set before init_perl */ 1237 /* copy throw, in case it was set before init_perl */
1193 CORO_THROW = coro->except; 1238 CORO_THROW = coro->except;
1194 1239
1195 SWAP_SVS (coro); 1240 SWAP_SVS_ENTER (coro);
1196 1241
1197 if (ecb_expect_false (enable_times)) 1242 if (ecb_expect_false (enable_times))
1198 { 1243 {
1199 coro_times_update (); 1244 coro_times_update ();
1200 coro_times_sub (coro); 1245 coro_times_sub (coro);
… …
1238 /* this will cause transfer_check to croak on block*/ 1283 /* this will cause transfer_check to croak on block*/
1239 SvRV_set (coro_current, (SV *)coro->hv); 1284 SvRV_set (coro_current, (SV *)coro->hv);
1240 1285
1241 load_perl (aTHX_ coro); 1286 load_perl (aTHX_ coro);
1242 1287
1288 /* restore swapped sv's */
1289 SWAP_SVS_LEAVE (coro);
1290
1243 coro_unwind_stacks (aTHX); 1291 coro_unwind_stacks (aTHX);
1244
1245 /* restore swapped sv's */
1246 SWAP_SVS (coro);
1247 1292
1248 coro_destruct_stacks (aTHX); 1293 coro_destruct_stacks (aTHX);
1249 1294
1250 /* now save some sv's to be free'd later */ 1295 /* now save some sv's to be free'd later */
1251 svf [0] = GvSV (PL_defgv); 1296 svf [0] = GvSV (PL_defgv);
… …
1272 1317
1273 SvREFCNT_dec (coro->saved_deffh); 1318 SvREFCNT_dec (coro->saved_deffh);
1274 SvREFCNT_dec (coro->rouse_cb); 1319 SvREFCNT_dec (coro->rouse_cb);
1275 SvREFCNT_dec (coro->invoke_cb); 1320 SvREFCNT_dec (coro->invoke_cb);
1276 SvREFCNT_dec (coro->invoke_av); 1321 SvREFCNT_dec (coro->invoke_av);
1322 SvREFCNT_dec (coro->on_enter_xs);
1323 SvREFCNT_dec (coro->on_leave_xs);
1277 } 1324 }
1278} 1325}
1279 1326
1280ecb_inline void 1327ecb_inline void
1281free_coro_mortal (pTHX) 1328free_coro_mortal (pTHX)
… …
1344 1391
1345 if (PL_curcop != &PL_compiling) 1392 if (PL_curcop != &PL_compiling)
1346 { 1393 {
1347 SV **cb; 1394 SV **cb;
1348 1395
1349 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1396 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1350 { 1397 {
1351 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1398 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1352 1399
1353 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1400 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1354 { 1401 {
… …
2384 else 2431 else
2385 { 2432 {
2386 av_clear (GvAV (PL_defgv)); 2433 av_clear (GvAV (PL_defgv));
2387 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2434 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2388 2435
2436 if (ecb_expect_false (coro->swap_sv))
2437 {
2438 swap_svs_leave (coro);
2439 SvREFCNT_dec_NN (coro->swap_sv);
2440 coro->swap_sv = 0;
2441 }
2442
2389 coro->prio = 0; 2443 coro->prio = 0;
2390 2444
2391 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2445 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2392 api_trace (aTHX_ coro_current, 0); 2446 api_trace (aTHX_ coro_current, 0);
2393 2447
2394 frame->prepare = prepare_schedule; 2448 frame->prepare = prepare_schedule;
2395 av_push (av_async_pool, SvREFCNT_inc (hv)); 2449 av_push (av_async_pool, SvREFCNT_inc (hv));
2396 } 2450 }
… …
2821static void 2875static void
2822coro_pop_on_leave (pTHX_ void *coro) 2876coro_pop_on_leave (pTHX_ void *coro)
2823{ 2877{
2824 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2878 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2825 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2879 on_enterleave_call (aTHX_ sv_2mortal (cb));
2880}
2881
2882static void
2883enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2884{
2885 if (!hook)
2886 return;
2887
2888 if (!*avp)
2889 {
2890 *avp = newAV ();
2891 AvREAL_off (*avp);
2892 }
2893
2894 av_push (*avp, (SV *)hook);
2895 av_push (*avp, (SV *)arg);
2896}
2897
2898static void
2899enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2900{
2901 AV *av = *avp;
2902 int i;
2903
2904 if (!av)
2905 return;
2906
2907 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2908 if (AvARRAY (av)[i] == (SV *)hook)
2909 {
2910 if (execute)
2911 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2912
2913 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2914 av_pop (av);
2915 av_pop (av);
2916 break;
2917 }
2918
2919 if (AvFILLp (av) >= 0)
2920 {
2921 *avp = 0;
2922 SvREFCNT_dec_NN (av);
2923 }
2924}
2925
2926static void
2927api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2928{
2929 struct coro *coro = SvSTATE (coro_sv);
2930
2931 if (SvSTATE_current == coro)
2932 if (enter)
2933 enter (aTHX_ enter_arg);
2934
2935 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2936 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2937}
2938
2939static void
2940api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2941{
2942 struct coro *coro = SvSTATE (coro_sv);
2943
2944 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2945 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2946}
2947
2948static void
2949savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2950{
2951 struct coro *coro = SvSTATE_current;
2952
2953 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2954}
2955
2956static void
2957savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2958{
2959 struct coro *coro = SvSTATE_current;
2960
2961 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2962}
2963
2964static void
2965api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2966{
2967 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2968
2969 /* this ought to be much cheaper than malloc + a single destructor call */
2970 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2971 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2826} 2972}
2827 2973
2828/*****************************************************************************/ 2974/*****************************************************************************/
2829/* PerlIO::cede */ 2975/* PerlIO::cede */
2830 2976
… …
2960 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3106 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2961 PUTBACK; 3107 PUTBACK;
2962 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3108 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2963 } 3109 }
2964 3110
2965 SvREFCNT_dec (cb); 3111 SvREFCNT_dec_NN (cb);
2966 } 3112 }
2967} 3113}
2968 3114
2969static void 3115static void
2970coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3116coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
3110 { 3256 {
3111 api_ready (aTHX_ cb); 3257 api_ready (aTHX_ cb);
3112 sv_setiv (cb, 0); /* signal waiter */ 3258 sv_setiv (cb, 0); /* signal waiter */
3113 } 3259 }
3114 3260
3115 SvREFCNT_dec (cb); 3261 SvREFCNT_dec_NN (cb);
3116 3262
3117 --count; 3263 --count;
3118 } 3264 }
3119} 3265}
3120 3266
… …
3205 } 3351 }
3206 3352
3207 av_push (state, data_sv); 3353 av_push (state, data_sv);
3208 3354
3209 api_ready (aTHX_ coro); 3355 api_ready (aTHX_ coro);
3210 SvREFCNT_dec (coro); 3356 SvREFCNT_dec_NN (coro);
3211 SvREFCNT_dec ((AV *)state); 3357 SvREFCNT_dec_NN ((AV *)state);
3212} 3358}
3213 3359
3214static int 3360static int
3215slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3361slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3216{ 3362{
… …
3234 errno = data->errorno; 3380 errno = data->errorno;
3235 PL_laststype = data->laststype; 3381 PL_laststype = data->laststype;
3236 PL_laststatval = data->laststatval; 3382 PL_laststatval = data->laststatval;
3237 PL_statcache = data->statcache; 3383 PL_statcache = data->statcache;
3238 3384
3239 SvREFCNT_dec (data_sv); 3385 SvREFCNT_dec_NN (data_sv);
3240 } 3386 }
3241 3387
3242 /* push result values */ 3388 /* push result values */
3243 { 3389 {
3244 dSP; 3390 dSP;
… …
3482 3628
3483 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3629 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; 3630 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; 3631 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
3486 3632
3487 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3488 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3633 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)); 3634 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3490 3635
3491 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3636 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3492 3637
… …
3798 if (ecb_expect_false (current == self)) 3943 if (ecb_expect_false (current == self))
3799 coro_times_sub (SvSTATE (coro_current)); 3944 coro_times_sub (SvSTATE (coro_current));
3800} 3945}
3801 3946
3802void 3947void
3803swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3948swap_sv (Coro::State coro, SV *sva, SV *svb)
3804 CODE: 3949 CODE:
3805{ 3950{
3806 struct coro *current = SvSTATE_current; 3951 struct coro *current = SvSTATE_current;
3952 AV *swap_sv;
3953 int i;
3954
3955 sva = SvRV (sva);
3956 svb = SvRV (svb);
3807 3957
3808 if (current == coro) 3958 if (current == coro)
3809 SWAP_SVS (current); 3959 SWAP_SVS_LEAVE (current);
3810 3960
3811 if (!coro->swap_sv) 3961 if (!coro->swap_sv)
3812 coro->swap_sv = newAV (); 3962 coro->swap_sv = newAV ();
3813 3963
3964 swap_sv = coro->swap_sv;
3965
3966 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
3967 {
3968 SV *a = AvARRAY (swap_sv)[i ];
3969 SV *b = AvARRAY (swap_sv)[i + 1];
3970
3971 if (a == sva && b == svb)
3972 {
3973 SvREFCNT_dec_NN (a);
3974 SvREFCNT_dec_NN (b);
3975
3976 for (; i <= AvFILLp (swap_sv) - 2; i++)
3977 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
3978
3979 AvFILLp (swap_sv) -= 2;
3980
3981 goto removed;
3982 }
3983 }
3984
3814 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 3985 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3815 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 3986 av_push (swap_sv, SvREFCNT_inc_NN (svb));
3987
3988 removed:
3816 3989
3817 if (current == coro) 3990 if (current == coro)
3818 SWAP_SVS (current); 3991 SWAP_SVS_ENTER (current);
3819} 3992}
3820 3993
3821 3994
3822MODULE = Coro::State PACKAGE = Coro 3995MODULE = Coro::State PACKAGE = Coro
3823 3996
3824BOOT: 3997BOOT:
3825{ 3998{
3999 if (SVt_LAST > 32)
4000 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4001
3826 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4002 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3827 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4003 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3828 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4004 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3829 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4005 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); 4006 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3856 coroapi.ready = api_ready; 4032 coroapi.ready = api_ready;
3857 coroapi.is_ready = api_is_ready; 4033 coroapi.is_ready = api_is_ready;
3858 coroapi.nready = coro_nready; 4034 coroapi.nready = coro_nready;
3859 coroapi.current = coro_current; 4035 coroapi.current = coro_current;
3860 4036
4037 coroapi.enterleave_hook = api_enterleave_hook;
4038 coroapi.enterleave_unhook = api_enterleave_unhook;
4039 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4040
3861 /*GCoroAPI = &coroapi;*/ 4041 /*GCoroAPI = &coroapi;*/
3862 sv_setiv (sv, (IV)&coroapi); 4042 sv_setiv (sv, (IV)&coroapi);
3863 SvREADONLY_on (sv); 4043 SvREADONLY_on (sv);
3864 } 4044 }
3865} 4045}
… …
3930 4110
3931void 4111void
3932_set_current (SV *current) 4112_set_current (SV *current)
3933 PROTOTYPE: $ 4113 PROTOTYPE: $
3934 CODE: 4114 CODE:
3935 SvREFCNT_dec (SvRV (coro_current)); 4115 SvREFCNT_dec_NN (SvRV (coro_current));
3936 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4116 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3937 4117
3938void 4118void
3939_set_readyhook (SV *hook) 4119_set_readyhook (SV *hook)
3940 PROTOTYPE: $ 4120 PROTOTYPE: $
… …
4024 4204
4025 if ((SV *)hv == &PL_sv_undef) 4205 if ((SV *)hv == &PL_sv_undef)
4026 { 4206 {
4027 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4207 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
4028 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4208 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4029 SvREFCNT_dec (sv); 4209 SvREFCNT_dec_NN (sv);
4030 } 4210 }
4031 4211
4032 { 4212 {
4033 struct coro *coro = SvSTATE_hv (hv); 4213 struct coro *coro = SvSTATE_hv (hv);
4034 4214
… …
4041 api_ready (aTHX_ (SV *)hv); 4221 api_ready (aTHX_ (SV *)hv);
4042 4222
4043 if (GIMME_V != G_VOID) 4223 if (GIMME_V != G_VOID)
4044 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4224 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4045 else 4225 else
4046 SvREFCNT_dec (hv); 4226 SvREFCNT_dec_NN (hv);
4047} 4227}
4048 4228
4049SV * 4229SV *
4050rouse_cb () 4230rouse_cb ()
4051 PROTOTYPE: 4231 PROTOTYPE:
… …
4130 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4310 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4131 OUTPUT: 4311 OUTPUT:
4132 RETVAL 4312 RETVAL
4133 4313
4134void 4314void
4135up (SV *self, int adjust = 1) 4315up (SV *self)
4136 ALIAS:
4137 adjust = 1
4138 CODE: 4316 CODE:
4317 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4318
4319void
4320adjust (SV *self, int adjust)
4321 CODE:
4139 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4322 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4140 4323
4141void 4324void
4142down (...) 4325down (...)
4143 CODE: 4326 CODE:
4144 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4327 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);

Diff Legend

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