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.435 by root, Sat Nov 2 19:49:33 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>
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
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 off = PadlistMAX (padlist) + 1; 538 PADOFFSET off = PadlistMAX (padlist) + 1;
517 539
518#if NEWPADAPI 540#if NEWPADAPI
519 541
542 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
543 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
520 while (!PadlistARRAY (padlist)[off - 1]) 544 while (!PadlistARRAY (padlist)[off - 1])
521 --off; 545 --off;
522 546
523 Perl_pad_push (aTHX_ padlist, off); 547 Perl_pad_push (aTHX_ padlist, off);
524 548
544 AvREAL_off (newpadlist); 568 AvREAL_off (newpadlist);
545#endif 569#endif
546 570
547 /* Already extended to 2 elements by newPADLIST. */ 571 /* Already extended to 2 elements by newPADLIST. */
548 PadlistMAX (newpadlist) = 1; 572 PadlistMAX (newpadlist) = 1;
549 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 573
574 padnames = PadlistNAMES (padlist);
575 ++PadnamelistREFCNT (padnames);
576 PadlistNAMES (newpadlist) = padnames;
577
550 PadlistARRAY (newpadlist)[1] = newpad; 578 PadlistARRAY (newpadlist)[1] = newpad;
551 579
552 return newpadlist; 580 return newpadlist;
553} 581}
554 582
562 590
563 while (i > 0) /* special-case index 0 */ 591 while (i > 0) /* special-case index 0 */
564 { 592 {
565 /* we try to be extra-careful here */ 593 /* we try to be extra-careful here */
566 PAD *pad = PadlistARRAY (padlist)[i--]; 594 PAD *pad = PadlistARRAY (padlist)[i--];
595
596 if (pad)
597 {
567 I32 j = PadMAX (pad); 598 I32 j = PadMAX (pad);
568 599
569 while (j >= 0) 600 while (j >= 0)
570 SvREFCNT_dec (PadARRAY (pad)[j--]); 601 SvREFCNT_dec (PadARRAY (pad)[j--]);
571 602
572 PadMAX (pad) = -1; 603 PadMAX (pad) = -1;
573 SvREFCNT_dec (pad); 604 SvREFCNT_dec (pad);
605 }
574 } 606 }
575 607
576 SvREFCNT_dec (PadlistNAMES (padlist)); 608 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
577 609
578#if NEWPADAPI 610#if NEWPADAPI
579 Safefree (PadlistARRAY (padlist)); 611 Safefree (PadlistARRAY (padlist));
580 Safefree (padlist); 612 Safefree (padlist);
581#else 613#else
756 788
757 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 789 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
758 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 790 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
759 } 791 }
760 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
761 SWAP_SVS (c); 801 SWAP_SVS (c);
762} 802}
763 803
764static void 804static void
765save_perl (pTHX_ Coro__State c) 805save_perl (pTHX_ Coro__State c)
766{ 806{
767 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 }
768 816
769 if (ecb_expect_false (c->on_leave)) 817 if (ecb_expect_false (c->on_leave))
770 { 818 {
771 int i; 819 int i;
772 820
1125 1173
1126 GvSV (PL_defgv) = newSV (0); 1174 GvSV (PL_defgv) = newSV (0);
1127 GvAV (PL_defgv) = coro->args; coro->args = 0; 1175 GvAV (PL_defgv) = coro->args; coro->args = 0;
1128 GvSV (PL_errgv) = newSV (0); 1176 GvSV (PL_errgv) = newSV (0);
1129 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);
1130 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
1131 PL_rs = newSVsv (GvSV (irsgv)); 1182 PL_rs = newSVsv (GvSV (irsgv));
1132 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1183 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1133 1184
1134 { 1185 {
1135 dSP; 1186 dSP;
1245 1296
1246 SvREFCNT_dec (coro->saved_deffh); 1297 SvREFCNT_dec (coro->saved_deffh);
1247 SvREFCNT_dec (coro->rouse_cb); 1298 SvREFCNT_dec (coro->rouse_cb);
1248 SvREFCNT_dec (coro->invoke_cb); 1299 SvREFCNT_dec (coro->invoke_cb);
1249 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);
1250 } 1303 }
1251} 1304}
1252 1305
1253ecb_inline void 1306ecb_inline void
1254free_coro_mortal (pTHX) 1307free_coro_mortal (pTHX)
1317 1370
1318 if (PL_curcop != &PL_compiling) 1371 if (PL_curcop != &PL_compiling)
1319 { 1372 {
1320 SV **cb; 1373 SV **cb;
1321 1374
1322 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1375 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1323 { 1376 {
1324 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1377 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1325 1378
1326 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1379 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1327 { 1380 {
1904 /* nothing to schedule: call the idle handler */ 1957 /* nothing to schedule: call the idle handler */
1905 if (SvROK (sv_idle) 1958 if (SvROK (sv_idle)
1906 && SvOBJECT (SvRV (sv_idle))) 1959 && SvOBJECT (SvRV (sv_idle)))
1907 { 1960 {
1908 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);
1909 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 }
1910 1980
1911 ++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 */
1912 api_ready (aTHX_ SvRV (sv_idle)); 1982 api_ready (aTHX_ SvRV (sv_idle));
1913 --coro_nready; 1983 --coro_nready;
1914 } 1984 }
2218 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2288 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2219 } 2289 }
2220 else 2290 else
2221 { 2291 {
2222 struct coro *self = SvSTATE_current; 2292 struct coro *self = SvSTATE_current;
2293
2294 if (!self)
2295 croak ("Coro::cancel called outside of thread content,");
2223 2296
2224 /* otherwise we cancel directly, purely for speed reasons 2297 /* otherwise we cancel directly, purely for speed reasons
2225 * unfortunately, this requires some magic trickery, as 2298 * unfortunately, this requires some magic trickery, as
2226 * 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.
2227 * this is ugly, and hopefully fully worth the extra speed. 2300 * this is ugly, and hopefully fully worth the extra speed.
2569 2642
2570/* "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 */
2571static void 2644static void
2572slf_destroy (pTHX_ struct coro *coro) 2645slf_destroy (pTHX_ struct coro *coro)
2573{ 2646{
2574 /* this callback is reserved for slf functions needing to do cleanup */ 2647 struct CoroSLF frame = coro->slf_frame;
2575 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2576 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2577 2648
2578 /* 2649 /*
2579 * The on_destroy above most likely is from an SLF call. 2650 * The on_destroy below most likely is from an SLF call.
2580 * 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
2581 * the coro, we will have to force-finish it here, otherwise 2652 * the coro, we will have to force-finish it here, otherwise
2582 * cleanup functions cannot call SLF functions. 2653 * cleanup functions cannot call SLF functions.
2583 */ 2654 */
2584 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);
2585} 2660}
2586 2661
2587/* 2662/*
2588 * these not obviously related functions are all rolled into one 2663 * these not obviously related functions are all rolled into one
2589 * 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
2772static void 2847static void
2773coro_pop_on_leave (pTHX_ void *coro) 2848coro_pop_on_leave (pTHX_ void *coro)
2774{ 2849{
2775 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);
2776 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);
2777} 2944}
2778 2945
2779/*****************************************************************************/ 2946/*****************************************************************************/
2780/* PerlIO::cede */ 2947/* PerlIO::cede */
2781 2948
2911 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3078 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2912 PUTBACK; 3079 PUTBACK;
2913 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3080 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2914 } 3081 }
2915 3082
2916 SvREFCNT_dec (cb); 3083 SvREFCNT_dec_NN (cb);
2917 } 3084 }
2918} 3085}
2919 3086
2920static void 3087static void
2921coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3088coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2929{ 3096{
2930 AV *av = (AV *)frame->data; 3097 AV *av = (AV *)frame->data;
2931 SV *count_sv = AvARRAY (av)[0]; 3098 SV *count_sv = AvARRAY (av)[0];
2932 SV *coro_hv = SvRV (coro_current); 3099 SV *coro_hv = SvRV (coro_current);
2933 3100
3101 frame->destroy = 0;
3102
2934 /* 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 */
2935 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
2936 return 0; 3109 return 0;
3110 }
2937 else if (SvIVX (count_sv) > 0) 3111 else if (SvIVX (count_sv) > 0)
2938 { 3112 {
2939 frame->destroy = 0;
2940
2941 if (acquire) 3113 if (acquire)
2942 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3114 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2943 else 3115 else
2944 coro_semaphore_adjust (aTHX_ av, 0); 3116 coro_semaphore_adjust (aTHX_ av, 0);
2945 3117
3056 { 3228 {
3057 api_ready (aTHX_ cb); 3229 api_ready (aTHX_ cb);
3058 sv_setiv (cb, 0); /* signal waiter */ 3230 sv_setiv (cb, 0); /* signal waiter */
3059 } 3231 }
3060 3232
3061 SvREFCNT_dec (cb); 3233 SvREFCNT_dec_NN (cb);
3062 3234
3063 --count; 3235 --count;
3064 } 3236 }
3065} 3237}
3066 3238
3151 } 3323 }
3152 3324
3153 av_push (state, data_sv); 3325 av_push (state, data_sv);
3154 3326
3155 api_ready (aTHX_ coro); 3327 api_ready (aTHX_ coro);
3156 SvREFCNT_dec (coro); 3328 SvREFCNT_dec_NN (coro);
3157 SvREFCNT_dec ((AV *)state); 3329 SvREFCNT_dec_NN ((AV *)state);
3158} 3330}
3159 3331
3160static int 3332static int
3161slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3333slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3162{ 3334{
3180 errno = data->errorno; 3352 errno = data->errorno;
3181 PL_laststype = data->laststype; 3353 PL_laststype = data->laststype;
3182 PL_laststatval = data->laststatval; 3354 PL_laststatval = data->laststatval;
3183 PL_statcache = data->statcache; 3355 PL_statcache = data->statcache;
3184 3356
3185 SvREFCNT_dec (data_sv); 3357 SvREFCNT_dec_NN (data_sv);
3186 } 3358 }
3187 3359
3188 /* push result values */ 3360 /* push result values */
3189 { 3361 {
3190 dSP; 3362 dSP;
3405 3577
3406PROTOTYPES: DISABLE 3578PROTOTYPES: DISABLE
3407 3579
3408BOOT: 3580BOOT:
3409{ 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"
3410#ifdef USE_ITHREADS 3584#ifdef USE_ITHREADS
3411# if CORO_PTHREAD 3585# if CORO_PTHREAD
3412 coro_thx = PERL_GET_CONTEXT; 3586 coro_thx = PERL_GET_CONTEXT;
3413# endif 3587# endif
3414#endif 3588#endif
3800 coroapi.ready = api_ready; 3974 coroapi.ready = api_ready;
3801 coroapi.is_ready = api_is_ready; 3975 coroapi.is_ready = api_is_ready;
3802 coroapi.nready = coro_nready; 3976 coroapi.nready = coro_nready;
3803 coroapi.current = coro_current; 3977 coroapi.current = coro_current;
3804 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
3805 /*GCoroAPI = &coroapi;*/ 3983 /*GCoroAPI = &coroapi;*/
3806 sv_setiv (sv, (IV)&coroapi); 3984 sv_setiv (sv, (IV)&coroapi);
3807 SvREADONLY_on (sv); 3985 SvREADONLY_on (sv);
3808 } 3986 }
3809} 3987}
3874 4052
3875void 4053void
3876_set_current (SV *current) 4054_set_current (SV *current)
3877 PROTOTYPE: $ 4055 PROTOTYPE: $
3878 CODE: 4056 CODE:
3879 SvREFCNT_dec (SvRV (coro_current)); 4057 SvREFCNT_dec_NN (SvRV (coro_current));
3880 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4058 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3881 4059
3882void 4060void
3883_set_readyhook (SV *hook) 4061_set_readyhook (SV *hook)
3884 PROTOTYPE: $ 4062 PROTOTYPE: $
3968 4146
3969 if ((SV *)hv == &PL_sv_undef) 4147 if ((SV *)hv == &PL_sv_undef)
3970 { 4148 {
3971 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);
3972 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4150 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3973 SvREFCNT_dec (sv); 4151 SvREFCNT_dec_NN (sv);
3974 } 4152 }
3975 4153
3976 { 4154 {
3977 struct coro *coro = SvSTATE_hv (hv); 4155 struct coro *coro = SvSTATE_hv (hv);
3978 4156
3985 api_ready (aTHX_ (SV *)hv); 4163 api_ready (aTHX_ (SV *)hv);
3986 4164
3987 if (GIMME_V != G_VOID) 4165 if (GIMME_V != G_VOID)
3988 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4166 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3989 else 4167 else
3990 SvREFCNT_dec (hv); 4168 SvREFCNT_dec_NN (hv);
3991} 4169}
3992 4170
3993SV * 4171SV *
3994rouse_cb () 4172rouse_cb ()
3995 PROTOTYPE: 4173 PROTOTYPE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines