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.439 by root, Tue Nov 19 05:16:01 2013 UTC vs.
Revision 1.456 by root, Sun Mar 6 06:26:21 2016 UTC

14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17 17
18#define ECB_NO_THREADS 1 18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
19#include "ecb.h" 20#include "ecb.h"
20 21
21#include <stddef.h> 22#include <stddef.h>
22#include <stdio.h> 23#include <stdio.h>
23#include <errno.h> 24#include <errno.h>
24#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
25 34
26#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
27# define SVs_PADSTALE 0 36# define SVs_PADSTALE 0
28#endif 37#endif
29 38
41# define PadlistNAMES(pl) (*PadlistARRAY (pl)) 50# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY 51# define PadARRAY AvARRAY
43# define PadMAX AvFILLp 52# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1)) 53# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45#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
46 61
47/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */ 62/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
48/* 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 */
49#if PERL_VERSION_ATLEAST(5,19,0) 64#if PERL_VERSION_ATLEAST(5,19,0)
50# define SVt_BIND SVt_IV 65# define SVt_BIND SVt_IV
125 140
126static GV *irsgv; /* $/ */ 141static GV *irsgv; /* $/ */
127static GV *stdoutgv; /* *STDOUT */ 142static GV *stdoutgv; /* *STDOUT */
128static SV *rv_diehook; 143static SV *rv_diehook;
129static SV *rv_warnhook; 144static SV *rv_warnhook;
130static HV *hv_sig; /* %SIG */
131 145
132/* async_pool helper stuff */ 146/* async_pool helper stuff */
133static SV *sv_pool_rss; 147static SV *sv_pool_rss;
134static SV *sv_pool_size; 148static SV *sv_pool_size;
135static SV *sv_async_pool_idle; /* description string */ 149static SV *sv_async_pool_idle; /* description string */
241 SV *saved_deffh; 255 SV *saved_deffh;
242 SV *invoke_cb; 256 SV *invoke_cb;
243 AV *invoke_av; 257 AV *invoke_av;
244 258
245 /* on_enter/on_leave */ 259 /* on_enter/on_leave */
246 AV *on_enter; 260 AV *on_enter; AV *on_enter_xs;
247 AV *on_leave; 261 AV *on_leave; AV *on_leave_xs;
248 262
249 /* swap_sv */ 263 /* swap_sv */
250 AV *swap_sv; 264 AV *swap_sv;
251 265
252 /* times */ 266 /* times */
488 502
489 return 0; 503 return 0;
490} 504}
491 505
492ecb_inline struct coro * 506ecb_inline struct coro *
493SvSTATE_ (pTHX_ SV *coro) 507SvSTATE_ (pTHX_ SV *coro_sv)
494{ 508{
495 MAGIC *mg; 509 MAGIC *mg;
496 510
497 if (SvROK (coro)) 511 if (SvROK (coro_sv))
498 coro = SvRV (coro); 512 coro_sv = SvRV (coro_sv);
499 513
500 mg = SvSTATEhv_p (aTHX_ coro); 514 mg = SvSTATEhv_p (aTHX_ coro_sv);
501 if (!mg) 515 if (!mg)
502 croak ("Coro::State object required"); 516 croak ("Coro::State object required");
503 517
504 return (struct coro *)mg->mg_ptr; 518 return (struct coro *)mg->mg_ptr;
505} 519}
516ecb_inline PADLIST * 530ecb_inline PADLIST *
517coro_derive_padlist (pTHX_ CV *cv) 531coro_derive_padlist (pTHX_ CV *cv)
518{ 532{
519 PADLIST *padlist = CvPADLIST (cv); 533 PADLIST *padlist = CvPADLIST (cv);
520 PADLIST *newpadlist; 534 PADLIST *newpadlist;
535 PADNAMELIST *padnames;
521 PAD *newpad; 536 PAD *newpad;
522 PADOFFSET off = PadlistMAX (padlist) + 1; 537 PADOFFSET off = PadlistMAX (padlist) + 1;
523 538
524#if NEWPADAPI 539#if NEWPADAPI
525 540
552 AvREAL_off (newpadlist); 567 AvREAL_off (newpadlist);
553#endif 568#endif
554 569
555 /* Already extended to 2 elements by newPADLIST. */ 570 /* Already extended to 2 elements by newPADLIST. */
556 PadlistMAX (newpadlist) = 1; 571 PadlistMAX (newpadlist) = 1;
557 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 572
573 padnames = PadlistNAMES (padlist);
574 ++PadnamelistREFCNT (padnames);
575 PadlistNAMES (newpadlist) = padnames;
576
558 PadlistARRAY (newpadlist)[1] = newpad; 577 PadlistARRAY (newpadlist)[1] = newpad;
559 578
560 return newpadlist; 579 return newpadlist;
561} 580}
562 581
583 PadMAX (pad) = -1; 602 PadMAX (pad) = -1;
584 SvREFCNT_dec (pad); 603 SvREFCNT_dec (pad);
585 } 604 }
586 } 605 }
587 606
588 SvREFCNT_dec (PadlistNAMES (padlist)); 607 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
589 608
590#if NEWPADAPI 609#if NEWPADAPI
591 Safefree (PadlistARRAY (padlist)); 610 Safefree (PadlistARRAY (padlist));
592 Safefree (padlist); 611 Safefree (padlist);
593#else 612#else
689 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;
690 709
691 /* 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,
692 * 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.
693 */ 712 */
694 #define svany_in_head(type) \ 713 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
695 (((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)))
696 719
697 if (svany_in_head (SvTYPE (a))) 720 if (svany_in_head (SvTYPE (a)))
698 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 721 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
699 722
700 if (svany_in_head (SvTYPE (b))) 723 if (svany_in_head (SvTYPE (b)))
768 791
769 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 792 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
770 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 793 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
771 } 794 }
772 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
773 SWAP_SVS (c); 804 SWAP_SVS (c);
774} 805}
775 806
776static void 807static void
777save_perl (pTHX_ Coro__State c) 808save_perl (pTHX_ Coro__State c)
778{ 809{
779 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 }
780 819
781 if (ecb_expect_false (c->on_leave)) 820 if (ecb_expect_false (c->on_leave))
782 { 821 {
783 int i; 822 int i;
784 823
1137 1176
1138 GvSV (PL_defgv) = newSV (0); 1177 GvSV (PL_defgv) = newSV (0);
1139 GvAV (PL_defgv) = coro->args; coro->args = 0; 1178 GvAV (PL_defgv) = coro->args; coro->args = 0;
1140 GvSV (PL_errgv) = newSV (0); 1179 GvSV (PL_errgv) = newSV (0);
1141 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1180 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1142 GvHV (PL_hintgv) = 0; 1181 GvHV (PL_hintgv) = newHV ();
1182#if PERL_VERSION_ATLEAST (5,10,0)
1183 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1184#endif
1143 PL_rs = newSVsv (GvSV (irsgv)); 1185 PL_rs = newSVsv (GvSV (irsgv));
1144 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1186 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1145 1187
1146 { 1188 {
1147 dSP; 1189 dSP;
1257 1299
1258 SvREFCNT_dec (coro->saved_deffh); 1300 SvREFCNT_dec (coro->saved_deffh);
1259 SvREFCNT_dec (coro->rouse_cb); 1301 SvREFCNT_dec (coro->rouse_cb);
1260 SvREFCNT_dec (coro->invoke_cb); 1302 SvREFCNT_dec (coro->invoke_cb);
1261 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);
1262 } 1306 }
1263} 1307}
1264 1308
1265ecb_inline void 1309ecb_inline void
1266free_coro_mortal (pTHX) 1310free_coro_mortal (pTHX)
1329 1373
1330 if (PL_curcop != &PL_compiling) 1374 if (PL_curcop != &PL_compiling)
1331 { 1375 {
1332 SV **cb; 1376 SV **cb;
1333 1377
1334 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1378 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1335 { 1379 {
1336 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1380 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1337 1381
1338 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1382 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1339 { 1383 {
1926 1970
1927 ENTER; 1971 ENTER;
1928 SAVETMPS; 1972 SAVETMPS;
1929 1973
1930 PUSHMARK (SP); 1974 PUSHMARK (SP);
1931 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught", 0))); 1975 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1932 PUTBACK; 1976 PUTBACK;
1933 call_pv ("Carp::confess", G_VOID | G_DISCARD); 1977 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1934 1978
1935 FREETMPS; 1979 FREETMPS;
1936 LEAVE; 1980 LEAVE;
2247 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2291 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2248 } 2292 }
2249 else 2293 else
2250 { 2294 {
2251 struct coro *self = SvSTATE_current; 2295 struct coro *self = SvSTATE_current;
2296
2297 if (!self)
2298 croak ("Coro::cancel called outside of thread content,");
2252 2299
2253 /* otherwise we cancel directly, purely for speed reasons 2300 /* otherwise we cancel directly, purely for speed reasons
2254 * unfortunately, this requires some magic trickery, as 2301 * unfortunately, this requires some magic trickery, as
2255 * somebody else could cancel us, so we have to fight the cancellation. 2302 * somebody else could cancel us, so we have to fight the cancellation.
2256 * this is ugly, and hopefully fully worth the extra speed. 2303 * this is ugly, and hopefully fully worth the extra speed.
2598 2645
2599/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2646/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2600static void 2647static void
2601slf_destroy (pTHX_ struct coro *coro) 2648slf_destroy (pTHX_ struct coro *coro)
2602{ 2649{
2603 /* this callback is reserved for slf functions needing to do cleanup */ 2650 struct CoroSLF frame = coro->slf_frame;
2604 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2605 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2606 2651
2607 /* 2652 /*
2608 * The on_destroy above most likely is from an SLF call. 2653 * The on_destroy below most likely is from an SLF call.
2609 * Since by definition the SLF call will not finish when we destroy 2654 * Since by definition the SLF call will not finish when we destroy
2610 * the coro, we will have to force-finish it here, otherwise 2655 * the coro, we will have to force-finish it here, otherwise
2611 * cleanup functions cannot call SLF functions. 2656 * cleanup functions cannot call SLF functions.
2612 */ 2657 */
2613 coro->slf_frame.prepare = 0; 2658 coro->slf_frame.prepare = 0;
2659
2660 /* this callback is reserved for slf functions needing to do cleanup */
2661 if (frame.destroy && frame.prepare && !PL_dirty)
2662 frame.destroy (aTHX_ &frame);
2614} 2663}
2615 2664
2616/* 2665/*
2617 * these not obviously related functions are all rolled into one 2666 * these not obviously related functions are all rolled into one
2618 * function to increase chances that they all will call transfer with the same 2667 * function to increase chances that they all will call transfer with the same
2801static void 2850static void
2802coro_pop_on_leave (pTHX_ void *coro) 2851coro_pop_on_leave (pTHX_ void *coro)
2803{ 2852{
2804 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);
2805 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);
2806} 2947}
2807 2948
2808/*****************************************************************************/ 2949/*****************************************************************************/
2809/* PerlIO::cede */ 2950/* PerlIO::cede */
2810 2951
2940 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3081 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2941 PUTBACK; 3082 PUTBACK;
2942 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3083 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2943 } 3084 }
2944 3085
2945 SvREFCNT_dec (cb); 3086 SvREFCNT_dec_NN (cb);
2946 } 3087 }
2947} 3088}
2948 3089
2949static void 3090static void
2950coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3091coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2958{ 3099{
2959 AV *av = (AV *)frame->data; 3100 AV *av = (AV *)frame->data;
2960 SV *count_sv = AvARRAY (av)[0]; 3101 SV *count_sv = AvARRAY (av)[0];
2961 SV *coro_hv = SvRV (coro_current); 3102 SV *coro_hv = SvRV (coro_current);
2962 3103
3104 frame->destroy = 0;
3105
2963 /* if we are about to throw, don't actually acquire the lock, just throw */ 3106 /* if we are about to throw, don't actually acquire the lock, just throw */
2964 if (CORO_THROW) 3107 if (ecb_expect_false (CORO_THROW))
3108 {
3109 /* we still might be responsible for the semaphore, so wake up others */
3110 coro_semaphore_adjust (aTHX_ av, 0);
3111
2965 return 0; 3112 return 0;
3113 }
2966 else if (SvIVX (count_sv) > 0) 3114 else if (SvIVX (count_sv) > 0)
2967 { 3115 {
2968 frame->destroy = 0;
2969
2970 if (acquire) 3116 if (acquire)
2971 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3117 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2972 else 3118 else
2973 coro_semaphore_adjust (aTHX_ av, 0); 3119 coro_semaphore_adjust (aTHX_ av, 0);
2974 3120
3085 { 3231 {
3086 api_ready (aTHX_ cb); 3232 api_ready (aTHX_ cb);
3087 sv_setiv (cb, 0); /* signal waiter */ 3233 sv_setiv (cb, 0); /* signal waiter */
3088 } 3234 }
3089 3235
3090 SvREFCNT_dec (cb); 3236 SvREFCNT_dec_NN (cb);
3091 3237
3092 --count; 3238 --count;
3093 } 3239 }
3094} 3240}
3095 3241
3180 } 3326 }
3181 3327
3182 av_push (state, data_sv); 3328 av_push (state, data_sv);
3183 3329
3184 api_ready (aTHX_ coro); 3330 api_ready (aTHX_ coro);
3185 SvREFCNT_dec (coro); 3331 SvREFCNT_dec_NN (coro);
3186 SvREFCNT_dec ((AV *)state); 3332 SvREFCNT_dec_NN ((AV *)state);
3187} 3333}
3188 3334
3189static int 3335static int
3190slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3336slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3191{ 3337{
3209 errno = data->errorno; 3355 errno = data->errorno;
3210 PL_laststype = data->laststype; 3356 PL_laststype = data->laststype;
3211 PL_laststatval = data->laststatval; 3357 PL_laststatval = data->laststatval;
3212 PL_statcache = data->statcache; 3358 PL_statcache = data->statcache;
3213 3359
3214 SvREFCNT_dec (data_sv); 3360 SvREFCNT_dec_NN (data_sv);
3215 } 3361 }
3216 3362
3217 /* push result values */ 3363 /* push result values */
3218 { 3364 {
3219 dSP; 3365 dSP;
3434 3580
3435PROTOTYPES: DISABLE 3581PROTOTYPES: DISABLE
3436 3582
3437BOOT: 3583BOOT:
3438{ 3584{
3585#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3586#include "state.h"
3439#ifdef USE_ITHREADS 3587#ifdef USE_ITHREADS
3440# if CORO_PTHREAD 3588# if CORO_PTHREAD
3441 coro_thx = PERL_GET_CONTEXT; 3589 coro_thx = PERL_GET_CONTEXT;
3442# endif 3590# endif
3443#endif 3591#endif
3455 3603
3456 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;
3457 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;
3458 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;
3459 3607
3460 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3461 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));
3462 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));
3463 3610
3464 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3611 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3465 3612
3794 3941
3795MODULE = Coro::State PACKAGE = Coro 3942MODULE = Coro::State PACKAGE = Coro
3796 3943
3797BOOT: 3944BOOT:
3798{ 3945{
3946 if (SVt_LAST > 32)
3947 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3948
3799 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3949 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3800 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3950 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3801 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3951 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3802 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);
3803 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3953 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3829 coroapi.ready = api_ready; 3979 coroapi.ready = api_ready;
3830 coroapi.is_ready = api_is_ready; 3980 coroapi.is_ready = api_is_ready;
3831 coroapi.nready = coro_nready; 3981 coroapi.nready = coro_nready;
3832 coroapi.current = coro_current; 3982 coroapi.current = coro_current;
3833 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
3834 /*GCoroAPI = &coroapi;*/ 3988 /*GCoroAPI = &coroapi;*/
3835 sv_setiv (sv, (IV)&coroapi); 3989 sv_setiv (sv, (IV)&coroapi);
3836 SvREADONLY_on (sv); 3990 SvREADONLY_on (sv);
3837 } 3991 }
3838} 3992}
3903 4057
3904void 4058void
3905_set_current (SV *current) 4059_set_current (SV *current)
3906 PROTOTYPE: $ 4060 PROTOTYPE: $
3907 CODE: 4061 CODE:
3908 SvREFCNT_dec (SvRV (coro_current)); 4062 SvREFCNT_dec_NN (SvRV (coro_current));
3909 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4063 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3910 4064
3911void 4065void
3912_set_readyhook (SV *hook) 4066_set_readyhook (SV *hook)
3913 PROTOTYPE: $ 4067 PROTOTYPE: $
3997 4151
3998 if ((SV *)hv == &PL_sv_undef) 4152 if ((SV *)hv == &PL_sv_undef)
3999 { 4153 {
4000 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);
4001 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4155 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4002 SvREFCNT_dec (sv); 4156 SvREFCNT_dec_NN (sv);
4003 } 4157 }
4004 4158
4005 { 4159 {
4006 struct coro *coro = SvSTATE_hv (hv); 4160 struct coro *coro = SvSTATE_hv (hv);
4007 4161
4014 api_ready (aTHX_ (SV *)hv); 4168 api_ready (aTHX_ (SV *)hv);
4015 4169
4016 if (GIMME_V != G_VOID) 4170 if (GIMME_V != G_VOID)
4017 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4171 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4018 else 4172 else
4019 SvREFCNT_dec (hv); 4173 SvREFCNT_dec_NN (hv);
4020} 4174}
4021 4175
4022SV * 4176SV *
4023rouse_cb () 4177rouse_cb ()
4024 PROTOTYPE: 4178 PROTOTYPE:
4103 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4257 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4104 OUTPUT: 4258 OUTPUT:
4105 RETVAL 4259 RETVAL
4106 4260
4107void 4261void
4108up (SV *self, int adjust = 1) 4262up (SV *self)
4109 ALIAS:
4110 adjust = 1
4111 CODE: 4263 CODE:
4264 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4265
4266void
4267adjust (SV *self, int adjust)
4268 CODE:
4112 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4269 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4113 4270
4114void 4271void
4115down (...) 4272down (...)
4116 CODE: 4273 CODE:
4117 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