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.439 by root, Tue Nov 19 05:16:01 2013 UTC vs.
Revision 1.463 by root, Wed Jun 22 20:37:27 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
… …
583 PadMAX (pad) = -1; 602 PadMAX (pad) = -1;
584 SvREFCNT_dec (pad); 603 SvREFCNT_dec (pad);
585 } 604 }
586 } 605 }
587 606
588 SvREFCNT_dec (PadlistNAMES (padlist)); 607 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
589 608
590#if NEWPADAPI 609#if NEWPADAPI
591 Safefree (PadlistARRAY (padlist)); 610 Safefree (PadlistARRAY (padlist));
592 Safefree (padlist); 611 Safefree (padlist);
593#else 612#else
… …
689 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;
690 709
691 /* 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,
692 * 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.
693 */ 712 */
694 #define svany_in_head(type) \ 713 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
695 (((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)))
696 719
697 if (svany_in_head (SvTYPE (a))) 720 if (svany_in_head (SvTYPE (a)))
698 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 721 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
699 722
700 if (svany_in_head (SvTYPE (b))) 723 if (svany_in_head (SvTYPE (b)))
… …
703#endif 726#endif
704} 727}
705 728
706/* swap sv heads, at least logically */ 729/* swap sv heads, at least logically */
707static void 730static void
708swap_svs (pTHX_ Coro__State c) 731swap_svs_enter (pTHX_ Coro__State c)
709{ 732{
710 int i; 733 int i;
711 734
712 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 735 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
713 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]);
714} 737}
715 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
716#define SWAP_SVS(coro) \ 748#define SWAP_SVS_ENTER(coro) \
717 if (ecb_expect_false ((coro)->swap_sv)) \ 749 if (ecb_expect_false ((coro)->swap_sv)) \
718 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))
719 755
720static void 756static void
721on_enterleave_call (pTHX_ SV *cb); 757on_enterleave_call (pTHX_ SV *cb);
722 758
723static void 759static void
… …
768 804
769 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 805 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
770 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 806 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
771 } 807 }
772 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
773 SWAP_SVS (c); 817 SWAP_SVS_ENTER (c);
774} 818}
775 819
776static void 820static void
777save_perl (pTHX_ Coro__State c) 821save_perl (pTHX_ Coro__State c)
778{ 822{
779 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 }
780 832
781 if (ecb_expect_false (c->on_leave)) 833 if (ecb_expect_false (c->on_leave))
782 { 834 {
783 int i; 835 int i;
784 836
… …
911#endif 963#endif
912 964
913 New(54,PL_savestack,24,ANY); 965 New(54,PL_savestack,24,ANY);
914 PL_savestack_ix = 0; 966 PL_savestack_ix = 0;
915 PL_savestack_max = 24; 967 PL_savestack_max = 24;
968#if !PERL_VERSION_ATLEAST (5,24,0)
969 /* perl 5.24 moves SS_MAXPUSH optimisation from */
970 /* the header macros to PL_savestack_max */
971 PL_savestack_max -= SS_MAXPUSH;
972#endif
916 973
917#if !PERL_VERSION_ATLEAST (5,10,0) 974#if !PERL_VERSION_ATLEAST (5,10,0)
918 New(54,PL_retstack,4,OP*); 975 New(54,PL_retstack,4,OP*);
919 PL_retstack_ix = 0; 976 PL_retstack_ix = 0;
920 PL_retstack_max = 4; 977 PL_retstack_max = 4;
… …
1137 1194
1138 GvSV (PL_defgv) = newSV (0); 1195 GvSV (PL_defgv) = newSV (0);
1139 GvAV (PL_defgv) = coro->args; coro->args = 0; 1196 GvAV (PL_defgv) = coro->args; coro->args = 0;
1140 GvSV (PL_errgv) = newSV (0); 1197 GvSV (PL_errgv) = newSV (0);
1141 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1198 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1142 GvHV (PL_hintgv) = 0; 1199 GvHV (PL_hintgv) = newHV ();
1200#if PERL_VERSION_ATLEAST (5,10,0)
1201 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1202#endif
1143 PL_rs = newSVsv (GvSV (irsgv)); 1203 PL_rs = newSVsv (GvSV (irsgv));
1144 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1204 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1145 1205
1146 { 1206 {
1147 dSP; 1207 dSP;
… …
1175 PL_op = (OP *)&init_perl_op; 1235 PL_op = (OP *)&init_perl_op;
1176 1236
1177 /* copy throw, in case it was set before init_perl */ 1237 /* copy throw, in case it was set before init_perl */
1178 CORO_THROW = coro->except; 1238 CORO_THROW = coro->except;
1179 1239
1180 SWAP_SVS (coro); 1240 SWAP_SVS_ENTER (coro);
1181 1241
1182 if (ecb_expect_false (enable_times)) 1242 if (ecb_expect_false (enable_times))
1183 { 1243 {
1184 coro_times_update (); 1244 coro_times_update ();
1185 coro_times_sub (coro); 1245 coro_times_sub (coro);
… …
1223 /* this will cause transfer_check to croak on block*/ 1283 /* this will cause transfer_check to croak on block*/
1224 SvRV_set (coro_current, (SV *)coro->hv); 1284 SvRV_set (coro_current, (SV *)coro->hv);
1225 1285
1226 load_perl (aTHX_ coro); 1286 load_perl (aTHX_ coro);
1227 1287
1288 /* restore swapped sv's */
1289 SWAP_SVS_LEAVE (coro);
1290
1228 coro_unwind_stacks (aTHX); 1291 coro_unwind_stacks (aTHX);
1229
1230 /* restore swapped sv's */
1231 SWAP_SVS (coro);
1232 1292
1233 coro_destruct_stacks (aTHX); 1293 coro_destruct_stacks (aTHX);
1234 1294
1235 /* now save some sv's to be free'd later */ 1295 /* now save some sv's to be free'd later */
1236 svf [0] = GvSV (PL_defgv); 1296 svf [0] = GvSV (PL_defgv);
… …
1257 1317
1258 SvREFCNT_dec (coro->saved_deffh); 1318 SvREFCNT_dec (coro->saved_deffh);
1259 SvREFCNT_dec (coro->rouse_cb); 1319 SvREFCNT_dec (coro->rouse_cb);
1260 SvREFCNT_dec (coro->invoke_cb); 1320 SvREFCNT_dec (coro->invoke_cb);
1261 SvREFCNT_dec (coro->invoke_av); 1321 SvREFCNT_dec (coro->invoke_av);
1322 SvREFCNT_dec (coro->on_enter_xs);
1323 SvREFCNT_dec (coro->on_leave_xs);
1262 } 1324 }
1263} 1325}
1264 1326
1265ecb_inline void 1327ecb_inline void
1266free_coro_mortal (pTHX) 1328free_coro_mortal (pTHX)
… …
1329 1391
1330 if (PL_curcop != &PL_compiling) 1392 if (PL_curcop != &PL_compiling)
1331 { 1393 {
1332 SV **cb; 1394 SV **cb;
1333 1395
1334 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1396 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1335 { 1397 {
1336 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1398 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1337 1399
1338 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1400 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1339 { 1401 {
… …
1481 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1543 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1482 * runtime errors here, as this is just a random interpreter, not a thread. 1544 * runtime errors here, as this is just a random interpreter, not a thread.
1483 */ 1545 */
1484 1546
1485 /* 1547 /*
1548 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1549 * requires PL_scopestack_ix, so do it here if required.
1550 */
1551 if (!PL_scopestack_ix)
1552 ENTER;
1553
1554 /*
1486 * If perl-run returns we assume exit() was being called or the coro 1555 * If perl-run returns we assume exit() was being called or the coro
1487 * fell off the end, which seems to be the only valid (non-bug) 1556 * fell off the end, which seems to be the only valid (non-bug)
1488 * reason for perl_run to return. We try to mimic whatever perl is normally 1557 * reason for perl_run to return. We try to mimic whatever perl is normally
1489 * doing in that case. YMMV. 1558 * doing in that case. YMMV.
1490 */ 1559 */
… …
1926 1995
1927 ENTER; 1996 ENTER;
1928 SAVETMPS; 1997 SAVETMPS;
1929 1998
1930 PUSHMARK (SP); 1999 PUSHMARK (SP);
1931 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught", 0))); 2000 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1932 PUTBACK; 2001 PUTBACK;
1933 call_pv ("Carp::confess", G_VOID | G_DISCARD); 2002 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1934 2003
1935 FREETMPS; 2004 FREETMPS;
1936 LEAVE; 2005 LEAVE;
… …
2247 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2316 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2248 } 2317 }
2249 else 2318 else
2250 { 2319 {
2251 struct coro *self = SvSTATE_current; 2320 struct coro *self = SvSTATE_current;
2321
2322 if (!self)
2323 croak ("Coro::cancel called outside of thread content,");
2252 2324
2253 /* otherwise we cancel directly, purely for speed reasons 2325 /* otherwise we cancel directly, purely for speed reasons
2254 * unfortunately, this requires some magic trickery, as 2326 * unfortunately, this requires some magic trickery, as
2255 * somebody else could cancel us, so we have to fight the cancellation. 2327 * somebody else could cancel us, so we have to fight the cancellation.
2256 * this is ugly, and hopefully fully worth the extra speed. 2328 * this is ugly, and hopefully fully worth the extra speed.
… …
2366 else 2438 else
2367 { 2439 {
2368 av_clear (GvAV (PL_defgv)); 2440 av_clear (GvAV (PL_defgv));
2369 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2441 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2370 2442
2443 if (ecb_expect_false (coro->swap_sv))
2444 {
2445 swap_svs_leave (coro);
2446 SvREFCNT_dec_NN (coro->swap_sv);
2447 coro->swap_sv = 0;
2448 }
2449
2371 coro->prio = 0; 2450 coro->prio = 0;
2372 2451
2373 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2452 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2374 api_trace (aTHX_ coro_current, 0); 2453 api_trace (aTHX_ coro_current, 0);
2375 2454
2376 frame->prepare = prepare_schedule; 2455 frame->prepare = prepare_schedule;
2377 av_push (av_async_pool, SvREFCNT_inc (hv)); 2456 av_push (av_async_pool, SvREFCNT_inc (hv));
2378 } 2457 }
… …
2598 2677
2599/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2678/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2600static void 2679static void
2601slf_destroy (pTHX_ struct coro *coro) 2680slf_destroy (pTHX_ struct coro *coro)
2602{ 2681{
2603 /* this callback is reserved for slf functions needing to do cleanup */ 2682 struct CoroSLF frame = coro->slf_frame;
2604 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2605 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2606 2683
2607 /* 2684 /*
2608 * The on_destroy above most likely is from an SLF call. 2685 * The on_destroy below most likely is from an SLF call.
2609 * Since by definition the SLF call will not finish when we destroy 2686 * Since by definition the SLF call will not finish when we destroy
2610 * the coro, we will have to force-finish it here, otherwise 2687 * the coro, we will have to force-finish it here, otherwise
2611 * cleanup functions cannot call SLF functions. 2688 * cleanup functions cannot call SLF functions.
2612 */ 2689 */
2613 coro->slf_frame.prepare = 0; 2690 coro->slf_frame.prepare = 0;
2691
2692 /* this callback is reserved for slf functions needing to do cleanup */
2693 if (frame.destroy && frame.prepare && !PL_dirty)
2694 frame.destroy (aTHX_ &frame);
2614} 2695}
2615 2696
2616/* 2697/*
2617 * these not obviously related functions are all rolled into one 2698 * these not obviously related functions are all rolled into one
2618 * function to increase chances that they all will call transfer with the same 2699 * function to increase chances that they all will call transfer with the same
… …
2801static void 2882static void
2802coro_pop_on_leave (pTHX_ void *coro) 2883coro_pop_on_leave (pTHX_ void *coro)
2803{ 2884{
2804 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2885 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2805 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2886 on_enterleave_call (aTHX_ sv_2mortal (cb));
2887}
2888
2889static void
2890enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2891{
2892 if (!hook)
2893 return;
2894
2895 if (!*avp)
2896 {
2897 *avp = newAV ();
2898 AvREAL_off (*avp);
2899 }
2900
2901 av_push (*avp, (SV *)hook);
2902 av_push (*avp, (SV *)arg);
2903}
2904
2905static void
2906enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2907{
2908 AV *av = *avp;
2909 int i;
2910
2911 if (!av)
2912 return;
2913
2914 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2915 if (AvARRAY (av)[i] == (SV *)hook)
2916 {
2917 if (execute)
2918 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2919
2920 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2921 av_pop (av);
2922 av_pop (av);
2923 break;
2924 }
2925
2926 if (AvFILLp (av) >= 0)
2927 {
2928 *avp = 0;
2929 SvREFCNT_dec_NN (av);
2930 }
2931}
2932
2933static void
2934api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2935{
2936 struct coro *coro = SvSTATE (coro_sv);
2937
2938 if (SvSTATE_current == coro)
2939 if (enter)
2940 enter (aTHX_ enter_arg);
2941
2942 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2943 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2944}
2945
2946static void
2947api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2948{
2949 struct coro *coro = SvSTATE (coro_sv);
2950
2951 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2952 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2953}
2954
2955static void
2956savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2957{
2958 struct coro *coro = SvSTATE_current;
2959
2960 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2961}
2962
2963static void
2964savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2965{
2966 struct coro *coro = SvSTATE_current;
2967
2968 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2969}
2970
2971static void
2972api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2973{
2974 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2975
2976 /* this ought to be much cheaper than malloc + a single destructor call */
2977 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2978 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2806} 2979}
2807 2980
2808/*****************************************************************************/ 2981/*****************************************************************************/
2809/* PerlIO::cede */ 2982/* PerlIO::cede */
2810 2983
… …
2940 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3113 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2941 PUTBACK; 3114 PUTBACK;
2942 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3115 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2943 } 3116 }
2944 3117
2945 SvREFCNT_dec (cb); 3118 SvREFCNT_dec_NN (cb);
2946 } 3119 }
2947} 3120}
2948 3121
2949static void 3122static void
2950coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3123coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
2958{ 3131{
2959 AV *av = (AV *)frame->data; 3132 AV *av = (AV *)frame->data;
2960 SV *count_sv = AvARRAY (av)[0]; 3133 SV *count_sv = AvARRAY (av)[0];
2961 SV *coro_hv = SvRV (coro_current); 3134 SV *coro_hv = SvRV (coro_current);
2962 3135
3136 frame->destroy = 0;
3137
2963 /* if we are about to throw, don't actually acquire the lock, just throw */ 3138 /* if we are about to throw, don't actually acquire the lock, just throw */
2964 if (CORO_THROW) 3139 if (ecb_expect_false (CORO_THROW))
3140 {
3141 /* we still might be responsible for the semaphore, so wake up others */
3142 coro_semaphore_adjust (aTHX_ av, 0);
3143
2965 return 0; 3144 return 0;
3145 }
2966 else if (SvIVX (count_sv) > 0) 3146 else if (SvIVX (count_sv) > 0)
2967 { 3147 {
2968 frame->destroy = 0;
2969
2970 if (acquire) 3148 if (acquire)
2971 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3149 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2972 else 3150 else
2973 coro_semaphore_adjust (aTHX_ av, 0); 3151 coro_semaphore_adjust (aTHX_ av, 0);
2974 3152
… …
3085 { 3263 {
3086 api_ready (aTHX_ cb); 3264 api_ready (aTHX_ cb);
3087 sv_setiv (cb, 0); /* signal waiter */ 3265 sv_setiv (cb, 0); /* signal waiter */
3088 } 3266 }
3089 3267
3090 SvREFCNT_dec (cb); 3268 SvREFCNT_dec_NN (cb);
3091 3269
3092 --count; 3270 --count;
3093 } 3271 }
3094} 3272}
3095 3273
… …
3180 } 3358 }
3181 3359
3182 av_push (state, data_sv); 3360 av_push (state, data_sv);
3183 3361
3184 api_ready (aTHX_ coro); 3362 api_ready (aTHX_ coro);
3185 SvREFCNT_dec (coro); 3363 SvREFCNT_dec_NN (coro);
3186 SvREFCNT_dec ((AV *)state); 3364 SvREFCNT_dec_NN ((AV *)state);
3187} 3365}
3188 3366
3189static int 3367static int
3190slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3368slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3191{ 3369{
… …
3209 errno = data->errorno; 3387 errno = data->errorno;
3210 PL_laststype = data->laststype; 3388 PL_laststype = data->laststype;
3211 PL_laststatval = data->laststatval; 3389 PL_laststatval = data->laststatval;
3212 PL_statcache = data->statcache; 3390 PL_statcache = data->statcache;
3213 3391
3214 SvREFCNT_dec (data_sv); 3392 SvREFCNT_dec_NN (data_sv);
3215 } 3393 }
3216 3394
3217 /* push result values */ 3395 /* push result values */
3218 { 3396 {
3219 dSP; 3397 dSP;
… …
3434 3612
3435PROTOTYPES: DISABLE 3613PROTOTYPES: DISABLE
3436 3614
3437BOOT: 3615BOOT:
3438{ 3616{
3617#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3618#include "state.h"
3439#ifdef USE_ITHREADS 3619#ifdef USE_ITHREADS
3440# if CORO_PTHREAD 3620# if CORO_PTHREAD
3441 coro_thx = PERL_GET_CONTEXT; 3621 coro_thx = PERL_GET_CONTEXT;
3442# endif 3622# endif
3443#endif 3623#endif
… …
3455 3635
3456 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3636 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
3457 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3637 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
3458 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3638 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
3459 3639
3460 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3461 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3640 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3462 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3641 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3463 3642
3464 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3643 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3465 3644
… …
3771 if (ecb_expect_false (current == self)) 3950 if (ecb_expect_false (current == self))
3772 coro_times_sub (SvSTATE (coro_current)); 3951 coro_times_sub (SvSTATE (coro_current));
3773} 3952}
3774 3953
3775void 3954void
3776swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3955swap_sv (Coro::State coro, SV *sva, SV *svb)
3777 CODE: 3956 CODE:
3778{ 3957{
3779 struct coro *current = SvSTATE_current; 3958 struct coro *current = SvSTATE_current;
3959 AV *swap_sv;
3960 int i;
3961
3962 sva = SvRV (sva);
3963 svb = SvRV (svb);
3780 3964
3781 if (current == coro) 3965 if (current == coro)
3782 SWAP_SVS (current); 3966 SWAP_SVS_LEAVE (current);
3783 3967
3784 if (!coro->swap_sv) 3968 if (!coro->swap_sv)
3785 coro->swap_sv = newAV (); 3969 coro->swap_sv = newAV ();
3786 3970
3971 swap_sv = coro->swap_sv;
3972
3973 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
3974 {
3975 SV *a = AvARRAY (swap_sv)[i ];
3976 SV *b = AvARRAY (swap_sv)[i + 1];
3977
3978 if (a == sva && b == svb)
3979 {
3980 SvREFCNT_dec_NN (a);
3981 SvREFCNT_dec_NN (b);
3982
3983 for (; i <= AvFILLp (swap_sv) - 2; i++)
3984 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
3985
3986 AvFILLp (swap_sv) -= 2;
3987
3988 goto removed;
3989 }
3990 }
3991
3787 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 3992 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3788 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 3993 av_push (swap_sv, SvREFCNT_inc_NN (svb));
3994
3995 removed:
3789 3996
3790 if (current == coro) 3997 if (current == coro)
3791 SWAP_SVS (current); 3998 SWAP_SVS_ENTER (current);
3792} 3999}
3793 4000
3794 4001
3795MODULE = Coro::State PACKAGE = Coro 4002MODULE = Coro::State PACKAGE = Coro
3796 4003
3797BOOT: 4004BOOT:
3798{ 4005{
4006 if (SVt_LAST > 32)
4007 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4008
3799 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4009 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3800 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4010 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3801 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4011 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3802 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4012 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3803 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4013 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3829 coroapi.ready = api_ready; 4039 coroapi.ready = api_ready;
3830 coroapi.is_ready = api_is_ready; 4040 coroapi.is_ready = api_is_ready;
3831 coroapi.nready = coro_nready; 4041 coroapi.nready = coro_nready;
3832 coroapi.current = coro_current; 4042 coroapi.current = coro_current;
3833 4043
4044 coroapi.enterleave_hook = api_enterleave_hook;
4045 coroapi.enterleave_unhook = api_enterleave_unhook;
4046 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4047
3834 /*GCoroAPI = &coroapi;*/ 4048 /*GCoroAPI = &coroapi;*/
3835 sv_setiv (sv, (IV)&coroapi); 4049 sv_setiv (sv, (IV)&coroapi);
3836 SvREADONLY_on (sv); 4050 SvREADONLY_on (sv);
3837 } 4051 }
3838} 4052}
… …
3903 4117
3904void 4118void
3905_set_current (SV *current) 4119_set_current (SV *current)
3906 PROTOTYPE: $ 4120 PROTOTYPE: $
3907 CODE: 4121 CODE:
3908 SvREFCNT_dec (SvRV (coro_current)); 4122 SvREFCNT_dec_NN (SvRV (coro_current));
3909 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4123 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3910 4124
3911void 4125void
3912_set_readyhook (SV *hook) 4126_set_readyhook (SV *hook)
3913 PROTOTYPE: $ 4127 PROTOTYPE: $
… …
3997 4211
3998 if ((SV *)hv == &PL_sv_undef) 4212 if ((SV *)hv == &PL_sv_undef)
3999 { 4213 {
4000 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4214 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
4001 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4215 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4002 SvREFCNT_dec (sv); 4216 SvREFCNT_dec_NN (sv);
4003 } 4217 }
4004 4218
4005 { 4219 {
4006 struct coro *coro = SvSTATE_hv (hv); 4220 struct coro *coro = SvSTATE_hv (hv);
4007 4221
… …
4014 api_ready (aTHX_ (SV *)hv); 4228 api_ready (aTHX_ (SV *)hv);
4015 4229
4016 if (GIMME_V != G_VOID) 4230 if (GIMME_V != G_VOID)
4017 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4231 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
4018 else 4232 else
4019 SvREFCNT_dec (hv); 4233 SvREFCNT_dec_NN (hv);
4020} 4234}
4021 4235
4022SV * 4236SV *
4023rouse_cb () 4237rouse_cb ()
4024 PROTOTYPE: 4238 PROTOTYPE:
… …
4103 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4317 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4104 OUTPUT: 4318 OUTPUT:
4105 RETVAL 4319 RETVAL
4106 4320
4107void 4321void
4108up (SV *self, int adjust = 1) 4322up (SV *self)
4109 ALIAS:
4110 adjust = 1
4111 CODE: 4323 CODE:
4324 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4325
4326void
4327adjust (SV *self, int adjust)
4328 CODE:
4112 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4329 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4113 4330
4114void 4331void
4115down (...) 4332down (...)
4116 CODE: 4333 CODE:
4117 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4334 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);

Diff Legend

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