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.452 by root, Tue Jun 30 12:42:45 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}
… …
780 788
781 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 789 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
782 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 790 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
783 } 791 }
784 792
793 if (ecb_expect_false (c->on_enter_xs))
794 {
795 int i;
796
797 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
798 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
799 }
800
785 SWAP_SVS (c); 801 SWAP_SVS (c);
786} 802}
787 803
788static void 804static void
789save_perl (pTHX_ Coro__State c) 805save_perl (pTHX_ Coro__State c)
790{ 806{
791 SWAP_SVS (c); 807 SWAP_SVS (c);
808
809 if (ecb_expect_false (c->on_leave_xs))
810 {
811 int i;
812
813 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
814 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
815 }
792 816
793 if (ecb_expect_false (c->on_leave)) 817 if (ecb_expect_false (c->on_leave))
794 { 818 {
795 int i; 819 int i;
796 820
… …
1272 1296
1273 SvREFCNT_dec (coro->saved_deffh); 1297 SvREFCNT_dec (coro->saved_deffh);
1274 SvREFCNT_dec (coro->rouse_cb); 1298 SvREFCNT_dec (coro->rouse_cb);
1275 SvREFCNT_dec (coro->invoke_cb); 1299 SvREFCNT_dec (coro->invoke_cb);
1276 SvREFCNT_dec (coro->invoke_av); 1300 SvREFCNT_dec (coro->invoke_av);
1301 SvREFCNT_dec (coro->on_enter_xs);
1302 SvREFCNT_dec (coro->on_leave_xs);
1277 } 1303 }
1278} 1304}
1279 1305
1280ecb_inline void 1306ecb_inline void
1281free_coro_mortal (pTHX) 1307free_coro_mortal (pTHX)
… …
1344 1370
1345 if (PL_curcop != &PL_compiling) 1371 if (PL_curcop != &PL_compiling)
1346 { 1372 {
1347 SV **cb; 1373 SV **cb;
1348 1374
1349 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1375 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1350 { 1376 {
1351 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1377 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1352 1378
1353 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1379 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1354 { 1380 {
… …
2821static void 2847static void
2822coro_pop_on_leave (pTHX_ void *coro) 2848coro_pop_on_leave (pTHX_ void *coro)
2823{ 2849{
2824 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2850 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2825 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2851 on_enterleave_call (aTHX_ sv_2mortal (cb));
2852}
2853
2854static void
2855enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2856{
2857 if (!hook)
2858 return;
2859
2860 if (!*avp)
2861 {
2862 *avp = newAV ();
2863 AvREAL_off (*avp);
2864 }
2865
2866 av_push (*avp, (SV *)hook);
2867 av_push (*avp, (SV *)arg);
2868}
2869
2870static void
2871enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2872{
2873 AV *av = *avp;
2874 int i;
2875
2876 if (!av)
2877 return;
2878
2879 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2880 if (AvARRAY (av)[i] == (SV *)hook)
2881 {
2882 if (execute)
2883 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2884
2885 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2886 av_pop (av);
2887 av_pop (av);
2888 break;
2889 }
2890
2891 if (AvFILLp (av) >= 0)
2892 {
2893 *avp = 0;
2894 SvREFCNT_dec_NN (av);
2895 }
2896}
2897
2898static void
2899api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2900{
2901 struct coro *coro = SvSTATE (coro_sv);
2902
2903 if (SvSTATE_current == coro)
2904 if (enter)
2905 enter (aTHX_ enter_arg);
2906
2907 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2908 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2909}
2910
2911static void
2912api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2913{
2914 struct coro *coro = SvSTATE (coro_sv);
2915
2916 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2917 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2918}
2919
2920static void
2921savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2922{
2923 struct coro *coro = SvSTATE_current;
2924
2925 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2926}
2927
2928static void
2929savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2930{
2931 struct coro *coro = SvSTATE_current;
2932
2933 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2934}
2935
2936static void
2937api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2938{
2939 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2940
2941 /* this ought to be much cheaper than malloc + a single destructor call */
2942 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2943 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2826} 2944}
2827 2945
2828/*****************************************************************************/ 2946/*****************************************************************************/
2829/* PerlIO::cede */ 2947/* PerlIO::cede */
2830 2948
… …
2960 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3078 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2961 PUTBACK; 3079 PUTBACK;
2962 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3080 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2963 } 3081 }
2964 3082
2965 SvREFCNT_dec (cb); 3083 SvREFCNT_dec_NN (cb);
2966 } 3084 }
2967} 3085}
2968 3086
2969static void 3087static void
2970coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3088coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
3110 { 3228 {
3111 api_ready (aTHX_ cb); 3229 api_ready (aTHX_ cb);
3112 sv_setiv (cb, 0); /* signal waiter */ 3230 sv_setiv (cb, 0); /* signal waiter */
3113 } 3231 }
3114 3232
3115 SvREFCNT_dec (cb); 3233 SvREFCNT_dec_NN (cb);
3116 3234
3117 --count; 3235 --count;
3118 } 3236 }
3119} 3237}
3120 3238
… …
3205 } 3323 }
3206 3324
3207 av_push (state, data_sv); 3325 av_push (state, data_sv);
3208 3326
3209 api_ready (aTHX_ coro); 3327 api_ready (aTHX_ coro);
3210 SvREFCNT_dec (coro); 3328 SvREFCNT_dec_NN (coro);
3211 SvREFCNT_dec ((AV *)state); 3329 SvREFCNT_dec_NN ((AV *)state);
3212} 3330}
3213 3331
3214static int 3332static int
3215slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3333slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3216{ 3334{
… …
3234 errno = data->errorno; 3352 errno = data->errorno;
3235 PL_laststype = data->laststype; 3353 PL_laststype = data->laststype;
3236 PL_laststatval = data->laststatval; 3354 PL_laststatval = data->laststatval;
3237 PL_statcache = data->statcache; 3355 PL_statcache = data->statcache;
3238 3356
3239 SvREFCNT_dec (data_sv); 3357 SvREFCNT_dec_NN (data_sv);
3240 } 3358 }
3241 3359
3242 /* push result values */ 3360 /* push result values */
3243 { 3361 {
3244 dSP; 3362 dSP;
… …
3856 coroapi.ready = api_ready; 3974 coroapi.ready = api_ready;
3857 coroapi.is_ready = api_is_ready; 3975 coroapi.is_ready = api_is_ready;
3858 coroapi.nready = coro_nready; 3976 coroapi.nready = coro_nready;
3859 coroapi.current = coro_current; 3977 coroapi.current = coro_current;
3860 3978
3979 coroapi.enterleave_hook = api_enterleave_hook;
3980 coroapi.enterleave_unhook = api_enterleave_unhook;
3981 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3982
3861 /*GCoroAPI = &coroapi;*/ 3983 /*GCoroAPI = &coroapi;*/
3862 sv_setiv (sv, (IV)&coroapi); 3984 sv_setiv (sv, (IV)&coroapi);
3863 SvREADONLY_on (sv); 3985 SvREADONLY_on (sv);
3864 } 3986 }
3865} 3987}
… …
3930 4052
3931void 4053void
3932_set_current (SV *current) 4054_set_current (SV *current)
3933 PROTOTYPE: $ 4055 PROTOTYPE: $
3934 CODE: 4056 CODE:
3935 SvREFCNT_dec (SvRV (coro_current)); 4057 SvREFCNT_dec_NN (SvRV (coro_current));
3936 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4058 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3937 4059
3938void 4060void
3939_set_readyhook (SV *hook) 4061_set_readyhook (SV *hook)
3940 PROTOTYPE: $ 4062 PROTOTYPE: $
… …
4024 4146
4025 if ((SV *)hv == &PL_sv_undef) 4147 if ((SV *)hv == &PL_sv_undef)
4026 { 4148 {
4027 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4149 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
4028 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4150 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4029 SvREFCNT_dec (sv); 4151 SvREFCNT_dec_NN (sv);
4030 } 4152 }
4031 4153
4032 { 4154 {
4033 struct coro *coro = SvSTATE_hv (hv); 4155 struct coro *coro = SvSTATE_hv (hv);
4034 4156
… …
4041 api_ready (aTHX_ (SV *)hv); 4163 api_ready (aTHX_ (SV *)hv);
4042 4164
4043 if (GIMME_V != G_VOID) 4165 if (GIMME_V != G_VOID)
4044 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4166 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4045 else 4167 else
4046 SvREFCNT_dec (hv); 4168 SvREFCNT_dec_NN (hv);
4047} 4169}
4048 4170
4049SV * 4171SV *
4050rouse_cb () 4172rouse_cb ()
4051 PROTOTYPE: 4173 PROTOTYPE:

Diff Legend

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