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.453 by root, Tue Jul 7 00:33:25 2015 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
… …
248 SV *saved_deffh; 256 SV *saved_deffh;
249 SV *invoke_cb; 257 SV *invoke_cb;
250 AV *invoke_av; 258 AV *invoke_av;
251 259
252 /* on_enter/on_leave */ 260 /* on_enter/on_leave */
253 AV *on_enter; 261 AV *on_enter; AV *on_enter_xs;
254 AV *on_leave; 262 AV *on_leave; AV *on_leave_xs;
255 263
256 /* swap_sv */ 264 /* swap_sv */
257 AV *swap_sv; 265 AV *swap_sv;
258 266
259 /* times */ 267 /* times */
… …
495 503
496 return 0; 504 return 0;
497} 505}
498 506
499ecb_inline struct coro * 507ecb_inline struct coro *
500SvSTATE_ (pTHX_ SV *coro) 508SvSTATE_ (pTHX_ SV *coro_sv)
501{ 509{
502 MAGIC *mg; 510 MAGIC *mg;
503 511
504 if (SvROK (coro)) 512 if (SvROK (coro_sv))
505 coro = SvRV (coro); 513 coro_sv = SvRV (coro_sv);
506 514
507 mg = SvSTATEhv_p (aTHX_ coro); 515 mg = SvSTATEhv_p (aTHX_ coro_sv);
508 if (!mg) 516 if (!mg)
509 croak ("Coro::State object required"); 517 croak ("Coro::State object required");
510 518
511 return (struct coro *)mg->mg_ptr; 519 return (struct coro *)mg->mg_ptr;
512} 520}
… …
701 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u; 709 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
702 710
703 /* if SvANY points to the head, we need to adjust the pointers, 711 /* 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. 712 * as the pointer for a still points to b, and maybe vice versa.
705 */ 713 */
706 #define svany_in_head(type) \ 714 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))) 715 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,20,0)
716 svany_in_head_set |= 1 << SVt_NV;
717 #endif
718
719 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
708 720
709 if (svany_in_head (SvTYPE (a))) 721 if (svany_in_head (SvTYPE (a)))
710 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 722 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
711 723
712 if (svany_in_head (SvTYPE (b))) 724 if (svany_in_head (SvTYPE (b)))
… …
780 792
781 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 793 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
782 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 794 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
783 } 795 }
784 796
797 if (ecb_expect_false (c->on_enter_xs))
798 {
799 int i;
800
801 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]);
803 }
804
785 SWAP_SVS (c); 805 SWAP_SVS (c);
786} 806}
787 807
788static void 808static void
789save_perl (pTHX_ Coro__State c) 809save_perl (pTHX_ Coro__State c)
790{ 810{
791 SWAP_SVS (c); 811 SWAP_SVS (c);
812
813 if (ecb_expect_false (c->on_leave_xs))
814 {
815 int i;
816
817 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
818 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
819 }
792 820
793 if (ecb_expect_false (c->on_leave)) 821 if (ecb_expect_false (c->on_leave))
794 { 822 {
795 int i; 823 int i;
796 824
… …
1272 1300
1273 SvREFCNT_dec (coro->saved_deffh); 1301 SvREFCNT_dec (coro->saved_deffh);
1274 SvREFCNT_dec (coro->rouse_cb); 1302 SvREFCNT_dec (coro->rouse_cb);
1275 SvREFCNT_dec (coro->invoke_cb); 1303 SvREFCNT_dec (coro->invoke_cb);
1276 SvREFCNT_dec (coro->invoke_av); 1304 SvREFCNT_dec (coro->invoke_av);
1305 SvREFCNT_dec (coro->on_enter_xs);
1306 SvREFCNT_dec (coro->on_leave_xs);
1277 } 1307 }
1278} 1308}
1279 1309
1280ecb_inline void 1310ecb_inline void
1281free_coro_mortal (pTHX) 1311free_coro_mortal (pTHX)
… …
2821static void 2851static void
2822coro_pop_on_leave (pTHX_ void *coro) 2852coro_pop_on_leave (pTHX_ void *coro)
2823{ 2853{
2824 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2854 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2825 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2855 on_enterleave_call (aTHX_ sv_2mortal (cb));
2856}
2857
2858static void
2859enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2860{
2861 if (!hook)
2862 return;
2863
2864 if (!*avp)
2865 {
2866 *avp = newAV ();
2867 AvREAL_off (*avp);
2868 }
2869
2870 av_push (*avp, (SV *)hook);
2871 av_push (*avp, (SV *)arg);
2872}
2873
2874static void
2875enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2876{
2877 AV *av = *avp;
2878 int i;
2879
2880 if (!av)
2881 return;
2882
2883 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2884 if (AvARRAY (av)[i] == (SV *)hook)
2885 {
2886 if (execute)
2887 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2888
2889 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2890 av_pop (av);
2891 av_pop (av);
2892 break;
2893 }
2894
2895 if (AvFILLp (av) >= 0)
2896 {
2897 *avp = 0;
2898 SvREFCNT_dec_NN (av);
2899 }
2900}
2901
2902static void
2903api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2904{
2905 struct coro *coro = SvSTATE (coro_sv);
2906
2907 if (SvSTATE_current == coro)
2908 if (enter)
2909 enter (aTHX_ enter_arg);
2910
2911 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2912 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2913}
2914
2915static void
2916api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2917{
2918 struct coro *coro = SvSTATE (coro_sv);
2919
2920 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2921 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2922}
2923
2924static void
2925savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2926{
2927 struct coro *coro = SvSTATE_current;
2928
2929 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2930}
2931
2932static void
2933savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2934{
2935 struct coro *coro = SvSTATE_current;
2936
2937 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2938}
2939
2940static void
2941api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2942{
2943 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2944
2945 /* this ought to be much cheaper than malloc + a single destructor call */
2946 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2947 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2826} 2948}
2827 2949
2828/*****************************************************************************/ 2950/*****************************************************************************/
2829/* PerlIO::cede */ 2951/* PerlIO::cede */
2830 2952
… …
2960 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3082 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2961 PUTBACK; 3083 PUTBACK;
2962 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3084 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2963 } 3085 }
2964 3086
2965 SvREFCNT_dec (cb); 3087 SvREFCNT_dec_NN (cb);
2966 } 3088 }
2967} 3089}
2968 3090
2969static void 3091static void
2970coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3092coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
3110 { 3232 {
3111 api_ready (aTHX_ cb); 3233 api_ready (aTHX_ cb);
3112 sv_setiv (cb, 0); /* signal waiter */ 3234 sv_setiv (cb, 0); /* signal waiter */
3113 } 3235 }
3114 3236
3115 SvREFCNT_dec (cb); 3237 SvREFCNT_dec_NN (cb);
3116 3238
3117 --count; 3239 --count;
3118 } 3240 }
3119} 3241}
3120 3242
… …
3205 } 3327 }
3206 3328
3207 av_push (state, data_sv); 3329 av_push (state, data_sv);
3208 3330
3209 api_ready (aTHX_ coro); 3331 api_ready (aTHX_ coro);
3210 SvREFCNT_dec (coro); 3332 SvREFCNT_dec_NN (coro);
3211 SvREFCNT_dec ((AV *)state); 3333 SvREFCNT_dec_NN ((AV *)state);
3212} 3334}
3213 3335
3214static int 3336static int
3215slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3337slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3216{ 3338{
… …
3234 errno = data->errorno; 3356 errno = data->errorno;
3235 PL_laststype = data->laststype; 3357 PL_laststype = data->laststype;
3236 PL_laststatval = data->laststatval; 3358 PL_laststatval = data->laststatval;
3237 PL_statcache = data->statcache; 3359 PL_statcache = data->statcache;
3238 3360
3239 SvREFCNT_dec (data_sv); 3361 SvREFCNT_dec_NN (data_sv);
3240 } 3362 }
3241 3363
3242 /* push result values */ 3364 /* push result values */
3243 { 3365 {
3244 dSP; 3366 dSP;
… …
3821 3943
3822MODULE = Coro::State PACKAGE = Coro 3944MODULE = Coro::State PACKAGE = Coro
3823 3945
3824BOOT: 3946BOOT:
3825{ 3947{
3948 if (SVt_LAST > 32)
3949 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3950
3826 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3951 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3827 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3952 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3828 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3953 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3829 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3954 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); 3955 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3856 coroapi.ready = api_ready; 3981 coroapi.ready = api_ready;
3857 coroapi.is_ready = api_is_ready; 3982 coroapi.is_ready = api_is_ready;
3858 coroapi.nready = coro_nready; 3983 coroapi.nready = coro_nready;
3859 coroapi.current = coro_current; 3984 coroapi.current = coro_current;
3860 3985
3986 coroapi.enterleave_hook = api_enterleave_hook;
3987 coroapi.enterleave_unhook = api_enterleave_unhook;
3988 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3989
3861 /*GCoroAPI = &coroapi;*/ 3990 /*GCoroAPI = &coroapi;*/
3862 sv_setiv (sv, (IV)&coroapi); 3991 sv_setiv (sv, (IV)&coroapi);
3863 SvREADONLY_on (sv); 3992 SvREADONLY_on (sv);
3864 } 3993 }
3865} 3994}
… …
3930 4059
3931void 4060void
3932_set_current (SV *current) 4061_set_current (SV *current)
3933 PROTOTYPE: $ 4062 PROTOTYPE: $
3934 CODE: 4063 CODE:
3935 SvREFCNT_dec (SvRV (coro_current)); 4064 SvREFCNT_dec_NN (SvRV (coro_current));
3936 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4065 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3937 4066
3938void 4067void
3939_set_readyhook (SV *hook) 4068_set_readyhook (SV *hook)
3940 PROTOTYPE: $ 4069 PROTOTYPE: $
… …
4024 4153
4025 if ((SV *)hv == &PL_sv_undef) 4154 if ((SV *)hv == &PL_sv_undef)
4026 { 4155 {
4027 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4156 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
4028 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4157 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4029 SvREFCNT_dec (sv); 4158 SvREFCNT_dec_NN (sv);
4030 } 4159 }
4031 4160
4032 { 4161 {
4033 struct coro *coro = SvSTATE_hv (hv); 4162 struct coro *coro = SvSTATE_hv (hv);
4034 4163
… …
4041 api_ready (aTHX_ (SV *)hv); 4170 api_ready (aTHX_ (SV *)hv);
4042 4171
4043 if (GIMME_V != G_VOID) 4172 if (GIMME_V != G_VOID)
4044 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4173 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4045 else 4174 else
4046 SvREFCNT_dec (hv); 4175 SvREFCNT_dec_NN (hv);
4047} 4176}
4048 4177
4049SV * 4178SV *
4050rouse_cb () 4179rouse_cb ()
4051 PROTOTYPE: 4180 PROTOTYPE:

Diff Legend

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