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.214 by root, Sat Oct 13 23:19:10 2007 UTC vs.
Revision 1.242 by root, Thu Aug 14 12:48:20 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
669static 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);
688static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
689
690/* apparently < 5.8.8 */
691#ifndef MgPV_nolen_const
692#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
693 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
694 (const char*)(mg)->mg_ptr)
695#endif
670 696
671/* 697/*
672 * This overrides the default magic get method of %SIG elements. 698 * This overrides the default magic get method of %SIG elements.
673 * 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
674 * 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
682{ 708{
683 const char *s = MgPV_nolen_const (mg); 709 const char *s = MgPV_nolen_const (mg);
684 710
685 if (*s == '_') 711 if (*s == '_')
686 { 712 {
687 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0; 713 SV **svp = 0;
688 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0; 714
715 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
716 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
717
718 if (svp)
719 {
720 sv_setsv (sv, *svp ? *svp : &PL_sv_undef);
721 return 0;
722 }
723 }
724
725 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
726}
727
728static int
729coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
730{
731 const char *s = MgPV_nolen_const (mg);
732
733 if (*s == '_')
689 } 734 {
735 SV **svp = 0;
690 736
737 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
738 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
739
740 if (svp)
741 {
742 SV *old = *svp;
743 *svp = 0;
744 SvREFCNT_dec (old);
745 return 0;
746 }
747 }
748
749 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
750}
751
752static int
753coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
754{
755 const char *s = MgPV_nolen_const (mg);
756
757 if (*s == '_')
758 {
759 SV **svp = 0;
760
761 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
762 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
763
764 if (svp)
765 {
766 SV *old = *svp;
767 *svp = newSVsv (sv);
768 SvREFCNT_dec (old);
769 return 0;
770 }
771 }
772
691 return orig_sigelem_get (aTHX_ sv, mg); 773 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
692} 774}
693 775
694static void 776static void
695coro_setup (pTHX_ struct coro *coro) 777coro_setup (pTHX_ struct coro *coro)
696{ 778{
706 PL_curpm = 0; 788 PL_curpm = 0;
707 PL_curpad = 0; 789 PL_curpad = 0;
708 PL_localizing = 0; 790 PL_localizing = 0;
709 PL_dirty = 0; 791 PL_dirty = 0;
710 PL_restartop = 0; 792 PL_restartop = 0;
793#if PERL_VERSION_ATLEAST (5,10,0)
794 PL_parser = 0;
795#endif
711 796
712 /* recreate the die/warn hooks */ 797 /* recreate the die/warn hooks */
713 PL_diehook = 0; 798 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
714 hv_store (hv_sig, "__DIE__", sizeof ("__DIE__") - 1, newSV (0), 0); 799 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
715 PL_diehook = SvREFCNT_inc (rv_diehook);
716
717 PL_warnhook = 0;
718 hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, newSV (0), 0);
719 PL_warnhook = SvREFCNT_inc (rv_warnhook);
720 800
721 GvSV (PL_defgv) = newSV (0); 801 GvSV (PL_defgv) = newSV (0);
722 GvAV (PL_defgv) = coro->args; coro->args = 0; 802 GvAV (PL_defgv) = coro->args; coro->args = 0;
723 GvSV (PL_errgv) = newSV (0); 803 GvSV (PL_errgv) = newSV (0);
724 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 804 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
875 SAVETMPS; 955 SAVETMPS;
876 EXTEND (SP, 3); 956 EXTEND (SP, 3);
877 PUSHMARK (SP); 957 PUSHMARK (SP);
878 PUSHs (&PL_sv_yes); 958 PUSHs (&PL_sv_yes);
879 PUSHs (fullname); 959 PUSHs (fullname);
880 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 960 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
881 PUTBACK; 961 PUTBACK;
882 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 962 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
883 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 963 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
884 SPAGAIN; 964 SPAGAIN;
885 FREETMPS; 965 FREETMPS;
1101 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1181 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
1102 1182
1103 if (expect_false (next->flags & CF_DESTROYED)) 1183 if (expect_false (next->flags & CF_DESTROYED))
1104 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1184 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1105 1185
1106 if (
1107#if PERL_VERSION_ATLEAST (5,9,0) 1186#if !PERL_VERSION_ATLEAST (5,10,0)
1108 expect_false (PL_parser)
1109#else
1110 expect_false (PL_lex_state != LEX_NOTPARSING) 1187 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1111#endif
1112 )
1113 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1188 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1189#endif
1114 } 1190 }
1115} 1191}
1116 1192
1117/* always use the TRANSFER macro */ 1193/* always use the TRANSFER macro */
1118static void NOINLINE 1194static void NOINLINE
1119transfer (pTHX_ struct coro *prev, struct coro *next) 1195transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1120{ 1196{
1121 dSTACKLEVEL; 1197 dSTACKLEVEL;
1198 static volatile int has_throw;
1122 1199
1123 /* sometimes transfer is only called to set idle_sp */ 1200 /* sometimes transfer is only called to set idle_sp */
1124 if (expect_false (!next)) 1201 if (expect_false (!next))
1125 { 1202 {
1126 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1203 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1157 load_perl (aTHX_ next); 1234 load_perl (aTHX_ next);
1158 1235
1159 prev__cctx = prev->cctx; 1236 prev__cctx = prev->cctx;
1160 1237
1161 /* possibly "free" the cctx */ 1238 /* possibly "free" the cctx */
1162 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1239 if (expect_true (
1240 prev__cctx->idle_sp == STACKLEVEL
1241 && !(prev__cctx->flags & CC_TRACE)
1242 && !force_cctx
1243 ))
1163 { 1244 {
1164 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1245 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1165 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1246 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1166 1247
1167 prev->cctx = 0; 1248 prev->cctx = 0;
1177 1258
1178 ++next->usecount; 1259 ++next->usecount;
1179 1260
1180 if (expect_true (!next->cctx)) 1261 if (expect_true (!next->cctx))
1181 next->cctx = cctx_get (aTHX); 1262 next->cctx = cctx_get (aTHX);
1263
1264 has_throw = !!next->throw;
1182 1265
1183 if (expect_false (prev__cctx != next->cctx)) 1266 if (expect_false (prev__cctx != next->cctx))
1184 { 1267 {
1185 prev__cctx->top_env = PL_top_env; 1268 prev__cctx->top_env = PL_top_env;
1186 PL_top_env = next->cctx->top_env; 1269 PL_top_env = next->cctx->top_env;
1188 } 1271 }
1189 1272
1190 free_coro_mortal (aTHX); 1273 free_coro_mortal (aTHX);
1191 UNLOCK; 1274 UNLOCK;
1192 1275
1193 if (expect_false (prev->throw || next->throw)) 1276 if (expect_false (has_throw))
1194 { 1277 {
1195 struct coro *coro = SvSTATE (coro_current); 1278 struct coro *coro = SvSTATE (coro_current);
1196 1279
1197 if (coro->throw) 1280 if (coro->throw)
1198 { 1281 {
1208struct transfer_args 1291struct transfer_args
1209{ 1292{
1210 struct coro *prev, *next; 1293 struct coro *prev, *next;
1211}; 1294};
1212 1295
1213#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1296#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1214#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1297#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1215 1298
1216/** high level stuff ********************************************************/ 1299/** high level stuff ********************************************************/
1217 1300
1218static int 1301static int
1312{ 1395{
1313 dTHX; 1396 dTHX;
1314 struct transfer_args ta; 1397 struct transfer_args ta;
1315 1398
1316 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1399 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1317 TRANSFER (ta); 1400 TRANSFER (ta, 1);
1318} 1401}
1319 1402
1320/** Coro ********************************************************************/ 1403/** Coro ********************************************************************/
1321 1404
1322static void 1405static void
1324{ 1407{
1325 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1408 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1326} 1409}
1327 1410
1328static SV * 1411static SV *
1329coro_deq (pTHX_ int min_prio) 1412coro_deq (pTHX)
1330{ 1413{
1331 int prio = PRIO_MAX - PRIO_MIN; 1414 int prio;
1332 1415
1333 min_prio -= PRIO_MIN;
1334 if (min_prio < 0)
1335 min_prio = 0;
1336
1337 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1416 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1338 if (AvFILLp (coro_ready [prio]) >= 0) 1417 if (AvFILLp (coro_ready [prio]) >= 0)
1339 return av_shift (coro_ready [prio]); 1418 return av_shift (coro_ready [prio]);
1340 1419
1341 return 0; 1420 return 0;
1342} 1421}
1344static int 1423static int
1345api_ready (SV *coro_sv) 1424api_ready (SV *coro_sv)
1346{ 1425{
1347 dTHX; 1426 dTHX;
1348 struct coro *coro; 1427 struct coro *coro;
1428 SV *sv_hook;
1429 void (*xs_hook)(void);
1349 1430
1350 if (SvROK (coro_sv)) 1431 if (SvROK (coro_sv))
1351 coro_sv = SvRV (coro_sv); 1432 coro_sv = SvRV (coro_sv);
1352 1433
1353 coro = SvSTATE (coro_sv); 1434 coro = SvSTATE (coro_sv);
1356 return 0; 1437 return 0;
1357 1438
1358 coro->flags |= CF_READY; 1439 coro->flags |= CF_READY;
1359 1440
1360 LOCK; 1441 LOCK;
1442
1443 sv_hook = coro_nready ? 0 : coro_readyhook;
1444 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1445
1361 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1446 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1362 ++coro_nready; 1447 ++coro_nready;
1448
1363 UNLOCK; 1449 UNLOCK;
1450
1451 if (sv_hook)
1452 {
1453 dSP;
1454
1455 ENTER;
1456 SAVETMPS;
1457
1458 PUSHMARK (SP);
1459 PUTBACK;
1460 call_sv (sv_hook, G_DISCARD);
1461 SPAGAIN;
1462
1463 FREETMPS;
1464 LEAVE;
1465 }
1466
1467 if (xs_hook)
1468 xs_hook ();
1364 1469
1365 return 1; 1470 return 1;
1366} 1471}
1367 1472
1368static int 1473static int
1378 SV *prev_sv, *next_sv; 1483 SV *prev_sv, *next_sv;
1379 1484
1380 for (;;) 1485 for (;;)
1381 { 1486 {
1382 LOCK; 1487 LOCK;
1383 next_sv = coro_deq (aTHX_ PRIO_MIN); 1488 next_sv = coro_deq (aTHX);
1384 1489
1385 /* nothing to schedule: call the idle handler */ 1490 /* nothing to schedule: call the idle handler */
1386 if (expect_false (!next_sv)) 1491 if (expect_false (!next_sv))
1387 { 1492 {
1388 dSP; 1493 dSP;
1392 SAVETMPS; 1497 SAVETMPS;
1393 1498
1394 PUSHMARK (SP); 1499 PUSHMARK (SP);
1395 PUTBACK; 1500 PUTBACK;
1396 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1501 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1502 SPAGAIN;
1397 1503
1398 FREETMPS; 1504 FREETMPS;
1399 LEAVE; 1505 LEAVE;
1400 continue; 1506 continue;
1401 } 1507 }
1456{ 1562{
1457 dTHX; 1563 dTHX;
1458 struct transfer_args ta; 1564 struct transfer_args ta;
1459 1565
1460 prepare_schedule (aTHX_ &ta); 1566 prepare_schedule (aTHX_ &ta);
1461 TRANSFER (ta); 1567 TRANSFER (ta, 1);
1462} 1568}
1463 1569
1464static int 1570static int
1465api_cede (void) 1571api_cede (void)
1466{ 1572{
1469 1575
1470 prepare_cede (aTHX_ &ta); 1576 prepare_cede (aTHX_ &ta);
1471 1577
1472 if (expect_true (ta.prev != ta.next)) 1578 if (expect_true (ta.prev != ta.next))
1473 { 1579 {
1474 TRANSFER (ta); 1580 TRANSFER (ta, 1);
1475 return 1; 1581 return 1;
1476 } 1582 }
1477 else 1583 else
1478 return 0; 1584 return 0;
1479} 1585}
1484 dTHX; 1590 dTHX;
1485 struct transfer_args ta; 1591 struct transfer_args ta;
1486 1592
1487 if (prepare_cede_notself (aTHX_ &ta)) 1593 if (prepare_cede_notself (aTHX_ &ta))
1488 { 1594 {
1489 TRANSFER (ta); 1595 TRANSFER (ta, 1);
1490 return 1; 1596 return 1;
1491 } 1597 }
1492 else 1598 else
1493 return 0; 1599 return 0;
1494} 1600}
1531 BOOT_PAGESIZE; 1637 BOOT_PAGESIZE;
1532 1638
1533 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1639 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1534 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1640 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1535 1641
1536 orig_sigelem_get = PL_vtbl_sigelem.svt_get; 1642 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1537 PL_vtbl_sigelem.svt_get = coro_sigelem_get; 1643 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1644 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1538 1645
1539 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE); 1646 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1540 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 1647 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1541 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 1648 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1542 1649
1551 main_top_env = PL_top_env; 1658 main_top_env = PL_top_env;
1552 1659
1553 while (main_top_env->je_prev) 1660 while (main_top_env->je_prev)
1554 main_top_env = main_top_env->je_prev; 1661 main_top_env = main_top_env->je_prev;
1555 1662
1556 coroapi.ver = CORO_API_VERSION; 1663 coroapi.ver = CORO_API_VERSION;
1557 coroapi.rev = CORO_API_REVISION; 1664 coroapi.rev = CORO_API_REVISION;
1558 coroapi.transfer = api_transfer; 1665 coroapi.transfer = api_transfer;
1559 1666
1560 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1667 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1561} 1668}
1562 1669
1563SV * 1670SV *
1601 Coro::cede_notself = 4 1708 Coro::cede_notself = 4
1602 CODE: 1709 CODE:
1603{ 1710{
1604 struct transfer_args ta; 1711 struct transfer_args ta;
1605 1712
1713 PUTBACK;
1606 switch (ix) 1714 switch (ix)
1607 { 1715 {
1608 case 0: 1716 case 0:
1609 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1717 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1610 ta.next = 0; 1718 ta.next = 0;
1629 if (!prepare_cede_notself (aTHX_ &ta)) 1737 if (!prepare_cede_notself (aTHX_ &ta))
1630 XSRETURN_EMPTY; 1738 XSRETURN_EMPTY;
1631 1739
1632 break; 1740 break;
1633 } 1741 }
1742 SPAGAIN;
1634 1743
1635 BARRIER; 1744 BARRIER;
1636 PUTBACK; 1745 PUTBACK;
1637 TRANSFER (ta); 1746 TRANSFER (ta, 0);
1638 SPAGAIN; /* might be the sp of a different coroutine now */ 1747 SPAGAIN; /* might be the sp of a different coroutine now */
1639 /* be extra careful not to ever do anything after TRANSFER */ 1748 /* be extra careful not to ever do anything after TRANSFER */
1640} 1749}
1641 1750
1642bool 1751bool
1645 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 1754 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1646 OUTPUT: 1755 OUTPUT:
1647 RETVAL 1756 RETVAL
1648 1757
1649void 1758void
1650_exit (code) 1759_exit (int code)
1651 int code
1652 PROTOTYPE: $ 1760 PROTOTYPE: $
1653 CODE: 1761 CODE:
1654 _exit (code); 1762 _exit (code);
1655 1763
1656int 1764int
1696 { 1804 {
1697 struct coro temp; 1805 struct coro temp;
1698 1806
1699 if (!(coro->flags & CF_RUNNING)) 1807 if (!(coro->flags & CF_RUNNING))
1700 { 1808 {
1809 PUTBACK;
1701 save_perl (aTHX_ &temp); 1810 save_perl (aTHX_ &temp);
1702 load_perl (aTHX_ coro); 1811 load_perl (aTHX_ coro);
1703 } 1812 }
1704 1813
1705 { 1814 {
1724 1833
1725 if (!(coro->flags & CF_RUNNING)) 1834 if (!(coro->flags & CF_RUNNING))
1726 { 1835 {
1727 save_perl (aTHX_ coro); 1836 save_perl (aTHX_ coro);
1728 load_perl (aTHX_ &temp); 1837 load_perl (aTHX_ &temp);
1838 SPAGAIN;
1729 } 1839 }
1730 } 1840 }
1731} 1841}
1732 1842
1733SV * 1843SV *
1745 1855
1746void 1856void
1747api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 1857api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1748 1858
1749SV * 1859SV *
1750has_stack (Coro::State coro) 1860has_cctx (Coro::State coro)
1751 PROTOTYPE: $ 1861 PROTOTYPE: $
1752 CODE: 1862 CODE:
1753 RETVAL = boolSV (!!coro->cctx); 1863 RETVAL = boolSV (!!coro->cctx);
1754 OUTPUT: 1864 OUTPUT:
1755 RETVAL 1865 RETVAL
1774 case 1: RETVAL = coro->usecount; break; 1884 case 1: RETVAL = coro->usecount; break;
1775 } 1885 }
1776 OUTPUT: 1886 OUTPUT:
1777 RETVAL 1887 RETVAL
1778 1888
1889void
1890force_cctx ()
1891 CODE:
1892 struct coro *coro = SvSTATE (coro_current);
1893 coro->cctx->idle_sp = 0;
1894
1895void
1896throw (Coro::State self, SV *throw = &PL_sv_undef)
1897 PROTOTYPE: $;$
1898 CODE:
1899 SvREFCNT_dec (self->throw);
1900 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1901
1902void
1903swap_defsv (Coro::State self)
1904 PROTOTYPE: $
1905 ALIAS:
1906 swap_defav = 1
1907 CODE:
1908 if (!self->slot)
1909 croak ("cannot swap state with coroutine that has no saved state");
1910 else
1911 {
1912 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1913 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1914
1915 SV *tmp = *src; *src = *dst; *dst = tmp;
1916 }
1779 1917
1780MODULE = Coro::State PACKAGE = Coro 1918MODULE = Coro::State PACKAGE = Coro
1781 1919
1782BOOT: 1920BOOT:
1783{ 1921{
1784 int i; 1922 int i;
1785 1923
1924 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1786 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 1925 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1787 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 1926 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1788 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1789 1927
1790 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 1928 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1791 SvREADONLY_on (coro_current); 1929 SvREADONLY_on (coro_current);
1792 1930
1793 coro_stash = gv_stashpv ("Coro", TRUE); 1931 coro_stash = gv_stashpv ("Coro", TRUE);
1825 PROTOTYPE: $ 1963 PROTOTYPE: $
1826 CODE: 1964 CODE:
1827 SvREFCNT_dec (SvRV (coro_current)); 1965 SvREFCNT_dec (SvRV (coro_current));
1828 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 1966 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1829 1967
1968void
1969_set_readyhook (SV *hook)
1970 PROTOTYPE: $
1971 CODE:
1972 LOCK;
1973 SvREFCNT_dec (coro_readyhook);
1974 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
1975 UNLOCK;
1976
1830int 1977int
1831prio (Coro::State coro, int newprio = 0) 1978prio (Coro::State coro, int newprio = 0)
1832 ALIAS: 1979 ALIAS:
1833 nice = 1 1980 nice = 1
1834 CODE: 1981 CODE:
1863 CODE: 2010 CODE:
1864 RETVAL = coro_nready; 2011 RETVAL = coro_nready;
1865 OUTPUT: 2012 OUTPUT:
1866 RETVAL 2013 RETVAL
1867 2014
1868void
1869throw (Coro::State self, SV *throw = &PL_sv_undef)
1870 PROTOTYPE: $;$
1871 CODE:
1872 SvREFCNT_dec (self->throw);
1873 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1874
1875# for async_pool speedup 2015# for async_pool speedup
1876void 2016void
1877_pool_1 (SV *cb) 2017_pool_1 (SV *cb)
1878 CODE: 2018 CODE:
1879{ 2019{
1883 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 2023 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1884 AV *invoke_av; 2024 AV *invoke_av;
1885 int i, len; 2025 int i, len;
1886 2026
1887 if (!invoke) 2027 if (!invoke)
2028 {
2029 SV *old = PL_diehook;
2030 PL_diehook = 0;
2031 SvREFCNT_dec (old);
1888 croak ("\3async_pool terminate\2\n"); 2032 croak ("\3async_pool terminate\2\n");
2033 }
1889 2034
1890 SvREFCNT_dec (coro->saved_deffh); 2035 SvREFCNT_dec (coro->saved_deffh);
1891 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2036 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1892 2037
1893 hv_store (hv, "desc", sizeof ("desc") - 1, 2038 hv_store (hv, "desc", sizeof ("desc") - 1,
1919 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2064 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1920 coro->saved_deffh = 0; 2065 coro->saved_deffh = 0;
1921 2066
1922 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2067 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1923 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2068 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2069 {
2070 SV *old = PL_diehook;
2071 PL_diehook = 0;
2072 SvREFCNT_dec (old);
1924 croak ("\3async_pool terminate\2\n"); 2073 croak ("\3async_pool terminate\2\n");
2074 }
1925 2075
1926 av_clear (GvAV (PL_defgv)); 2076 av_clear (GvAV (PL_defgv));
1927 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2077 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1928 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2078 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1929 2079
1968 PL_laststype = data->laststype; 2118 PL_laststype = data->laststype;
1969 PL_laststatval = data->laststatval; 2119 PL_laststatval = data->laststatval;
1970 PL_statcache = data->statcache; 2120 PL_statcache = data->statcache;
1971} 2121}
1972 2122
2123
2124MODULE = Coro::State PACKAGE = Coro::AnyEvent
2125
2126BOOT:
2127 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2128
2129SV *
2130_schedule (...)
2131 PROTOTYPE: @
2132 CODE:
2133{
2134 static int incede;
2135
2136 api_cede_notself ();
2137
2138 ++incede;
2139 while (coro_nready >= incede && api_cede ())
2140 ;
2141
2142 sv_setsv (sv_activity, &PL_sv_undef);
2143 if (coro_nready >= incede)
2144 {
2145 PUSHMARK (SP);
2146 PUTBACK;
2147 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2148 SPAGAIN;
2149 }
2150
2151 --incede;
2152}
2153

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines