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.446 by root, Wed Sep 3 14:26:34 2014 UTC vs.
Revision 1.454 by root, Tue Jul 7 00:38:03 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
… …
42# define PadlistNAMES(pl) (*PadlistARRAY (pl)) 50# define PadlistNAMES(pl) (*PadlistARRAY (pl))
43# define PadARRAY AvARRAY 51# define PadARRAY AvARRAY
44# define PadMAX AvFILLp 52# define PadMAX AvFILLp
45# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1)) 53# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
46#endif 54#endif
55#ifndef PadnamelistREFCNT
56# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
57#endif
58#ifndef PadnamelistREFCNT_dec
59# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
60#endif
47 61
48/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */ 62/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
49/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */ 63/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
50#if PERL_VERSION_ATLEAST(5,19,0) 64#if PERL_VERSION_ATLEAST(5,19,0)
51# define SVt_BIND SVt_IV 65# define SVt_BIND SVt_IV
… …
242 SV *saved_deffh; 256 SV *saved_deffh;
243 SV *invoke_cb; 257 SV *invoke_cb;
244 AV *invoke_av; 258 AV *invoke_av;
245 259
246 /* on_enter/on_leave */ 260 /* on_enter/on_leave */
247 AV *on_enter; 261 AV *on_enter; AV *on_enter_xs;
248 AV *on_leave; 262 AV *on_leave; AV *on_leave_xs;
249 263
250 /* swap_sv */ 264 /* swap_sv */
251 AV *swap_sv; 265 AV *swap_sv;
252 266
253 /* times */ 267 /* times */
… …
489 503
490 return 0; 504 return 0;
491} 505}
492 506
493ecb_inline struct coro * 507ecb_inline struct coro *
494SvSTATE_ (pTHX_ SV *coro) 508SvSTATE_ (pTHX_ SV *coro_sv)
495{ 509{
496 MAGIC *mg; 510 MAGIC *mg;
497 511
498 if (SvROK (coro)) 512 if (SvROK (coro_sv))
499 coro = SvRV (coro); 513 coro_sv = SvRV (coro_sv);
500 514
501 mg = SvSTATEhv_p (aTHX_ coro); 515 mg = SvSTATEhv_p (aTHX_ coro_sv);
502 if (!mg) 516 if (!mg)
503 croak ("Coro::State object required"); 517 croak ("Coro::State object required");
504 518
505 return (struct coro *)mg->mg_ptr; 519 return (struct coro *)mg->mg_ptr;
506} 520}
… …
517ecb_inline PADLIST * 531ecb_inline PADLIST *
518coro_derive_padlist (pTHX_ CV *cv) 532coro_derive_padlist (pTHX_ CV *cv)
519{ 533{
520 PADLIST *padlist = CvPADLIST (cv); 534 PADLIST *padlist = CvPADLIST (cv);
521 PADLIST *newpadlist; 535 PADLIST *newpadlist;
536 PADNAMELIST *padnames;
522 PAD *newpad; 537 PAD *newpad;
523 PADOFFSET off = PadlistMAX (padlist) + 1; 538 PADOFFSET off = PadlistMAX (padlist) + 1;
524 539
525#if NEWPADAPI 540#if NEWPADAPI
526 541
… …
553 AvREAL_off (newpadlist); 568 AvREAL_off (newpadlist);
554#endif 569#endif
555 570
556 /* Already extended to 2 elements by newPADLIST. */ 571 /* Already extended to 2 elements by newPADLIST. */
557 PadlistMAX (newpadlist) = 1; 572 PadlistMAX (newpadlist) = 1;
558 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 573
574 padnames = PadlistNAMES (padlist);
575 ++PadnamelistREFCNT (padnames);
576 PadlistNAMES (newpadlist) = padnames;
577
559 PadlistARRAY (newpadlist)[1] = newpad; 578 PadlistARRAY (newpadlist)[1] = newpad;
560 579
561 return newpadlist; 580 return newpadlist;
562} 581}
563 582
… …
584 PadMAX (pad) = -1; 603 PadMAX (pad) = -1;
585 SvREFCNT_dec (pad); 604 SvREFCNT_dec (pad);
586 } 605 }
587 } 606 }
588 607
589 SvREFCNT_dec (PadlistNAMES (padlist)); 608 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
590 609
591#if NEWPADAPI 610#if NEWPADAPI
592 Safefree (PadlistARRAY (padlist)); 611 Safefree (PadlistARRAY (padlist));
593 Safefree (padlist); 612 Safefree (padlist);
594#else 613#else
… …
690 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;
691 710
692 /* 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,
693 * 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.
694 */ 713 */
695 #define svany_in_head(type) \ 714 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
696 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type))) 715 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
716 svany_in_head_set |= 1 << SVt_NV;
717 #endif
718
719 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
697 720
698 if (svany_in_head (SvTYPE (a))) 721 if (svany_in_head (SvTYPE (a)))
699 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 722 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
700 723
701 if (svany_in_head (SvTYPE (b))) 724 if (svany_in_head (SvTYPE (b)))
… …
769 792
770 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 793 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
771 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 794 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
772 } 795 }
773 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
774 SWAP_SVS (c); 805 SWAP_SVS (c);
775} 806}
776 807
777static void 808static void
778save_perl (pTHX_ Coro__State c) 809save_perl (pTHX_ Coro__State c)
779{ 810{
780 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 }
781 820
782 if (ecb_expect_false (c->on_leave)) 821 if (ecb_expect_false (c->on_leave))
783 { 822 {
784 int i; 823 int i;
785 824
… …
1261 1300
1262 SvREFCNT_dec (coro->saved_deffh); 1301 SvREFCNT_dec (coro->saved_deffh);
1263 SvREFCNT_dec (coro->rouse_cb); 1302 SvREFCNT_dec (coro->rouse_cb);
1264 SvREFCNT_dec (coro->invoke_cb); 1303 SvREFCNT_dec (coro->invoke_cb);
1265 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);
1266 } 1307 }
1267} 1308}
1268 1309
1269ecb_inline void 1310ecb_inline void
1270free_coro_mortal (pTHX) 1311free_coro_mortal (pTHX)
… …
1333 1374
1334 if (PL_curcop != &PL_compiling) 1375 if (PL_curcop != &PL_compiling)
1335 { 1376 {
1336 SV **cb; 1377 SV **cb;
1337 1378
1338 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1379 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1339 { 1380 {
1340 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1381 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1341 1382
1342 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1383 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1343 { 1384 {
… …
1930 1971
1931 ENTER; 1972 ENTER;
1932 SAVETMPS; 1973 SAVETMPS;
1933 1974
1934 PUSHMARK (SP); 1975 PUSHMARK (SP);
1935 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught", 0))); 1976 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1936 PUTBACK; 1977 PUTBACK;
1937 call_pv ("Carp::confess", G_VOID | G_DISCARD); 1978 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1938 1979
1939 FREETMPS; 1980 FREETMPS;
1940 LEAVE; 1981 LEAVE;
… …
2810static void 2851static void
2811coro_pop_on_leave (pTHX_ void *coro) 2852coro_pop_on_leave (pTHX_ void *coro)
2812{ 2853{
2813 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);
2814 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);
2815} 2948}
2816 2949
2817/*****************************************************************************/ 2950/*****************************************************************************/
2818/* PerlIO::cede */ 2951/* PerlIO::cede */
2819 2952
… …
2949 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3082 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2950 PUTBACK; 3083 PUTBACK;
2951 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3084 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2952 } 3085 }
2953 3086
2954 SvREFCNT_dec (cb); 3087 SvREFCNT_dec_NN (cb);
2955 } 3088 }
2956} 3089}
2957 3090
2958static void 3091static void
2959coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3092coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
3099 { 3232 {
3100 api_ready (aTHX_ cb); 3233 api_ready (aTHX_ cb);
3101 sv_setiv (cb, 0); /* signal waiter */ 3234 sv_setiv (cb, 0); /* signal waiter */
3102 } 3235 }
3103 3236
3104 SvREFCNT_dec (cb); 3237 SvREFCNT_dec_NN (cb);
3105 3238
3106 --count; 3239 --count;
3107 } 3240 }
3108} 3241}
3109 3242
… …
3194 } 3327 }
3195 3328
3196 av_push (state, data_sv); 3329 av_push (state, data_sv);
3197 3330
3198 api_ready (aTHX_ coro); 3331 api_ready (aTHX_ coro);
3199 SvREFCNT_dec (coro); 3332 SvREFCNT_dec_NN (coro);
3200 SvREFCNT_dec ((AV *)state); 3333 SvREFCNT_dec_NN ((AV *)state);
3201} 3334}
3202 3335
3203static int 3336static int
3204slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3337slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3205{ 3338{
… …
3223 errno = data->errorno; 3356 errno = data->errorno;
3224 PL_laststype = data->laststype; 3357 PL_laststype = data->laststype;
3225 PL_laststatval = data->laststatval; 3358 PL_laststatval = data->laststatval;
3226 PL_statcache = data->statcache; 3359 PL_statcache = data->statcache;
3227 3360
3228 SvREFCNT_dec (data_sv); 3361 SvREFCNT_dec_NN (data_sv);
3229 } 3362 }
3230 3363
3231 /* push result values */ 3364 /* push result values */
3232 { 3365 {
3233 dSP; 3366 dSP;
… …
3810 3943
3811MODULE = Coro::State PACKAGE = Coro 3944MODULE = Coro::State PACKAGE = Coro
3812 3945
3813BOOT: 3946BOOT:
3814{ 3947{
3948 if (SVt_LAST > 32)
3949 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3950
3815 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3951 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3816 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3952 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3817 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3953 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3818 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);
3819 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3955 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3845 coroapi.ready = api_ready; 3981 coroapi.ready = api_ready;
3846 coroapi.is_ready = api_is_ready; 3982 coroapi.is_ready = api_is_ready;
3847 coroapi.nready = coro_nready; 3983 coroapi.nready = coro_nready;
3848 coroapi.current = coro_current; 3984 coroapi.current = coro_current;
3849 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
3850 /*GCoroAPI = &coroapi;*/ 3990 /*GCoroAPI = &coroapi;*/
3851 sv_setiv (sv, (IV)&coroapi); 3991 sv_setiv (sv, (IV)&coroapi);
3852 SvREADONLY_on (sv); 3992 SvREADONLY_on (sv);
3853 } 3993 }
3854} 3994}
… …
3919 4059
3920void 4060void
3921_set_current (SV *current) 4061_set_current (SV *current)
3922 PROTOTYPE: $ 4062 PROTOTYPE: $
3923 CODE: 4063 CODE:
3924 SvREFCNT_dec (SvRV (coro_current)); 4064 SvREFCNT_dec_NN (SvRV (coro_current));
3925 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4065 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3926 4066
3927void 4067void
3928_set_readyhook (SV *hook) 4068_set_readyhook (SV *hook)
3929 PROTOTYPE: $ 4069 PROTOTYPE: $
… …
4013 4153
4014 if ((SV *)hv == &PL_sv_undef) 4154 if ((SV *)hv == &PL_sv_undef)
4015 { 4155 {
4016 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);
4017 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4157 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4018 SvREFCNT_dec (sv); 4158 SvREFCNT_dec_NN (sv);
4019 } 4159 }
4020 4160
4021 { 4161 {
4022 struct coro *coro = SvSTATE_hv (hv); 4162 struct coro *coro = SvSTATE_hv (hv);
4023 4163
… …
4030 api_ready (aTHX_ (SV *)hv); 4170 api_ready (aTHX_ (SV *)hv);
4031 4171
4032 if (GIMME_V != G_VOID) 4172 if (GIMME_V != G_VOID)
4033 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4173 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4034 else 4174 else
4035 SvREFCNT_dec (hv); 4175 SvREFCNT_dec_NN (hv);
4036} 4176}
4037 4177
4038SV * 4178SV *
4039rouse_cb () 4179rouse_cb ()
4040 PROTOTYPE: 4180 PROTOTYPE:

Diff Legend

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