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.457 by root, Fri Jun 17 04:49:22 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)))
… …
693#endif 726#endif
694} 727}
695 728
696/* swap sv heads, at least logically */ 729/* swap sv heads, at least logically */
697static void 730static void
698swap_svs (pTHX_ Coro__State c) 731swap_svs_enter (pTHX_ Coro__State c)
732{
733 int i;
734
735 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
736 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
737}
738
739static void
740swap_svs_leave (pTHX_ Coro__State c)
699{ 741{
700 int i; 742 int i;
701 743
702 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 744 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
703 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]); 745 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
704} 746}
705 747
706#define SWAP_SVS(coro) \ 748#define SWAP_SVS_ENTER(coro) \
707 if (ecb_expect_false ((coro)->swap_sv)) \ 749 if (ecb_expect_false ((coro)->swap_sv)) \
708 swap_svs (aTHX_ (coro)) 750 swap_svs_enter (aTHX_ (coro))
751
752#define SWAP_SVS_LEAVE(coro) \
753 if (ecb_expect_false ((coro)->swap_sv)) \
754 swap_svs_leave (aTHX_ (coro))
709 755
710static void 756static void
711on_enterleave_call (pTHX_ SV *cb); 757on_enterleave_call (pTHX_ SV *cb);
712 758
713static void 759static void
… …
758 804
759 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 805 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
760 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 806 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
761 } 807 }
762 808
809 if (ecb_expect_false (c->on_enter_xs))
810 {
811 int i;
812
813 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
814 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
815 }
816
763 SWAP_SVS (c); 817 SWAP_SVS_ENTER (c);
764} 818}
765 819
766static void 820static void
767save_perl (pTHX_ Coro__State c) 821save_perl (pTHX_ Coro__State c)
768{ 822{
769 SWAP_SVS (c); 823 SWAP_SVS_LEAVE (c);
824
825 if (ecb_expect_false (c->on_leave_xs))
826 {
827 int i;
828
829 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
830 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
831 }
770 832
771 if (ecb_expect_false (c->on_leave)) 833 if (ecb_expect_false (c->on_leave))
772 { 834 {
773 int i; 835 int i;
774 836
… …
1127 1189
1128 GvSV (PL_defgv) = newSV (0); 1190 GvSV (PL_defgv) = newSV (0);
1129 GvAV (PL_defgv) = coro->args; coro->args = 0; 1191 GvAV (PL_defgv) = coro->args; coro->args = 0;
1130 GvSV (PL_errgv) = newSV (0); 1192 GvSV (PL_errgv) = newSV (0);
1131 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1193 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1132 GvHV (PL_hintgv) = 0; 1194 GvHV (PL_hintgv) = newHV ();
1195#if PERL_VERSION_ATLEAST (5,10,0)
1196 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1197#endif
1133 PL_rs = newSVsv (GvSV (irsgv)); 1198 PL_rs = newSVsv (GvSV (irsgv));
1134 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1199 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1135 1200
1136 { 1201 {
1137 dSP; 1202 dSP;
… …
1165 PL_op = (OP *)&init_perl_op; 1230 PL_op = (OP *)&init_perl_op;
1166 1231
1167 /* copy throw, in case it was set before init_perl */ 1232 /* copy throw, in case it was set before init_perl */
1168 CORO_THROW = coro->except; 1233 CORO_THROW = coro->except;
1169 1234
1170 SWAP_SVS (coro); 1235 SWAP_SVS_ENTER (coro);
1171 1236
1172 if (ecb_expect_false (enable_times)) 1237 if (ecb_expect_false (enable_times))
1173 { 1238 {
1174 coro_times_update (); 1239 coro_times_update ();
1175 coro_times_sub (coro); 1240 coro_times_sub (coro);
… …
1213 /* this will cause transfer_check to croak on block*/ 1278 /* this will cause transfer_check to croak on block*/
1214 SvRV_set (coro_current, (SV *)coro->hv); 1279 SvRV_set (coro_current, (SV *)coro->hv);
1215 1280
1216 load_perl (aTHX_ coro); 1281 load_perl (aTHX_ coro);
1217 1282
1283 /* restore swapped sv's */
1284 SWAP_SVS_LEAVE (coro);
1285
1218 coro_unwind_stacks (aTHX); 1286 coro_unwind_stacks (aTHX);
1219
1220 /* restore swapped sv's */
1221 SWAP_SVS (coro);
1222 1287
1223 coro_destruct_stacks (aTHX); 1288 coro_destruct_stacks (aTHX);
1224 1289
1225 /* now save some sv's to be free'd later */ 1290 /* now save some sv's to be free'd later */
1226 svf [0] = GvSV (PL_defgv); 1291 svf [0] = GvSV (PL_defgv);
… …
1247 1312
1248 SvREFCNT_dec (coro->saved_deffh); 1313 SvREFCNT_dec (coro->saved_deffh);
1249 SvREFCNT_dec (coro->rouse_cb); 1314 SvREFCNT_dec (coro->rouse_cb);
1250 SvREFCNT_dec (coro->invoke_cb); 1315 SvREFCNT_dec (coro->invoke_cb);
1251 SvREFCNT_dec (coro->invoke_av); 1316 SvREFCNT_dec (coro->invoke_av);
1317 SvREFCNT_dec (coro->on_enter_xs);
1318 SvREFCNT_dec (coro->on_leave_xs);
1252 } 1319 }
1253} 1320}
1254 1321
1255ecb_inline void 1322ecb_inline void
1256free_coro_mortal (pTHX) 1323free_coro_mortal (pTHX)
… …
1319 1386
1320 if (PL_curcop != &PL_compiling) 1387 if (PL_curcop != &PL_compiling)
1321 { 1388 {
1322 SV **cb; 1389 SV **cb;
1323 1390
1324 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1391 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1325 { 1392 {
1326 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1393 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1327 1394
1328 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1395 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1329 { 1396 {
… …
1906 /* nothing to schedule: call the idle handler */ 1973 /* nothing to schedule: call the idle handler */
1907 if (SvROK (sv_idle) 1974 if (SvROK (sv_idle)
1908 && SvOBJECT (SvRV (sv_idle))) 1975 && SvOBJECT (SvRV (sv_idle)))
1909 { 1976 {
1910 if (SvRV (sv_idle) == SvRV (coro_current)) 1977 if (SvRV (sv_idle) == SvRV (coro_current))
1978 {
1979 require_pv ("Carp");
1980
1981 {
1982 dSP;
1983
1984 ENTER;
1985 SAVETMPS;
1986
1987 PUSHMARK (SP);
1911 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1988 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1989 PUTBACK;
1990 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1991
1992 FREETMPS;
1993 LEAVE;
1994 }
1995 }
1912 1996
1913 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1997 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1914 api_ready (aTHX_ SvRV (sv_idle)); 1998 api_ready (aTHX_ SvRV (sv_idle));
1915 --coro_nready; 1999 --coro_nready;
1916 } 2000 }
… …
2220 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2304 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2221 } 2305 }
2222 else 2306 else
2223 { 2307 {
2224 struct coro *self = SvSTATE_current; 2308 struct coro *self = SvSTATE_current;
2309
2310 if (!self)
2311 croak ("Coro::cancel called outside of thread content,");
2225 2312
2226 /* otherwise we cancel directly, purely for speed reasons 2313 /* otherwise we cancel directly, purely for speed reasons
2227 * unfortunately, this requires some magic trickery, as 2314 * unfortunately, this requires some magic trickery, as
2228 * somebody else could cancel us, so we have to fight the cancellation. 2315 * somebody else could cancel us, so we have to fight the cancellation.
2229 * this is ugly, and hopefully fully worth the extra speed. 2316 * this is ugly, and hopefully fully worth the extra speed.
… …
2571 2658
2572/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2659/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2573static void 2660static void
2574slf_destroy (pTHX_ struct coro *coro) 2661slf_destroy (pTHX_ struct coro *coro)
2575{ 2662{
2576 /* this callback is reserved for slf functions needing to do cleanup */ 2663 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 2664
2580 /* 2665 /*
2581 * The on_destroy above most likely is from an SLF call. 2666 * The on_destroy below most likely is from an SLF call.
2582 * Since by definition the SLF call will not finish when we destroy 2667 * Since by definition the SLF call will not finish when we destroy
2583 * the coro, we will have to force-finish it here, otherwise 2668 * the coro, we will have to force-finish it here, otherwise
2584 * cleanup functions cannot call SLF functions. 2669 * cleanup functions cannot call SLF functions.
2585 */ 2670 */
2586 coro->slf_frame.prepare = 0; 2671 coro->slf_frame.prepare = 0;
2672
2673 /* this callback is reserved for slf functions needing to do cleanup */
2674 if (frame.destroy && frame.prepare && !PL_dirty)
2675 frame.destroy (aTHX_ &frame);
2587} 2676}
2588 2677
2589/* 2678/*
2590 * these not obviously related functions are all rolled into one 2679 * these not obviously related functions are all rolled into one
2591 * function to increase chances that they all will call transfer with the same 2680 * function to increase chances that they all will call transfer with the same
… …
2774static void 2863static void
2775coro_pop_on_leave (pTHX_ void *coro) 2864coro_pop_on_leave (pTHX_ void *coro)
2776{ 2865{
2777 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2866 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2778 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2867 on_enterleave_call (aTHX_ sv_2mortal (cb));
2868}
2869
2870static void
2871enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2872{
2873 if (!hook)
2874 return;
2875
2876 if (!*avp)
2877 {
2878 *avp = newAV ();
2879 AvREAL_off (*avp);
2880 }
2881
2882 av_push (*avp, (SV *)hook);
2883 av_push (*avp, (SV *)arg);
2884}
2885
2886static void
2887enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2888{
2889 AV *av = *avp;
2890 int i;
2891
2892 if (!av)
2893 return;
2894
2895 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2896 if (AvARRAY (av)[i] == (SV *)hook)
2897 {
2898 if (execute)
2899 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2900
2901 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2902 av_pop (av);
2903 av_pop (av);
2904 break;
2905 }
2906
2907 if (AvFILLp (av) >= 0)
2908 {
2909 *avp = 0;
2910 SvREFCNT_dec_NN (av);
2911 }
2912}
2913
2914static void
2915api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2916{
2917 struct coro *coro = SvSTATE (coro_sv);
2918
2919 if (SvSTATE_current == coro)
2920 if (enter)
2921 enter (aTHX_ enter_arg);
2922
2923 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2924 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2925}
2926
2927static void
2928api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2929{
2930 struct coro *coro = SvSTATE (coro_sv);
2931
2932 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2933 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2934}
2935
2936static void
2937savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2938{
2939 struct coro *coro = SvSTATE_current;
2940
2941 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2942}
2943
2944static void
2945savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2946{
2947 struct coro *coro = SvSTATE_current;
2948
2949 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2950}
2951
2952static void
2953api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2954{
2955 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2956
2957 /* this ought to be much cheaper than malloc + a single destructor call */
2958 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2959 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2779} 2960}
2780 2961
2781/*****************************************************************************/ 2962/*****************************************************************************/
2782/* PerlIO::cede */ 2963/* PerlIO::cede */
2783 2964
… …
2913 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3094 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2914 PUTBACK; 3095 PUTBACK;
2915 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3096 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2916 } 3097 }
2917 3098
2918 SvREFCNT_dec (cb); 3099 SvREFCNT_dec_NN (cb);
2919 } 3100 }
2920} 3101}
2921 3102
2922static void 3103static void
2923coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3104coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
2931{ 3112{
2932 AV *av = (AV *)frame->data; 3113 AV *av = (AV *)frame->data;
2933 SV *count_sv = AvARRAY (av)[0]; 3114 SV *count_sv = AvARRAY (av)[0];
2934 SV *coro_hv = SvRV (coro_current); 3115 SV *coro_hv = SvRV (coro_current);
2935 3116
3117 frame->destroy = 0;
3118
2936 /* if we are about to throw, don't actually acquire the lock, just throw */ 3119 /* if we are about to throw, don't actually acquire the lock, just throw */
2937 if (CORO_THROW) 3120 if (ecb_expect_false (CORO_THROW))
3121 {
3122 /* we still might be responsible for the semaphore, so wake up others */
3123 coro_semaphore_adjust (aTHX_ av, 0);
3124
2938 return 0; 3125 return 0;
3126 }
2939 else if (SvIVX (count_sv) > 0) 3127 else if (SvIVX (count_sv) > 0)
2940 { 3128 {
2941 frame->destroy = 0;
2942
2943 if (acquire) 3129 if (acquire)
2944 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3130 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2945 else 3131 else
2946 coro_semaphore_adjust (aTHX_ av, 0); 3132 coro_semaphore_adjust (aTHX_ av, 0);
2947 3133
… …
3058 { 3244 {
3059 api_ready (aTHX_ cb); 3245 api_ready (aTHX_ cb);
3060 sv_setiv (cb, 0); /* signal waiter */ 3246 sv_setiv (cb, 0); /* signal waiter */
3061 } 3247 }
3062 3248
3063 SvREFCNT_dec (cb); 3249 SvREFCNT_dec_NN (cb);
3064 3250
3065 --count; 3251 --count;
3066 } 3252 }
3067} 3253}
3068 3254
… …
3153 } 3339 }
3154 3340
3155 av_push (state, data_sv); 3341 av_push (state, data_sv);
3156 3342
3157 api_ready (aTHX_ coro); 3343 api_ready (aTHX_ coro);
3158 SvREFCNT_dec (coro); 3344 SvREFCNT_dec_NN (coro);
3159 SvREFCNT_dec ((AV *)state); 3345 SvREFCNT_dec_NN ((AV *)state);
3160} 3346}
3161 3347
3162static int 3348static int
3163slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3349slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3164{ 3350{
… …
3182 errno = data->errorno; 3368 errno = data->errorno;
3183 PL_laststype = data->laststype; 3369 PL_laststype = data->laststype;
3184 PL_laststatval = data->laststatval; 3370 PL_laststatval = data->laststatval;
3185 PL_statcache = data->statcache; 3371 PL_statcache = data->statcache;
3186 3372
3187 SvREFCNT_dec (data_sv); 3373 SvREFCNT_dec_NN (data_sv);
3188 } 3374 }
3189 3375
3190 /* push result values */ 3376 /* push result values */
3191 { 3377 {
3192 dSP; 3378 dSP;
… …
3407 3593
3408PROTOTYPES: DISABLE 3594PROTOTYPES: DISABLE
3409 3595
3410BOOT: 3596BOOT:
3411{ 3597{
3598#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3599#include "state.h"
3412#ifdef USE_ITHREADS 3600#ifdef USE_ITHREADS
3413# if CORO_PTHREAD 3601# if CORO_PTHREAD
3414 coro_thx = PERL_GET_CONTEXT; 3602 coro_thx = PERL_GET_CONTEXT;
3415# endif 3603# endif
3416#endif 3604#endif
… …
3428 3616
3429 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3617 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; 3618 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; 3619 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
3432 3620
3433 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3434 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3621 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)); 3622 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3436 3623
3437 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3624 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3438 3625
… …
3744 if (ecb_expect_false (current == self)) 3931 if (ecb_expect_false (current == self))
3745 coro_times_sub (SvSTATE (coro_current)); 3932 coro_times_sub (SvSTATE (coro_current));
3746} 3933}
3747 3934
3748void 3935void
3749swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3936swap_sv (Coro::State coro, SV *sva, SV *svb)
3750 CODE: 3937 CODE:
3751{ 3938{
3752 struct coro *current = SvSTATE_current; 3939 struct coro *current = SvSTATE_current;
3940 AV *swap_sv;
3941 int i;
3942
3943 sva = SvRV (sva);
3944 svb = SvRV (svb);
3753 3945
3754 if (current == coro) 3946 if (current == coro)
3755 SWAP_SVS (current); 3947 SWAP_SVS_LEAVE (current);
3756 3948
3757 if (!coro->swap_sv) 3949 if (!coro->swap_sv)
3758 coro->swap_sv = newAV (); 3950 coro->swap_sv = newAV ();
3759 3951
3952 swap_sv = coro->swap_sv;
3953
3954 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
3955 {
3956 SV *a = AvARRAY (swap_sv)[i ];
3957 SV *b = AvARRAY (swap_sv)[i + 1];
3958
3959 if (a == sva && b == svb)
3960 {
3961 SvREFCNT_dec_NN (a);
3962 SvREFCNT_dec_NN (b);
3963
3964 for (; i <= AvFILLp (swap_sv) - 2; i++)
3965 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
3966
3967 AvFILLp (swap_sv) -= 2;
3968
3969 goto removed;
3970 }
3971 }
3972
3760 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 3973 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3761 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 3974 av_push (swap_sv, SvREFCNT_inc_NN (svb));
3975
3976 removed:
3762 3977
3763 if (current == coro) 3978 if (current == coro)
3764 SWAP_SVS (current); 3979 SWAP_SVS_ENTER (current);
3765} 3980}
3766 3981
3767 3982
3768MODULE = Coro::State PACKAGE = Coro 3983MODULE = Coro::State PACKAGE = Coro
3769 3984
3770BOOT: 3985BOOT:
3771{ 3986{
3987 if (SVt_LAST > 32)
3988 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3989
3772 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3990 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3773 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3991 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3774 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3992 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3775 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3993 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); 3994 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3802 coroapi.ready = api_ready; 4020 coroapi.ready = api_ready;
3803 coroapi.is_ready = api_is_ready; 4021 coroapi.is_ready = api_is_ready;
3804 coroapi.nready = coro_nready; 4022 coroapi.nready = coro_nready;
3805 coroapi.current = coro_current; 4023 coroapi.current = coro_current;
3806 4024
4025 coroapi.enterleave_hook = api_enterleave_hook;
4026 coroapi.enterleave_unhook = api_enterleave_unhook;
4027 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4028
3807 /*GCoroAPI = &coroapi;*/ 4029 /*GCoroAPI = &coroapi;*/
3808 sv_setiv (sv, (IV)&coroapi); 4030 sv_setiv (sv, (IV)&coroapi);
3809 SvREADONLY_on (sv); 4031 SvREADONLY_on (sv);
3810 } 4032 }
3811} 4033}
… …
3876 4098
3877void 4099void
3878_set_current (SV *current) 4100_set_current (SV *current)
3879 PROTOTYPE: $ 4101 PROTOTYPE: $
3880 CODE: 4102 CODE:
3881 SvREFCNT_dec (SvRV (coro_current)); 4103 SvREFCNT_dec_NN (SvRV (coro_current));
3882 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4104 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3883 4105
3884void 4106void
3885_set_readyhook (SV *hook) 4107_set_readyhook (SV *hook)
3886 PROTOTYPE: $ 4108 PROTOTYPE: $
… …
3970 4192
3971 if ((SV *)hv == &PL_sv_undef) 4193 if ((SV *)hv == &PL_sv_undef)
3972 { 4194 {
3973 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4195 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3974 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4196 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3975 SvREFCNT_dec (sv); 4197 SvREFCNT_dec_NN (sv);
3976 } 4198 }
3977 4199
3978 { 4200 {
3979 struct coro *coro = SvSTATE_hv (hv); 4201 struct coro *coro = SvSTATE_hv (hv);
3980 4202
… …
3987 api_ready (aTHX_ (SV *)hv); 4209 api_ready (aTHX_ (SV *)hv);
3988 4210
3989 if (GIMME_V != G_VOID) 4211 if (GIMME_V != G_VOID)
3990 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4212 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3991 else 4213 else
3992 SvREFCNT_dec (hv); 4214 SvREFCNT_dec_NN (hv);
3993} 4215}
3994 4216
3995SV * 4217SV *
3996rouse_cb () 4218rouse_cb ()
3997 PROTOTYPE: 4219 PROTOTYPE:
… …
4076 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4298 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4077 OUTPUT: 4299 OUTPUT:
4078 RETVAL 4300 RETVAL
4079 4301
4080void 4302void
4081up (SV *self, int adjust = 1) 4303up (SV *self)
4082 ALIAS:
4083 adjust = 1
4084 CODE: 4304 CODE:
4305 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4306
4307void
4308adjust (SV *self, int adjust)
4309 CODE:
4085 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4310 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4086 4311
4087void 4312void
4088down (...) 4313down (...)
4089 CODE: 4314 CODE:
4090 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4315 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);

Diff Legend

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