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.447 by root, Tue Oct 14 21:53:32 2014 UTC vs.
Revision 1.459 by root, Fri Jun 17 05:00:19 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)))
… …
704#endif 726#endif
705} 727}
706 728
707/* swap sv heads, at least logically */ 729/* swap sv heads, at least logically */
708static void 730static void
709swap_svs (pTHX_ Coro__State c) 731swap_svs_enter (pTHX_ Coro__State c)
710{ 732{
711 int i; 733 int i;
712 734
713 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 735 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
714 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]);
715} 737}
716 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
717#define SWAP_SVS(coro) \ 748#define SWAP_SVS_ENTER(coro) \
718 if (ecb_expect_false ((coro)->swap_sv)) \ 749 if (ecb_expect_false ((coro)->swap_sv)) \
719 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))
720 755
721static void 756static void
722on_enterleave_call (pTHX_ SV *cb); 757on_enterleave_call (pTHX_ SV *cb);
723 758
724static void 759static void
… …
769 804
770 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 805 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
771 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 806 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
772 } 807 }
773 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
774 SWAP_SVS (c); 817 SWAP_SVS_ENTER (c);
775} 818}
776 819
777static void 820static void
778save_perl (pTHX_ Coro__State c) 821save_perl (pTHX_ Coro__State c)
779{ 822{
780 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 }
781 832
782 if (ecb_expect_false (c->on_leave)) 833 if (ecb_expect_false (c->on_leave))
783 { 834 {
784 int i; 835 int i;
785 836
… …
1179 PL_op = (OP *)&init_perl_op; 1230 PL_op = (OP *)&init_perl_op;
1180 1231
1181 /* copy throw, in case it was set before init_perl */ 1232 /* copy throw, in case it was set before init_perl */
1182 CORO_THROW = coro->except; 1233 CORO_THROW = coro->except;
1183 1234
1184 SWAP_SVS (coro); 1235 SWAP_SVS_ENTER (coro);
1185 1236
1186 if (ecb_expect_false (enable_times)) 1237 if (ecb_expect_false (enable_times))
1187 { 1238 {
1188 coro_times_update (); 1239 coro_times_update ();
1189 coro_times_sub (coro); 1240 coro_times_sub (coro);
… …
1227 /* this will cause transfer_check to croak on block*/ 1278 /* this will cause transfer_check to croak on block*/
1228 SvRV_set (coro_current, (SV *)coro->hv); 1279 SvRV_set (coro_current, (SV *)coro->hv);
1229 1280
1230 load_perl (aTHX_ coro); 1281 load_perl (aTHX_ coro);
1231 1282
1283 /* restore swapped sv's */
1284 SWAP_SVS_LEAVE (coro);
1285
1232 coro_unwind_stacks (aTHX); 1286 coro_unwind_stacks (aTHX);
1233
1234 /* restore swapped sv's */
1235 SWAP_SVS (coro);
1236 1287
1237 coro_destruct_stacks (aTHX); 1288 coro_destruct_stacks (aTHX);
1238 1289
1239 /* now save some sv's to be free'd later */ 1290 /* now save some sv's to be free'd later */
1240 svf [0] = GvSV (PL_defgv); 1291 svf [0] = GvSV (PL_defgv);
… …
1261 1312
1262 SvREFCNT_dec (coro->saved_deffh); 1313 SvREFCNT_dec (coro->saved_deffh);
1263 SvREFCNT_dec (coro->rouse_cb); 1314 SvREFCNT_dec (coro->rouse_cb);
1264 SvREFCNT_dec (coro->invoke_cb); 1315 SvREFCNT_dec (coro->invoke_cb);
1265 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);
1266 } 1319 }
1267} 1320}
1268 1321
1269ecb_inline void 1322ecb_inline void
1270free_coro_mortal (pTHX) 1323free_coro_mortal (pTHX)
… …
1333 1386
1334 if (PL_curcop != &PL_compiling) 1387 if (PL_curcop != &PL_compiling)
1335 { 1388 {
1336 SV **cb; 1389 SV **cb;
1337 1390
1338 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1391 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1339 { 1392 {
1340 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1393 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1341 1394
1342 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1395 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1343 { 1396 {
… …
2373 else 2426 else
2374 { 2427 {
2375 av_clear (GvAV (PL_defgv)); 2428 av_clear (GvAV (PL_defgv));
2376 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);
2377 2430
2431 if (ecb_expect_false (coro->swap_sv))
2432 {
2433 SvREFCNT_dec_NN (coro->swap_sv);
2434 coro->swap_sv = 0;
2435 }
2436
2378 coro->prio = 0; 2437 coro->prio = 0;
2379 2438
2380 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2439 if (coro->cctx && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2381 api_trace (aTHX_ coro_current, 0); 2440 api_trace (aTHX_ coro_current, 0);
2382 2441
2383 frame->prepare = prepare_schedule; 2442 frame->prepare = prepare_schedule;
2384 av_push (av_async_pool, SvREFCNT_inc (hv)); 2443 av_push (av_async_pool, SvREFCNT_inc (hv));
2385 } 2444 }
… …
2810static void 2869static void
2811coro_pop_on_leave (pTHX_ void *coro) 2870coro_pop_on_leave (pTHX_ void *coro)
2812{ 2871{
2813 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2872 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2814 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2873 on_enterleave_call (aTHX_ sv_2mortal (cb));
2874}
2875
2876static void
2877enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2878{
2879 if (!hook)
2880 return;
2881
2882 if (!*avp)
2883 {
2884 *avp = newAV ();
2885 AvREAL_off (*avp);
2886 }
2887
2888 av_push (*avp, (SV *)hook);
2889 av_push (*avp, (SV *)arg);
2890}
2891
2892static void
2893enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2894{
2895 AV *av = *avp;
2896 int i;
2897
2898 if (!av)
2899 return;
2900
2901 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2902 if (AvARRAY (av)[i] == (SV *)hook)
2903 {
2904 if (execute)
2905 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2906
2907 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2908 av_pop (av);
2909 av_pop (av);
2910 break;
2911 }
2912
2913 if (AvFILLp (av) >= 0)
2914 {
2915 *avp = 0;
2916 SvREFCNT_dec_NN (av);
2917 }
2918}
2919
2920static void
2921api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2922{
2923 struct coro *coro = SvSTATE (coro_sv);
2924
2925 if (SvSTATE_current == coro)
2926 if (enter)
2927 enter (aTHX_ enter_arg);
2928
2929 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2930 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2931}
2932
2933static void
2934api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2935{
2936 struct coro *coro = SvSTATE (coro_sv);
2937
2938 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2939 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2940}
2941
2942static void
2943savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2944{
2945 struct coro *coro = SvSTATE_current;
2946
2947 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2948}
2949
2950static void
2951savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2952{
2953 struct coro *coro = SvSTATE_current;
2954
2955 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2956}
2957
2958static void
2959api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2960{
2961 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2962
2963 /* this ought to be much cheaper than malloc + a single destructor call */
2964 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2965 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2815} 2966}
2816 2967
2817/*****************************************************************************/ 2968/*****************************************************************************/
2818/* PerlIO::cede */ 2969/* PerlIO::cede */
2819 2970
… …
2949 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3100 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2950 PUTBACK; 3101 PUTBACK;
2951 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3102 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2952 } 3103 }
2953 3104
2954 SvREFCNT_dec (cb); 3105 SvREFCNT_dec_NN (cb);
2955 } 3106 }
2956} 3107}
2957 3108
2958static void 3109static void
2959coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3110coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
3099 { 3250 {
3100 api_ready (aTHX_ cb); 3251 api_ready (aTHX_ cb);
3101 sv_setiv (cb, 0); /* signal waiter */ 3252 sv_setiv (cb, 0); /* signal waiter */
3102 } 3253 }
3103 3254
3104 SvREFCNT_dec (cb); 3255 SvREFCNT_dec_NN (cb);
3105 3256
3106 --count; 3257 --count;
3107 } 3258 }
3108} 3259}
3109 3260
… …
3194 } 3345 }
3195 3346
3196 av_push (state, data_sv); 3347 av_push (state, data_sv);
3197 3348
3198 api_ready (aTHX_ coro); 3349 api_ready (aTHX_ coro);
3199 SvREFCNT_dec (coro); 3350 SvREFCNT_dec_NN (coro);
3200 SvREFCNT_dec ((AV *)state); 3351 SvREFCNT_dec_NN ((AV *)state);
3201} 3352}
3202 3353
3203static int 3354static int
3204slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3355slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3205{ 3356{
… …
3223 errno = data->errorno; 3374 errno = data->errorno;
3224 PL_laststype = data->laststype; 3375 PL_laststype = data->laststype;
3225 PL_laststatval = data->laststatval; 3376 PL_laststatval = data->laststatval;
3226 PL_statcache = data->statcache; 3377 PL_statcache = data->statcache;
3227 3378
3228 SvREFCNT_dec (data_sv); 3379 SvREFCNT_dec_NN (data_sv);
3229 } 3380 }
3230 3381
3231 /* push result values */ 3382 /* push result values */
3232 { 3383 {
3233 dSP; 3384 dSP;
… …
3471 3622
3472 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3623 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
3473 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3624 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
3474 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3625 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
3475 3626
3476 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3477 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3627 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3478 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3628 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3479 3629
3480 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3630 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3481 3631
… …
3787 if (ecb_expect_false (current == self)) 3937 if (ecb_expect_false (current == self))
3788 coro_times_sub (SvSTATE (coro_current)); 3938 coro_times_sub (SvSTATE (coro_current));
3789} 3939}
3790 3940
3791void 3941void
3792swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3942swap_sv (Coro::State coro, SV *sva, SV *svb)
3793 CODE: 3943 CODE:
3794{ 3944{
3795 struct coro *current = SvSTATE_current; 3945 struct coro *current = SvSTATE_current;
3946 AV *swap_sv;
3947 int i;
3948
3949 sva = SvRV (sva);
3950 svb = SvRV (svb);
3796 3951
3797 if (current == coro) 3952 if (current == coro)
3798 SWAP_SVS (current); 3953 SWAP_SVS_LEAVE (current);
3799 3954
3800 if (!coro->swap_sv) 3955 if (!coro->swap_sv)
3801 coro->swap_sv = newAV (); 3956 coro->swap_sv = newAV ();
3802 3957
3958 swap_sv = coro->swap_sv;
3959
3960 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
3961 {
3962 SV *a = AvARRAY (swap_sv)[i ];
3963 SV *b = AvARRAY (swap_sv)[i + 1];
3964
3965 if (a == sva && b == svb)
3966 {
3967 SvREFCNT_dec_NN (a);
3968 SvREFCNT_dec_NN (b);
3969
3970 for (; i <= AvFILLp (swap_sv) - 2; i++)
3971 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
3972
3973 AvFILLp (swap_sv) -= 2;
3974
3975 goto removed;
3976 }
3977 }
3978
3803 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 3979 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3804 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 3980 av_push (swap_sv, SvREFCNT_inc_NN (svb));
3981
3982 removed:
3805 3983
3806 if (current == coro) 3984 if (current == coro)
3807 SWAP_SVS (current); 3985 SWAP_SVS_ENTER (current);
3808} 3986}
3809 3987
3810 3988
3811MODULE = Coro::State PACKAGE = Coro 3989MODULE = Coro::State PACKAGE = Coro
3812 3990
3813BOOT: 3991BOOT:
3814{ 3992{
3993 if (SVt_LAST > 32)
3994 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3995
3815 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3996 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3816 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3997 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3817 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3998 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3818 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3999 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3819 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4000 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3845 coroapi.ready = api_ready; 4026 coroapi.ready = api_ready;
3846 coroapi.is_ready = api_is_ready; 4027 coroapi.is_ready = api_is_ready;
3847 coroapi.nready = coro_nready; 4028 coroapi.nready = coro_nready;
3848 coroapi.current = coro_current; 4029 coroapi.current = coro_current;
3849 4030
4031 coroapi.enterleave_hook = api_enterleave_hook;
4032 coroapi.enterleave_unhook = api_enterleave_unhook;
4033 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4034
3850 /*GCoroAPI = &coroapi;*/ 4035 /*GCoroAPI = &coroapi;*/
3851 sv_setiv (sv, (IV)&coroapi); 4036 sv_setiv (sv, (IV)&coroapi);
3852 SvREADONLY_on (sv); 4037 SvREADONLY_on (sv);
3853 } 4038 }
3854} 4039}
… …
3919 4104
3920void 4105void
3921_set_current (SV *current) 4106_set_current (SV *current)
3922 PROTOTYPE: $ 4107 PROTOTYPE: $
3923 CODE: 4108 CODE:
3924 SvREFCNT_dec (SvRV (coro_current)); 4109 SvREFCNT_dec_NN (SvRV (coro_current));
3925 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4110 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3926 4111
3927void 4112void
3928_set_readyhook (SV *hook) 4113_set_readyhook (SV *hook)
3929 PROTOTYPE: $ 4114 PROTOTYPE: $
… …
4013 4198
4014 if ((SV *)hv == &PL_sv_undef) 4199 if ((SV *)hv == &PL_sv_undef)
4015 { 4200 {
4016 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4201 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
4017 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4202 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4018 SvREFCNT_dec (sv); 4203 SvREFCNT_dec_NN (sv);
4019 } 4204 }
4020 4205
4021 { 4206 {
4022 struct coro *coro = SvSTATE_hv (hv); 4207 struct coro *coro = SvSTATE_hv (hv);
4023 4208
… …
4030 api_ready (aTHX_ (SV *)hv); 4215 api_ready (aTHX_ (SV *)hv);
4031 4216
4032 if (GIMME_V != G_VOID) 4217 if (GIMME_V != G_VOID)
4033 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4218 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4034 else 4219 else
4035 SvREFCNT_dec (hv); 4220 SvREFCNT_dec_NN (hv);
4036} 4221}
4037 4222
4038SV * 4223SV *
4039rouse_cb () 4224rouse_cb ()
4040 PROTOTYPE: 4225 PROTOTYPE:
… …
4119 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4304 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4120 OUTPUT: 4305 OUTPUT:
4121 RETVAL 4306 RETVAL
4122 4307
4123void 4308void
4124up (SV *self, int adjust = 1) 4309up (SV *self)
4125 ALIAS:
4126 adjust = 1
4127 CODE: 4310 CODE:
4311 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4312
4313void
4314adjust (SV *self, int adjust)
4315 CODE:
4128 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4316 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4129 4317
4130void 4318void
4131down (...) 4319down (...)
4132 CODE: 4320 CODE:
4133 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4321 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);

Diff Legend

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