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.449 by root, Sun Jun 21 17:02:49 2015 UTC vs.
Revision 1.450 by root, Sun Jun 28 22:31:03 2015 UTC

… …
248 SV *saved_deffh; 248 SV *saved_deffh;
249 SV *invoke_cb; 249 SV *invoke_cb;
250 AV *invoke_av; 250 AV *invoke_av;
251 251
252 /* on_enter/on_leave */ 252 /* on_enter/on_leave */
253 AV *on_enter; 253 AV *on_enter; AV *on_enter_xs;
254 AV *on_leave; 254 AV *on_leave; AV *on_leave_xs;
255 255
256 /* swap_sv */ 256 /* swap_sv */
257 AV *swap_sv; 257 AV *swap_sv;
258 258
259 /* times */ 259 /* times */
… …
495 495
496 return 0; 496 return 0;
497} 497}
498 498
499ecb_inline struct coro * 499ecb_inline struct coro *
500SvSTATE_ (pTHX_ SV *coro) 500SvSTATE_ (pTHX_ SV *coro_sv)
501{ 501{
502 MAGIC *mg; 502 MAGIC *mg;
503 503
504 if (SvROK (coro)) 504 if (SvROK (coro_sv))
505 coro = SvRV (coro); 505 coro_sv = SvRV (coro_sv);
506 506
507 mg = SvSTATEhv_p (aTHX_ coro); 507 mg = SvSTATEhv_p (aTHX_ coro_sv);
508 if (!mg) 508 if (!mg)
509 croak ("Coro::State object required"); 509 croak ("Coro::State object required");
510 510
511 return (struct coro *)mg->mg_ptr; 511 return (struct coro *)mg->mg_ptr;
512} 512}
… …
780 780
781 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 781 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
782 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 782 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
783 } 783 }
784 784
785 if (ecb_expect_false (c->on_enter_xs))
786 {
787 int i;
788
789 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
790 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
791 }
792
785 SWAP_SVS (c); 793 SWAP_SVS (c);
786} 794}
787 795
788static void 796static void
789save_perl (pTHX_ Coro__State c) 797save_perl (pTHX_ Coro__State c)
790{ 798{
791 SWAP_SVS (c); 799 SWAP_SVS (c);
800
801 if (ecb_expect_false (c->on_leave_xs))
802 {
803 int i;
804
805 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
806 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
807 }
792 808
793 if (ecb_expect_false (c->on_leave)) 809 if (ecb_expect_false (c->on_leave))
794 { 810 {
795 int i; 811 int i;
796 812
… …
1272 1288
1273 SvREFCNT_dec (coro->saved_deffh); 1289 SvREFCNT_dec (coro->saved_deffh);
1274 SvREFCNT_dec (coro->rouse_cb); 1290 SvREFCNT_dec (coro->rouse_cb);
1275 SvREFCNT_dec (coro->invoke_cb); 1291 SvREFCNT_dec (coro->invoke_cb);
1276 SvREFCNT_dec (coro->invoke_av); 1292 SvREFCNT_dec (coro->invoke_av);
1293 SvREFCNT_dec (coro->on_enter_xs);
1294 SvREFCNT_dec (coro->on_leave_xs);
1277 } 1295 }
1278} 1296}
1279 1297
1280ecb_inline void 1298ecb_inline void
1281free_coro_mortal (pTHX) 1299free_coro_mortal (pTHX)
… …
2821static void 2839static void
2822coro_pop_on_leave (pTHX_ void *coro) 2840coro_pop_on_leave (pTHX_ void *coro)
2823{ 2841{
2824 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2842 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2825 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2843 on_enterleave_call (aTHX_ sv_2mortal (cb));
2844}
2845
2846static void
2847enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2848{
2849 if (!hook)
2850 return;
2851
2852 if (!*avp)
2853 {
2854 *avp = newAV ();
2855 AvREAL_off (*avp);
2856 }
2857
2858 av_push (*avp, (SV *)hook);
2859 av_push (*avp, (SV *)arg);
2860}
2861
2862static void
2863enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2864{
2865 AV *av = *avp;
2866 int i;
2867
2868 if (!av)
2869 return;
2870
2871 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2872 if (AvARRAY (av)[i] == (SV *)hook)
2873 {
2874 if (execute)
2875 hook ((void *)AvARRAY (av)[i + 1]);
2876
2877 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2878 av_pop (av);
2879 av_pop (av);
2880 break;
2881 }
2882
2883 if (AvFILLp (av) >= 0)
2884 {
2885 *avp = 0;
2886 SvREFCNT_dec_NN (av);
2887 }
2888}
2889
2890static void
2891api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2892{
2893 struct coro *coro = SvSTATE (coro_sv);
2894
2895 if (SvSTATE_current == coro)
2896 if (enter)
2897 enter (aTHX enter_arg);
2898
2899 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2900 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2901}
2902
2903static void
2904api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2905{
2906 struct coro *coro = SvSTATE (coro_sv);
2907
2908 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2909 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2910}
2911
2912static void
2913savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2914{
2915 struct coro *coro = SvSTATE_current;
2916
2917 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2918}
2919
2920static void
2921savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2922{
2923 struct coro *coro = SvSTATE_current;
2924
2925 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2926}
2927
2928static void
2929api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2930{
2931 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2932
2933 /* this ought to be much cheaper than malloc + a single destructor call */
2934 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2935 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2826} 2936}
2827 2937
2828/*****************************************************************************/ 2938/*****************************************************************************/
2829/* PerlIO::cede */ 2939/* PerlIO::cede */
2830 2940
… …
2960 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3070 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2961 PUTBACK; 3071 PUTBACK;
2962 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3072 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2963 } 3073 }
2964 3074
2965 SvREFCNT_dec (cb); 3075 SvREFCNT_dec_NN (cb);
2966 } 3076 }
2967} 3077}
2968 3078
2969static void 3079static void
2970coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3080coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
3110 { 3220 {
3111 api_ready (aTHX_ cb); 3221 api_ready (aTHX_ cb);
3112 sv_setiv (cb, 0); /* signal waiter */ 3222 sv_setiv (cb, 0); /* signal waiter */
3113 } 3223 }
3114 3224
3115 SvREFCNT_dec (cb); 3225 SvREFCNT_dec_NN (cb);
3116 3226
3117 --count; 3227 --count;
3118 } 3228 }
3119} 3229}
3120 3230
… …
3205 } 3315 }
3206 3316
3207 av_push (state, data_sv); 3317 av_push (state, data_sv);
3208 3318
3209 api_ready (aTHX_ coro); 3319 api_ready (aTHX_ coro);
3210 SvREFCNT_dec (coro); 3320 SvREFCNT_dec_NN (coro);
3211 SvREFCNT_dec ((AV *)state); 3321 SvREFCNT_dec_NN ((AV *)state);
3212} 3322}
3213 3323
3214static int 3324static int
3215slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3325slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3216{ 3326{
… …
3234 errno = data->errorno; 3344 errno = data->errorno;
3235 PL_laststype = data->laststype; 3345 PL_laststype = data->laststype;
3236 PL_laststatval = data->laststatval; 3346 PL_laststatval = data->laststatval;
3237 PL_statcache = data->statcache; 3347 PL_statcache = data->statcache;
3238 3348
3239 SvREFCNT_dec (data_sv); 3349 SvREFCNT_dec_NN (data_sv);
3240 } 3350 }
3241 3351
3242 /* push result values */ 3352 /* push result values */
3243 { 3353 {
3244 dSP; 3354 dSP;
… …
3856 coroapi.ready = api_ready; 3966 coroapi.ready = api_ready;
3857 coroapi.is_ready = api_is_ready; 3967 coroapi.is_ready = api_is_ready;
3858 coroapi.nready = coro_nready; 3968 coroapi.nready = coro_nready;
3859 coroapi.current = coro_current; 3969 coroapi.current = coro_current;
3860 3970
3971 coroapi.enterleave_hook = api_enterleave_hook;
3972 coroapi.enterleave_unhook = api_enterleave_unhook;
3973 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3974
3861 /*GCoroAPI = &coroapi;*/ 3975 /*GCoroAPI = &coroapi;*/
3862 sv_setiv (sv, (IV)&coroapi); 3976 sv_setiv (sv, (IV)&coroapi);
3863 SvREADONLY_on (sv); 3977 SvREADONLY_on (sv);
3864 } 3978 }
3865} 3979}
… …
3930 4044
3931void 4045void
3932_set_current (SV *current) 4046_set_current (SV *current)
3933 PROTOTYPE: $ 4047 PROTOTYPE: $
3934 CODE: 4048 CODE:
3935 SvREFCNT_dec (SvRV (coro_current)); 4049 SvREFCNT_dec_NN (SvRV (coro_current));
3936 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4050 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3937 4051
3938void 4052void
3939_set_readyhook (SV *hook) 4053_set_readyhook (SV *hook)
3940 PROTOTYPE: $ 4054 PROTOTYPE: $
… …
4024 4138
4025 if ((SV *)hv == &PL_sv_undef) 4139 if ((SV *)hv == &PL_sv_undef)
4026 { 4140 {
4027 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4141 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
4028 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4142 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4029 SvREFCNT_dec (sv); 4143 SvREFCNT_dec_NN (sv);
4030 } 4144 }
4031 4145
4032 { 4146 {
4033 struct coro *coro = SvSTATE_hv (hv); 4147 struct coro *coro = SvSTATE_hv (hv);
4034 4148
… …
4041 api_ready (aTHX_ (SV *)hv); 4155 api_ready (aTHX_ (SV *)hv);
4042 4156
4043 if (GIMME_V != G_VOID) 4157 if (GIMME_V != G_VOID)
4044 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4158 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4045 else 4159 else
4046 SvREFCNT_dec (hv); 4160 SvREFCNT_dec_NN (hv);
4047} 4161}
4048 4162
4049SV * 4163SV *
4050rouse_cb () 4164rouse_cb ()
4051 PROTOTYPE: 4165 PROTOTYPE:

Diff Legend

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