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.437 by root, Tue Nov 5 15:13:42 2013 UTC vs.
Revision 1.460 by root, Fri Jun 17 05:28: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
46 61
47/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */ 62/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
48/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */ 63/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
49#if PERL_VERSION_ATLEAST(5,19,0) 64#if PERL_VERSION_ATLEAST(5,19,0)
50# define SVt_BIND SVt_IV 65# define SVt_BIND SVt_IV
… …
125 140
126static GV *irsgv; /* $/ */ 141static GV *irsgv; /* $/ */
127static GV *stdoutgv; /* *STDOUT */ 142static GV *stdoutgv; /* *STDOUT */
128static SV *rv_diehook; 143static SV *rv_diehook;
129static SV *rv_warnhook; 144static SV *rv_warnhook;
130static HV *hv_sig; /* %SIG */
131 145
132/* async_pool helper stuff */ 146/* async_pool helper stuff */
133static SV *sv_pool_rss; 147static SV *sv_pool_rss;
134static SV *sv_pool_size; 148static SV *sv_pool_size;
135static SV *sv_async_pool_idle; /* description string */ 149static SV *sv_async_pool_idle; /* description string */
… …
241 SV *saved_deffh; 255 SV *saved_deffh;
242 SV *invoke_cb; 256 SV *invoke_cb;
243 AV *invoke_av; 257 AV *invoke_av;
244 258
245 /* on_enter/on_leave */ 259 /* on_enter/on_leave */
246 AV *on_enter; 260 AV *on_enter; AV *on_enter_xs;
247 AV *on_leave; 261 AV *on_leave; AV *on_leave_xs;
248 262
249 /* swap_sv */ 263 /* swap_sv */
250 AV *swap_sv; 264 AV *swap_sv;
251 265
252 /* times */ 266 /* times */
… …
488 502
489 return 0; 503 return 0;
490} 504}
491 505
492ecb_inline struct coro * 506ecb_inline struct coro *
493SvSTATE_ (pTHX_ SV *coro) 507SvSTATE_ (pTHX_ SV *coro_sv)
494{ 508{
495 MAGIC *mg; 509 MAGIC *mg;
496 510
497 if (SvROK (coro)) 511 if (SvROK (coro_sv))
498 coro = SvRV (coro); 512 coro_sv = SvRV (coro_sv);
499 513
500 mg = SvSTATEhv_p (aTHX_ coro); 514 mg = SvSTATEhv_p (aTHX_ coro_sv);
501 if (!mg) 515 if (!mg)
502 croak ("Coro::State object required"); 516 croak ("Coro::State object required");
503 517
504 return (struct coro *)mg->mg_ptr; 518 return (struct coro *)mg->mg_ptr;
505} 519}
… …
516ecb_inline PADLIST * 530ecb_inline PADLIST *
517coro_derive_padlist (pTHX_ CV *cv) 531coro_derive_padlist (pTHX_ CV *cv)
518{ 532{
519 PADLIST *padlist = CvPADLIST (cv); 533 PADLIST *padlist = CvPADLIST (cv);
520 PADLIST *newpadlist; 534 PADLIST *newpadlist;
535 PADNAMELIST *padnames;
521 PAD *newpad; 536 PAD *newpad;
522 PADOFFSET off = PadlistMAX (padlist) + 1; 537 PADOFFSET off = PadlistMAX (padlist) + 1;
523 538
524#if NEWPADAPI 539#if NEWPADAPI
525 540
… …
552 AvREAL_off (newpadlist); 567 AvREAL_off (newpadlist);
553#endif 568#endif
554 569
555 /* Already extended to 2 elements by newPADLIST. */ 570 /* Already extended to 2 elements by newPADLIST. */
556 PadlistMAX (newpadlist) = 1; 571 PadlistMAX (newpadlist) = 1;
557 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 572
573 padnames = PadlistNAMES (padlist);
574 ++PadnamelistREFCNT (padnames);
575 PadlistNAMES (newpadlist) = padnames;
576
558 PadlistARRAY (newpadlist)[1] = newpad; 577 PadlistARRAY (newpadlist)[1] = newpad;
559 578
560 return newpadlist; 579 return newpadlist;
561} 580}
562 581
… …
570 589
571 while (i > 0) /* special-case index 0 */ 590 while (i > 0) /* special-case index 0 */
572 { 591 {
573 /* we try to be extra-careful here */ 592 /* we try to be extra-careful here */
574 PAD *pad = PadlistARRAY (padlist)[i--]; 593 PAD *pad = PadlistARRAY (padlist)[i--];
594
595 if (pad)
596 {
575 I32 j = PadMAX (pad); 597 I32 j = PadMAX (pad);
576 598
577 while (j >= 0) 599 while (j >= 0)
578 SvREFCNT_dec (PadARRAY (pad)[j--]); 600 SvREFCNT_dec (PadARRAY (pad)[j--]);
579 601
580 PadMAX (pad) = -1; 602 PadMAX (pad) = -1;
581 SvREFCNT_dec (pad); 603 SvREFCNT_dec (pad);
604 }
582 } 605 }
583 606
584 SvREFCNT_dec (PadlistNAMES (padlist)); 607 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
585 608
586#if NEWPADAPI 609#if NEWPADAPI
587 Safefree (PadlistARRAY (padlist)); 610 Safefree (PadlistARRAY (padlist));
588 Safefree (padlist); 611 Safefree (padlist);
589#else 612#else
… …
685 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;
686 709
687 /* 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,
688 * 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.
689 */ 712 */
690 #define svany_in_head(type) \ 713 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
691 (((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)))
692 719
693 if (svany_in_head (SvTYPE (a))) 720 if (svany_in_head (SvTYPE (a)))
694 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 721 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
695 722
696 if (svany_in_head (SvTYPE (b))) 723 if (svany_in_head (SvTYPE (b)))
… …
699#endif 726#endif
700} 727}
701 728
702/* swap sv heads, at least logically */ 729/* swap sv heads, at least logically */
703static void 730static void
704swap_svs (pTHX_ Coro__State c) 731swap_svs_enter (pTHX_ Coro__State c)
705{ 732{
706 int i; 733 int i;
707 734
708 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 735 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
709 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]); 736 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
710} 737}
711 738
739static void
740swap_svs_leave (pTHX_ Coro__State c)
741{
742 int i;
743
744 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
745 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
746}
747
712#define SWAP_SVS(coro) \ 748#define SWAP_SVS_ENTER(coro) \
713 if (ecb_expect_false ((coro)->swap_sv)) \ 749 if (ecb_expect_false ((coro)->swap_sv)) \
714 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))
715 755
716static void 756static void
717on_enterleave_call (pTHX_ SV *cb); 757on_enterleave_call (pTHX_ SV *cb);
718 758
719static void 759static void
… …
764 804
765 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 805 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
766 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 806 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
767 } 807 }
768 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
769 SWAP_SVS (c); 817 SWAP_SVS_ENTER (c);
770} 818}
771 819
772static void 820static void
773save_perl (pTHX_ Coro__State c) 821save_perl (pTHX_ Coro__State c)
774{ 822{
775 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 }
776 832
777 if (ecb_expect_false (c->on_leave)) 833 if (ecb_expect_false (c->on_leave))
778 { 834 {
779 int i; 835 int i;
780 836
… …
1133 1189
1134 GvSV (PL_defgv) = newSV (0); 1190 GvSV (PL_defgv) = newSV (0);
1135 GvAV (PL_defgv) = coro->args; coro->args = 0; 1191 GvAV (PL_defgv) = coro->args; coro->args = 0;
1136 GvSV (PL_errgv) = newSV (0); 1192 GvSV (PL_errgv) = newSV (0);
1137 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);
1138 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
1139 PL_rs = newSVsv (GvSV (irsgv)); 1198 PL_rs = newSVsv (GvSV (irsgv));
1140 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1199 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1141 1200
1142 { 1201 {
1143 dSP; 1202 dSP;
… …
1171 PL_op = (OP *)&init_perl_op; 1230 PL_op = (OP *)&init_perl_op;
1172 1231
1173 /* copy throw, in case it was set before init_perl */ 1232 /* copy throw, in case it was set before init_perl */
1174 CORO_THROW = coro->except; 1233 CORO_THROW = coro->except;
1175 1234
1176 SWAP_SVS (coro); 1235 SWAP_SVS_ENTER (coro);
1177 1236
1178 if (ecb_expect_false (enable_times)) 1237 if (ecb_expect_false (enable_times))
1179 { 1238 {
1180 coro_times_update (); 1239 coro_times_update ();
1181 coro_times_sub (coro); 1240 coro_times_sub (coro);
… …
1219 /* this will cause transfer_check to croak on block*/ 1278 /* this will cause transfer_check to croak on block*/
1220 SvRV_set (coro_current, (SV *)coro->hv); 1279 SvRV_set (coro_current, (SV *)coro->hv);
1221 1280
1222 load_perl (aTHX_ coro); 1281 load_perl (aTHX_ coro);
1223 1282
1283 /* restore swapped sv's */
1284 SWAP_SVS_LEAVE (coro);
1285
1224 coro_unwind_stacks (aTHX); 1286 coro_unwind_stacks (aTHX);
1225
1226 /* restore swapped sv's */
1227 SWAP_SVS (coro);
1228 1287
1229 coro_destruct_stacks (aTHX); 1288 coro_destruct_stacks (aTHX);
1230 1289
1231 /* now save some sv's to be free'd later */ 1290 /* now save some sv's to be free'd later */
1232 svf [0] = GvSV (PL_defgv); 1291 svf [0] = GvSV (PL_defgv);
… …
1253 1312
1254 SvREFCNT_dec (coro->saved_deffh); 1313 SvREFCNT_dec (coro->saved_deffh);
1255 SvREFCNT_dec (coro->rouse_cb); 1314 SvREFCNT_dec (coro->rouse_cb);
1256 SvREFCNT_dec (coro->invoke_cb); 1315 SvREFCNT_dec (coro->invoke_cb);
1257 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);
1258 } 1319 }
1259} 1320}
1260 1321
1261ecb_inline void 1322ecb_inline void
1262free_coro_mortal (pTHX) 1323free_coro_mortal (pTHX)
… …
1325 1386
1326 if (PL_curcop != &PL_compiling) 1387 if (PL_curcop != &PL_compiling)
1327 { 1388 {
1328 SV **cb; 1389 SV **cb;
1329 1390
1330 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1391 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1331 { 1392 {
1332 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1393 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1333 1394
1334 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1395 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1335 { 1396 {
… …
1912 /* nothing to schedule: call the idle handler */ 1973 /* nothing to schedule: call the idle handler */
1913 if (SvROK (sv_idle) 1974 if (SvROK (sv_idle)
1914 && SvOBJECT (SvRV (sv_idle))) 1975 && SvOBJECT (SvRV (sv_idle)))
1915 { 1976 {
1916 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);
1917 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 }
1918 1996
1919 ++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 */
1920 api_ready (aTHX_ SvRV (sv_idle)); 1998 api_ready (aTHX_ SvRV (sv_idle));
1921 --coro_nready; 1999 --coro_nready;
1922 } 2000 }
… …
2226 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2304 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2227 } 2305 }
2228 else 2306 else
2229 { 2307 {
2230 struct coro *self = SvSTATE_current; 2308 struct coro *self = SvSTATE_current;
2309
2310 if (!self)
2311 croak ("Coro::cancel called outside of thread content,");
2231 2312
2232 /* otherwise we cancel directly, purely for speed reasons 2313 /* otherwise we cancel directly, purely for speed reasons
2233 * unfortunately, this requires some magic trickery, as 2314 * unfortunately, this requires some magic trickery, as
2234 * 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.
2235 * this is ugly, and hopefully fully worth the extra speed. 2316 * this is ugly, and hopefully fully worth the extra speed.
… …
2345 else 2426 else
2346 { 2427 {
2347 av_clear (GvAV (PL_defgv)); 2428 av_clear (GvAV (PL_defgv));
2348 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2429 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2349 2430
2431 if (ecb_expect_false (coro->swap_sv))
2432 {
2433 swap_svs_leave (coro);
2434 SvREFCNT_dec_NN (coro->swap_sv);
2435 coro->swap_sv = 0;
2436 }
2437
2350 coro->prio = 0; 2438 coro->prio = 0;
2351 2439
2352 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2440 if (coro->cctx && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2353 api_trace (aTHX_ coro_current, 0); 2441 api_trace (aTHX_ coro_current, 0);
2354 2442
2355 frame->prepare = prepare_schedule; 2443 frame->prepare = prepare_schedule;
2356 av_push (av_async_pool, SvREFCNT_inc (hv)); 2444 av_push (av_async_pool, SvREFCNT_inc (hv));
2357 } 2445 }
… …
2577 2665
2578/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2666/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2579static void 2667static void
2580slf_destroy (pTHX_ struct coro *coro) 2668slf_destroy (pTHX_ struct coro *coro)
2581{ 2669{
2582 /* this callback is reserved for slf functions needing to do cleanup */ 2670 struct CoroSLF frame = coro->slf_frame;
2583 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2584 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2585 2671
2586 /* 2672 /*
2587 * The on_destroy above most likely is from an SLF call. 2673 * The on_destroy below most likely is from an SLF call.
2588 * Since by definition the SLF call will not finish when we destroy 2674 * Since by definition the SLF call will not finish when we destroy
2589 * the coro, we will have to force-finish it here, otherwise 2675 * the coro, we will have to force-finish it here, otherwise
2590 * cleanup functions cannot call SLF functions. 2676 * cleanup functions cannot call SLF functions.
2591 */ 2677 */
2592 coro->slf_frame.prepare = 0; 2678 coro->slf_frame.prepare = 0;
2679
2680 /* this callback is reserved for slf functions needing to do cleanup */
2681 if (frame.destroy && frame.prepare && !PL_dirty)
2682 frame.destroy (aTHX_ &frame);
2593} 2683}
2594 2684
2595/* 2685/*
2596 * these not obviously related functions are all rolled into one 2686 * these not obviously related functions are all rolled into one
2597 * function to increase chances that they all will call transfer with the same 2687 * function to increase chances that they all will call transfer with the same
… …
2780static void 2870static void
2781coro_pop_on_leave (pTHX_ void *coro) 2871coro_pop_on_leave (pTHX_ void *coro)
2782{ 2872{
2783 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2873 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2784 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2874 on_enterleave_call (aTHX_ sv_2mortal (cb));
2875}
2876
2877static void
2878enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2879{
2880 if (!hook)
2881 return;
2882
2883 if (!*avp)
2884 {
2885 *avp = newAV ();
2886 AvREAL_off (*avp);
2887 }
2888
2889 av_push (*avp, (SV *)hook);
2890 av_push (*avp, (SV *)arg);
2891}
2892
2893static void
2894enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2895{
2896 AV *av = *avp;
2897 int i;
2898
2899 if (!av)
2900 return;
2901
2902 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2903 if (AvARRAY (av)[i] == (SV *)hook)
2904 {
2905 if (execute)
2906 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2907
2908 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2909 av_pop (av);
2910 av_pop (av);
2911 break;
2912 }
2913
2914 if (AvFILLp (av) >= 0)
2915 {
2916 *avp = 0;
2917 SvREFCNT_dec_NN (av);
2918 }
2919}
2920
2921static void
2922api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2923{
2924 struct coro *coro = SvSTATE (coro_sv);
2925
2926 if (SvSTATE_current == coro)
2927 if (enter)
2928 enter (aTHX_ enter_arg);
2929
2930 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2931 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2932}
2933
2934static void
2935api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2936{
2937 struct coro *coro = SvSTATE (coro_sv);
2938
2939 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2940 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2941}
2942
2943static void
2944savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2945{
2946 struct coro *coro = SvSTATE_current;
2947
2948 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2949}
2950
2951static void
2952savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2953{
2954 struct coro *coro = SvSTATE_current;
2955
2956 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2957}
2958
2959static void
2960api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2961{
2962 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2963
2964 /* this ought to be much cheaper than malloc + a single destructor call */
2965 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2966 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2785} 2967}
2786 2968
2787/*****************************************************************************/ 2969/*****************************************************************************/
2788/* PerlIO::cede */ 2970/* PerlIO::cede */
2789 2971
… …
2919 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3101 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2920 PUTBACK; 3102 PUTBACK;
2921 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3103 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2922 } 3104 }
2923 3105
2924 SvREFCNT_dec (cb); 3106 SvREFCNT_dec_NN (cb);
2925 } 3107 }
2926} 3108}
2927 3109
2928static void 3110static void
2929coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3111coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
2937{ 3119{
2938 AV *av = (AV *)frame->data; 3120 AV *av = (AV *)frame->data;
2939 SV *count_sv = AvARRAY (av)[0]; 3121 SV *count_sv = AvARRAY (av)[0];
2940 SV *coro_hv = SvRV (coro_current); 3122 SV *coro_hv = SvRV (coro_current);
2941 3123
3124 frame->destroy = 0;
3125
2942 /* if we are about to throw, don't actually acquire the lock, just throw */ 3126 /* if we are about to throw, don't actually acquire the lock, just throw */
2943 if (CORO_THROW) 3127 if (ecb_expect_false (CORO_THROW))
3128 {
3129 /* we still might be responsible for the semaphore, so wake up others */
3130 coro_semaphore_adjust (aTHX_ av, 0);
3131
2944 return 0; 3132 return 0;
3133 }
2945 else if (SvIVX (count_sv) > 0) 3134 else if (SvIVX (count_sv) > 0)
2946 { 3135 {
2947 frame->destroy = 0;
2948
2949 if (acquire) 3136 if (acquire)
2950 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3137 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2951 else 3138 else
2952 coro_semaphore_adjust (aTHX_ av, 0); 3139 coro_semaphore_adjust (aTHX_ av, 0);
2953 3140
… …
3064 { 3251 {
3065 api_ready (aTHX_ cb); 3252 api_ready (aTHX_ cb);
3066 sv_setiv (cb, 0); /* signal waiter */ 3253 sv_setiv (cb, 0); /* signal waiter */
3067 } 3254 }
3068 3255
3069 SvREFCNT_dec (cb); 3256 SvREFCNT_dec_NN (cb);
3070 3257
3071 --count; 3258 --count;
3072 } 3259 }
3073} 3260}
3074 3261
… …
3159 } 3346 }
3160 3347
3161 av_push (state, data_sv); 3348 av_push (state, data_sv);
3162 3349
3163 api_ready (aTHX_ coro); 3350 api_ready (aTHX_ coro);
3164 SvREFCNT_dec (coro); 3351 SvREFCNT_dec_NN (coro);
3165 SvREFCNT_dec ((AV *)state); 3352 SvREFCNT_dec_NN ((AV *)state);
3166} 3353}
3167 3354
3168static int 3355static int
3169slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3356slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3170{ 3357{
… …
3188 errno = data->errorno; 3375 errno = data->errorno;
3189 PL_laststype = data->laststype; 3376 PL_laststype = data->laststype;
3190 PL_laststatval = data->laststatval; 3377 PL_laststatval = data->laststatval;
3191 PL_statcache = data->statcache; 3378 PL_statcache = data->statcache;
3192 3379
3193 SvREFCNT_dec (data_sv); 3380 SvREFCNT_dec_NN (data_sv);
3194 } 3381 }
3195 3382
3196 /* push result values */ 3383 /* push result values */
3197 { 3384 {
3198 dSP; 3385 dSP;
… …
3413 3600
3414PROTOTYPES: DISABLE 3601PROTOTYPES: DISABLE
3415 3602
3416BOOT: 3603BOOT:
3417{ 3604{
3605#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3606#include "state.h"
3418#ifdef USE_ITHREADS 3607#ifdef USE_ITHREADS
3419# if CORO_PTHREAD 3608# if CORO_PTHREAD
3420 coro_thx = PERL_GET_CONTEXT; 3609 coro_thx = PERL_GET_CONTEXT;
3421# endif 3610# endif
3422#endif 3611#endif
… …
3434 3623
3435 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3624 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
3436 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3625 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
3437 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3626 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
3438 3627
3439 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3440 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3628 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3441 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3629 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3442 3630
3443 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3631 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3444 3632
… …
3750 if (ecb_expect_false (current == self)) 3938 if (ecb_expect_false (current == self))
3751 coro_times_sub (SvSTATE (coro_current)); 3939 coro_times_sub (SvSTATE (coro_current));
3752} 3940}
3753 3941
3754void 3942void
3755swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3943swap_sv (Coro::State coro, SV *sva, SV *svb)
3756 CODE: 3944 CODE:
3757{ 3945{
3758 struct coro *current = SvSTATE_current; 3946 struct coro *current = SvSTATE_current;
3947 AV *swap_sv;
3948 int i;
3949
3950 sva = SvRV (sva);
3951 svb = SvRV (svb);
3759 3952
3760 if (current == coro) 3953 if (current == coro)
3761 SWAP_SVS (current); 3954 SWAP_SVS_LEAVE (current);
3762 3955
3763 if (!coro->swap_sv) 3956 if (!coro->swap_sv)
3764 coro->swap_sv = newAV (); 3957 coro->swap_sv = newAV ();
3765 3958
3959 swap_sv = coro->swap_sv;
3960
3961 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
3962 {
3963 SV *a = AvARRAY (swap_sv)[i ];
3964 SV *b = AvARRAY (swap_sv)[i + 1];
3965
3966 if (a == sva && b == svb)
3967 {
3968 SvREFCNT_dec_NN (a);
3969 SvREFCNT_dec_NN (b);
3970
3971 for (; i <= AvFILLp (swap_sv) - 2; i++)
3972 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
3973
3974 AvFILLp (swap_sv) -= 2;
3975
3976 goto removed;
3977 }
3978 }
3979
3766 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 3980 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3767 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 3981 av_push (swap_sv, SvREFCNT_inc_NN (svb));
3982
3983 removed:
3768 3984
3769 if (current == coro) 3985 if (current == coro)
3770 SWAP_SVS (current); 3986 SWAP_SVS_ENTER (current);
3771} 3987}
3772 3988
3773 3989
3774MODULE = Coro::State PACKAGE = Coro 3990MODULE = Coro::State PACKAGE = Coro
3775 3991
3776BOOT: 3992BOOT:
3777{ 3993{
3994 if (SVt_LAST > 32)
3995 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3996
3778 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3997 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3779 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3998 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3780 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3999 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3781 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4000 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3782 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4001 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3808 coroapi.ready = api_ready; 4027 coroapi.ready = api_ready;
3809 coroapi.is_ready = api_is_ready; 4028 coroapi.is_ready = api_is_ready;
3810 coroapi.nready = coro_nready; 4029 coroapi.nready = coro_nready;
3811 coroapi.current = coro_current; 4030 coroapi.current = coro_current;
3812 4031
4032 coroapi.enterleave_hook = api_enterleave_hook;
4033 coroapi.enterleave_unhook = api_enterleave_unhook;
4034 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4035
3813 /*GCoroAPI = &coroapi;*/ 4036 /*GCoroAPI = &coroapi;*/
3814 sv_setiv (sv, (IV)&coroapi); 4037 sv_setiv (sv, (IV)&coroapi);
3815 SvREADONLY_on (sv); 4038 SvREADONLY_on (sv);
3816 } 4039 }
3817} 4040}
… …
3882 4105
3883void 4106void
3884_set_current (SV *current) 4107_set_current (SV *current)
3885 PROTOTYPE: $ 4108 PROTOTYPE: $
3886 CODE: 4109 CODE:
3887 SvREFCNT_dec (SvRV (coro_current)); 4110 SvREFCNT_dec_NN (SvRV (coro_current));
3888 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4111 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3889 4112
3890void 4113void
3891_set_readyhook (SV *hook) 4114_set_readyhook (SV *hook)
3892 PROTOTYPE: $ 4115 PROTOTYPE: $
… …
3976 4199
3977 if ((SV *)hv == &PL_sv_undef) 4200 if ((SV *)hv == &PL_sv_undef)
3978 { 4201 {
3979 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4202 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3980 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4203 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3981 SvREFCNT_dec (sv); 4204 SvREFCNT_dec_NN (sv);
3982 } 4205 }
3983 4206
3984 { 4207 {
3985 struct coro *coro = SvSTATE_hv (hv); 4208 struct coro *coro = SvSTATE_hv (hv);
3986 4209
… …
3993 api_ready (aTHX_ (SV *)hv); 4216 api_ready (aTHX_ (SV *)hv);
3994 4217
3995 if (GIMME_V != G_VOID) 4218 if (GIMME_V != G_VOID)
3996 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4219 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3997 else 4220 else
3998 SvREFCNT_dec (hv); 4221 SvREFCNT_dec_NN (hv);
3999} 4222}
4000 4223
4001SV * 4224SV *
4002rouse_cb () 4225rouse_cb ()
4003 PROTOTYPE: 4226 PROTOTYPE:
… …
4082 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4305 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4083 OUTPUT: 4306 OUTPUT:
4084 RETVAL 4307 RETVAL
4085 4308
4086void 4309void
4087up (SV *self, int adjust = 1) 4310up (SV *self)
4088 ALIAS:
4089 adjust = 1
4090 CODE: 4311 CODE:
4312 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4313
4314void
4315adjust (SV *self, int adjust)
4316 CODE:
4091 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4317 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4092 4318
4093void 4319void
4094down (...) 4320down (...)
4095 CODE: 4321 CODE:
4096 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4322 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);

Diff Legend

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