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.431 by root, Fri Feb 8 22:29:18 2013 UTC vs.
Revision 1.451 by root, Mon Jun 29 23:49:34 2015 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>
25 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
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
30#ifdef PadARRAY 39#ifdef PadARRAY
31# define NEWPADAPI 40# define NEWPADAPI 1
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *)) 41# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else 42#else
34typedef AV PADNAMELIST; 43typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0) 44# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST; 45typedef AV PADLIST;
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
235 SV *saved_deffh; 256 SV *saved_deffh;
236 SV *invoke_cb; 257 SV *invoke_cb;
237 AV *invoke_av; 258 AV *invoke_av;
238 259
239 /* on_enter/on_leave */ 260 /* on_enter/on_leave */
240 AV *on_enter; 261 AV *on_enter; AV *on_enter_xs;
241 AV *on_leave; 262 AV *on_leave; AV *on_leave_xs;
242 263
243 /* swap_sv */ 264 /* swap_sv */
244 AV *swap_sv; 265 AV *swap_sv;
245 266
246 /* times */ 267 /* times */
482 503
483 return 0; 504 return 0;
484} 505}
485 506
486ecb_inline struct coro * 507ecb_inline struct coro *
487SvSTATE_ (pTHX_ SV *coro) 508SvSTATE_ (pTHX_ SV *coro_sv)
488{ 509{
489 MAGIC *mg; 510 MAGIC *mg;
490 511
491 if (SvROK (coro)) 512 if (SvROK (coro_sv))
492 coro = SvRV (coro); 513 coro_sv = SvRV (coro_sv);
493 514
494 mg = SvSTATEhv_p (aTHX_ coro); 515 mg = SvSTATEhv_p (aTHX_ coro_sv);
495 if (!mg) 516 if (!mg)
496 croak ("Coro::State object required"); 517 croak ("Coro::State object required");
497 518
498 return (struct coro *)mg->mg_ptr; 519 return (struct coro *)mg->mg_ptr;
499} 520}
510ecb_inline PADLIST * 531ecb_inline PADLIST *
511coro_derive_padlist (pTHX_ CV *cv) 532coro_derive_padlist (pTHX_ CV *cv)
512{ 533{
513 PADLIST *padlist = CvPADLIST (cv); 534 PADLIST *padlist = CvPADLIST (cv);
514 PADLIST *newpadlist; 535 PADLIST *newpadlist;
536 PADNAMELIST *padnames;
515 PAD *newpad; 537 PAD *newpad;
516 PADOFFSET const off = PadlistMAX (padlist) + 1; 538 PADOFFSET off = PadlistMAX (padlist) + 1;
517 539
518 newPADLIST(newpadlist); 540#if NEWPADAPI
519#if !PERL_VERSION_ATLEAST(5,15,3) 541
520 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */ 542 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
521 AvREAL_off (newpadlist); 543 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
522#endif 544 while (!PadlistARRAY (padlist)[off - 1])
545 --off;
546
547 Perl_pad_push (aTHX_ padlist, off);
548
549 newpad = PadlistARRAY (padlist)[off];
550 PadlistARRAY (padlist)[off] = 0;
551
552#else
553
523#if PERL_VERSION_ATLEAST (5,10,0) 554#if PERL_VERSION_ATLEAST (5,10,0)
524 Perl_pad_push (aTHX_ padlist, off); 555 Perl_pad_push (aTHX_ padlist, off);
525#else 556#else
526 Perl_pad_push (aTHX_ padlist, off, 1); 557 Perl_pad_push (aTHX_ padlist, off, 1);
527#endif 558#endif
559
528 newpad = PadlistARRAY (padlist)[off]; 560 newpad = PadlistARRAY (padlist)[off];
529 PadlistMAX (padlist) = off - 1; 561 PadlistMAX (padlist) = off - 1;
530 562
563#endif
564
565 newPADLIST (newpadlist);
566#if !PERL_VERSION_ATLEAST(5,15,3)
567 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
568 AvREAL_off (newpadlist);
569#endif
570
531 /* Already extended to 2 elements by newPADLIST. */ 571 /* Already extended to 2 elements by newPADLIST. */
532 PadlistMAX (newpadlist) = 1; 572 PadlistMAX (newpadlist) = 1;
533 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 573
574 padnames = PadlistNAMES (padlist);
575 ++PadnamelistREFCNT (padnames);
576 PadlistNAMES (newpadlist) = padnames;
577
534 PadlistARRAY (newpadlist)[1] = newpad; 578 PadlistARRAY (newpadlist)[1] = newpad;
535 579
536 return newpadlist; 580 return newpadlist;
537} 581}
538 582
546 590
547 while (i > 0) /* special-case index 0 */ 591 while (i > 0) /* special-case index 0 */
548 { 592 {
549 /* we try to be extra-careful here */ 593 /* we try to be extra-careful here */
550 PAD *pad = PadlistARRAY (padlist)[i--]; 594 PAD *pad = PadlistARRAY (padlist)[i--];
595
596 if (pad)
597 {
551 I32 j = PadMAX (pad); 598 I32 j = PadMAX (pad);
552 599
553 while (j >= 0) 600 while (j >= 0)
554 SvREFCNT_dec (PadARRAY (pad)[j--]); 601 SvREFCNT_dec (PadARRAY (pad)[j--]);
555 602
556 PadMAX (pad) = -1; 603 PadMAX (pad) = -1;
557 SvREFCNT_dec (pad); 604 SvREFCNT_dec (pad);
605 }
558 } 606 }
559 607
560 SvREFCNT_dec (PadlistNAMES (padlist)); 608 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
561 609
562#ifdef NEWPADAPI 610#if NEWPADAPI
563 Safefree (PadlistARRAY (padlist)); 611 Safefree (PadlistARRAY (padlist));
564 Safefree (padlist); 612 Safefree (padlist);
565#else 613#else
566 AvFILLp (padlist) = -1; 614 AvFILLp (padlist) = -1;
567 AvREAL_off (padlist); 615 AvREAL_off (padlist);
740 788
741 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 789 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
742 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 790 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
743 } 791 }
744 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
745 SWAP_SVS (c); 801 SWAP_SVS (c);
746} 802}
747 803
748static void 804static void
749save_perl (pTHX_ Coro__State c) 805save_perl (pTHX_ Coro__State c)
750{ 806{
751 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 }
752 816
753 if (ecb_expect_false (c->on_leave)) 817 if (ecb_expect_false (c->on_leave))
754 { 818 {
755 int i; 819 int i;
756 820
1109 1173
1110 GvSV (PL_defgv) = newSV (0); 1174 GvSV (PL_defgv) = newSV (0);
1111 GvAV (PL_defgv) = coro->args; coro->args = 0; 1175 GvAV (PL_defgv) = coro->args; coro->args = 0;
1112 GvSV (PL_errgv) = newSV (0); 1176 GvSV (PL_errgv) = newSV (0);
1113 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1177 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1114 GvHV (PL_hintgv) = 0; 1178 GvHV (PL_hintgv) = newHV ();
1179#if PERL_VERSION_ATLEAST (5,10,0)
1180 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1181#endif
1115 PL_rs = newSVsv (GvSV (irsgv)); 1182 PL_rs = newSVsv (GvSV (irsgv));
1116 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1183 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1117 1184
1118 { 1185 {
1119 dSP; 1186 dSP;
1229 1296
1230 SvREFCNT_dec (coro->saved_deffh); 1297 SvREFCNT_dec (coro->saved_deffh);
1231 SvREFCNT_dec (coro->rouse_cb); 1298 SvREFCNT_dec (coro->rouse_cb);
1232 SvREFCNT_dec (coro->invoke_cb); 1299 SvREFCNT_dec (coro->invoke_cb);
1233 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);
1234 } 1303 }
1235} 1304}
1236 1305
1237ecb_inline void 1306ecb_inline void
1238free_coro_mortal (pTHX) 1307free_coro_mortal (pTHX)
1301 1370
1302 if (PL_curcop != &PL_compiling) 1371 if (PL_curcop != &PL_compiling)
1303 { 1372 {
1304 SV **cb; 1373 SV **cb;
1305 1374
1306 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1375 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1307 { 1376 {
1308 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1377 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1309 1378
1310 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1379 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1311 { 1380 {
1888 /* nothing to schedule: call the idle handler */ 1957 /* nothing to schedule: call the idle handler */
1889 if (SvROK (sv_idle) 1958 if (SvROK (sv_idle)
1890 && SvOBJECT (SvRV (sv_idle))) 1959 && SvOBJECT (SvRV (sv_idle)))
1891 { 1960 {
1892 if (SvRV (sv_idle) == SvRV (coro_current)) 1961 if (SvRV (sv_idle) == SvRV (coro_current))
1962 {
1963 require_pv ("Carp");
1964
1965 {
1966 dSP;
1967
1968 ENTER;
1969 SAVETMPS;
1970
1971 PUSHMARK (SP);
1893 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1972 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1973 PUTBACK;
1974 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1975
1976 FREETMPS;
1977 LEAVE;
1978 }
1979 }
1894 1980
1895 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1981 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1896 api_ready (aTHX_ SvRV (sv_idle)); 1982 api_ready (aTHX_ SvRV (sv_idle));
1897 --coro_nready; 1983 --coro_nready;
1898 } 1984 }
2096 AV *od = coro->on_destroy; 2182 AV *od = coro->on_destroy;
2097 2183
2098 if (!od) 2184 if (!od)
2099 return; 2185 return;
2100 2186
2187 coro->on_destroy = 0;
2188 sv_2mortal ((SV *)od);
2189
2101 while (AvFILLp (od) >= 0) 2190 while (AvFILLp (od) >= 0)
2102 { 2191 {
2103 SV *cb = sv_2mortal (av_pop (od)); 2192 SV *cb = sv_2mortal (av_pop (od));
2104 2193
2105 /* coro hv's (and only hv's at the moment) are supported as well */ 2194 /* coro hv's (and only hv's at the moment) are supported as well */
2199 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2288 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2200 } 2289 }
2201 else 2290 else
2202 { 2291 {
2203 struct coro *self = SvSTATE_current; 2292 struct coro *self = SvSTATE_current;
2293
2294 if (!self)
2295 croak ("Coro::cancel called outside of thread content,");
2204 2296
2205 /* otherwise we cancel directly, purely for speed reasons 2297 /* otherwise we cancel directly, purely for speed reasons
2206 * unfortunately, this requires some magic trickery, as 2298 * unfortunately, this requires some magic trickery, as
2207 * somebody else could cancel us, so we have to fight the cancellation. 2299 * somebody else could cancel us, so we have to fight the cancellation.
2208 * this is ugly, and hopefully fully worth the extra speed. 2300 * this is ugly, and hopefully fully worth the extra speed.
2550 2642
2551/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2643/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2552static void 2644static void
2553slf_destroy (pTHX_ struct coro *coro) 2645slf_destroy (pTHX_ struct coro *coro)
2554{ 2646{
2555 /* this callback is reserved for slf functions needing to do cleanup */ 2647 struct CoroSLF frame = coro->slf_frame;
2556 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2557 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2558 2648
2559 /* 2649 /*
2560 * The on_destroy above most likely is from an SLF call. 2650 * The on_destroy below most likely is from an SLF call.
2561 * Since by definition the SLF call will not finish when we destroy 2651 * Since by definition the SLF call will not finish when we destroy
2562 * the coro, we will have to force-finish it here, otherwise 2652 * the coro, we will have to force-finish it here, otherwise
2563 * cleanup functions cannot call SLF functions. 2653 * cleanup functions cannot call SLF functions.
2564 */ 2654 */
2565 coro->slf_frame.prepare = 0; 2655 coro->slf_frame.prepare = 0;
2656
2657 /* this callback is reserved for slf functions needing to do cleanup */
2658 if (frame.destroy && frame.prepare && !PL_dirty)
2659 frame.destroy (aTHX_ &frame);
2566} 2660}
2567 2661
2568/* 2662/*
2569 * these not obviously related functions are all rolled into one 2663 * these not obviously related functions are all rolled into one
2570 * function to increase chances that they all will call transfer with the same 2664 * function to increase chances that they all will call transfer with the same
2753static void 2847static void
2754coro_pop_on_leave (pTHX_ void *coro) 2848coro_pop_on_leave (pTHX_ void *coro)
2755{ 2849{
2756 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);
2757 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 ((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);
2758} 2944}
2759 2945
2760/*****************************************************************************/ 2946/*****************************************************************************/
2761/* PerlIO::cede */ 2947/* PerlIO::cede */
2762 2948
2892 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3078 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2893 PUTBACK; 3079 PUTBACK;
2894 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3080 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2895 } 3081 }
2896 3082
2897 SvREFCNT_dec (cb); 3083 SvREFCNT_dec_NN (cb);
2898 } 3084 }
2899} 3085}
2900 3086
2901static void 3087static void
2902coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3088coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2910{ 3096{
2911 AV *av = (AV *)frame->data; 3097 AV *av = (AV *)frame->data;
2912 SV *count_sv = AvARRAY (av)[0]; 3098 SV *count_sv = AvARRAY (av)[0];
2913 SV *coro_hv = SvRV (coro_current); 3099 SV *coro_hv = SvRV (coro_current);
2914 3100
3101 frame->destroy = 0;
3102
2915 /* if we are about to throw, don't actually acquire the lock, just throw */ 3103 /* if we are about to throw, don't actually acquire the lock, just throw */
2916 if (CORO_THROW) 3104 if (ecb_expect_false (CORO_THROW))
3105 {
3106 /* we still might be responsible for the semaphore, so wake up others */
3107 coro_semaphore_adjust (aTHX_ av, 0);
3108
2917 return 0; 3109 return 0;
3110 }
2918 else if (SvIVX (count_sv) > 0) 3111 else if (SvIVX (count_sv) > 0)
2919 { 3112 {
2920 frame->destroy = 0;
2921
2922 if (acquire) 3113 if (acquire)
2923 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3114 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2924 else 3115 else
2925 coro_semaphore_adjust (aTHX_ av, 0); 3116 coro_semaphore_adjust (aTHX_ av, 0);
2926 3117
3037 { 3228 {
3038 api_ready (aTHX_ cb); 3229 api_ready (aTHX_ cb);
3039 sv_setiv (cb, 0); /* signal waiter */ 3230 sv_setiv (cb, 0); /* signal waiter */
3040 } 3231 }
3041 3232
3042 SvREFCNT_dec (cb); 3233 SvREFCNT_dec_NN (cb);
3043 3234
3044 --count; 3235 --count;
3045 } 3236 }
3046} 3237}
3047 3238
3132 } 3323 }
3133 3324
3134 av_push (state, data_sv); 3325 av_push (state, data_sv);
3135 3326
3136 api_ready (aTHX_ coro); 3327 api_ready (aTHX_ coro);
3137 SvREFCNT_dec (coro); 3328 SvREFCNT_dec_NN (coro);
3138 SvREFCNT_dec ((AV *)state); 3329 SvREFCNT_dec_NN ((AV *)state);
3139} 3330}
3140 3331
3141static int 3332static int
3142slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3333slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3143{ 3334{
3148 /* it quickly returns */ 3339 /* it quickly returns */
3149 if (CORO_THROW) 3340 if (CORO_THROW)
3150 return 0; 3341 return 0;
3151 3342
3152 /* one element that is an RV? repeat! */ 3343 /* one element that is an RV? repeat! */
3153 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3344 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3154 return 1; 3345 return 1;
3155 3346
3156 /* restore status */ 3347 /* restore status */
3157 { 3348 {
3158 SV *data_sv = av_pop (state); 3349 SV *data_sv = av_pop (state);
3161 errno = data->errorno; 3352 errno = data->errorno;
3162 PL_laststype = data->laststype; 3353 PL_laststype = data->laststype;
3163 PL_laststatval = data->laststatval; 3354 PL_laststatval = data->laststatval;
3164 PL_statcache = data->statcache; 3355 PL_statcache = data->statcache;
3165 3356
3166 SvREFCNT_dec (data_sv); 3357 SvREFCNT_dec_NN (data_sv);
3167 } 3358 }
3168 3359
3169 /* push result values */ 3360 /* push result values */
3170 { 3361 {
3171 dSP; 3362 dSP;
3386 3577
3387PROTOTYPES: DISABLE 3578PROTOTYPES: DISABLE
3388 3579
3389BOOT: 3580BOOT:
3390{ 3581{
3582#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3583#include "state.h"
3391#ifdef USE_ITHREADS 3584#ifdef USE_ITHREADS
3392# if CORO_PTHREAD 3585# if CORO_PTHREAD
3393 coro_thx = PERL_GET_CONTEXT; 3586 coro_thx = PERL_GET_CONTEXT;
3394# endif 3587# endif
3395#endif 3588#endif
3781 coroapi.ready = api_ready; 3974 coroapi.ready = api_ready;
3782 coroapi.is_ready = api_is_ready; 3975 coroapi.is_ready = api_is_ready;
3783 coroapi.nready = coro_nready; 3976 coroapi.nready = coro_nready;
3784 coroapi.current = coro_current; 3977 coroapi.current = coro_current;
3785 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
3786 /*GCoroAPI = &coroapi;*/ 3983 /*GCoroAPI = &coroapi;*/
3787 sv_setiv (sv, (IV)&coroapi); 3984 sv_setiv (sv, (IV)&coroapi);
3788 SvREADONLY_on (sv); 3985 SvREADONLY_on (sv);
3789 } 3986 }
3790} 3987}
3855 4052
3856void 4053void
3857_set_current (SV *current) 4054_set_current (SV *current)
3858 PROTOTYPE: $ 4055 PROTOTYPE: $
3859 CODE: 4056 CODE:
3860 SvREFCNT_dec (SvRV (coro_current)); 4057 SvREFCNT_dec_NN (SvRV (coro_current));
3861 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4058 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3862 4059
3863void 4060void
3864_set_readyhook (SV *hook) 4061_set_readyhook (SV *hook)
3865 PROTOTYPE: $ 4062 PROTOTYPE: $
3949 4146
3950 if ((SV *)hv == &PL_sv_undef) 4147 if ((SV *)hv == &PL_sv_undef)
3951 { 4148 {
3952 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);
3953 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4150 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3954 SvREFCNT_dec (sv); 4151 SvREFCNT_dec_NN (sv);
3955 } 4152 }
3956 4153
3957 { 4154 {
3958 struct coro *coro = SvSTATE_hv (hv); 4155 struct coro *coro = SvSTATE_hv (hv);
3959 4156
3966 api_ready (aTHX_ (SV *)hv); 4163 api_ready (aTHX_ (SV *)hv);
3967 4164
3968 if (GIMME_V != G_VOID) 4165 if (GIMME_V != G_VOID)
3969 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4166 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3970 else 4167 else
3971 SvREFCNT_dec (hv); 4168 SvREFCNT_dec_NN (hv);
3972} 4169}
3973 4170
3974SV * 4171SV *
3975rouse_cb () 4172rouse_cb ()
3976 PROTOTYPE: 4173 PROTOTYPE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines