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.215 by root, Sun Oct 14 19:34:09 2007 UTC vs.
Revision 1.238 by root, Sat May 31 12:10:55 2008 UTC

10#include "patchlevel.h" 10#include "patchlevel.h"
11 11
12#include <stdio.h> 12#include <stdio.h>
13#include <errno.h> 13#include <errno.h>
14#include <assert.h> 14#include <assert.h>
15
16#ifdef WIN32
17# undef setjmp
18# undef longjmp
19# undef _exit
20# define setjmp _setjmp // deep magic, don't ask
21#else
15#include <inttypes.h> /* portable stdint.h */ 22# include <inttypes.h> /* most portable stdint.h */
23#endif
16 24
17#ifdef HAVE_MMAP 25#ifdef HAVE_MMAP
18# include <unistd.h> 26# include <unistd.h>
19# include <sys/mman.h> 27# include <sys/mman.h>
20# ifndef MAP_ANONYMOUS 28# ifndef MAP_ANONYMOUS
72# ifndef IS_PADCONST 80# ifndef IS_PADCONST
73# define IS_PADCONST(v) 0 81# define IS_PADCONST(v) 0
74# endif 82# endif
75#endif 83#endif
76 84
85/* 5.8.8 */
86#ifndef GV_NOTQUAL
87# define GV_NOTQUAL 0
88#endif
89#ifndef newSV
90# define newSV(l) NEWSV(0,l)
91#endif
92
93/* 5.11 */
94#ifndef CxHASARGS
95# define CxHASARGS(cx) (cx)->blk_sub.hasargs
96#endif
97
77/* 5.8.7 */ 98/* 5.8.7 */
78#ifndef SvRV_set 99#ifndef SvRV_set
79# define SvRV_set(s,v) SvRV(s) = (v) 100# define SvRV_set(s,v) SvRV(s) = (v)
80#endif
81
82/* 5.8.8 */
83#ifndef GV_NOTQUAL
84# define GV_NOTQUAL 0
85#endif
86#ifndef newSV
87# define newSV(l) NEWSV(0,l)
88#endif 101#endif
89 102
90#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 103#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
91# undef CORO_STACKGUARD 104# undef CORO_STACKGUARD
92#endif 105#endif
145static size_t coro_stacksize = CORO_STACKSIZE; 158static size_t coro_stacksize = CORO_STACKSIZE;
146static struct CoroAPI coroapi; 159static struct CoroAPI coroapi;
147static AV *main_mainstack; /* used to differentiate between $main and others */ 160static AV *main_mainstack; /* used to differentiate between $main and others */
148static JMPENV *main_top_env; 161static JMPENV *main_top_env;
149static HV *coro_state_stash, *coro_stash; 162static HV *coro_state_stash, *coro_stash;
150static SV *coro_mortal; /* will be freed after next transfer */ 163static volatile SV *coro_mortal; /* will be freed after next transfer */
151 164
152static GV *irsgv; /* $/ */ 165static GV *irsgv; /* $/ */
153static GV *stdoutgv; /* *STDOUT */ 166static GV *stdoutgv; /* *STDOUT */
154static SV *rv_diehook; 167static SV *rv_diehook;
155static SV *rv_warnhook; 168static SV *rv_warnhook;
157 170
158/* async_pool helper stuff */ 171/* async_pool helper stuff */
159static SV *sv_pool_rss; 172static SV *sv_pool_rss;
160static SV *sv_pool_size; 173static SV *sv_pool_size;
161static AV *av_async_pool; 174static AV *av_async_pool;
175
176/* Coro::AnyEvent */
177static SV *sv_activity;
162 178
163static struct coro_cctx *cctx_first; 179static struct coro_cctx *cctx_first;
164static int cctx_count, cctx_idle; 180static int cctx_count, cctx_idle;
165 181
166enum { 182enum {
252#define PRIO_IDLE -3 268#define PRIO_IDLE -3
253#define PRIO_MIN -4 269#define PRIO_MIN -4
254 270
255/* for Coro.pm */ 271/* for Coro.pm */
256static SV *coro_current; 272static SV *coro_current;
273static SV *coro_readyhook;
257static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 274static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
258static int coro_nready; 275static int coro_nready;
259static struct coro *coro_first; 276static struct coro *coro_first;
260 277
261/** lowlevel stuff **********************************************************/ 278/** lowlevel stuff **********************************************************/
262 279
263static SV * 280static SV *
264coro_get_sv (pTHX_ const char *name, int create) 281coro_get_sv (pTHX_ const char *name, int create)
265{ 282{
266#if PERL_VERSION_ATLEAST (5,9,0) 283#if PERL_VERSION_ATLEAST (5,10,0)
267 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 284 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
268 get_sv (name, create); 285 get_sv (name, create);
269#endif 286#endif
270 return get_sv (name, create); 287 return get_sv (name, create);
271} 288}
272 289
273static AV * 290static AV *
274coro_get_av (pTHX_ const char *name, int create) 291coro_get_av (pTHX_ const char *name, int create)
275{ 292{
276#if PERL_VERSION_ATLEAST (5,9,0) 293#if PERL_VERSION_ATLEAST (5,10,0)
277 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 294 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
278 get_av (name, create); 295 get_av (name, create);
279#endif 296#endif
280 return get_av (name, create); 297 return get_av (name, create);
281} 298}
282 299
283static HV * 300static HV *
284coro_get_hv (pTHX_ const char *name, int create) 301coro_get_hv (pTHX_ const char *name, int create)
285{ 302{
286#if PERL_VERSION_ATLEAST (5,9,0) 303#if PERL_VERSION_ATLEAST (5,10,0)
287 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 304 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
288 get_hv (name, create); 305 get_hv (name, create);
289#endif 306#endif
290 return get_hv (name, create); 307 return get_hv (name, create);
291} 308}
296 AV *padlist = CvPADLIST (cv); 313 AV *padlist = CvPADLIST (cv);
297 AV *newpadlist, *newpad; 314 AV *newpadlist, *newpad;
298 315
299 newpadlist = newAV (); 316 newpadlist = newAV ();
300 AvREAL_off (newpadlist); 317 AvREAL_off (newpadlist);
301#if PERL_VERSION_ATLEAST (5,9,0) 318#if PERL_VERSION_ATLEAST (5,10,0)
302 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 319 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
303#else 320#else
304 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 321 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
305#endif 322#endif
306 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 323 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
497 514
498 if (expect_true (CvDEPTH (cv))) 515 if (expect_true (CvDEPTH (cv)))
499 { 516 {
500 EXTEND (SP, 3); 517 EXTEND (SP, 3);
501 PUSHs ((SV *)CvPADLIST (cv)); 518 PUSHs ((SV *)CvPADLIST (cv));
502 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 519 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
503 PUSHs ((SV *)cv); 520 PUSHs ((SV *)cv);
504 521
505 CvDEPTH (cv) = 0; 522 CvDEPTH (cv) = 0;
506 get_padlist (aTHX_ cv); 523 get_padlist (aTHX_ cv);
507 } 524 }
587 604
588 New(54,PL_savestack,24,ANY); 605 New(54,PL_savestack,24,ANY);
589 PL_savestack_ix = 0; 606 PL_savestack_ix = 0;
590 PL_savestack_max = 24; 607 PL_savestack_max = 24;
591 608
592#if !PERL_VERSION_ATLEAST (5,9,0) 609#if !PERL_VERSION_ATLEAST (5,10,0)
593 New(54,PL_retstack,4,OP*); 610 New(54,PL_retstack,4,OP*);
594 PL_retstack_ix = 0; 611 PL_retstack_ix = 0;
595 PL_retstack_max = 4; 612 PL_retstack_max = 4;
596#endif 613#endif
597} 614}
620 637
621 Safefree (PL_tmps_stack); 638 Safefree (PL_tmps_stack);
622 Safefree (PL_markstack); 639 Safefree (PL_markstack);
623 Safefree (PL_scopestack); 640 Safefree (PL_scopestack);
624 Safefree (PL_savestack); 641 Safefree (PL_savestack);
625#if !PERL_VERSION_ATLEAST (5,9,0) 642#if !PERL_VERSION_ATLEAST (5,10,0)
626 Safefree (PL_retstack); 643 Safefree (PL_retstack);
627#endif 644#endif
628} 645}
629 646
630static size_t 647static size_t
654 rss += slot->tmps_max * sizeof (SV *); 671 rss += slot->tmps_max * sizeof (SV *);
655 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 672 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
656 rss += slot->scopestack_max * sizeof (I32); 673 rss += slot->scopestack_max * sizeof (I32);
657 rss += slot->savestack_max * sizeof (ANY); 674 rss += slot->savestack_max * sizeof (ANY);
658 675
659#if !PERL_VERSION_ATLEAST (5,9,0) 676#if !PERL_VERSION_ATLEAST (5,10,0)
660 rss += slot->retstack_max * sizeof (OP *); 677 rss += slot->retstack_max * sizeof (OP *);
661#endif 678#endif
662 } 679 }
663 680
664 return rss; 681 return rss;
665} 682}
666 683
667/** coroutine stack handling ************************************************/ 684/** coroutine stack handling ************************************************/
668 685
669#if 0
670static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg); 686static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
687static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
688
689/* apparently < 5.8.8 */
690#undef MgPV_nolen_const
691#ifndef MgPV_nolen_const
692#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
693 SvPV_nolen_const((SV*)((mg)->mg_ptr)) : \
694 (const char*)(mg)->mg_ptr)
695#endif
671 696
672/* 697/*
673 * This overrides the default magic get method of %SIG elements. 698 * This overrides the default magic get method of %SIG elements.
674 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 699 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
675 * and instead of tryign to save and restore the hash elements, we just provide 700 * and instead of tryign to save and restore the hash elements, we just provide
679 * when a schedule happens then, but we ignore this. 704 * when a schedule happens then, but we ignore this.
680 */ 705 */
681static int 706static int
682coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 707coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
683{ 708{
684 return orig_sigelem_get (aTHX_ sv, mg);
685 const char *s = MgPV_nolen_const (mg); 709 const char *s = MgPV_nolen_const (mg);
686 710
687 if (*s == '_') 711 if (*s == '_')
688 { 712 {
689 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0; 713 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;
690 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0; 714 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
691 } 715 }
692 716
693 return orig_sigelem_get (aTHX_ sv, mg); 717 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
694} 718}
695#endif 719
720static int
721coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
722{
723 const char *s = MgPV_nolen_const (mg);
724
725 if (*s == '_')
726 {
727 SV **svp = 0;
728
729 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
730 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
731
732 if (svp)
733 {
734 SV *old = *svp;
735 *svp = newSVsv (sv);
736 SvREFCNT_dec (old);
737 return 0;
738 }
739 }
740
741 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
742}
696 743
697static void 744static void
698coro_setup (pTHX_ struct coro *coro) 745coro_setup (pTHX_ struct coro *coro)
699{ 746{
700 /* 747 /*
709 PL_curpm = 0; 756 PL_curpm = 0;
710 PL_curpad = 0; 757 PL_curpad = 0;
711 PL_localizing = 0; 758 PL_localizing = 0;
712 PL_dirty = 0; 759 PL_dirty = 0;
713 PL_restartop = 0; 760 PL_restartop = 0;
761#if PERL_VERSION_ATLEAST (5,10,0)
762 PL_parser = 0;
763#endif
714 764
715 /* recreate the die/warn hooks */ 765 /* recreate the die/warn hooks */
716 PL_diehook = 0; 766 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
717 hv_store (hv_sig, "__DIE__", sizeof ("__DIE__") - 1, newSV (0), 0); 767 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
718 PL_diehook = SvREFCNT_inc (rv_diehook);
719
720 PL_warnhook = 0;
721 hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, newSV (0), 0);
722 PL_warnhook = SvREFCNT_inc (rv_warnhook);
723 768
724 GvSV (PL_defgv) = newSV (0); 769 GvSV (PL_defgv) = newSV (0);
725 GvAV (PL_defgv) = coro->args; coro->args = 0; 770 GvAV (PL_defgv) = coro->args; coro->args = 0;
726 GvSV (PL_errgv) = newSV (0); 771 GvSV (PL_errgv) = newSV (0);
727 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 772 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
878 SAVETMPS; 923 SAVETMPS;
879 EXTEND (SP, 3); 924 EXTEND (SP, 3);
880 PUSHMARK (SP); 925 PUSHMARK (SP);
881 PUSHs (&PL_sv_yes); 926 PUSHs (&PL_sv_yes);
882 PUSHs (fullname); 927 PUSHs (fullname);
883 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 928 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
884 PUTBACK; 929 PUTBACK;
885 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 930 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
886 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 931 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
887 SPAGAIN; 932 SPAGAIN;
888 FREETMPS; 933 FREETMPS;
1104 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1149 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
1105 1150
1106 if (expect_false (next->flags & CF_DESTROYED)) 1151 if (expect_false (next->flags & CF_DESTROYED))
1107 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1152 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1108 1153
1109 if (
1110#if PERL_VERSION_ATLEAST (5,9,0) 1154#if !PERL_VERSION_ATLEAST (5,10,0)
1111 expect_false (PL_parser)
1112#else
1113 expect_false (PL_lex_state != LEX_NOTPARSING) 1155 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1114#endif
1115 )
1116 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1156 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1157#endif
1117 } 1158 }
1118} 1159}
1119 1160
1120/* always use the TRANSFER macro */ 1161/* always use the TRANSFER macro */
1121static void NOINLINE 1162static void NOINLINE
1122transfer (pTHX_ struct coro *prev, struct coro *next) 1163transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1123{ 1164{
1124 dSTACKLEVEL; 1165 dSTACKLEVEL;
1166 static volatile int has_throw;
1125 1167
1126 /* sometimes transfer is only called to set idle_sp */ 1168 /* sometimes transfer is only called to set idle_sp */
1127 if (expect_false (!next)) 1169 if (expect_false (!next))
1128 { 1170 {
1129 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1171 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1160 load_perl (aTHX_ next); 1202 load_perl (aTHX_ next);
1161 1203
1162 prev__cctx = prev->cctx; 1204 prev__cctx = prev->cctx;
1163 1205
1164 /* possibly "free" the cctx */ 1206 /* possibly "free" the cctx */
1165 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1207 if (expect_true (
1208 prev__cctx->idle_sp == STACKLEVEL
1209 && !(prev__cctx->flags & CC_TRACE)
1210 && !force_cctx
1211 ))
1166 { 1212 {
1167 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1213 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1168 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1214 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1169 1215
1170 prev->cctx = 0; 1216 prev->cctx = 0;
1180 1226
1181 ++next->usecount; 1227 ++next->usecount;
1182 1228
1183 if (expect_true (!next->cctx)) 1229 if (expect_true (!next->cctx))
1184 next->cctx = cctx_get (aTHX); 1230 next->cctx = cctx_get (aTHX);
1231
1232 has_throw = !!next->throw;
1185 1233
1186 if (expect_false (prev__cctx != next->cctx)) 1234 if (expect_false (prev__cctx != next->cctx))
1187 { 1235 {
1188 prev__cctx->top_env = PL_top_env; 1236 prev__cctx->top_env = PL_top_env;
1189 PL_top_env = next->cctx->top_env; 1237 PL_top_env = next->cctx->top_env;
1191 } 1239 }
1192 1240
1193 free_coro_mortal (aTHX); 1241 free_coro_mortal (aTHX);
1194 UNLOCK; 1242 UNLOCK;
1195 1243
1196 if (expect_false (prev->throw || next->throw)) 1244 if (expect_false (has_throw))
1197 { 1245 {
1198 struct coro *coro = SvSTATE (coro_current); 1246 struct coro *coro = SvSTATE (coro_current);
1199 1247
1200 if (coro->throw) 1248 if (coro->throw)
1201 { 1249 {
1211struct transfer_args 1259struct transfer_args
1212{ 1260{
1213 struct coro *prev, *next; 1261 struct coro *prev, *next;
1214}; 1262};
1215 1263
1216#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1264#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1217#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1265#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1218 1266
1219/** high level stuff ********************************************************/ 1267/** high level stuff ********************************************************/
1220 1268
1221static int 1269static int
1315{ 1363{
1316 dTHX; 1364 dTHX;
1317 struct transfer_args ta; 1365 struct transfer_args ta;
1318 1366
1319 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1367 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1320 TRANSFER (ta); 1368 TRANSFER (ta, 1);
1321} 1369}
1322 1370
1323/** Coro ********************************************************************/ 1371/** Coro ********************************************************************/
1324 1372
1325static void 1373static void
1327{ 1375{
1328 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1376 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1329} 1377}
1330 1378
1331static SV * 1379static SV *
1332coro_deq (pTHX_ int min_prio) 1380coro_deq (pTHX)
1333{ 1381{
1334 int prio = PRIO_MAX - PRIO_MIN; 1382 int prio;
1335 1383
1336 min_prio -= PRIO_MIN;
1337 if (min_prio < 0)
1338 min_prio = 0;
1339
1340 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1384 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1341 if (AvFILLp (coro_ready [prio]) >= 0) 1385 if (AvFILLp (coro_ready [prio]) >= 0)
1342 return av_shift (coro_ready [prio]); 1386 return av_shift (coro_ready [prio]);
1343 1387
1344 return 0; 1388 return 0;
1345} 1389}
1347static int 1391static int
1348api_ready (SV *coro_sv) 1392api_ready (SV *coro_sv)
1349{ 1393{
1350 dTHX; 1394 dTHX;
1351 struct coro *coro; 1395 struct coro *coro;
1396 SV *sv_hook;
1397 void (*xs_hook)(void);
1352 1398
1353 if (SvROK (coro_sv)) 1399 if (SvROK (coro_sv))
1354 coro_sv = SvRV (coro_sv); 1400 coro_sv = SvRV (coro_sv);
1355 1401
1356 coro = SvSTATE (coro_sv); 1402 coro = SvSTATE (coro_sv);
1359 return 0; 1405 return 0;
1360 1406
1361 coro->flags |= CF_READY; 1407 coro->flags |= CF_READY;
1362 1408
1363 LOCK; 1409 LOCK;
1410
1411 sv_hook = coro_nready ? 0 : coro_readyhook;
1412 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1413
1364 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1414 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1365 ++coro_nready; 1415 ++coro_nready;
1416
1366 UNLOCK; 1417 UNLOCK;
1418
1419 if (sv_hook)
1420 {
1421 dSP;
1422
1423 ENTER;
1424 SAVETMPS;
1425
1426 PUSHMARK (SP);
1427 PUTBACK;
1428 call_sv (sv_hook, G_DISCARD);
1429 SPAGAIN;
1430
1431 FREETMPS;
1432 LEAVE;
1433 }
1434
1435 if (xs_hook)
1436 xs_hook ();
1367 1437
1368 return 1; 1438 return 1;
1369} 1439}
1370 1440
1371static int 1441static int
1381 SV *prev_sv, *next_sv; 1451 SV *prev_sv, *next_sv;
1382 1452
1383 for (;;) 1453 for (;;)
1384 { 1454 {
1385 LOCK; 1455 LOCK;
1386 next_sv = coro_deq (aTHX_ PRIO_MIN); 1456 next_sv = coro_deq (aTHX);
1387 1457
1388 /* nothing to schedule: call the idle handler */ 1458 /* nothing to schedule: call the idle handler */
1389 if (expect_false (!next_sv)) 1459 if (expect_false (!next_sv))
1390 { 1460 {
1391 dSP; 1461 dSP;
1395 SAVETMPS; 1465 SAVETMPS;
1396 1466
1397 PUSHMARK (SP); 1467 PUSHMARK (SP);
1398 PUTBACK; 1468 PUTBACK;
1399 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1469 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1470 SPAGAIN;
1400 1471
1401 FREETMPS; 1472 FREETMPS;
1402 LEAVE; 1473 LEAVE;
1403 continue; 1474 continue;
1404 } 1475 }
1459{ 1530{
1460 dTHX; 1531 dTHX;
1461 struct transfer_args ta; 1532 struct transfer_args ta;
1462 1533
1463 prepare_schedule (aTHX_ &ta); 1534 prepare_schedule (aTHX_ &ta);
1464 TRANSFER (ta); 1535 TRANSFER (ta, 1);
1465} 1536}
1466 1537
1467static int 1538static int
1468api_cede (void) 1539api_cede (void)
1469{ 1540{
1472 1543
1473 prepare_cede (aTHX_ &ta); 1544 prepare_cede (aTHX_ &ta);
1474 1545
1475 if (expect_true (ta.prev != ta.next)) 1546 if (expect_true (ta.prev != ta.next))
1476 { 1547 {
1477 TRANSFER (ta); 1548 TRANSFER (ta, 1);
1478 return 1; 1549 return 1;
1479 } 1550 }
1480 else 1551 else
1481 return 0; 1552 return 0;
1482} 1553}
1487 dTHX; 1558 dTHX;
1488 struct transfer_args ta; 1559 struct transfer_args ta;
1489 1560
1490 if (prepare_cede_notself (aTHX_ &ta)) 1561 if (prepare_cede_notself (aTHX_ &ta))
1491 { 1562 {
1492 TRANSFER (ta); 1563 TRANSFER (ta, 1);
1493 return 1; 1564 return 1;
1494 } 1565 }
1495 else 1566 else
1496 return 0; 1567 return 0;
1497} 1568}
1533#endif 1604#endif
1534 BOOT_PAGESIZE; 1605 BOOT_PAGESIZE;
1535 1606
1536 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1607 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1537 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1608 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1538#if 0 1609
1539 orig_sigelem_get = PL_vtbl_sigelem.svt_get; 1610 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1540 PL_vtbl_sigelem.svt_get = coro_sigelem_get; 1611 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1541#endif 1612 orig_sigelem_set = PL_vtbl_sigelem.svt_set;
1613 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1614
1542 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE); 1615 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1543 rv_diehook = SvREFCNT_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 1616 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1544 rv_warnhook = SvREFCNT_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 1617 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1545 1618
1546 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1619 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1547 1620
1548 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1621 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1549 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1622 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1554 main_top_env = PL_top_env; 1627 main_top_env = PL_top_env;
1555 1628
1556 while (main_top_env->je_prev) 1629 while (main_top_env->je_prev)
1557 main_top_env = main_top_env->je_prev; 1630 main_top_env = main_top_env->je_prev;
1558 1631
1559 coroapi.ver = CORO_API_VERSION; 1632 coroapi.ver = CORO_API_VERSION;
1560 coroapi.rev = CORO_API_REVISION; 1633 coroapi.rev = CORO_API_REVISION;
1561 coroapi.transfer = api_transfer; 1634 coroapi.transfer = api_transfer;
1562 1635
1563 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1636 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1564} 1637}
1565 1638
1566SV * 1639SV *
1604 Coro::cede_notself = 4 1677 Coro::cede_notself = 4
1605 CODE: 1678 CODE:
1606{ 1679{
1607 struct transfer_args ta; 1680 struct transfer_args ta;
1608 1681
1682 PUTBACK;
1609 switch (ix) 1683 switch (ix)
1610 { 1684 {
1611 case 0: 1685 case 0:
1612 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1686 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1613 ta.next = 0; 1687 ta.next = 0;
1632 if (!prepare_cede_notself (aTHX_ &ta)) 1706 if (!prepare_cede_notself (aTHX_ &ta))
1633 XSRETURN_EMPTY; 1707 XSRETURN_EMPTY;
1634 1708
1635 break; 1709 break;
1636 } 1710 }
1711 SPAGAIN;
1637 1712
1638 BARRIER; 1713 BARRIER;
1639 PUTBACK; 1714 PUTBACK;
1640 TRANSFER (ta); 1715 TRANSFER (ta, 0);
1641 SPAGAIN; /* might be the sp of a different coroutine now */ 1716 SPAGAIN; /* might be the sp of a different coroutine now */
1642 /* be extra careful not to ever do anything after TRANSFER */ 1717 /* be extra careful not to ever do anything after TRANSFER */
1643} 1718}
1644 1719
1645bool 1720bool
1648 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 1723 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1649 OUTPUT: 1724 OUTPUT:
1650 RETVAL 1725 RETVAL
1651 1726
1652void 1727void
1653_exit (code) 1728_exit (int code)
1654 int code
1655 PROTOTYPE: $ 1729 PROTOTYPE: $
1656 CODE: 1730 CODE:
1657 _exit (code); 1731 _exit (code);
1658 1732
1659int 1733int
1699 { 1773 {
1700 struct coro temp; 1774 struct coro temp;
1701 1775
1702 if (!(coro->flags & CF_RUNNING)) 1776 if (!(coro->flags & CF_RUNNING))
1703 { 1777 {
1778 PUTBACK;
1704 save_perl (aTHX_ &temp); 1779 save_perl (aTHX_ &temp);
1705 load_perl (aTHX_ coro); 1780 load_perl (aTHX_ coro);
1706 } 1781 }
1707 1782
1708 { 1783 {
1727 1802
1728 if (!(coro->flags & CF_RUNNING)) 1803 if (!(coro->flags & CF_RUNNING))
1729 { 1804 {
1730 save_perl (aTHX_ coro); 1805 save_perl (aTHX_ coro);
1731 load_perl (aTHX_ &temp); 1806 load_perl (aTHX_ &temp);
1807 SPAGAIN;
1732 } 1808 }
1733 } 1809 }
1734} 1810}
1735 1811
1736SV * 1812SV *
1748 1824
1749void 1825void
1750api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 1826api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1751 1827
1752SV * 1828SV *
1753has_stack (Coro::State coro) 1829has_cctx (Coro::State coro)
1754 PROTOTYPE: $ 1830 PROTOTYPE: $
1755 CODE: 1831 CODE:
1756 RETVAL = boolSV (!!coro->cctx); 1832 RETVAL = boolSV (!!coro->cctx);
1757 OUTPUT: 1833 OUTPUT:
1758 RETVAL 1834 RETVAL
1777 case 1: RETVAL = coro->usecount; break; 1853 case 1: RETVAL = coro->usecount; break;
1778 } 1854 }
1779 OUTPUT: 1855 OUTPUT:
1780 RETVAL 1856 RETVAL
1781 1857
1858void
1859force_cctx ()
1860 CODE:
1861 struct coro *coro = SvSTATE (coro_current);
1862 coro->cctx->idle_sp = 0;
1782 1863
1783MODULE = Coro::State PACKAGE = Coro 1864MODULE = Coro::State PACKAGE = Coro
1784 1865
1785BOOT: 1866BOOT:
1786{ 1867{
1787 int i; 1868 int i;
1788 1869
1870 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1789 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 1871 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1790 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 1872 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1791 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1792 1873
1793 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 1874 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1794 SvREADONLY_on (coro_current); 1875 SvREADONLY_on (coro_current);
1795 1876
1796 coro_stash = gv_stashpv ("Coro", TRUE); 1877 coro_stash = gv_stashpv ("Coro", TRUE);
1828 PROTOTYPE: $ 1909 PROTOTYPE: $
1829 CODE: 1910 CODE:
1830 SvREFCNT_dec (SvRV (coro_current)); 1911 SvREFCNT_dec (SvRV (coro_current));
1831 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 1912 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1832 1913
1914void
1915_set_readyhook (SV *hook)
1916 PROTOTYPE: $
1917 CODE:
1918 LOCK;
1919 SvREFCNT_dec (coro_readyhook);
1920 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
1921 UNLOCK;
1922
1833int 1923int
1834prio (Coro::State coro, int newprio = 0) 1924prio (Coro::State coro, int newprio = 0)
1835 ALIAS: 1925 ALIAS:
1836 nice = 1 1926 nice = 1
1837 CODE: 1927 CODE:
1873 PROTOTYPE: $;$ 1963 PROTOTYPE: $;$
1874 CODE: 1964 CODE:
1875 SvREFCNT_dec (self->throw); 1965 SvREFCNT_dec (self->throw);
1876 self->throw = SvOK (throw) ? newSVsv (throw) : 0; 1966 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1877 1967
1968void
1969swap_defsv (Coro::State self)
1970 PROTOTYPE: $
1971 ALIAS:
1972 swap_defav = 1
1973 CODE:
1974 if (!self->slot)
1975 croak ("cannot swap state with coroutine that has no saved state");
1976 else
1977 {
1978 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1979 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1980
1981 SV *tmp = *src; *src = *dst; *dst = tmp;
1982 }
1983
1878# for async_pool speedup 1984# for async_pool speedup
1879void 1985void
1880_pool_1 (SV *cb) 1986_pool_1 (SV *cb)
1881 CODE: 1987 CODE:
1882{ 1988{
1886 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1992 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1887 AV *invoke_av; 1993 AV *invoke_av;
1888 int i, len; 1994 int i, len;
1889 1995
1890 if (!invoke) 1996 if (!invoke)
1997 {
1998 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1891 croak ("\3async_pool terminate\2\n"); 1999 croak ("\3async_pool terminate\2\n");
2000 }
1892 2001
1893 SvREFCNT_dec (coro->saved_deffh); 2002 SvREFCNT_dec (coro->saved_deffh);
1894 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2003 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1895 2004
1896 hv_store (hv, "desc", sizeof ("desc") - 1, 2005 hv_store (hv, "desc", sizeof ("desc") - 1,
1922 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2031 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1923 coro->saved_deffh = 0; 2032 coro->saved_deffh = 0;
1924 2033
1925 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2034 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1926 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2035 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2036 {
2037 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1927 croak ("\3async_pool terminate\2\n"); 2038 croak ("\3async_pool terminate\2\n");
2039 }
1928 2040
1929 av_clear (GvAV (PL_defgv)); 2041 av_clear (GvAV (PL_defgv));
1930 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2042 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1931 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2043 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1932 2044
1971 PL_laststype = data->laststype; 2083 PL_laststype = data->laststype;
1972 PL_laststatval = data->laststatval; 2084 PL_laststatval = data->laststatval;
1973 PL_statcache = data->statcache; 2085 PL_statcache = data->statcache;
1974} 2086}
1975 2087
2088
2089MODULE = Coro::State PACKAGE = Coro::AnyEvent
2090
2091BOOT:
2092 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2093
2094SV *
2095_schedule (...)
2096 PROTOTYPE: @
2097 CODE:
2098{
2099 static int incede;
2100
2101 api_cede_notself ();
2102
2103 ++incede;
2104 while (coro_nready >= incede && api_cede ())
2105 ;
2106
2107 sv_setsv (sv_activity, &PL_sv_undef);
2108 if (coro_nready >= incede)
2109 {
2110 PUSHMARK (SP);
2111 PUTBACK;
2112 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2113 SPAGAIN;
2114 }
2115
2116 --incede;
2117}
2118

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines