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.434 by root, Sat Nov 2 19:48:50 2013 UTC vs.
Revision 1.459 by root, Fri Jun 17 05:00:19 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
541 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
542 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
520 while (!PadlistARRAY (padlist)[off - 1]) 543 while (!PadlistARRAY (padlist)[off - 1])
521 --off; 544 --off;
522 545
523 Perl_pad_push (aTHX_ padlist, off); 546 Perl_pad_push (aTHX_ padlist, off);
547
524 newpad = PadlistARRAY (padlist)[off]; 548 newpad = PadlistARRAY (padlist)[off];
525 PadlistARRAY (padlist)[off] = 0; 549 PadlistARRAY (padlist)[off] = 0;
526 550
527#else 551#else
528 552
… …
543 AvREAL_off (newpadlist); 567 AvREAL_off (newpadlist);
544#endif 568#endif
545 569
546 /* Already extended to 2 elements by newPADLIST. */ 570 /* Already extended to 2 elements by newPADLIST. */
547 PadlistMAX (newpadlist) = 1; 571 PadlistMAX (newpadlist) = 1;
548 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 572
573 padnames = PadlistNAMES (padlist);
574 ++PadnamelistREFCNT (padnames);
575 PadlistNAMES (newpadlist) = padnames;
576
549 PadlistARRAY (newpadlist)[1] = newpad; 577 PadlistARRAY (newpadlist)[1] = newpad;
550 578
551 return newpadlist; 579 return newpadlist;
552} 580}
553 581
… …
561 589
562 while (i > 0) /* special-case index 0 */ 590 while (i > 0) /* special-case index 0 */
563 { 591 {
564 /* we try to be extra-careful here */ 592 /* we try to be extra-careful here */
565 PAD *pad = PadlistARRAY (padlist)[i--]; 593 PAD *pad = PadlistARRAY (padlist)[i--];
594
595 if (pad)
596 {
566 I32 j = PadMAX (pad); 597 I32 j = PadMAX (pad);
567 598
568 while (j >= 0) 599 while (j >= 0)
569 SvREFCNT_dec (PadARRAY (pad)[j--]); 600 SvREFCNT_dec (PadARRAY (pad)[j--]);
570 601
571 PadMAX (pad) = -1; 602 PadMAX (pad) = -1;
572 SvREFCNT_dec (pad); 603 SvREFCNT_dec (pad);
604 }
573 } 605 }
574 606
575 SvREFCNT_dec (PadlistNAMES (padlist)); 607 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
576 608
577#if NEWPADAPI 609#if NEWPADAPI
578 Safefree (PadlistARRAY (padlist)); 610 Safefree (PadlistARRAY (padlist));
579 Safefree (padlist); 611 Safefree (padlist);
580#else 612#else
… …
676 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;
677 709
678 /* 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,
679 * 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.
680 */ 712 */
681 #define svany_in_head(type) \ 713 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
682 (((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)))
683 719
684 if (svany_in_head (SvTYPE (a))) 720 if (svany_in_head (SvTYPE (a)))
685 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 721 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
686 722
687 if (svany_in_head (SvTYPE (b))) 723 if (svany_in_head (SvTYPE (b)))
… …
690#endif 726#endif
691} 727}
692 728
693/* swap sv heads, at least logically */ 729/* swap sv heads, at least logically */
694static void 730static void
695swap_svs (pTHX_ Coro__State c) 731swap_svs_enter (pTHX_ Coro__State c)
696{ 732{
697 int i; 733 int i;
698 734
699 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 735 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
700 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]);
701} 737}
702 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
703#define SWAP_SVS(coro) \ 748#define SWAP_SVS_ENTER(coro) \
704 if (ecb_expect_false ((coro)->swap_sv)) \ 749 if (ecb_expect_false ((coro)->swap_sv)) \
705 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))
706 755
707static void 756static void
708on_enterleave_call (pTHX_ SV *cb); 757on_enterleave_call (pTHX_ SV *cb);
709 758
710static void 759static void
… …
755 804
756 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 805 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
757 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 806 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
758 } 807 }
759 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
760 SWAP_SVS (c); 817 SWAP_SVS_ENTER (c);
761} 818}
762 819
763static void 820static void
764save_perl (pTHX_ Coro__State c) 821save_perl (pTHX_ Coro__State c)
765{ 822{
766 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 }
767 832
768 if (ecb_expect_false (c->on_leave)) 833 if (ecb_expect_false (c->on_leave))
769 { 834 {
770 int i; 835 int i;
771 836
… …
1124 1189
1125 GvSV (PL_defgv) = newSV (0); 1190 GvSV (PL_defgv) = newSV (0);
1126 GvAV (PL_defgv) = coro->args; coro->args = 0; 1191 GvAV (PL_defgv) = coro->args; coro->args = 0;
1127 GvSV (PL_errgv) = newSV (0); 1192 GvSV (PL_errgv) = newSV (0);
1128 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);
1129 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
1130 PL_rs = newSVsv (GvSV (irsgv)); 1198 PL_rs = newSVsv (GvSV (irsgv));
1131 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1199 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1132 1200
1133 { 1201 {
1134 dSP; 1202 dSP;
… …
1162 PL_op = (OP *)&init_perl_op; 1230 PL_op = (OP *)&init_perl_op;
1163 1231
1164 /* copy throw, in case it was set before init_perl */ 1232 /* copy throw, in case it was set before init_perl */
1165 CORO_THROW = coro->except; 1233 CORO_THROW = coro->except;
1166 1234
1167 SWAP_SVS (coro); 1235 SWAP_SVS_ENTER (coro);
1168 1236
1169 if (ecb_expect_false (enable_times)) 1237 if (ecb_expect_false (enable_times))
1170 { 1238 {
1171 coro_times_update (); 1239 coro_times_update ();
1172 coro_times_sub (coro); 1240 coro_times_sub (coro);
… …
1210 /* this will cause transfer_check to croak on block*/ 1278 /* this will cause transfer_check to croak on block*/
1211 SvRV_set (coro_current, (SV *)coro->hv); 1279 SvRV_set (coro_current, (SV *)coro->hv);
1212 1280
1213 load_perl (aTHX_ coro); 1281 load_perl (aTHX_ coro);
1214 1282
1283 /* restore swapped sv's */
1284 SWAP_SVS_LEAVE (coro);
1285
1215 coro_unwind_stacks (aTHX); 1286 coro_unwind_stacks (aTHX);
1216
1217 /* restore swapped sv's */
1218 SWAP_SVS (coro);
1219 1287
1220 coro_destruct_stacks (aTHX); 1288 coro_destruct_stacks (aTHX);
1221 1289
1222 /* now save some sv's to be free'd later */ 1290 /* now save some sv's to be free'd later */
1223 svf [0] = GvSV (PL_defgv); 1291 svf [0] = GvSV (PL_defgv);
… …
1244 1312
1245 SvREFCNT_dec (coro->saved_deffh); 1313 SvREFCNT_dec (coro->saved_deffh);
1246 SvREFCNT_dec (coro->rouse_cb); 1314 SvREFCNT_dec (coro->rouse_cb);
1247 SvREFCNT_dec (coro->invoke_cb); 1315 SvREFCNT_dec (coro->invoke_cb);
1248 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);
1249 } 1319 }
1250} 1320}
1251 1321
1252ecb_inline void 1322ecb_inline void
1253free_coro_mortal (pTHX) 1323free_coro_mortal (pTHX)
… …
1316 1386
1317 if (PL_curcop != &PL_compiling) 1387 if (PL_curcop != &PL_compiling)
1318 { 1388 {
1319 SV **cb; 1389 SV **cb;
1320 1390
1321 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1391 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1322 { 1392 {
1323 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1393 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1324 1394
1325 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1395 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1326 { 1396 {
… …
1903 /* nothing to schedule: call the idle handler */ 1973 /* nothing to schedule: call the idle handler */
1904 if (SvROK (sv_idle) 1974 if (SvROK (sv_idle)
1905 && SvOBJECT (SvRV (sv_idle))) 1975 && SvOBJECT (SvRV (sv_idle)))
1906 { 1976 {
1907 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);
1908 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 }
1909 1996
1910 ++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 */
1911 api_ready (aTHX_ SvRV (sv_idle)); 1998 api_ready (aTHX_ SvRV (sv_idle));
1912 --coro_nready; 1999 --coro_nready;
1913 } 2000 }
… …
2217 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2304 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2218 } 2305 }
2219 else 2306 else
2220 { 2307 {
2221 struct coro *self = SvSTATE_current; 2308 struct coro *self = SvSTATE_current;
2309
2310 if (!self)
2311 croak ("Coro::cancel called outside of thread content,");
2222 2312
2223 /* otherwise we cancel directly, purely for speed reasons 2313 /* otherwise we cancel directly, purely for speed reasons
2224 * unfortunately, this requires some magic trickery, as 2314 * unfortunately, this requires some magic trickery, as
2225 * 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.
2226 * this is ugly, and hopefully fully worth the extra speed. 2316 * this is ugly, and hopefully fully worth the extra speed.
… …
2336 else 2426 else
2337 { 2427 {
2338 av_clear (GvAV (PL_defgv)); 2428 av_clear (GvAV (PL_defgv));
2339 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);
2340 2430
2431 if (ecb_expect_false (coro->swap_sv))
2432 {
2433 SvREFCNT_dec_NN (coro->swap_sv);
2434 coro->swap_sv = 0;
2435 }
2436
2341 coro->prio = 0; 2437 coro->prio = 0;
2342 2438
2343 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2439 if (coro->cctx && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2344 api_trace (aTHX_ coro_current, 0); 2440 api_trace (aTHX_ coro_current, 0);
2345 2441
2346 frame->prepare = prepare_schedule; 2442 frame->prepare = prepare_schedule;
2347 av_push (av_async_pool, SvREFCNT_inc (hv)); 2443 av_push (av_async_pool, SvREFCNT_inc (hv));
2348 } 2444 }
… …
2568 2664
2569/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2665/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2570static void 2666static void
2571slf_destroy (pTHX_ struct coro *coro) 2667slf_destroy (pTHX_ struct coro *coro)
2572{ 2668{
2573 /* this callback is reserved for slf functions needing to do cleanup */ 2669 struct CoroSLF frame = coro->slf_frame;
2574 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2575 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2576 2670
2577 /* 2671 /*
2578 * The on_destroy above most likely is from an SLF call. 2672 * The on_destroy below most likely is from an SLF call.
2579 * Since by definition the SLF call will not finish when we destroy 2673 * Since by definition the SLF call will not finish when we destroy
2580 * the coro, we will have to force-finish it here, otherwise 2674 * the coro, we will have to force-finish it here, otherwise
2581 * cleanup functions cannot call SLF functions. 2675 * cleanup functions cannot call SLF functions.
2582 */ 2676 */
2583 coro->slf_frame.prepare = 0; 2677 coro->slf_frame.prepare = 0;
2678
2679 /* this callback is reserved for slf functions needing to do cleanup */
2680 if (frame.destroy && frame.prepare && !PL_dirty)
2681 frame.destroy (aTHX_ &frame);
2584} 2682}
2585 2683
2586/* 2684/*
2587 * these not obviously related functions are all rolled into one 2685 * these not obviously related functions are all rolled into one
2588 * function to increase chances that they all will call transfer with the same 2686 * function to increase chances that they all will call transfer with the same
… …
2771static void 2869static void
2772coro_pop_on_leave (pTHX_ void *coro) 2870coro_pop_on_leave (pTHX_ void *coro)
2773{ 2871{
2774 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2872 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2775 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2873 on_enterleave_call (aTHX_ sv_2mortal (cb));
2874}
2875
2876static void
2877enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2878{
2879 if (!hook)
2880 return;
2881
2882 if (!*avp)
2883 {
2884 *avp = newAV ();
2885 AvREAL_off (*avp);
2886 }
2887
2888 av_push (*avp, (SV *)hook);
2889 av_push (*avp, (SV *)arg);
2890}
2891
2892static void
2893enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2894{
2895 AV *av = *avp;
2896 int i;
2897
2898 if (!av)
2899 return;
2900
2901 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2902 if (AvARRAY (av)[i] == (SV *)hook)
2903 {
2904 if (execute)
2905 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2906
2907 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2908 av_pop (av);
2909 av_pop (av);
2910 break;
2911 }
2912
2913 if (AvFILLp (av) >= 0)
2914 {
2915 *avp = 0;
2916 SvREFCNT_dec_NN (av);
2917 }
2918}
2919
2920static void
2921api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2922{
2923 struct coro *coro = SvSTATE (coro_sv);
2924
2925 if (SvSTATE_current == coro)
2926 if (enter)
2927 enter (aTHX_ enter_arg);
2928
2929 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2930 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2931}
2932
2933static void
2934api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2935{
2936 struct coro *coro = SvSTATE (coro_sv);
2937
2938 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2939 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2940}
2941
2942static void
2943savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2944{
2945 struct coro *coro = SvSTATE_current;
2946
2947 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2948}
2949
2950static void
2951savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2952{
2953 struct coro *coro = SvSTATE_current;
2954
2955 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2956}
2957
2958static void
2959api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2960{
2961 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2962
2963 /* this ought to be much cheaper than malloc + a single destructor call */
2964 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2965 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2776} 2966}
2777 2967
2778/*****************************************************************************/ 2968/*****************************************************************************/
2779/* PerlIO::cede */ 2969/* PerlIO::cede */
2780 2970
… …
2910 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3100 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2911 PUTBACK; 3101 PUTBACK;
2912 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3102 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2913 } 3103 }
2914 3104
2915 SvREFCNT_dec (cb); 3105 SvREFCNT_dec_NN (cb);
2916 } 3106 }
2917} 3107}
2918 3108
2919static void 3109static void
2920coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3110coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
2928{ 3118{
2929 AV *av = (AV *)frame->data; 3119 AV *av = (AV *)frame->data;
2930 SV *count_sv = AvARRAY (av)[0]; 3120 SV *count_sv = AvARRAY (av)[0];
2931 SV *coro_hv = SvRV (coro_current); 3121 SV *coro_hv = SvRV (coro_current);
2932 3122
3123 frame->destroy = 0;
3124
2933 /* if we are about to throw, don't actually acquire the lock, just throw */ 3125 /* if we are about to throw, don't actually acquire the lock, just throw */
2934 if (CORO_THROW) 3126 if (ecb_expect_false (CORO_THROW))
3127 {
3128 /* we still might be responsible for the semaphore, so wake up others */
3129 coro_semaphore_adjust (aTHX_ av, 0);
3130
2935 return 0; 3131 return 0;
3132 }
2936 else if (SvIVX (count_sv) > 0) 3133 else if (SvIVX (count_sv) > 0)
2937 { 3134 {
2938 frame->destroy = 0;
2939
2940 if (acquire) 3135 if (acquire)
2941 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3136 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2942 else 3137 else
2943 coro_semaphore_adjust (aTHX_ av, 0); 3138 coro_semaphore_adjust (aTHX_ av, 0);
2944 3139
… …
3055 { 3250 {
3056 api_ready (aTHX_ cb); 3251 api_ready (aTHX_ cb);
3057 sv_setiv (cb, 0); /* signal waiter */ 3252 sv_setiv (cb, 0); /* signal waiter */
3058 } 3253 }
3059 3254
3060 SvREFCNT_dec (cb); 3255 SvREFCNT_dec_NN (cb);
3061 3256
3062 --count; 3257 --count;
3063 } 3258 }
3064} 3259}
3065 3260
… …
3150 } 3345 }
3151 3346
3152 av_push (state, data_sv); 3347 av_push (state, data_sv);
3153 3348
3154 api_ready (aTHX_ coro); 3349 api_ready (aTHX_ coro);
3155 SvREFCNT_dec (coro); 3350 SvREFCNT_dec_NN (coro);
3156 SvREFCNT_dec ((AV *)state); 3351 SvREFCNT_dec_NN ((AV *)state);
3157} 3352}
3158 3353
3159static int 3354static int
3160slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3355slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3161{ 3356{
… …
3179 errno = data->errorno; 3374 errno = data->errorno;
3180 PL_laststype = data->laststype; 3375 PL_laststype = data->laststype;
3181 PL_laststatval = data->laststatval; 3376 PL_laststatval = data->laststatval;
3182 PL_statcache = data->statcache; 3377 PL_statcache = data->statcache;
3183 3378
3184 SvREFCNT_dec (data_sv); 3379 SvREFCNT_dec_NN (data_sv);
3185 } 3380 }
3186 3381
3187 /* push result values */ 3382 /* push result values */
3188 { 3383 {
3189 dSP; 3384 dSP;
… …
3404 3599
3405PROTOTYPES: DISABLE 3600PROTOTYPES: DISABLE
3406 3601
3407BOOT: 3602BOOT:
3408{ 3603{
3604#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3605#include "state.h"
3409#ifdef USE_ITHREADS 3606#ifdef USE_ITHREADS
3410# if CORO_PTHREAD 3607# if CORO_PTHREAD
3411 coro_thx = PERL_GET_CONTEXT; 3608 coro_thx = PERL_GET_CONTEXT;
3412# endif 3609# endif
3413#endif 3610#endif
… …
3425 3622
3426 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3623 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
3427 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3624 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
3428 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3625 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
3429 3626
3430 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3431 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3627 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3432 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3628 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3433 3629
3434 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3630 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3435 3631
… …
3741 if (ecb_expect_false (current == self)) 3937 if (ecb_expect_false (current == self))
3742 coro_times_sub (SvSTATE (coro_current)); 3938 coro_times_sub (SvSTATE (coro_current));
3743} 3939}
3744 3940
3745void 3941void
3746swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3942swap_sv (Coro::State coro, SV *sva, SV *svb)
3747 CODE: 3943 CODE:
3748{ 3944{
3749 struct coro *current = SvSTATE_current; 3945 struct coro *current = SvSTATE_current;
3946 AV *swap_sv;
3947 int i;
3948
3949 sva = SvRV (sva);
3950 svb = SvRV (svb);
3750 3951
3751 if (current == coro) 3952 if (current == coro)
3752 SWAP_SVS (current); 3953 SWAP_SVS_LEAVE (current);
3753 3954
3754 if (!coro->swap_sv) 3955 if (!coro->swap_sv)
3755 coro->swap_sv = newAV (); 3956 coro->swap_sv = newAV ();
3756 3957
3958 swap_sv = coro->swap_sv;
3959
3960 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
3961 {
3962 SV *a = AvARRAY (swap_sv)[i ];
3963 SV *b = AvARRAY (swap_sv)[i + 1];
3964
3965 if (a == sva && b == svb)
3966 {
3967 SvREFCNT_dec_NN (a);
3968 SvREFCNT_dec_NN (b);
3969
3970 for (; i <= AvFILLp (swap_sv) - 2; i++)
3971 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
3972
3973 AvFILLp (swap_sv) -= 2;
3974
3975 goto removed;
3976 }
3977 }
3978
3757 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 3979 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3758 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 3980 av_push (swap_sv, SvREFCNT_inc_NN (svb));
3981
3982 removed:
3759 3983
3760 if (current == coro) 3984 if (current == coro)
3761 SWAP_SVS (current); 3985 SWAP_SVS_ENTER (current);
3762} 3986}
3763 3987
3764 3988
3765MODULE = Coro::State PACKAGE = Coro 3989MODULE = Coro::State PACKAGE = Coro
3766 3990
3767BOOT: 3991BOOT:
3768{ 3992{
3993 if (SVt_LAST > 32)
3994 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3995
3769 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3996 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3770 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3997 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3771 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3998 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3772 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3999 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3773 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4000 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3799 coroapi.ready = api_ready; 4026 coroapi.ready = api_ready;
3800 coroapi.is_ready = api_is_ready; 4027 coroapi.is_ready = api_is_ready;
3801 coroapi.nready = coro_nready; 4028 coroapi.nready = coro_nready;
3802 coroapi.current = coro_current; 4029 coroapi.current = coro_current;
3803 4030
4031 coroapi.enterleave_hook = api_enterleave_hook;
4032 coroapi.enterleave_unhook = api_enterleave_unhook;
4033 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4034
3804 /*GCoroAPI = &coroapi;*/ 4035 /*GCoroAPI = &coroapi;*/
3805 sv_setiv (sv, (IV)&coroapi); 4036 sv_setiv (sv, (IV)&coroapi);
3806 SvREADONLY_on (sv); 4037 SvREADONLY_on (sv);
3807 } 4038 }
3808} 4039}
… …
3873 4104
3874void 4105void
3875_set_current (SV *current) 4106_set_current (SV *current)
3876 PROTOTYPE: $ 4107 PROTOTYPE: $
3877 CODE: 4108 CODE:
3878 SvREFCNT_dec (SvRV (coro_current)); 4109 SvREFCNT_dec_NN (SvRV (coro_current));
3879 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4110 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3880 4111
3881void 4112void
3882_set_readyhook (SV *hook) 4113_set_readyhook (SV *hook)
3883 PROTOTYPE: $ 4114 PROTOTYPE: $
… …
3967 4198
3968 if ((SV *)hv == &PL_sv_undef) 4199 if ((SV *)hv == &PL_sv_undef)
3969 { 4200 {
3970 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4201 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3971 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4202 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3972 SvREFCNT_dec (sv); 4203 SvREFCNT_dec_NN (sv);
3973 } 4204 }
3974 4205
3975 { 4206 {
3976 struct coro *coro = SvSTATE_hv (hv); 4207 struct coro *coro = SvSTATE_hv (hv);
3977 4208
… …
3984 api_ready (aTHX_ (SV *)hv); 4215 api_ready (aTHX_ (SV *)hv);
3985 4216
3986 if (GIMME_V != G_VOID) 4217 if (GIMME_V != G_VOID)
3987 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4218 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3988 else 4219 else
3989 SvREFCNT_dec (hv); 4220 SvREFCNT_dec_NN (hv);
3990} 4221}
3991 4222
3992SV * 4223SV *
3993rouse_cb () 4224rouse_cb ()
3994 PROTOTYPE: 4225 PROTOTYPE:
… …
4073 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4304 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4074 OUTPUT: 4305 OUTPUT:
4075 RETVAL 4306 RETVAL
4076 4307
4077void 4308void
4078up (SV *self, int adjust = 1) 4309up (SV *self)
4079 ALIAS:
4080 adjust = 1
4081 CODE: 4310 CODE:
4311 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4312
4313void
4314adjust (SV *self, int adjust)
4315 CODE:
4082 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4316 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4083 4317
4084void 4318void
4085down (...) 4319down (...)
4086 CODE: 4320 CODE:
4087 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4321 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);

Diff Legend

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