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.456 by root, Sun Mar 6 06:26:21 2016 UTC vs.
Revision 1.457 by root, Fri Jun 17 04:49:22 2016 UTC

… …
726#endif 726#endif
727} 727}
728 728
729/* swap sv heads, at least logically */ 729/* swap sv heads, at least logically */
730static void 730static void
731swap_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)
732{ 741{
733 int i; 742 int i;
734 743
735 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 744 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
736 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]);
737} 746}
738 747
739#define SWAP_SVS(coro) \ 748#define SWAP_SVS_ENTER(coro) \
740 if (ecb_expect_false ((coro)->swap_sv)) \ 749 if (ecb_expect_false ((coro)->swap_sv)) \
741 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))
742 755
743static void 756static void
744on_enterleave_call (pTHX_ SV *cb); 757on_enterleave_call (pTHX_ SV *cb);
745 758
746static void 759static void
… …
799 812
800 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2) 813 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
801 ((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]);
802 } 815 }
803 816
804 SWAP_SVS (c); 817 SWAP_SVS_ENTER (c);
805} 818}
806 819
807static void 820static void
808save_perl (pTHX_ Coro__State c) 821save_perl (pTHX_ Coro__State c)
809{ 822{
810 SWAP_SVS (c); 823 SWAP_SVS_LEAVE (c);
811 824
812 if (ecb_expect_false (c->on_leave_xs)) 825 if (ecb_expect_false (c->on_leave_xs))
813 { 826 {
814 int i; 827 int i;
815 828
… …
1217 PL_op = (OP *)&init_perl_op; 1230 PL_op = (OP *)&init_perl_op;
1218 1231
1219 /* copy throw, in case it was set before init_perl */ 1232 /* copy throw, in case it was set before init_perl */
1220 CORO_THROW = coro->except; 1233 CORO_THROW = coro->except;
1221 1234
1222 SWAP_SVS (coro); 1235 SWAP_SVS_ENTER (coro);
1223 1236
1224 if (ecb_expect_false (enable_times)) 1237 if (ecb_expect_false (enable_times))
1225 { 1238 {
1226 coro_times_update (); 1239 coro_times_update ();
1227 coro_times_sub (coro); 1240 coro_times_sub (coro);
… …
1265 /* this will cause transfer_check to croak on block*/ 1278 /* this will cause transfer_check to croak on block*/
1266 SvRV_set (coro_current, (SV *)coro->hv); 1279 SvRV_set (coro_current, (SV *)coro->hv);
1267 1280
1268 load_perl (aTHX_ coro); 1281 load_perl (aTHX_ coro);
1269 1282
1283 /* restore swapped sv's */
1284 SWAP_SVS_LEAVE (coro);
1285
1270 coro_unwind_stacks (aTHX); 1286 coro_unwind_stacks (aTHX);
1271
1272 /* restore swapped sv's */
1273 SWAP_SVS (coro);
1274 1287
1275 coro_destruct_stacks (aTHX); 1288 coro_destruct_stacks (aTHX);
1276 1289
1277 /* now save some sv's to be free'd later */ 1290 /* now save some sv's to be free'd later */
1278 svf [0] = GvSV (PL_defgv); 1291 svf [0] = GvSV (PL_defgv);
… …
3918 if (ecb_expect_false (current == self)) 3931 if (ecb_expect_false (current == self))
3919 coro_times_sub (SvSTATE (coro_current)); 3932 coro_times_sub (SvSTATE (coro_current));
3920} 3933}
3921 3934
3922void 3935void
3923swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3936swap_sv (Coro::State coro, SV *sva, SV *svb)
3924 CODE: 3937 CODE:
3925{ 3938{
3926 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);
3927 3945
3928 if (current == coro) 3946 if (current == coro)
3929 SWAP_SVS (current); 3947 SWAP_SVS_LEAVE (current);
3930 3948
3931 if (!coro->swap_sv) 3949 if (!coro->swap_sv)
3932 coro->swap_sv = newAV (); 3950 coro->swap_sv = newAV ();
3933 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
3934 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 3973 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3935 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 3974 av_push (swap_sv, SvREFCNT_inc_NN (svb));
3975
3976 removed:
3936 3977
3937 if (current == coro) 3978 if (current == coro)
3938 SWAP_SVS (current); 3979 SWAP_SVS_ENTER (current);
3939} 3980}
3940 3981
3941 3982
3942MODULE = Coro::State PACKAGE = Coro 3983MODULE = Coro::State PACKAGE = Coro
3943 3984

Diff Legend

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