ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

Comparing Coro/Coro/State.xs (file contents):
Revision 1.435 by root, Sat Nov 2 19:49:33 2013 UTC vs.
Revision 1.462 by root, Wed Jun 22 20:24:38 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);
524 547
… …
544 AvREAL_off (newpadlist); 567 AvREAL_off (newpadlist);
545#endif 568#endif
546 569
547 /* Already extended to 2 elements by newPADLIST. */ 570 /* Already extended to 2 elements by newPADLIST. */
548 PadlistMAX (newpadlist) = 1; 571 PadlistMAX (newpadlist) = 1;
549 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 572
573 padnames = PadlistNAMES (padlist);
574 ++PadnamelistREFCNT (padnames);
575 PadlistNAMES (newpadlist) = padnames;
576
550 PadlistARRAY (newpadlist)[1] = newpad; 577 PadlistARRAY (newpadlist)[1] = newpad;
551 578
552 return newpadlist; 579 return newpadlist;
553} 580}
554 581
… …
562 589
563 while (i > 0) /* special-case index 0 */ 590 while (i > 0) /* special-case index 0 */
564 { 591 {
565 /* we try to be extra-careful here */ 592 /* we try to be extra-careful here */
566 PAD *pad = PadlistARRAY (padlist)[i--]; 593 PAD *pad = PadlistARRAY (padlist)[i--];
594
595 if (pad)
596 {
567 I32 j = PadMAX (pad); 597 I32 j = PadMAX (pad);
568 598
569 while (j >= 0) 599 while (j >= 0)
570 SvREFCNT_dec (PadARRAY (pad)[j--]); 600 SvREFCNT_dec (PadARRAY (pad)[j--]);
571 601
572 PadMAX (pad) = -1; 602 PadMAX (pad) = -1;
573 SvREFCNT_dec (pad); 603 SvREFCNT_dec (pad);
604 }
574 } 605 }
575 606
576 SvREFCNT_dec (PadlistNAMES (padlist)); 607 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
577 608
578#if NEWPADAPI 609#if NEWPADAPI
579 Safefree (PadlistARRAY (padlist)); 610 Safefree (PadlistARRAY (padlist));
580 Safefree (padlist); 611 Safefree (padlist);
581#else 612#else
… …
677 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;
678 709
679 /* 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,
680 * 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.
681 */ 712 */
682 #define svany_in_head(type) \ 713 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
683 (((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)))
684 719
685 if (svany_in_head (SvTYPE (a))) 720 if (svany_in_head (SvTYPE (a)))
686 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 721 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
687 722
688 if (svany_in_head (SvTYPE (b))) 723 if (svany_in_head (SvTYPE (b)))
… …
691#endif 726#endif
692} 727}
693 728
694/* swap sv heads, at least logically */ 729/* swap sv heads, at least logically */
695static void 730static void
696swap_svs (pTHX_ Coro__State c) 731swap_svs_enter (pTHX_ Coro__State c)
697{ 732{
698 int i; 733 int i;
699 734
700 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 735 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
701 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]);
702} 737}
703 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
704#define SWAP_SVS(coro) \ 748#define SWAP_SVS_ENTER(coro) \
705 if (ecb_expect_false ((coro)->swap_sv)) \ 749 if (ecb_expect_false ((coro)->swap_sv)) \
706 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))
707 755
708static void 756static void
709on_enterleave_call (pTHX_ SV *cb); 757on_enterleave_call (pTHX_ SV *cb);
710 758
711static void 759static void
… …
756 804
757 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 805 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
758 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 806 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
759 } 807 }
760 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
761 SWAP_SVS (c); 817 SWAP_SVS_ENTER (c);
762} 818}
763 819
764static void 820static void
765save_perl (pTHX_ Coro__State c) 821save_perl (pTHX_ Coro__State c)
766{ 822{
767 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 }
768 832
769 if (ecb_expect_false (c->on_leave)) 833 if (ecb_expect_false (c->on_leave))
770 { 834 {
771 int i; 835 int i;
772 836
… …
899#endif 963#endif
900 964
901 New(54,PL_savestack,24,ANY); 965 New(54,PL_savestack,24,ANY);
902 PL_savestack_ix = 0; 966 PL_savestack_ix = 0;
903 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
904 973
905#if !PERL_VERSION_ATLEAST (5,10,0) 974#if !PERL_VERSION_ATLEAST (5,10,0)
906 New(54,PL_retstack,4,OP*); 975 New(54,PL_retstack,4,OP*);
907 PL_retstack_ix = 0; 976 PL_retstack_ix = 0;
908 PL_retstack_max = 4; 977 PL_retstack_max = 4;
… …
1125 1194
1126 GvSV (PL_defgv) = newSV (0); 1195 GvSV (PL_defgv) = newSV (0);
1127 GvAV (PL_defgv) = coro->args; coro->args = 0; 1196 GvAV (PL_defgv) = coro->args; coro->args = 0;
1128 GvSV (PL_errgv) = newSV (0); 1197 GvSV (PL_errgv) = newSV (0);
1129 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);
1130 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
1131 PL_rs = newSVsv (GvSV (irsgv)); 1203 PL_rs = newSVsv (GvSV (irsgv));
1132 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1204 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1133 1205
1134 { 1206 {
1135 dSP; 1207 dSP;
… …
1163 PL_op = (OP *)&init_perl_op; 1235 PL_op = (OP *)&init_perl_op;
1164 1236
1165 /* copy throw, in case it was set before init_perl */ 1237 /* copy throw, in case it was set before init_perl */
1166 CORO_THROW = coro->except; 1238 CORO_THROW = coro->except;
1167 1239
1168 SWAP_SVS (coro); 1240 SWAP_SVS_ENTER (coro);
1169 1241
1170 if (ecb_expect_false (enable_times)) 1242 if (ecb_expect_false (enable_times))
1171 { 1243 {
1172 coro_times_update (); 1244 coro_times_update ();
1173 coro_times_sub (coro); 1245 coro_times_sub (coro);
… …
1211 /* this will cause transfer_check to croak on block*/ 1283 /* this will cause transfer_check to croak on block*/
1212 SvRV_set (coro_current, (SV *)coro->hv); 1284 SvRV_set (coro_current, (SV *)coro->hv);
1213 1285
1214 load_perl (aTHX_ coro); 1286 load_perl (aTHX_ coro);
1215 1287
1288 /* restore swapped sv's */
1289 SWAP_SVS_LEAVE (coro);
1290
1216 coro_unwind_stacks (aTHX); 1291 coro_unwind_stacks (aTHX);
1217
1218 /* restore swapped sv's */
1219 SWAP_SVS (coro);
1220 1292
1221 coro_destruct_stacks (aTHX); 1293 coro_destruct_stacks (aTHX);
1222 1294
1223 /* now save some sv's to be free'd later */ 1295 /* now save some sv's to be free'd later */
1224 svf [0] = GvSV (PL_defgv); 1296 svf [0] = GvSV (PL_defgv);
… …
1245 1317
1246 SvREFCNT_dec (coro->saved_deffh); 1318 SvREFCNT_dec (coro->saved_deffh);
1247 SvREFCNT_dec (coro->rouse_cb); 1319 SvREFCNT_dec (coro->rouse_cb);
1248 SvREFCNT_dec (coro->invoke_cb); 1320 SvREFCNT_dec (coro->invoke_cb);
1249 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);
1250 } 1324 }
1251} 1325}
1252 1326
1253ecb_inline void 1327ecb_inline void
1254free_coro_mortal (pTHX) 1328free_coro_mortal (pTHX)
… …
1317 1391
1318 if (PL_curcop != &PL_compiling) 1392 if (PL_curcop != &PL_compiling)
1319 { 1393 {
1320 SV **cb; 1394 SV **cb;
1321 1395
1322 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1396 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1323 { 1397 {
1324 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1398 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1325 1399
1326 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1400 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1327 { 1401 {
… …
1904 /* nothing to schedule: call the idle handler */ 1978 /* nothing to schedule: call the idle handler */
1905 if (SvROK (sv_idle) 1979 if (SvROK (sv_idle)
1906 && SvOBJECT (SvRV (sv_idle))) 1980 && SvOBJECT (SvRV (sv_idle)))
1907 { 1981 {
1908 if (SvRV (sv_idle) == SvRV (coro_current)) 1982 if (SvRV (sv_idle) == SvRV (coro_current))
1983 {
1984 require_pv ("Carp");
1985
1986 {
1987 dSP;
1988
1989 ENTER;
1990 SAVETMPS;
1991
1992 PUSHMARK (SP);
1909 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1993 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1994 PUTBACK;
1995 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1996
1997 FREETMPS;
1998 LEAVE;
1999 }
2000 }
1910 2001
1911 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2002 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1912 api_ready (aTHX_ SvRV (sv_idle)); 2003 api_ready (aTHX_ SvRV (sv_idle));
1913 --coro_nready; 2004 --coro_nready;
1914 } 2005 }
… …
2218 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2309 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2219 } 2310 }
2220 else 2311 else
2221 { 2312 {
2222 struct coro *self = SvSTATE_current; 2313 struct coro *self = SvSTATE_current;
2314
2315 if (!self)
2316 croak ("Coro::cancel called outside of thread content,");
2223 2317
2224 /* otherwise we cancel directly, purely for speed reasons 2318 /* otherwise we cancel directly, purely for speed reasons
2225 * unfortunately, this requires some magic trickery, as 2319 * unfortunately, this requires some magic trickery, as
2226 * somebody else could cancel us, so we have to fight the cancellation. 2320 * somebody else could cancel us, so we have to fight the cancellation.
2227 * this is ugly, and hopefully fully worth the extra speed. 2321 * this is ugly, and hopefully fully worth the extra speed.
… …
2337 else 2431 else
2338 { 2432 {
2339 av_clear (GvAV (PL_defgv)); 2433 av_clear (GvAV (PL_defgv));
2340 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2434 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2341 2435
2436 if (ecb_expect_false (coro->swap_sv))
2437 {
2438 swap_svs_leave (coro);
2439 SvREFCNT_dec_NN (coro->swap_sv);
2440 coro->swap_sv = 0;
2441 }
2442
2342 coro->prio = 0; 2443 coro->prio = 0;
2343 2444
2344 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2445 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2345 api_trace (aTHX_ coro_current, 0); 2446 api_trace (aTHX_ coro_current, 0);
2346 2447
2347 frame->prepare = prepare_schedule; 2448 frame->prepare = prepare_schedule;
2348 av_push (av_async_pool, SvREFCNT_inc (hv)); 2449 av_push (av_async_pool, SvREFCNT_inc (hv));
2349 } 2450 }
… …
2569 2670
2570/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2671/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2571static void 2672static void
2572slf_destroy (pTHX_ struct coro *coro) 2673slf_destroy (pTHX_ struct coro *coro)
2573{ 2674{
2574 /* this callback is reserved for slf functions needing to do cleanup */ 2675 struct CoroSLF frame = coro->slf_frame;
2575 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2576 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2577 2676
2578 /* 2677 /*
2579 * The on_destroy above most likely is from an SLF call. 2678 * The on_destroy below most likely is from an SLF call.
2580 * Since by definition the SLF call will not finish when we destroy 2679 * Since by definition the SLF call will not finish when we destroy
2581 * the coro, we will have to force-finish it here, otherwise 2680 * the coro, we will have to force-finish it here, otherwise
2582 * cleanup functions cannot call SLF functions. 2681 * cleanup functions cannot call SLF functions.
2583 */ 2682 */
2584 coro->slf_frame.prepare = 0; 2683 coro->slf_frame.prepare = 0;
2684
2685 /* this callback is reserved for slf functions needing to do cleanup */
2686 if (frame.destroy && frame.prepare && !PL_dirty)
2687 frame.destroy (aTHX_ &frame);
2585} 2688}
2586 2689
2587/* 2690/*
2588 * these not obviously related functions are all rolled into one 2691 * these not obviously related functions are all rolled into one
2589 * function to increase chances that they all will call transfer with the same 2692 * function to increase chances that they all will call transfer with the same
… …
2772static void 2875static void
2773coro_pop_on_leave (pTHX_ void *coro) 2876coro_pop_on_leave (pTHX_ void *coro)
2774{ 2877{
2775 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2878 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2776 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2879 on_enterleave_call (aTHX_ sv_2mortal (cb));
2880}
2881
2882static void
2883enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2884{
2885 if (!hook)
2886 return;
2887
2888 if (!*avp)
2889 {
2890 *avp = newAV ();
2891 AvREAL_off (*avp);
2892 }
2893
2894 av_push (*avp, (SV *)hook);
2895 av_push (*avp, (SV *)arg);
2896}
2897
2898static void
2899enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2900{
2901 AV *av = *avp;
2902 int i;
2903
2904 if (!av)
2905 return;
2906
2907 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2908 if (AvARRAY (av)[i] == (SV *)hook)
2909 {
2910 if (execute)
2911 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2912
2913 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2914 av_pop (av);
2915 av_pop (av);
2916 break;
2917 }
2918
2919 if (AvFILLp (av) >= 0)
2920 {
2921 *avp = 0;
2922 SvREFCNT_dec_NN (av);
2923 }
2924}
2925
2926static void
2927api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2928{
2929 struct coro *coro = SvSTATE (coro_sv);
2930
2931 if (SvSTATE_current == coro)
2932 if (enter)
2933 enter (aTHX_ enter_arg);
2934
2935 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2936 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2937}
2938
2939static void
2940api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2941{
2942 struct coro *coro = SvSTATE (coro_sv);
2943
2944 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2945 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2946}
2947
2948static void
2949savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2950{
2951 struct coro *coro = SvSTATE_current;
2952
2953 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2954}
2955
2956static void
2957savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2958{
2959 struct coro *coro = SvSTATE_current;
2960
2961 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2962}
2963
2964static void
2965api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2966{
2967 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2968
2969 /* this ought to be much cheaper than malloc + a single destructor call */
2970 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2971 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2777} 2972}
2778 2973
2779/*****************************************************************************/ 2974/*****************************************************************************/
2780/* PerlIO::cede */ 2975/* PerlIO::cede */
2781 2976
… …
2911 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3106 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2912 PUTBACK; 3107 PUTBACK;
2913 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3108 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2914 } 3109 }
2915 3110
2916 SvREFCNT_dec (cb); 3111 SvREFCNT_dec_NN (cb);
2917 } 3112 }
2918} 3113}
2919 3114
2920static void 3115static void
2921coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3116coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
2929{ 3124{
2930 AV *av = (AV *)frame->data; 3125 AV *av = (AV *)frame->data;
2931 SV *count_sv = AvARRAY (av)[0]; 3126 SV *count_sv = AvARRAY (av)[0];
2932 SV *coro_hv = SvRV (coro_current); 3127 SV *coro_hv = SvRV (coro_current);
2933 3128
3129 frame->destroy = 0;
3130
2934 /* if we are about to throw, don't actually acquire the lock, just throw */ 3131 /* if we are about to throw, don't actually acquire the lock, just throw */
2935 if (CORO_THROW) 3132 if (ecb_expect_false (CORO_THROW))
3133 {
3134 /* we still might be responsible for the semaphore, so wake up others */
3135 coro_semaphore_adjust (aTHX_ av, 0);
3136
2936 return 0; 3137 return 0;
3138 }
2937 else if (SvIVX (count_sv) > 0) 3139 else if (SvIVX (count_sv) > 0)
2938 { 3140 {
2939 frame->destroy = 0;
2940
2941 if (acquire) 3141 if (acquire)
2942 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3142 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2943 else 3143 else
2944 coro_semaphore_adjust (aTHX_ av, 0); 3144 coro_semaphore_adjust (aTHX_ av, 0);
2945 3145
… …
3056 { 3256 {
3057 api_ready (aTHX_ cb); 3257 api_ready (aTHX_ cb);
3058 sv_setiv (cb, 0); /* signal waiter */ 3258 sv_setiv (cb, 0); /* signal waiter */
3059 } 3259 }
3060 3260
3061 SvREFCNT_dec (cb); 3261 SvREFCNT_dec_NN (cb);
3062 3262
3063 --count; 3263 --count;
3064 } 3264 }
3065} 3265}
3066 3266
… …
3151 } 3351 }
3152 3352
3153 av_push (state, data_sv); 3353 av_push (state, data_sv);
3154 3354
3155 api_ready (aTHX_ coro); 3355 api_ready (aTHX_ coro);
3156 SvREFCNT_dec (coro); 3356 SvREFCNT_dec_NN (coro);
3157 SvREFCNT_dec ((AV *)state); 3357 SvREFCNT_dec_NN ((AV *)state);
3158} 3358}
3159 3359
3160static int 3360static int
3161slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3361slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3162{ 3362{
… …
3180 errno = data->errorno; 3380 errno = data->errorno;
3181 PL_laststype = data->laststype; 3381 PL_laststype = data->laststype;
3182 PL_laststatval = data->laststatval; 3382 PL_laststatval = data->laststatval;
3183 PL_statcache = data->statcache; 3383 PL_statcache = data->statcache;
3184 3384
3185 SvREFCNT_dec (data_sv); 3385 SvREFCNT_dec_NN (data_sv);
3186 } 3386 }
3187 3387
3188 /* push result values */ 3388 /* push result values */
3189 { 3389 {
3190 dSP; 3390 dSP;
… …
3405 3605
3406PROTOTYPES: DISABLE 3606PROTOTYPES: DISABLE
3407 3607
3408BOOT: 3608BOOT:
3409{ 3609{
3610#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3611#include "state.h"
3410#ifdef USE_ITHREADS 3612#ifdef USE_ITHREADS
3411# if CORO_PTHREAD 3613# if CORO_PTHREAD
3412 coro_thx = PERL_GET_CONTEXT; 3614 coro_thx = PERL_GET_CONTEXT;
3413# endif 3615# endif
3414#endif 3616#endif
… …
3426 3628
3427 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3629 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
3428 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3630 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
3429 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3631 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
3430 3632
3431 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3432 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3633 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3433 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3634 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3434 3635
3435 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3636 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3436 3637
… …
3742 if (ecb_expect_false (current == self)) 3943 if (ecb_expect_false (current == self))
3743 coro_times_sub (SvSTATE (coro_current)); 3944 coro_times_sub (SvSTATE (coro_current));
3744} 3945}
3745 3946
3746void 3947void
3747swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3948swap_sv (Coro::State coro, SV *sva, SV *svb)
3748 CODE: 3949 CODE:
3749{ 3950{
3750 struct coro *current = SvSTATE_current; 3951 struct coro *current = SvSTATE_current;
3952 AV *swap_sv;
3953 int i;
3954
3955 sva = SvRV (sva);
3956 svb = SvRV (svb);
3751 3957
3752 if (current == coro) 3958 if (current == coro)
3753 SWAP_SVS (current); 3959 SWAP_SVS_LEAVE (current);
3754 3960
3755 if (!coro->swap_sv) 3961 if (!coro->swap_sv)
3756 coro->swap_sv = newAV (); 3962 coro->swap_sv = newAV ();
3757 3963
3964 swap_sv = coro->swap_sv;
3965
3966 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
3967 {
3968 SV *a = AvARRAY (swap_sv)[i ];
3969 SV *b = AvARRAY (swap_sv)[i + 1];
3970
3971 if (a == sva && b == svb)
3972 {
3973 SvREFCNT_dec_NN (a);
3974 SvREFCNT_dec_NN (b);
3975
3976 for (; i <= AvFILLp (swap_sv) - 2; i++)
3977 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
3978
3979 AvFILLp (swap_sv) -= 2;
3980
3981 goto removed;
3982 }
3983 }
3984
3758 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 3985 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3759 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 3986 av_push (swap_sv, SvREFCNT_inc_NN (svb));
3987
3988 removed:
3760 3989
3761 if (current == coro) 3990 if (current == coro)
3762 SWAP_SVS (current); 3991 SWAP_SVS_ENTER (current);
3763} 3992}
3764 3993
3765 3994
3766MODULE = Coro::State PACKAGE = Coro 3995MODULE = Coro::State PACKAGE = Coro
3767 3996
3768BOOT: 3997BOOT:
3769{ 3998{
3999 if (SVt_LAST > 32)
4000 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4001
3770 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4002 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3771 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4003 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3772 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4004 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3773 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4005 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3774 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4006 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3800 coroapi.ready = api_ready; 4032 coroapi.ready = api_ready;
3801 coroapi.is_ready = api_is_ready; 4033 coroapi.is_ready = api_is_ready;
3802 coroapi.nready = coro_nready; 4034 coroapi.nready = coro_nready;
3803 coroapi.current = coro_current; 4035 coroapi.current = coro_current;
3804 4036
4037 coroapi.enterleave_hook = api_enterleave_hook;
4038 coroapi.enterleave_unhook = api_enterleave_unhook;
4039 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4040
3805 /*GCoroAPI = &coroapi;*/ 4041 /*GCoroAPI = &coroapi;*/
3806 sv_setiv (sv, (IV)&coroapi); 4042 sv_setiv (sv, (IV)&coroapi);
3807 SvREADONLY_on (sv); 4043 SvREADONLY_on (sv);
3808 } 4044 }
3809} 4045}
… …
3874 4110
3875void 4111void
3876_set_current (SV *current) 4112_set_current (SV *current)
3877 PROTOTYPE: $ 4113 PROTOTYPE: $
3878 CODE: 4114 CODE:
3879 SvREFCNT_dec (SvRV (coro_current)); 4115 SvREFCNT_dec_NN (SvRV (coro_current));
3880 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4116 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3881 4117
3882void 4118void
3883_set_readyhook (SV *hook) 4119_set_readyhook (SV *hook)
3884 PROTOTYPE: $ 4120 PROTOTYPE: $
… …
3968 4204
3969 if ((SV *)hv == &PL_sv_undef) 4205 if ((SV *)hv == &PL_sv_undef)
3970 { 4206 {
3971 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4207 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3972 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4208 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3973 SvREFCNT_dec (sv); 4209 SvREFCNT_dec_NN (sv);
3974 } 4210 }
3975 4211
3976 { 4212 {
3977 struct coro *coro = SvSTATE_hv (hv); 4213 struct coro *coro = SvSTATE_hv (hv);
3978 4214
… …
3985 api_ready (aTHX_ (SV *)hv); 4221 api_ready (aTHX_ (SV *)hv);
3986 4222
3987 if (GIMME_V != G_VOID) 4223 if (GIMME_V != G_VOID)
3988 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4224 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3989 else 4225 else
3990 SvREFCNT_dec (hv); 4226 SvREFCNT_dec_NN (hv);
3991} 4227}
3992 4228
3993SV * 4229SV *
3994rouse_cb () 4230rouse_cb ()
3995 PROTOTYPE: 4231 PROTOTYPE:
… …
4074 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4310 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4075 OUTPUT: 4311 OUTPUT:
4076 RETVAL 4312 RETVAL
4077 4313
4078void 4314void
4079up (SV *self, int adjust = 1) 4315up (SV *self)
4080 ALIAS:
4081 adjust = 1
4082 CODE: 4316 CODE:
4317 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4318
4319void
4320adjust (SV *self, int adjust)
4321 CODE:
4083 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4322 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4084 4323
4085void 4324void
4086down (...) 4325down (...)
4087 CODE: 4326 CODE:
4088 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4327 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);

Diff Legend

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