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.455 by root, Sun Oct 4 13:07:55 2015 UTC vs.
Revision 1.460 by root, Fri Jun 17 05:28: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{ 732{
733 int i; 733 int i;
734 734
735 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 735 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
736 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]);
737} 737}
738 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
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);
… …
2413 else 2426 else
2414 { 2427 {
2415 av_clear (GvAV (PL_defgv)); 2428 av_clear (GvAV (PL_defgv));
2416 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);
2417 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
2418 coro->prio = 0; 2438 coro->prio = 0;
2419 2439
2420 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2440 if (coro->cctx && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2421 api_trace (aTHX_ coro_current, 0); 2441 api_trace (aTHX_ coro_current, 0);
2422 2442
2423 frame->prepare = prepare_schedule; 2443 frame->prepare = prepare_schedule;
2424 av_push (av_async_pool, SvREFCNT_inc (hv)); 2444 av_push (av_async_pool, SvREFCNT_inc (hv));
2425 } 2445 }
… …
3918 if (ecb_expect_false (current == self)) 3938 if (ecb_expect_false (current == self))
3919 coro_times_sub (SvSTATE (coro_current)); 3939 coro_times_sub (SvSTATE (coro_current));
3920} 3940}
3921 3941
3922void 3942void
3923swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3943swap_sv (Coro::State coro, SV *sva, SV *svb)
3924 CODE: 3944 CODE:
3925{ 3945{
3926 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);
3927 3952
3928 if (current == coro) 3953 if (current == coro)
3929 SWAP_SVS (current); 3954 SWAP_SVS_LEAVE (current);
3930 3955
3931 if (!coro->swap_sv) 3956 if (!coro->swap_sv)
3932 coro->swap_sv = newAV (); 3957 coro->swap_sv = newAV ();
3933 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
3934 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 3980 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3935 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 3981 av_push (swap_sv, SvREFCNT_inc_NN (svb));
3982
3983 removed:
3936 3984
3937 if (current == coro) 3985 if (current == coro)
3938 SWAP_SVS (current); 3986 SWAP_SVS_ENTER (current);
3939} 3987}
3940 3988
3941 3989
3942MODULE = Coro::State PACKAGE = Coro 3990MODULE = Coro::State PACKAGE = Coro
3943 3991
… …
4257 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4305 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4258 OUTPUT: 4306 OUTPUT:
4259 RETVAL 4307 RETVAL
4260 4308
4261void 4309void
4262up (SV *self, int adjust = 1) 4310up (SV *self)
4263 ALIAS:
4264 adjust = 1
4265 CODE: 4311 CODE:
4312 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4313
4314void
4315adjust (SV *self, int adjust)
4316 CODE:
4266 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4317 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4267 4318
4268void 4319void
4269down (...) 4320down (...)
4270 CODE: 4321 CODE:
4271 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