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.444 by root, Thu May 1 08:09:18 2014 UTC vs.
Revision 1.457 by root, Fri Jun 17 04:49: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
… …
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)
732{
733 int i;
734
735 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
736 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
737}
738
739static void
740swap_svs_leave (pTHX_ Coro__State c)
710{ 741{
711 int i; 742 int i;
712 743
713 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 744 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
714 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]); 745 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
715} 746}
716 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
… …
1138 1189
1139 GvSV (PL_defgv) = newSV (0); 1190 GvSV (PL_defgv) = newSV (0);
1140 GvAV (PL_defgv) = coro->args; coro->args = 0; 1191 GvAV (PL_defgv) = coro->args; coro->args = 0;
1141 GvSV (PL_errgv) = newSV (0); 1192 GvSV (PL_errgv) = newSV (0);
1142 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1193 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1143 GvHV (PL_hintgv) = 0; 1194 GvHV (PL_hintgv) = newHV ();
1195#if PERL_VERSION_ATLEAST (5,10,0)
1196 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1197#endif
1144 PL_rs = newSVsv (GvSV (irsgv)); 1198 PL_rs = newSVsv (GvSV (irsgv));
1145 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1199 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1146 1200
1147 { 1201 {
1148 dSP; 1202 dSP;
… …
1176 PL_op = (OP *)&init_perl_op; 1230 PL_op = (OP *)&init_perl_op;
1177 1231
1178 /* copy throw, in case it was set before init_perl */ 1232 /* copy throw, in case it was set before init_perl */
1179 CORO_THROW = coro->except; 1233 CORO_THROW = coro->except;
1180 1234
1181 SWAP_SVS (coro); 1235 SWAP_SVS_ENTER (coro);
1182 1236
1183 if (ecb_expect_false (enable_times)) 1237 if (ecb_expect_false (enable_times))
1184 { 1238 {
1185 coro_times_update (); 1239 coro_times_update ();
1186 coro_times_sub (coro); 1240 coro_times_sub (coro);
… …
1224 /* this will cause transfer_check to croak on block*/ 1278 /* this will cause transfer_check to croak on block*/
1225 SvRV_set (coro_current, (SV *)coro->hv); 1279 SvRV_set (coro_current, (SV *)coro->hv);
1226 1280
1227 load_perl (aTHX_ coro); 1281 load_perl (aTHX_ coro);
1228 1282
1283 /* restore swapped sv's */
1284 SWAP_SVS_LEAVE (coro);
1285
1229 coro_unwind_stacks (aTHX); 1286 coro_unwind_stacks (aTHX);
1230
1231 /* restore swapped sv's */
1232 SWAP_SVS (coro);
1233 1287
1234 coro_destruct_stacks (aTHX); 1288 coro_destruct_stacks (aTHX);
1235 1289
1236 /* now save some sv's to be free'd later */ 1290 /* now save some sv's to be free'd later */
1237 svf [0] = GvSV (PL_defgv); 1291 svf [0] = GvSV (PL_defgv);
… …
1258 1312
1259 SvREFCNT_dec (coro->saved_deffh); 1313 SvREFCNT_dec (coro->saved_deffh);
1260 SvREFCNT_dec (coro->rouse_cb); 1314 SvREFCNT_dec (coro->rouse_cb);
1261 SvREFCNT_dec (coro->invoke_cb); 1315 SvREFCNT_dec (coro->invoke_cb);
1262 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);
1263 } 1319 }
1264} 1320}
1265 1321
1266ecb_inline void 1322ecb_inline void
1267free_coro_mortal (pTHX) 1323free_coro_mortal (pTHX)
… …
1330 1386
1331 if (PL_curcop != &PL_compiling) 1387 if (PL_curcop != &PL_compiling)
1332 { 1388 {
1333 SV **cb; 1389 SV **cb;
1334 1390
1335 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1391 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1336 { 1392 {
1337 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1393 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1338 1394
1339 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1395 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1340 { 1396 {
… …
1927 1983
1928 ENTER; 1984 ENTER;
1929 SAVETMPS; 1985 SAVETMPS;
1930 1986
1931 PUSHMARK (SP); 1987 PUSHMARK (SP);
1932 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught", 0))); 1988 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1933 PUTBACK; 1989 PUTBACK;
1934 call_pv ("Carp::confess", G_VOID | G_DISCARD); 1990 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1935 1991
1936 FREETMPS; 1992 FREETMPS;
1937 LEAVE; 1993 LEAVE;
… …
2807static void 2863static void
2808coro_pop_on_leave (pTHX_ void *coro) 2864coro_pop_on_leave (pTHX_ void *coro)
2809{ 2865{
2810 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2866 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2811 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2867 on_enterleave_call (aTHX_ sv_2mortal (cb));
2868}
2869
2870static void
2871enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2872{
2873 if (!hook)
2874 return;
2875
2876 if (!*avp)
2877 {
2878 *avp = newAV ();
2879 AvREAL_off (*avp);
2880 }
2881
2882 av_push (*avp, (SV *)hook);
2883 av_push (*avp, (SV *)arg);
2884}
2885
2886static void
2887enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2888{
2889 AV *av = *avp;
2890 int i;
2891
2892 if (!av)
2893 return;
2894
2895 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2896 if (AvARRAY (av)[i] == (SV *)hook)
2897 {
2898 if (execute)
2899 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2900
2901 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2902 av_pop (av);
2903 av_pop (av);
2904 break;
2905 }
2906
2907 if (AvFILLp (av) >= 0)
2908 {
2909 *avp = 0;
2910 SvREFCNT_dec_NN (av);
2911 }
2912}
2913
2914static void
2915api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2916{
2917 struct coro *coro = SvSTATE (coro_sv);
2918
2919 if (SvSTATE_current == coro)
2920 if (enter)
2921 enter (aTHX_ enter_arg);
2922
2923 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2924 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2925}
2926
2927static void
2928api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2929{
2930 struct coro *coro = SvSTATE (coro_sv);
2931
2932 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2933 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2934}
2935
2936static void
2937savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2938{
2939 struct coro *coro = SvSTATE_current;
2940
2941 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2942}
2943
2944static void
2945savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2946{
2947 struct coro *coro = SvSTATE_current;
2948
2949 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2950}
2951
2952static void
2953api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2954{
2955 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2956
2957 /* this ought to be much cheaper than malloc + a single destructor call */
2958 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2959 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2812} 2960}
2813 2961
2814/*****************************************************************************/ 2962/*****************************************************************************/
2815/* PerlIO::cede */ 2963/* PerlIO::cede */
2816 2964
… …
2946 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3094 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2947 PUTBACK; 3095 PUTBACK;
2948 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3096 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2949 } 3097 }
2950 3098
2951 SvREFCNT_dec (cb); 3099 SvREFCNT_dec_NN (cb);
2952 } 3100 }
2953} 3101}
2954 3102
2955static void 3103static void
2956coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3104coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
3096 { 3244 {
3097 api_ready (aTHX_ cb); 3245 api_ready (aTHX_ cb);
3098 sv_setiv (cb, 0); /* signal waiter */ 3246 sv_setiv (cb, 0); /* signal waiter */
3099 } 3247 }
3100 3248
3101 SvREFCNT_dec (cb); 3249 SvREFCNT_dec_NN (cb);
3102 3250
3103 --count; 3251 --count;
3104 } 3252 }
3105} 3253}
3106 3254
… …
3191 } 3339 }
3192 3340
3193 av_push (state, data_sv); 3341 av_push (state, data_sv);
3194 3342
3195 api_ready (aTHX_ coro); 3343 api_ready (aTHX_ coro);
3196 SvREFCNT_dec (coro); 3344 SvREFCNT_dec_NN (coro);
3197 SvREFCNT_dec ((AV *)state); 3345 SvREFCNT_dec_NN ((AV *)state);
3198} 3346}
3199 3347
3200static int 3348static int
3201slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3349slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3202{ 3350{
… …
3220 errno = data->errorno; 3368 errno = data->errorno;
3221 PL_laststype = data->laststype; 3369 PL_laststype = data->laststype;
3222 PL_laststatval = data->laststatval; 3370 PL_laststatval = data->laststatval;
3223 PL_statcache = data->statcache; 3371 PL_statcache = data->statcache;
3224 3372
3225 SvREFCNT_dec (data_sv); 3373 SvREFCNT_dec_NN (data_sv);
3226 } 3374 }
3227 3375
3228 /* push result values */ 3376 /* push result values */
3229 { 3377 {
3230 dSP; 3378 dSP;
… …
3445 3593
3446PROTOTYPES: DISABLE 3594PROTOTYPES: DISABLE
3447 3595
3448BOOT: 3596BOOT:
3449{ 3597{
3450#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl"); 3598#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3451#include "state.h" 3599#include "state.h"
3452#ifdef USE_ITHREADS 3600#ifdef USE_ITHREADS
3453# if CORO_PTHREAD 3601# if CORO_PTHREAD
3454 coro_thx = PERL_GET_CONTEXT; 3602 coro_thx = PERL_GET_CONTEXT;
3455# endif 3603# endif
… …
3468 3616
3469 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3617 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
3470 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3618 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
3471 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3619 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
3472 3620
3473 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3474 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3621 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3475 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3622 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3476 3623
3477 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3624 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3478 3625
… …
3784 if (ecb_expect_false (current == self)) 3931 if (ecb_expect_false (current == self))
3785 coro_times_sub (SvSTATE (coro_current)); 3932 coro_times_sub (SvSTATE (coro_current));
3786} 3933}
3787 3934
3788void 3935void
3789swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3936swap_sv (Coro::State coro, SV *sva, SV *svb)
3790 CODE: 3937 CODE:
3791{ 3938{
3792 struct coro *current = SvSTATE_current; 3939 struct coro *current = SvSTATE_current;
3940 AV *swap_sv;
3941 int i;
3942
3943 sva = SvRV (sva);
3944 svb = SvRV (svb);
3793 3945
3794 if (current == coro) 3946 if (current == coro)
3795 SWAP_SVS (current); 3947 SWAP_SVS_LEAVE (current);
3796 3948
3797 if (!coro->swap_sv) 3949 if (!coro->swap_sv)
3798 coro->swap_sv = newAV (); 3950 coro->swap_sv = newAV ();
3799 3951
3952 swap_sv = coro->swap_sv;
3953
3954 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
3955 {
3956 SV *a = AvARRAY (swap_sv)[i ];
3957 SV *b = AvARRAY (swap_sv)[i + 1];
3958
3959 if (a == sva && b == svb)
3960 {
3961 SvREFCNT_dec_NN (a);
3962 SvREFCNT_dec_NN (b);
3963
3964 for (; i <= AvFILLp (swap_sv) - 2; i++)
3965 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
3966
3967 AvFILLp (swap_sv) -= 2;
3968
3969 goto removed;
3970 }
3971 }
3972
3800 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 3973 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3801 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 3974 av_push (swap_sv, SvREFCNT_inc_NN (svb));
3975
3976 removed:
3802 3977
3803 if (current == coro) 3978 if (current == coro)
3804 SWAP_SVS (current); 3979 SWAP_SVS_ENTER (current);
3805} 3980}
3806 3981
3807 3982
3808MODULE = Coro::State PACKAGE = Coro 3983MODULE = Coro::State PACKAGE = Coro
3809 3984
3810BOOT: 3985BOOT:
3811{ 3986{
3987 if (SVt_LAST > 32)
3988 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3989
3812 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3990 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3813 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3991 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3814 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3992 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3815 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3993 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3816 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3994 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3842 coroapi.ready = api_ready; 4020 coroapi.ready = api_ready;
3843 coroapi.is_ready = api_is_ready; 4021 coroapi.is_ready = api_is_ready;
3844 coroapi.nready = coro_nready; 4022 coroapi.nready = coro_nready;
3845 coroapi.current = coro_current; 4023 coroapi.current = coro_current;
3846 4024
4025 coroapi.enterleave_hook = api_enterleave_hook;
4026 coroapi.enterleave_unhook = api_enterleave_unhook;
4027 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4028
3847 /*GCoroAPI = &coroapi;*/ 4029 /*GCoroAPI = &coroapi;*/
3848 sv_setiv (sv, (IV)&coroapi); 4030 sv_setiv (sv, (IV)&coroapi);
3849 SvREADONLY_on (sv); 4031 SvREADONLY_on (sv);
3850 } 4032 }
3851} 4033}
… …
3916 4098
3917void 4099void
3918_set_current (SV *current) 4100_set_current (SV *current)
3919 PROTOTYPE: $ 4101 PROTOTYPE: $
3920 CODE: 4102 CODE:
3921 SvREFCNT_dec (SvRV (coro_current)); 4103 SvREFCNT_dec_NN (SvRV (coro_current));
3922 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4104 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3923 4105
3924void 4106void
3925_set_readyhook (SV *hook) 4107_set_readyhook (SV *hook)
3926 PROTOTYPE: $ 4108 PROTOTYPE: $
… …
4010 4192
4011 if ((SV *)hv == &PL_sv_undef) 4193 if ((SV *)hv == &PL_sv_undef)
4012 { 4194 {
4013 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4195 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
4014 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4196 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4015 SvREFCNT_dec (sv); 4197 SvREFCNT_dec_NN (sv);
4016 } 4198 }
4017 4199
4018 { 4200 {
4019 struct coro *coro = SvSTATE_hv (hv); 4201 struct coro *coro = SvSTATE_hv (hv);
4020 4202
… …
4027 api_ready (aTHX_ (SV *)hv); 4209 api_ready (aTHX_ (SV *)hv);
4028 4210
4029 if (GIMME_V != G_VOID) 4211 if (GIMME_V != G_VOID)
4030 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4212 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4031 else 4213 else
4032 SvREFCNT_dec (hv); 4214 SvREFCNT_dec_NN (hv);
4033} 4215}
4034 4216
4035SV * 4217SV *
4036rouse_cb () 4218rouse_cb ()
4037 PROTOTYPE: 4219 PROTOTYPE:
… …
4116 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4298 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4117 OUTPUT: 4299 OUTPUT:
4118 RETVAL 4300 RETVAL
4119 4301
4120void 4302void
4121up (SV *self, int adjust = 1) 4303up (SV *self)
4122 ALIAS:
4123 adjust = 1
4124 CODE: 4304 CODE:
4305 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4306
4307void
4308adjust (SV *self, int adjust)
4309 CODE:
4125 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4310 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4126 4311
4127void 4312void
4128down (...) 4313down (...)
4129 CODE: 4314 CODE:
4130 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4315 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);

Diff Legend

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