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.430 by root, Wed Dec 19 23:36:16 2012 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>
25 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
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
30#ifdef PadARRAY 39#ifdef PadARRAY
31# define NEWPADAPI 40# define NEWPADAPI 1
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *)) 41# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else 42#else
34typedef AV PADNAMELIST; 43typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0) 44# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST; 45typedef AV PADLIST;
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 const off = PadlistMAX (padlist) + 1; 537 PADOFFSET off = PadlistMAX (padlist) + 1;
517 538
518 newPADLIST(newpadlist); 539#if NEWPADAPI
519#if !PERL_VERSION_ATLEAST(5,15,3) 540
520 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */ 541 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
521 AvREAL_off (newpadlist); 542 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
522#endif 543 while (!PadlistARRAY (padlist)[off - 1])
544 --off;
545
546 Perl_pad_push (aTHX_ padlist, off);
547
548 newpad = PadlistARRAY (padlist)[off];
549 PadlistARRAY (padlist)[off] = 0;
550
551#else
552
523#if PERL_VERSION_ATLEAST (5,10,0) 553#if PERL_VERSION_ATLEAST (5,10,0)
524 Perl_pad_push (aTHX_ padlist, off); 554 Perl_pad_push (aTHX_ padlist, off);
525#else 555#else
526 Perl_pad_push (aTHX_ padlist, off, 1); 556 Perl_pad_push (aTHX_ padlist, off, 1);
527#endif 557#endif
558
528 newpad = PadlistARRAY (padlist)[off]; 559 newpad = PadlistARRAY (padlist)[off];
529 PadlistMAX (padlist) = off - 1; 560 PadlistMAX (padlist) = off - 1;
530 561
562#endif
563
564 newPADLIST (newpadlist);
565#if !PERL_VERSION_ATLEAST(5,15,3)
566 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
567 AvREAL_off (newpadlist);
568#endif
569
531 /* Already extended to 2 elements by newPADLIST. */ 570 /* Already extended to 2 elements by newPADLIST. */
532 PadlistMAX (newpadlist) = 1; 571 PadlistMAX (newpadlist) = 1;
533 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist)); 572
573 padnames = PadlistNAMES (padlist);
574 ++PadnamelistREFCNT (padnames);
575 PadlistNAMES (newpadlist) = padnames;
576
534 PadlistARRAY (newpadlist)[1] = newpad; 577 PadlistARRAY (newpadlist)[1] = newpad;
535 578
536 return newpadlist; 579 return newpadlist;
537} 580}
538 581
546 589
547 while (i > 0) /* special-case index 0 */ 590 while (i > 0) /* special-case index 0 */
548 { 591 {
549 /* we try to be extra-careful here */ 592 /* we try to be extra-careful here */
550 PAD *pad = PadlistARRAY (padlist)[i--]; 593 PAD *pad = PadlistARRAY (padlist)[i--];
594
595 if (pad)
596 {
551 I32 j = PadMAX (pad); 597 I32 j = PadMAX (pad);
552 598
553 while (j >= 0) 599 while (j >= 0)
554 SvREFCNT_dec (PadARRAY (pad)[j--]); 600 SvREFCNT_dec (PadARRAY (pad)[j--]);
555 601
556 PadMAX (pad) = -1; 602 PadMAX (pad) = -1;
557 SvREFCNT_dec (pad); 603 SvREFCNT_dec (pad);
604 }
558 } 605 }
559 606
560 SvREFCNT_dec (PadlistNAMES (padlist)); 607 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
561 608
562#ifdef NEWPADAPI 609#if NEWPADAPI
563 Safefree (PadlistARRAY (padlist)); 610 Safefree (PadlistARRAY (padlist));
564 Safefree (padlist); 611 Safefree (padlist);
565#else 612#else
566 AvFILLp (padlist) = -1; 613 AvFILLp (padlist) = -1;
567 AvREAL_off (padlist); 614 AvREAL_off (padlist);
661 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;
662 709
663 /* 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,
664 * 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.
665 */ 712 */
666 #define svany_in_head(type) \ 713 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
667 (((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)))
668 719
669 if (svany_in_head (SvTYPE (a))) 720 if (svany_in_head (SvTYPE (a)))
670 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a); 721 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
671 722
672 if (svany_in_head (SvTYPE (b))) 723 if (svany_in_head (SvTYPE (b)))
675#endif 726#endif
676} 727}
677 728
678/* swap sv heads, at least logically */ 729/* swap sv heads, at least logically */
679static void 730static void
680swap_svs (pTHX_ Coro__State c) 731swap_svs_enter (pTHX_ Coro__State c)
681{ 732{
682 int i; 733 int i;
683 734
684 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2) 735 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
685 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]);
686} 737}
687 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
688#define SWAP_SVS(coro) \ 748#define SWAP_SVS_ENTER(coro) \
689 if (ecb_expect_false ((coro)->swap_sv)) \ 749 if (ecb_expect_false ((coro)->swap_sv)) \
690 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))
691 755
692static void 756static void
693on_enterleave_call (pTHX_ SV *cb); 757on_enterleave_call (pTHX_ SV *cb);
694 758
695static void 759static void
740 804
741 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 805 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
742 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 806 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
743 } 807 }
744 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
745 SWAP_SVS (c); 817 SWAP_SVS_ENTER (c);
746} 818}
747 819
748static void 820static void
749save_perl (pTHX_ Coro__State c) 821save_perl (pTHX_ Coro__State c)
750{ 822{
751 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 }
752 832
753 if (ecb_expect_false (c->on_leave)) 833 if (ecb_expect_false (c->on_leave))
754 { 834 {
755 int i; 835 int i;
756 836
1109 1189
1110 GvSV (PL_defgv) = newSV (0); 1190 GvSV (PL_defgv) = newSV (0);
1111 GvAV (PL_defgv) = coro->args; coro->args = 0; 1191 GvAV (PL_defgv) = coro->args; coro->args = 0;
1112 GvSV (PL_errgv) = newSV (0); 1192 GvSV (PL_errgv) = newSV (0);
1113 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);
1114 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
1115 PL_rs = newSVsv (GvSV (irsgv)); 1198 PL_rs = newSVsv (GvSV (irsgv));
1116 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1199 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1117 1200
1118 { 1201 {
1119 dSP; 1202 dSP;
1147 PL_op = (OP *)&init_perl_op; 1230 PL_op = (OP *)&init_perl_op;
1148 1231
1149 /* copy throw, in case it was set before init_perl */ 1232 /* copy throw, in case it was set before init_perl */
1150 CORO_THROW = coro->except; 1233 CORO_THROW = coro->except;
1151 1234
1152 SWAP_SVS (coro); 1235 SWAP_SVS_ENTER (coro);
1153 1236
1154 if (ecb_expect_false (enable_times)) 1237 if (ecb_expect_false (enable_times))
1155 { 1238 {
1156 coro_times_update (); 1239 coro_times_update ();
1157 coro_times_sub (coro); 1240 coro_times_sub (coro);
1195 /* this will cause transfer_check to croak on block*/ 1278 /* this will cause transfer_check to croak on block*/
1196 SvRV_set (coro_current, (SV *)coro->hv); 1279 SvRV_set (coro_current, (SV *)coro->hv);
1197 1280
1198 load_perl (aTHX_ coro); 1281 load_perl (aTHX_ coro);
1199 1282
1283 /* restore swapped sv's */
1284 SWAP_SVS_LEAVE (coro);
1285
1200 coro_unwind_stacks (aTHX); 1286 coro_unwind_stacks (aTHX);
1201
1202 /* restore swapped sv's */
1203 SWAP_SVS (coro);
1204 1287
1205 coro_destruct_stacks (aTHX); 1288 coro_destruct_stacks (aTHX);
1206 1289
1207 /* now save some sv's to be free'd later */ 1290 /* now save some sv's to be free'd later */
1208 svf [0] = GvSV (PL_defgv); 1291 svf [0] = GvSV (PL_defgv);
1229 1312
1230 SvREFCNT_dec (coro->saved_deffh); 1313 SvREFCNT_dec (coro->saved_deffh);
1231 SvREFCNT_dec (coro->rouse_cb); 1314 SvREFCNT_dec (coro->rouse_cb);
1232 SvREFCNT_dec (coro->invoke_cb); 1315 SvREFCNT_dec (coro->invoke_cb);
1233 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);
1234 } 1319 }
1235} 1320}
1236 1321
1237ecb_inline void 1322ecb_inline void
1238free_coro_mortal (pTHX) 1323free_coro_mortal (pTHX)
1301 1386
1302 if (PL_curcop != &PL_compiling) 1387 if (PL_curcop != &PL_compiling)
1303 { 1388 {
1304 SV **cb; 1389 SV **cb;
1305 1390
1306 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1391 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1307 { 1392 {
1308 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1393 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1309 1394
1310 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1395 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1311 { 1396 {
1888 /* nothing to schedule: call the idle handler */ 1973 /* nothing to schedule: call the idle handler */
1889 if (SvROK (sv_idle) 1974 if (SvROK (sv_idle)
1890 && SvOBJECT (SvRV (sv_idle))) 1975 && SvOBJECT (SvRV (sv_idle)))
1891 { 1976 {
1892 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);
1893 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 }
1894 1996
1895 ++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 */
1896 api_ready (aTHX_ SvRV (sv_idle)); 1998 api_ready (aTHX_ SvRV (sv_idle));
1897 --coro_nready; 1999 --coro_nready;
1898 } 2000 }
2096 AV *od = coro->on_destroy; 2198 AV *od = coro->on_destroy;
2097 2199
2098 if (!od) 2200 if (!od)
2099 return; 2201 return;
2100 2202
2203 coro->on_destroy = 0;
2204 sv_2mortal ((SV *)od);
2205
2101 while (AvFILLp (od) >= 0) 2206 while (AvFILLp (od) >= 0)
2102 { 2207 {
2103 SV *cb = sv_2mortal (av_pop (od)); 2208 SV *cb = sv_2mortal (av_pop (od));
2104 2209
2105 /* coro hv's (and only hv's at the moment) are supported as well */ 2210 /* coro hv's (and only hv's at the moment) are supported as well */
2199 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2304 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2200 } 2305 }
2201 else 2306 else
2202 { 2307 {
2203 struct coro *self = SvSTATE_current; 2308 struct coro *self = SvSTATE_current;
2309
2310 if (!self)
2311 croak ("Coro::cancel called outside of thread content,");
2204 2312
2205 /* otherwise we cancel directly, purely for speed reasons 2313 /* otherwise we cancel directly, purely for speed reasons
2206 * unfortunately, this requires some magic trickery, as 2314 * unfortunately, this requires some magic trickery, as
2207 * 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.
2208 * this is ugly, and hopefully fully worth the extra speed. 2316 * this is ugly, and hopefully fully worth the extra speed.
2318 else 2426 else
2319 { 2427 {
2320 av_clear (GvAV (PL_defgv)); 2428 av_clear (GvAV (PL_defgv));
2321 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);
2322 2430
2431 if (ecb_expect_false (coro->swap_sv))
2432 {
2433 SvREFCNT_dec_NN (coro->swap_sv);
2434 coro->swap_sv = 0;
2435 }
2436
2323 coro->prio = 0; 2437 coro->prio = 0;
2324 2438
2325 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2439 if (coro->cctx && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2326 api_trace (aTHX_ coro_current, 0); 2440 api_trace (aTHX_ coro_current, 0);
2327 2441
2328 frame->prepare = prepare_schedule; 2442 frame->prepare = prepare_schedule;
2329 av_push (av_async_pool, SvREFCNT_inc (hv)); 2443 av_push (av_async_pool, SvREFCNT_inc (hv));
2330 } 2444 }
2550 2664
2551/* "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 */
2552static void 2666static void
2553slf_destroy (pTHX_ struct coro *coro) 2667slf_destroy (pTHX_ struct coro *coro)
2554{ 2668{
2555 /* this callback is reserved for slf functions needing to do cleanup */ 2669 struct CoroSLF frame = coro->slf_frame;
2556 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2557 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2558 2670
2559 /* 2671 /*
2560 * The on_destroy above most likely is from an SLF call. 2672 * The on_destroy below most likely is from an SLF call.
2561 * 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
2562 * the coro, we will have to force-finish it here, otherwise 2674 * the coro, we will have to force-finish it here, otherwise
2563 * cleanup functions cannot call SLF functions. 2675 * cleanup functions cannot call SLF functions.
2564 */ 2676 */
2565 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);
2566} 2682}
2567 2683
2568/* 2684/*
2569 * these not obviously related functions are all rolled into one 2685 * these not obviously related functions are all rolled into one
2570 * 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
2753static void 2869static void
2754coro_pop_on_leave (pTHX_ void *coro) 2870coro_pop_on_leave (pTHX_ void *coro)
2755{ 2871{
2756 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);
2757 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);
2758} 2966}
2759 2967
2760/*****************************************************************************/ 2968/*****************************************************************************/
2761/* PerlIO::cede */ 2969/* PerlIO::cede */
2762 2970
2892 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3100 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2893 PUTBACK; 3101 PUTBACK;
2894 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3102 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2895 } 3103 }
2896 3104
2897 SvREFCNT_dec (cb); 3105 SvREFCNT_dec_NN (cb);
2898 } 3106 }
2899} 3107}
2900 3108
2901static void 3109static void
2902coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3110coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2910{ 3118{
2911 AV *av = (AV *)frame->data; 3119 AV *av = (AV *)frame->data;
2912 SV *count_sv = AvARRAY (av)[0]; 3120 SV *count_sv = AvARRAY (av)[0];
2913 SV *coro_hv = SvRV (coro_current); 3121 SV *coro_hv = SvRV (coro_current);
2914 3122
3123 frame->destroy = 0;
3124
2915 /* 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 */
2916 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
2917 return 0; 3131 return 0;
3132 }
2918 else if (SvIVX (count_sv) > 0) 3133 else if (SvIVX (count_sv) > 0)
2919 { 3134 {
2920 frame->destroy = 0;
2921
2922 if (acquire) 3135 if (acquire)
2923 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3136 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2924 else 3137 else
2925 coro_semaphore_adjust (aTHX_ av, 0); 3138 coro_semaphore_adjust (aTHX_ av, 0);
2926 3139
3037 { 3250 {
3038 api_ready (aTHX_ cb); 3251 api_ready (aTHX_ cb);
3039 sv_setiv (cb, 0); /* signal waiter */ 3252 sv_setiv (cb, 0); /* signal waiter */
3040 } 3253 }
3041 3254
3042 SvREFCNT_dec (cb); 3255 SvREFCNT_dec_NN (cb);
3043 3256
3044 --count; 3257 --count;
3045 } 3258 }
3046} 3259}
3047 3260
3132 } 3345 }
3133 3346
3134 av_push (state, data_sv); 3347 av_push (state, data_sv);
3135 3348
3136 api_ready (aTHX_ coro); 3349 api_ready (aTHX_ coro);
3137 SvREFCNT_dec (coro); 3350 SvREFCNT_dec_NN (coro);
3138 SvREFCNT_dec ((AV *)state); 3351 SvREFCNT_dec_NN ((AV *)state);
3139} 3352}
3140 3353
3141static int 3354static int
3142slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3355slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3143{ 3356{
3148 /* it quickly returns */ 3361 /* it quickly returns */
3149 if (CORO_THROW) 3362 if (CORO_THROW)
3150 return 0; 3363 return 0;
3151 3364
3152 /* one element that is an RV? repeat! */ 3365 /* one element that is an RV? repeat! */
3153 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3366 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3154 return 1; 3367 return 1;
3155 3368
3156 /* restore status */ 3369 /* restore status */
3157 { 3370 {
3158 SV *data_sv = av_pop (state); 3371 SV *data_sv = av_pop (state);
3161 errno = data->errorno; 3374 errno = data->errorno;
3162 PL_laststype = data->laststype; 3375 PL_laststype = data->laststype;
3163 PL_laststatval = data->laststatval; 3376 PL_laststatval = data->laststatval;
3164 PL_statcache = data->statcache; 3377 PL_statcache = data->statcache;
3165 3378
3166 SvREFCNT_dec (data_sv); 3379 SvREFCNT_dec_NN (data_sv);
3167 } 3380 }
3168 3381
3169 /* push result values */ 3382 /* push result values */
3170 { 3383 {
3171 dSP; 3384 dSP;
3386 3599
3387PROTOTYPES: DISABLE 3600PROTOTYPES: DISABLE
3388 3601
3389BOOT: 3602BOOT:
3390{ 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"
3391#ifdef USE_ITHREADS 3606#ifdef USE_ITHREADS
3392# if CORO_PTHREAD 3607# if CORO_PTHREAD
3393 coro_thx = PERL_GET_CONTEXT; 3608 coro_thx = PERL_GET_CONTEXT;
3394# endif 3609# endif
3395#endif 3610#endif
3407 3622
3408 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;
3409 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;
3410 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;
3411 3626
3412 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3413 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));
3414 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));
3415 3629
3416 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3630 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3417 3631
3470void 3684void
3471transfer (...) 3685transfer (...)
3472 PROTOTYPE: $$ 3686 PROTOTYPE: $$
3473 CODE: 3687 CODE:
3474 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3688 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3475
3476void
3477_exit (int code)
3478 PROTOTYPE: $
3479 CODE:
3480 _exit (code);
3481 3689
3482SV * 3690SV *
3483clone (Coro::State coro) 3691clone (Coro::State coro)
3484 CODE: 3692 CODE:
3485{ 3693{
3729 if (ecb_expect_false (current == self)) 3937 if (ecb_expect_false (current == self))
3730 coro_times_sub (SvSTATE (coro_current)); 3938 coro_times_sub (SvSTATE (coro_current));
3731} 3939}
3732 3940
3733void 3941void
3734swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3942swap_sv (Coro::State coro, SV *sva, SV *svb)
3735 CODE: 3943 CODE:
3736{ 3944{
3737 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);
3738 3951
3739 if (current == coro) 3952 if (current == coro)
3740 SWAP_SVS (current); 3953 SWAP_SVS_LEAVE (current);
3741 3954
3742 if (!coro->swap_sv) 3955 if (!coro->swap_sv)
3743 coro->swap_sv = newAV (); 3956 coro->swap_sv = newAV ();
3744 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
3745 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 3979 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3746 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 3980 av_push (swap_sv, SvREFCNT_inc_NN (svb));
3981
3982 removed:
3747 3983
3748 if (current == coro) 3984 if (current == coro)
3749 SWAP_SVS (current); 3985 SWAP_SVS_ENTER (current);
3750} 3986}
3751 3987
3752 3988
3753MODULE = Coro::State PACKAGE = Coro 3989MODULE = Coro::State PACKAGE = Coro
3754 3990
3755BOOT: 3991BOOT:
3756{ 3992{
3993 if (SVt_LAST > 32)
3994 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3995
3757 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3996 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3758 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3997 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3759 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3998 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3760 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);
3761 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4000 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3787 coroapi.ready = api_ready; 4026 coroapi.ready = api_ready;
3788 coroapi.is_ready = api_is_ready; 4027 coroapi.is_ready = api_is_ready;
3789 coroapi.nready = coro_nready; 4028 coroapi.nready = coro_nready;
3790 coroapi.current = coro_current; 4029 coroapi.current = coro_current;
3791 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
3792 /*GCoroAPI = &coroapi;*/ 4035 /*GCoroAPI = &coroapi;*/
3793 sv_setiv (sv, (IV)&coroapi); 4036 sv_setiv (sv, (IV)&coroapi);
3794 SvREADONLY_on (sv); 4037 SvREADONLY_on (sv);
3795 } 4038 }
3796} 4039}
3861 4104
3862void 4105void
3863_set_current (SV *current) 4106_set_current (SV *current)
3864 PROTOTYPE: $ 4107 PROTOTYPE: $
3865 CODE: 4108 CODE:
3866 SvREFCNT_dec (SvRV (coro_current)); 4109 SvREFCNT_dec_NN (SvRV (coro_current));
3867 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4110 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3868 4111
3869void 4112void
3870_set_readyhook (SV *hook) 4113_set_readyhook (SV *hook)
3871 PROTOTYPE: $ 4114 PROTOTYPE: $
3955 4198
3956 if ((SV *)hv == &PL_sv_undef) 4199 if ((SV *)hv == &PL_sv_undef)
3957 { 4200 {
3958 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);
3959 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4202 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3960 SvREFCNT_dec (sv); 4203 SvREFCNT_dec_NN (sv);
3961 } 4204 }
3962 4205
3963 { 4206 {
3964 struct coro *coro = SvSTATE_hv (hv); 4207 struct coro *coro = SvSTATE_hv (hv);
3965 4208
3972 api_ready (aTHX_ (SV *)hv); 4215 api_ready (aTHX_ (SV *)hv);
3973 4216
3974 if (GIMME_V != G_VOID) 4217 if (GIMME_V != G_VOID)
3975 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4218 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3976 else 4219 else
3977 SvREFCNT_dec (hv); 4220 SvREFCNT_dec_NN (hv);
3978} 4221}
3979 4222
3980SV * 4223SV *
3981rouse_cb () 4224rouse_cb ()
3982 PROTOTYPE: 4225 PROTOTYPE:
4061 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4304 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4062 OUTPUT: 4305 OUTPUT:
4063 RETVAL 4306 RETVAL
4064 4307
4065void 4308void
4066up (SV *self, int adjust = 1) 4309up (SV *self)
4067 ALIAS:
4068 adjust = 1
4069 CODE: 4310 CODE:
4311 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4312
4313void
4314adjust (SV *self, int adjust)
4315 CODE:
4070 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4316 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4071 4317
4072void 4318void
4073down (...) 4319down (...)
4074 CODE: 4320 CODE:
4075 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4321 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
4237 { 4483 {
4238 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4484 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4239 coro_old_pp_sselect = 0; 4485 coro_old_pp_sselect = 0;
4240 } 4486 }
4241 4487
4488MODULE = Coro::State PACKAGE = Coro::Util
4489
4490void
4491_exit (int code)
4492 CODE:
4493 _exit (code);
4494
4495NV
4496time ()
4497 CODE:
4498 RETVAL = nvtime (aTHX);
4499 OUTPUT:
4500 RETVAL
4501
4502NV
4503gettimeofday ()
4504 PPCODE:
4505{
4506 UV tv [2];
4507 u2time (aTHX_ tv);
4508 EXTEND (SP, 2);
4509 PUSHs (sv_2mortal (newSVuv (tv [0])));
4510 PUSHs (sv_2mortal (newSVuv (tv [1])));
4511}
4512

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines