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.448 by root, Thu Jun 4 22:58:28 2015 UTC vs.
Revision 1.456 by root, Sun Mar 6 06:26:21 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
… …
132 140
133static GV *irsgv; /* $/ */ 141static GV *irsgv; /* $/ */
134static GV *stdoutgv; /* *STDOUT */ 142static GV *stdoutgv; /* *STDOUT */
135static SV *rv_diehook; 143static SV *rv_diehook;
136static SV *rv_warnhook; 144static SV *rv_warnhook;
137static HV *hv_sig; /* %SIG */
138 145
139/* async_pool helper stuff */ 146/* async_pool helper stuff */
140static SV *sv_pool_rss; 147static SV *sv_pool_rss;
141static SV *sv_pool_size; 148static SV *sv_pool_size;
142static SV *sv_async_pool_idle; /* description string */ 149static SV *sv_async_pool_idle; /* description string */
… …
248 SV *saved_deffh; 255 SV *saved_deffh;
249 SV *invoke_cb; 256 SV *invoke_cb;
250 AV *invoke_av; 257 AV *invoke_av;
251 258
252 /* on_enter/on_leave */ 259 /* on_enter/on_leave */
253 AV *on_enter; 260 AV *on_enter; AV *on_enter_xs;
254 AV *on_leave; 261 AV *on_leave; AV *on_leave_xs;
255 262
256 /* swap_sv */ 263 /* swap_sv */
257 AV *swap_sv; 264 AV *swap_sv;
258 265
259 /* times */ 266 /* times */
… …
495 502
496 return 0; 503 return 0;
497} 504}
498 505
499ecb_inline struct coro * 506ecb_inline struct coro *
500SvSTATE_ (pTHX_ SV *coro) 507SvSTATE_ (pTHX_ SV *coro_sv)
501{ 508{
502 MAGIC *mg; 509 MAGIC *mg;
503 510
504 if (SvROK (coro)) 511 if (SvROK (coro_sv))
505 coro = SvRV (coro); 512 coro_sv = SvRV (coro_sv);
506 513
507 mg = SvSTATEhv_p (aTHX_ coro); 514 mg = SvSTATEhv_p (aTHX_ coro_sv);
508 if (!mg) 515 if (!mg)
509 croak ("Coro::State object required"); 516 croak ("Coro::State object required");
510 517
511 return (struct coro *)mg->mg_ptr; 518 return (struct coro *)mg->mg_ptr;
512} 519}
… …
701 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;
702 709
703 /* 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,
704 * 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.
705 */ 712 */
706 #define svany_in_head(type) \ 713 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
707 (((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)))
708 719
709 if (svany_in_head (SvTYPE (a))) 720 if (svany_in_head (SvTYPE (a)))
710 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 721 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
711 722
712 if (svany_in_head (SvTYPE (b))) 723 if (svany_in_head (SvTYPE (b)))
… …
780 791
781 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 792 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
782 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 793 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
783 } 794 }
784 795
796 if (ecb_expect_false (c->on_enter_xs))
797 {
798 int i;
799
800 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]);
802 }
803
785 SWAP_SVS (c); 804 SWAP_SVS (c);
786} 805}
787 806
788static void 807static void
789save_perl (pTHX_ Coro__State c) 808save_perl (pTHX_ Coro__State c)
790{ 809{
791 SWAP_SVS (c); 810 SWAP_SVS (c);
811
812 if (ecb_expect_false (c->on_leave_xs))
813 {
814 int i;
815
816 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
817 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
818 }
792 819
793 if (ecb_expect_false (c->on_leave)) 820 if (ecb_expect_false (c->on_leave))
794 { 821 {
795 int i; 822 int i;
796 823
… …
1272 1299
1273 SvREFCNT_dec (coro->saved_deffh); 1300 SvREFCNT_dec (coro->saved_deffh);
1274 SvREFCNT_dec (coro->rouse_cb); 1301 SvREFCNT_dec (coro->rouse_cb);
1275 SvREFCNT_dec (coro->invoke_cb); 1302 SvREFCNT_dec (coro->invoke_cb);
1276 SvREFCNT_dec (coro->invoke_av); 1303 SvREFCNT_dec (coro->invoke_av);
1304 SvREFCNT_dec (coro->on_enter_xs);
1305 SvREFCNT_dec (coro->on_leave_xs);
1277 } 1306 }
1278} 1307}
1279 1308
1280ecb_inline void 1309ecb_inline void
1281free_coro_mortal (pTHX) 1310free_coro_mortal (pTHX)
… …
1344 1373
1345 if (PL_curcop != &PL_compiling) 1374 if (PL_curcop != &PL_compiling)
1346 { 1375 {
1347 SV **cb; 1376 SV **cb;
1348 1377
1349 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1378 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1350 { 1379 {
1351 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1380 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1352 1381
1353 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1382 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1354 { 1383 {
… …
2821static void 2850static void
2822coro_pop_on_leave (pTHX_ void *coro) 2851coro_pop_on_leave (pTHX_ void *coro)
2823{ 2852{
2824 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2853 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2825 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2854 on_enterleave_call (aTHX_ sv_2mortal (cb));
2855}
2856
2857static void
2858enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2859{
2860 if (!hook)
2861 return;
2862
2863 if (!*avp)
2864 {
2865 *avp = newAV ();
2866 AvREAL_off (*avp);
2867 }
2868
2869 av_push (*avp, (SV *)hook);
2870 av_push (*avp, (SV *)arg);
2871}
2872
2873static void
2874enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2875{
2876 AV *av = *avp;
2877 int i;
2878
2879 if (!av)
2880 return;
2881
2882 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2883 if (AvARRAY (av)[i] == (SV *)hook)
2884 {
2885 if (execute)
2886 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2887
2888 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2889 av_pop (av);
2890 av_pop (av);
2891 break;
2892 }
2893
2894 if (AvFILLp (av) >= 0)
2895 {
2896 *avp = 0;
2897 SvREFCNT_dec_NN (av);
2898 }
2899}
2900
2901static void
2902api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2903{
2904 struct coro *coro = SvSTATE (coro_sv);
2905
2906 if (SvSTATE_current == coro)
2907 if (enter)
2908 enter (aTHX_ enter_arg);
2909
2910 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2911 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2912}
2913
2914static void
2915api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2916{
2917 struct coro *coro = SvSTATE (coro_sv);
2918
2919 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2920 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2921}
2922
2923static void
2924savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2925{
2926 struct coro *coro = SvSTATE_current;
2927
2928 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2929}
2930
2931static void
2932savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2933{
2934 struct coro *coro = SvSTATE_current;
2935
2936 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2937}
2938
2939static void
2940api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2941{
2942 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2943
2944 /* this ought to be much cheaper than malloc + a single destructor call */
2945 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2946 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2826} 2947}
2827 2948
2828/*****************************************************************************/ 2949/*****************************************************************************/
2829/* PerlIO::cede */ 2950/* PerlIO::cede */
2830 2951
… …
2960 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3081 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2961 PUTBACK; 3082 PUTBACK;
2962 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3083 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2963 } 3084 }
2964 3085
2965 SvREFCNT_dec (cb); 3086 SvREFCNT_dec_NN (cb);
2966 } 3087 }
2967} 3088}
2968 3089
2969static void 3090static void
2970coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3091coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
3110 { 3231 {
3111 api_ready (aTHX_ cb); 3232 api_ready (aTHX_ cb);
3112 sv_setiv (cb, 0); /* signal waiter */ 3233 sv_setiv (cb, 0); /* signal waiter */
3113 } 3234 }
3114 3235
3115 SvREFCNT_dec (cb); 3236 SvREFCNT_dec_NN (cb);
3116 3237
3117 --count; 3238 --count;
3118 } 3239 }
3119} 3240}
3120 3241
… …
3205 } 3326 }
3206 3327
3207 av_push (state, data_sv); 3328 av_push (state, data_sv);
3208 3329
3209 api_ready (aTHX_ coro); 3330 api_ready (aTHX_ coro);
3210 SvREFCNT_dec (coro); 3331 SvREFCNT_dec_NN (coro);
3211 SvREFCNT_dec ((AV *)state); 3332 SvREFCNT_dec_NN ((AV *)state);
3212} 3333}
3213 3334
3214static int 3335static int
3215slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3336slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3216{ 3337{
… …
3234 errno = data->errorno; 3355 errno = data->errorno;
3235 PL_laststype = data->laststype; 3356 PL_laststype = data->laststype;
3236 PL_laststatval = data->laststatval; 3357 PL_laststatval = data->laststatval;
3237 PL_statcache = data->statcache; 3358 PL_statcache = data->statcache;
3238 3359
3239 SvREFCNT_dec (data_sv); 3360 SvREFCNT_dec_NN (data_sv);
3240 } 3361 }
3241 3362
3242 /* push result values */ 3363 /* push result values */
3243 { 3364 {
3244 dSP; 3365 dSP;
… …
3482 3603
3483 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3604 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
3484 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3605 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
3485 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3606 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
3486 3607
3487 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3488 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3608 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3489 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3609 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3490 3610
3491 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3611 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3492 3612
… …
3821 3941
3822MODULE = Coro::State PACKAGE = Coro 3942MODULE = Coro::State PACKAGE = Coro
3823 3943
3824BOOT: 3944BOOT:
3825{ 3945{
3946 if (SVt_LAST > 32)
3947 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3948
3826 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3949 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3827 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3950 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3828 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3951 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3829 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3952 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3830 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3953 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3856 coroapi.ready = api_ready; 3979 coroapi.ready = api_ready;
3857 coroapi.is_ready = api_is_ready; 3980 coroapi.is_ready = api_is_ready;
3858 coroapi.nready = coro_nready; 3981 coroapi.nready = coro_nready;
3859 coroapi.current = coro_current; 3982 coroapi.current = coro_current;
3860 3983
3984 coroapi.enterleave_hook = api_enterleave_hook;
3985 coroapi.enterleave_unhook = api_enterleave_unhook;
3986 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3987
3861 /*GCoroAPI = &coroapi;*/ 3988 /*GCoroAPI = &coroapi;*/
3862 sv_setiv (sv, (IV)&coroapi); 3989 sv_setiv (sv, (IV)&coroapi);
3863 SvREADONLY_on (sv); 3990 SvREADONLY_on (sv);
3864 } 3991 }
3865} 3992}
… …
3930 4057
3931void 4058void
3932_set_current (SV *current) 4059_set_current (SV *current)
3933 PROTOTYPE: $ 4060 PROTOTYPE: $
3934 CODE: 4061 CODE:
3935 SvREFCNT_dec (SvRV (coro_current)); 4062 SvREFCNT_dec_NN (SvRV (coro_current));
3936 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4063 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3937 4064
3938void 4065void
3939_set_readyhook (SV *hook) 4066_set_readyhook (SV *hook)
3940 PROTOTYPE: $ 4067 PROTOTYPE: $
… …
4024 4151
4025 if ((SV *)hv == &PL_sv_undef) 4152 if ((SV *)hv == &PL_sv_undef)
4026 { 4153 {
4027 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4154 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
4028 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4155 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4029 SvREFCNT_dec (sv); 4156 SvREFCNT_dec_NN (sv);
4030 } 4157 }
4031 4158
4032 { 4159 {
4033 struct coro *coro = SvSTATE_hv (hv); 4160 struct coro *coro = SvSTATE_hv (hv);
4034 4161
… …
4041 api_ready (aTHX_ (SV *)hv); 4168 api_ready (aTHX_ (SV *)hv);
4042 4169
4043 if (GIMME_V != G_VOID) 4170 if (GIMME_V != G_VOID)
4044 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4171 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4045 else 4172 else
4046 SvREFCNT_dec (hv); 4173 SvREFCNT_dec_NN (hv);
4047} 4174}
4048 4175
4049SV * 4176SV *
4050rouse_cb () 4177rouse_cb ()
4051 PROTOTYPE: 4178 PROTOTYPE:
… …
4130 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4257 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4131 OUTPUT: 4258 OUTPUT:
4132 RETVAL 4259 RETVAL
4133 4260
4134void 4261void
4135up (SV *self, int adjust = 1) 4262up (SV *self)
4136 ALIAS:
4137 adjust = 1
4138 CODE: 4263 CODE:
4264 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4265
4266void
4267adjust (SV *self, int adjust)
4268 CODE:
4139 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4269 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4140 4270
4141void 4271void
4142down (...) 4272down (...)
4143 CODE: 4273 CODE:
4144 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4274 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);

Diff Legend

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