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.436 by root, Tue Nov 5 14:38:46 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
61
62/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
63/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
64#if PERL_VERSION_ATLEAST(5,19,0)
65# define SVt_BIND SVt_IV
66#endif
46 67
47#if defined(_WIN32) 68#if defined(_WIN32)
48# undef HAS_GETTIMEOFDAY 69# undef HAS_GETTIMEOFDAY
49# undef setjmp 70# undef setjmp
50# undef longjmp 71# undef longjmp
… …
119 140
120static GV *irsgv; /* $/ */ 141static GV *irsgv; /* $/ */
121static GV *stdoutgv; /* *STDOUT */ 142static GV *stdoutgv; /* *STDOUT */
122static SV *rv_diehook; 143static SV *rv_diehook;
123static SV *rv_warnhook; 144static SV *rv_warnhook;
124static HV *hv_sig; /* %SIG */
125 145
126/* async_pool helper stuff */ 146/* async_pool helper stuff */
127static SV *sv_pool_rss; 147static SV *sv_pool_rss;
128static SV *sv_pool_size; 148static SV *sv_pool_size;
129static SV *sv_async_pool_idle; /* description string */ 149static SV *sv_async_pool_idle; /* description string */
… …
235 SV *saved_deffh; 255 SV *saved_deffh;
236 SV *invoke_cb; 256 SV *invoke_cb;
237 AV *invoke_av; 257 AV *invoke_av;
238 258
239 /* on_enter/on_leave */ 259 /* on_enter/on_leave */
240 AV *on_enter; 260 AV *on_enter; AV *on_enter_xs;
241 AV *on_leave; 261 AV *on_leave; AV *on_leave_xs;
242 262
243 /* swap_sv */ 263 /* swap_sv */
244 AV *swap_sv; 264 AV *swap_sv;
245 265
246 /* times */ 266 /* times */
… …
482 502
483 return 0; 503 return 0;
484} 504}
485 505
486ecb_inline struct coro * 506ecb_inline struct coro *
487SvSTATE_ (pTHX_ SV *coro) 507SvSTATE_ (pTHX_ SV *coro_sv)
488{ 508{
489 MAGIC *mg; 509 MAGIC *mg;
490 510
491 if (SvROK (coro)) 511 if (SvROK (coro_sv))
492 coro = SvRV (coro); 512 coro_sv = SvRV (coro_sv);
493 513
494 mg = SvSTATEhv_p (aTHX_ coro); 514 mg = SvSTATEhv_p (aTHX_ coro_sv);
495 if (!mg) 515 if (!mg)
496 croak ("Coro::State object required"); 516 croak ("Coro::State object required");
497 517
498 return (struct coro *)mg->mg_ptr; 518 return (struct coro *)mg->mg_ptr;
499} 519}
… …
510ecb_inline PADLIST * 530ecb_inline PADLIST *
511coro_derive_padlist (pTHX_ CV *cv) 531coro_derive_padlist (pTHX_ CV *cv)
512{ 532{
513 PADLIST *padlist = CvPADLIST (cv); 533 PADLIST *padlist = CvPADLIST (cv);
514 PADLIST *newpadlist; 534 PADLIST *newpadlist;
535 PADNAMELIST *padnames;
515 PAD *newpad; 536 PAD *newpad;
516 PADOFFSET off = PadlistMAX (padlist) + 1; 537 PADOFFSET off = PadlistMAX (padlist) + 1;
517 538
518#if NEWPADAPI 539#if NEWPADAPI
519 540
… …
546 AvREAL_off (newpadlist); 567 AvREAL_off (newpadlist);
547#endif 568#endif
548 569
549 /* Already extended to 2 elements by newPADLIST. */ 570 /* Already extended to 2 elements by newPADLIST. */
550 PadlistMAX (newpadlist) = 1; 571 PadlistMAX (newpadlist) = 1;
551 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 572
573 padnames = PadlistNAMES (padlist);
574 ++PadnamelistREFCNT (padnames);
575 PadlistNAMES (newpadlist) = padnames;
576
552 PadlistARRAY (newpadlist)[1] = newpad; 577 PadlistARRAY (newpadlist)[1] = newpad;
553 578
554 return newpadlist; 579 return newpadlist;
555} 580}
556 581
… …
564 589
565 while (i > 0) /* special-case index 0 */ 590 while (i > 0) /* special-case index 0 */
566 { 591 {
567 /* we try to be extra-careful here */ 592 /* we try to be extra-careful here */
568 PAD *pad = PadlistARRAY (padlist)[i--]; 593 PAD *pad = PadlistARRAY (padlist)[i--];
594
595 if (pad)
596 {
569 I32 j = PadMAX (pad); 597 I32 j = PadMAX (pad);
570 598
571 while (j >= 0) 599 while (j >= 0)
572 SvREFCNT_dec (PadARRAY (pad)[j--]); 600 SvREFCNT_dec (PadARRAY (pad)[j--]);
573 601
574 PadMAX (pad) = -1; 602 PadMAX (pad) = -1;
575 SvREFCNT_dec (pad); 603 SvREFCNT_dec (pad);
604 }
576 } 605 }
577 606
578 SvREFCNT_dec (PadlistNAMES (padlist)); 607 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
579 608
580#if NEWPADAPI 609#if NEWPADAPI
581 Safefree (PadlistARRAY (padlist)); 610 Safefree (PadlistARRAY (padlist));
582 Safefree (padlist); 611 Safefree (padlist);
583#else 612#else
… …
679 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;
680 709
681 /* 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,
682 * 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.
683 */ 712 */
684 #define svany_in_head(type) \ 713 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
685 (((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)))
686 719
687 if (svany_in_head (SvTYPE (a))) 720 if (svany_in_head (SvTYPE (a)))
688 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 721 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
689 722
690 if (svany_in_head (SvTYPE (b))) 723 if (svany_in_head (SvTYPE (b)))
… …
758 791
759 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 792 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
760 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 793 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
761 } 794 }
762 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
763 SWAP_SVS (c); 804 SWAP_SVS (c);
764} 805}
765 806
766static void 807static void
767save_perl (pTHX_ Coro__State c) 808save_perl (pTHX_ Coro__State c)
768{ 809{
769 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 }
770 819
771 if (ecb_expect_false (c->on_leave)) 820 if (ecb_expect_false (c->on_leave))
772 { 821 {
773 int i; 822 int i;
774 823
… …
1127 1176
1128 GvSV (PL_defgv) = newSV (0); 1177 GvSV (PL_defgv) = newSV (0);
1129 GvAV (PL_defgv) = coro->args; coro->args = 0; 1178 GvAV (PL_defgv) = coro->args; coro->args = 0;
1130 GvSV (PL_errgv) = newSV (0); 1179 GvSV (PL_errgv) = newSV (0);
1131 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);
1132 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
1133 PL_rs = newSVsv (GvSV (irsgv)); 1185 PL_rs = newSVsv (GvSV (irsgv));
1134 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1186 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1135 1187
1136 { 1188 {
1137 dSP; 1189 dSP;
… …
1247 1299
1248 SvREFCNT_dec (coro->saved_deffh); 1300 SvREFCNT_dec (coro->saved_deffh);
1249 SvREFCNT_dec (coro->rouse_cb); 1301 SvREFCNT_dec (coro->rouse_cb);
1250 SvREFCNT_dec (coro->invoke_cb); 1302 SvREFCNT_dec (coro->invoke_cb);
1251 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);
1252 } 1306 }
1253} 1307}
1254 1308
1255ecb_inline void 1309ecb_inline void
1256free_coro_mortal (pTHX) 1310free_coro_mortal (pTHX)
… …
1319 1373
1320 if (PL_curcop != &PL_compiling) 1374 if (PL_curcop != &PL_compiling)
1321 { 1375 {
1322 SV **cb; 1376 SV **cb;
1323 1377
1324 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1378 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1325 { 1379 {
1326 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1380 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1327 1381
1328 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1382 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1329 { 1383 {
… …
1906 /* nothing to schedule: call the idle handler */ 1960 /* nothing to schedule: call the idle handler */
1907 if (SvROK (sv_idle) 1961 if (SvROK (sv_idle)
1908 && SvOBJECT (SvRV (sv_idle))) 1962 && SvOBJECT (SvRV (sv_idle)))
1909 { 1963 {
1910 if (SvRV (sv_idle) == SvRV (coro_current)) 1964 if (SvRV (sv_idle) == SvRV (coro_current))
1965 {
1966 require_pv ("Carp");
1967
1968 {
1969 dSP;
1970
1971 ENTER;
1972 SAVETMPS;
1973
1974 PUSHMARK (SP);
1911 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1975 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1976 PUTBACK;
1977 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1978
1979 FREETMPS;
1980 LEAVE;
1981 }
1982 }
1912 1983
1913 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1984 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1914 api_ready (aTHX_ SvRV (sv_idle)); 1985 api_ready (aTHX_ SvRV (sv_idle));
1915 --coro_nready; 1986 --coro_nready;
1916 } 1987 }
… …
2220 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2291 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2221 } 2292 }
2222 else 2293 else
2223 { 2294 {
2224 struct coro *self = SvSTATE_current; 2295 struct coro *self = SvSTATE_current;
2296
2297 if (!self)
2298 croak ("Coro::cancel called outside of thread content,");
2225 2299
2226 /* otherwise we cancel directly, purely for speed reasons 2300 /* otherwise we cancel directly, purely for speed reasons
2227 * unfortunately, this requires some magic trickery, as 2301 * unfortunately, this requires some magic trickery, as
2228 * 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.
2229 * this is ugly, and hopefully fully worth the extra speed. 2303 * this is ugly, and hopefully fully worth the extra speed.
… …
2571 2645
2572/* "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 */
2573static void 2647static void
2574slf_destroy (pTHX_ struct coro *coro) 2648slf_destroy (pTHX_ struct coro *coro)
2575{ 2649{
2576 /* this callback is reserved for slf functions needing to do cleanup */ 2650 struct CoroSLF frame = coro->slf_frame;
2577 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2578 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2579 2651
2580 /* 2652 /*
2581 * The on_destroy above most likely is from an SLF call. 2653 * The on_destroy below most likely is from an SLF call.
2582 * 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
2583 * the coro, we will have to force-finish it here, otherwise 2655 * the coro, we will have to force-finish it here, otherwise
2584 * cleanup functions cannot call SLF functions. 2656 * cleanup functions cannot call SLF functions.
2585 */ 2657 */
2586 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);
2587} 2663}
2588 2664
2589/* 2665/*
2590 * these not obviously related functions are all rolled into one 2666 * these not obviously related functions are all rolled into one
2591 * 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
… …
2774static void 2850static void
2775coro_pop_on_leave (pTHX_ void *coro) 2851coro_pop_on_leave (pTHX_ void *coro)
2776{ 2852{
2777 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);
2778 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);
2779} 2947}
2780 2948
2781/*****************************************************************************/ 2949/*****************************************************************************/
2782/* PerlIO::cede */ 2950/* PerlIO::cede */
2783 2951
… …
2913 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3081 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2914 PUTBACK; 3082 PUTBACK;
2915 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3083 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2916 } 3084 }
2917 3085
2918 SvREFCNT_dec (cb); 3086 SvREFCNT_dec_NN (cb);
2919 } 3087 }
2920} 3088}
2921 3089
2922static void 3090static void
2923coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3091coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
2931{ 3099{
2932 AV *av = (AV *)frame->data; 3100 AV *av = (AV *)frame->data;
2933 SV *count_sv = AvARRAY (av)[0]; 3101 SV *count_sv = AvARRAY (av)[0];
2934 SV *coro_hv = SvRV (coro_current); 3102 SV *coro_hv = SvRV (coro_current);
2935 3103
3104 frame->destroy = 0;
3105
2936 /* 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 */
2937 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
2938 return 0; 3112 return 0;
3113 }
2939 else if (SvIVX (count_sv) > 0) 3114 else if (SvIVX (count_sv) > 0)
2940 { 3115 {
2941 frame->destroy = 0;
2942
2943 if (acquire) 3116 if (acquire)
2944 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3117 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2945 else 3118 else
2946 coro_semaphore_adjust (aTHX_ av, 0); 3119 coro_semaphore_adjust (aTHX_ av, 0);
2947 3120
… …
3058 { 3231 {
3059 api_ready (aTHX_ cb); 3232 api_ready (aTHX_ cb);
3060 sv_setiv (cb, 0); /* signal waiter */ 3233 sv_setiv (cb, 0); /* signal waiter */
3061 } 3234 }
3062 3235
3063 SvREFCNT_dec (cb); 3236 SvREFCNT_dec_NN (cb);
3064 3237
3065 --count; 3238 --count;
3066 } 3239 }
3067} 3240}
3068 3241
… …
3153 } 3326 }
3154 3327
3155 av_push (state, data_sv); 3328 av_push (state, data_sv);
3156 3329
3157 api_ready (aTHX_ coro); 3330 api_ready (aTHX_ coro);
3158 SvREFCNT_dec (coro); 3331 SvREFCNT_dec_NN (coro);
3159 SvREFCNT_dec ((AV *)state); 3332 SvREFCNT_dec_NN ((AV *)state);
3160} 3333}
3161 3334
3162static int 3335static int
3163slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3336slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3164{ 3337{
… …
3182 errno = data->errorno; 3355 errno = data->errorno;
3183 PL_laststype = data->laststype; 3356 PL_laststype = data->laststype;
3184 PL_laststatval = data->laststatval; 3357 PL_laststatval = data->laststatval;
3185 PL_statcache = data->statcache; 3358 PL_statcache = data->statcache;
3186 3359
3187 SvREFCNT_dec (data_sv); 3360 SvREFCNT_dec_NN (data_sv);
3188 } 3361 }
3189 3362
3190 /* push result values */ 3363 /* push result values */
3191 { 3364 {
3192 dSP; 3365 dSP;
… …
3407 3580
3408PROTOTYPES: DISABLE 3581PROTOTYPES: DISABLE
3409 3582
3410BOOT: 3583BOOT:
3411{ 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"
3412#ifdef USE_ITHREADS 3587#ifdef USE_ITHREADS
3413# if CORO_PTHREAD 3588# if CORO_PTHREAD
3414 coro_thx = PERL_GET_CONTEXT; 3589 coro_thx = PERL_GET_CONTEXT;
3415# endif 3590# endif
3416#endif 3591#endif
… …
3428 3603
3429 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;
3430 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;
3431 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;
3432 3607
3433 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3434 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));
3435 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));
3436 3610
3437 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3611 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3438 3612
… …
3767 3941
3768MODULE = Coro::State PACKAGE = Coro 3942MODULE = Coro::State PACKAGE = Coro
3769 3943
3770BOOT: 3944BOOT:
3771{ 3945{
3946 if (SVt_LAST > 32)
3947 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3948
3772 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3949 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3773 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3950 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3774 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3951 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3775 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);
3776 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3953 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3802 coroapi.ready = api_ready; 3979 coroapi.ready = api_ready;
3803 coroapi.is_ready = api_is_ready; 3980 coroapi.is_ready = api_is_ready;
3804 coroapi.nready = coro_nready; 3981 coroapi.nready = coro_nready;
3805 coroapi.current = coro_current; 3982 coroapi.current = coro_current;
3806 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
3807 /*GCoroAPI = &coroapi;*/ 3988 /*GCoroAPI = &coroapi;*/
3808 sv_setiv (sv, (IV)&coroapi); 3989 sv_setiv (sv, (IV)&coroapi);
3809 SvREADONLY_on (sv); 3990 SvREADONLY_on (sv);
3810 } 3991 }
3811} 3992}
… …
3876 4057
3877void 4058void
3878_set_current (SV *current) 4059_set_current (SV *current)
3879 PROTOTYPE: $ 4060 PROTOTYPE: $
3880 CODE: 4061 CODE:
3881 SvREFCNT_dec (SvRV (coro_current)); 4062 SvREFCNT_dec_NN (SvRV (coro_current));
3882 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4063 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3883 4064
3884void 4065void
3885_set_readyhook (SV *hook) 4066_set_readyhook (SV *hook)
3886 PROTOTYPE: $ 4067 PROTOTYPE: $
… …
3970 4151
3971 if ((SV *)hv == &PL_sv_undef) 4152 if ((SV *)hv == &PL_sv_undef)
3972 { 4153 {
3973 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);
3974 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4155 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3975 SvREFCNT_dec (sv); 4156 SvREFCNT_dec_NN (sv);
3976 } 4157 }
3977 4158
3978 { 4159 {
3979 struct coro *coro = SvSTATE_hv (hv); 4160 struct coro *coro = SvSTATE_hv (hv);
3980 4161
… …
3987 api_ready (aTHX_ (SV *)hv); 4168 api_ready (aTHX_ (SV *)hv);
3988 4169
3989 if (GIMME_V != G_VOID) 4170 if (GIMME_V != G_VOID)
3990 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4171 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3991 else 4172 else
3992 SvREFCNT_dec (hv); 4173 SvREFCNT_dec_NN (hv);
3993} 4174}
3994 4175
3995SV * 4176SV *
3996rouse_cb () 4177rouse_cb ()
3997 PROTOTYPE: 4178 PROTOTYPE:
… …
4076 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4257 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4077 OUTPUT: 4258 OUTPUT:
4078 RETVAL 4259 RETVAL
4079 4260
4080void 4261void
4081up (SV *self, int adjust = 1) 4262up (SV *self)
4082 ALIAS:
4083 adjust = 1
4084 CODE: 4263 CODE:
4264 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4265
4266void
4267adjust (SV *self, int adjust)
4268 CODE:
4085 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4269 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4086 4270
4087void 4271void
4088down (...) 4272down (...)
4089 CODE: 4273 CODE:
4090 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