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.453 by root, Tue Jul 7 00:33:25 2015 UTC vs.
Revision 1.461 by root, Fri Jun 17 16:29:50 2016 UTC

… …
140 140
141static GV *irsgv; /* $/ */ 141static GV *irsgv; /* $/ */
142static GV *stdoutgv; /* *STDOUT */ 142static GV *stdoutgv; /* *STDOUT */
143static SV *rv_diehook; 143static SV *rv_diehook;
144static SV *rv_warnhook; 144static SV *rv_warnhook;
145static HV *hv_sig; /* %SIG */
146 145
147/* async_pool helper stuff */ 146/* async_pool helper stuff */
148static SV *sv_pool_rss; 147static SV *sv_pool_rss;
149static SV *sv_pool_size; 148static SV *sv_pool_size;
150static SV *sv_async_pool_idle; /* description string */ 149static SV *sv_async_pool_idle; /* description string */
… …
710 709
711 /* 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,
712 * 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.
713 */ 712 */
714 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV); 713 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
715 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,20,0) 714 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
716 svany_in_head_set |= 1 << SVt_NV; 715 svany_in_head_set |= 1 << SVt_NV;
717 #endif 716 #endif
718 717
719 #define svany_in_head(type) (svany_in_head_set & (1 << (type))) 718 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
720 719
… …
727#endif 726#endif
728} 727}
729 728
730/* swap sv heads, at least logically */ 729/* swap sv heads, at least logically */
731static void 730static void
732swap_svs (pTHX_ Coro__State c) 731swap_svs_enter (pTHX_ Coro__State c)
733{ 732{
734 int i; 733 int i;
735 734
736 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 735 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
737 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]);
738} 737}
739 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
740#define SWAP_SVS(coro) \ 748#define SWAP_SVS_ENTER(coro) \
741 if (ecb_expect_false ((coro)->swap_sv)) \ 749 if (ecb_expect_false ((coro)->swap_sv)) \
742 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))
743 755
744static void 756static void
745on_enterleave_call (pTHX_ SV *cb); 757on_enterleave_call (pTHX_ SV *cb);
746 758
747static void 759static void
… …
800 812
801 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2) 813 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
802 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]); 814 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
803 } 815 }
804 816
805 SWAP_SVS (c); 817 SWAP_SVS_ENTER (c);
806} 818}
807 819
808static void 820static void
809save_perl (pTHX_ Coro__State c) 821save_perl (pTHX_ Coro__State c)
810{ 822{
811 SWAP_SVS (c); 823 SWAP_SVS_LEAVE (c);
812 824
813 if (ecb_expect_false (c->on_leave_xs)) 825 if (ecb_expect_false (c->on_leave_xs))
814 { 826 {
815 int i; 827 int i;
816 828
… …
1218 PL_op = (OP *)&init_perl_op; 1230 PL_op = (OP *)&init_perl_op;
1219 1231
1220 /* copy throw, in case it was set before init_perl */ 1232 /* copy throw, in case it was set before init_perl */
1221 CORO_THROW = coro->except; 1233 CORO_THROW = coro->except;
1222 1234
1223 SWAP_SVS (coro); 1235 SWAP_SVS_ENTER (coro);
1224 1236
1225 if (ecb_expect_false (enable_times)) 1237 if (ecb_expect_false (enable_times))
1226 { 1238 {
1227 coro_times_update (); 1239 coro_times_update ();
1228 coro_times_sub (coro); 1240 coro_times_sub (coro);
… …
1266 /* this will cause transfer_check to croak on block*/ 1278 /* this will cause transfer_check to croak on block*/
1267 SvRV_set (coro_current, (SV *)coro->hv); 1279 SvRV_set (coro_current, (SV *)coro->hv);
1268 1280
1269 load_perl (aTHX_ coro); 1281 load_perl (aTHX_ coro);
1270 1282
1283 /* restore swapped sv's */
1284 SWAP_SVS_LEAVE (coro);
1285
1271 coro_unwind_stacks (aTHX); 1286 coro_unwind_stacks (aTHX);
1272
1273 /* restore swapped sv's */
1274 SWAP_SVS (coro);
1275 1287
1276 coro_destruct_stacks (aTHX); 1288 coro_destruct_stacks (aTHX);
1277 1289
1278 /* now save some sv's to be free'd later */ 1290 /* now save some sv's to be free'd later */
1279 svf [0] = GvSV (PL_defgv); 1291 svf [0] = GvSV (PL_defgv);
… …
2414 else 2426 else
2415 { 2427 {
2416 av_clear (GvAV (PL_defgv)); 2428 av_clear (GvAV (PL_defgv));
2417 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);
2418 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
2419 coro->prio = 0; 2438 coro->prio = 0;
2420 2439
2421 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2440 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2422 api_trace (aTHX_ coro_current, 0); 2441 api_trace (aTHX_ coro_current, 0);
2423 2442
2424 frame->prepare = prepare_schedule; 2443 frame->prepare = prepare_schedule;
2425 av_push (av_async_pool, SvREFCNT_inc (hv)); 2444 av_push (av_async_pool, SvREFCNT_inc (hv));
2426 } 2445 }
… …
3604 3623
3605 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;
3606 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;
3607 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;
3608 3627
3609 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3610 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));
3611 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));
3612 3630
3613 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3631 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3614 3632
… …
3920 if (ecb_expect_false (current == self)) 3938 if (ecb_expect_false (current == self))
3921 coro_times_sub (SvSTATE (coro_current)); 3939 coro_times_sub (SvSTATE (coro_current));
3922} 3940}
3923 3941
3924void 3942void
3925swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3943swap_sv (Coro::State coro, SV *sva, SV *svb)
3926 CODE: 3944 CODE:
3927{ 3945{
3928 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);
3929 3952
3930 if (current == coro) 3953 if (current == coro)
3931 SWAP_SVS (current); 3954 SWAP_SVS_LEAVE (current);
3932 3955
3933 if (!coro->swap_sv) 3956 if (!coro->swap_sv)
3934 coro->swap_sv = newAV (); 3957 coro->swap_sv = newAV ();
3935 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
3936 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 3980 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3937 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 3981 av_push (swap_sv, SvREFCNT_inc_NN (svb));
3982
3983 removed:
3938 3984
3939 if (current == coro) 3985 if (current == coro)
3940 SWAP_SVS (current); 3986 SWAP_SVS_ENTER (current);
3941} 3987}
3942 3988
3943 3989
3944MODULE = Coro::State PACKAGE = Coro 3990MODULE = Coro::State PACKAGE = Coro
3945 3991
… …
4259 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4305 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4260 OUTPUT: 4306 OUTPUT:
4261 RETVAL 4307 RETVAL
4262 4308
4263void 4309void
4264up (SV *self, int adjust = 1) 4310up (SV *self)
4265 ALIAS:
4266 adjust = 1
4267 CODE: 4311 CODE:
4312 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4313
4314void
4315adjust (SV *self, int adjust)
4316 CODE:
4268 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4317 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4269 4318
4270void 4319void
4271down (...) 4320down (...)
4272 CODE: 4321 CODE:
4273 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