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.237 by root, Fri May 23 00:27:06 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);
670 688
671/* 689/*
672 * This overrides the default magic get method of %SIG elements. 690 * 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 691 * 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 692 * and instead of tryign to save and restore the hash elements, we just provide
… …
686 { 704 {
687 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0; 705 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;
688 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0; 706 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
689 } 707 }
690 708
691 return orig_sigelem_get (aTHX_ sv, mg); 709 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
710}
711
712static int
713coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
714{
715 const char *s = MgPV_nolen_const (mg);
716
717 if (*s == '_')
718 {
719 SV **svp = 0;
720
721 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
722 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
723
724 if (svp)
725 {
726 SV *old = *svp;
727 *svp = newSVsv (sv);
728 SvREFCNT_dec (old);
729 return 0;
730 }
731 }
732
733 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
692} 734}
693 735
694static void 736static void
695coro_setup (pTHX_ struct coro *coro) 737coro_setup (pTHX_ struct coro *coro)
696{ 738{
… …
706 PL_curpm = 0; 748 PL_curpm = 0;
707 PL_curpad = 0; 749 PL_curpad = 0;
708 PL_localizing = 0; 750 PL_localizing = 0;
709 PL_dirty = 0; 751 PL_dirty = 0;
710 PL_restartop = 0; 752 PL_restartop = 0;
753#if PERL_VERSION_ATLEAST (5,10,0)
754 PL_parser = 0;
755#endif
711 756
712 /* recreate the die/warn hooks */ 757 /* recreate the die/warn hooks */
713 PL_diehook = 0; 758 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); 759 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 760
721 GvSV (PL_defgv) = newSV (0); 761 GvSV (PL_defgv) = newSV (0);
722 GvAV (PL_defgv) = coro->args; coro->args = 0; 762 GvAV (PL_defgv) = coro->args; coro->args = 0;
723 GvSV (PL_errgv) = newSV (0); 763 GvSV (PL_errgv) = newSV (0);
724 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 764 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
875 SAVETMPS; 915 SAVETMPS;
876 EXTEND (SP, 3); 916 EXTEND (SP, 3);
877 PUSHMARK (SP); 917 PUSHMARK (SP);
878 PUSHs (&PL_sv_yes); 918 PUSHs (&PL_sv_yes);
879 PUSHs (fullname); 919 PUSHs (fullname);
880 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 920 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
881 PUTBACK; 921 PUTBACK;
882 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 922 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); 923 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
884 SPAGAIN; 924 SPAGAIN;
885 FREETMPS; 925 FREETMPS;
… …
1101 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1141 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
1102 1142
1103 if (expect_false (next->flags & CF_DESTROYED)) 1143 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"); 1144 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1105 1145
1106 if (
1107#if PERL_VERSION_ATLEAST (5,9,0) 1146#if !PERL_VERSION_ATLEAST (5,10,0)
1108 expect_false (PL_parser)
1109#else
1110 expect_false (PL_lex_state != LEX_NOTPARSING) 1147 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1111#endif
1112 )
1113 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1148 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1149#endif
1114 } 1150 }
1115} 1151}
1116 1152
1117/* always use the TRANSFER macro */ 1153/* always use the TRANSFER macro */
1118static void NOINLINE 1154static void NOINLINE
1119transfer (pTHX_ struct coro *prev, struct coro *next) 1155transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1120{ 1156{
1121 dSTACKLEVEL; 1157 dSTACKLEVEL;
1158 static volatile int has_throw;
1122 1159
1123 /* sometimes transfer is only called to set idle_sp */ 1160 /* sometimes transfer is only called to set idle_sp */
1124 if (expect_false (!next)) 1161 if (expect_false (!next))
1125 { 1162 {
1126 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1163 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
… …
1157 load_perl (aTHX_ next); 1194 load_perl (aTHX_ next);
1158 1195
1159 prev__cctx = prev->cctx; 1196 prev__cctx = prev->cctx;
1160 1197
1161 /* possibly "free" the cctx */ 1198 /* possibly "free" the cctx */
1162 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1199 if (expect_true (
1200 prev__cctx->idle_sp == STACKLEVEL
1201 && !(prev__cctx->flags & CC_TRACE)
1202 && !force_cctx
1203 ))
1163 { 1204 {
1164 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1205 /* 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)); 1206 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1166 1207
1167 prev->cctx = 0; 1208 prev->cctx = 0;
… …
1177 1218
1178 ++next->usecount; 1219 ++next->usecount;
1179 1220
1180 if (expect_true (!next->cctx)) 1221 if (expect_true (!next->cctx))
1181 next->cctx = cctx_get (aTHX); 1222 next->cctx = cctx_get (aTHX);
1223
1224 has_throw = !!next->throw;
1182 1225
1183 if (expect_false (prev__cctx != next->cctx)) 1226 if (expect_false (prev__cctx != next->cctx))
1184 { 1227 {
1185 prev__cctx->top_env = PL_top_env; 1228 prev__cctx->top_env = PL_top_env;
1186 PL_top_env = next->cctx->top_env; 1229 PL_top_env = next->cctx->top_env;
… …
1188 } 1231 }
1189 1232
1190 free_coro_mortal (aTHX); 1233 free_coro_mortal (aTHX);
1191 UNLOCK; 1234 UNLOCK;
1192 1235
1193 if (expect_false (prev->throw || next->throw)) 1236 if (expect_false (has_throw))
1194 { 1237 {
1195 struct coro *coro = SvSTATE (coro_current); 1238 struct coro *coro = SvSTATE (coro_current);
1196 1239
1197 if (coro->throw) 1240 if (coro->throw)
1198 { 1241 {
… …
1208struct transfer_args 1251struct transfer_args
1209{ 1252{
1210 struct coro *prev, *next; 1253 struct coro *prev, *next;
1211}; 1254};
1212 1255
1213#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1256#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) 1257#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1215 1258
1216/** high level stuff ********************************************************/ 1259/** high level stuff ********************************************************/
1217 1260
1218static int 1261static int
… …
1312{ 1355{
1313 dTHX; 1356 dTHX;
1314 struct transfer_args ta; 1357 struct transfer_args ta;
1315 1358
1316 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1359 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1317 TRANSFER (ta); 1360 TRANSFER (ta, 1);
1318} 1361}
1319 1362
1320/** Coro ********************************************************************/ 1363/** Coro ********************************************************************/
1321 1364
1322static void 1365static void
… …
1324{ 1367{
1325 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1368 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1326} 1369}
1327 1370
1328static SV * 1371static SV *
1329coro_deq (pTHX_ int min_prio) 1372coro_deq (pTHX)
1330{ 1373{
1331 int prio = PRIO_MAX - PRIO_MIN; 1374 int prio;
1332 1375
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; ) 1376 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1338 if (AvFILLp (coro_ready [prio]) >= 0) 1377 if (AvFILLp (coro_ready [prio]) >= 0)
1339 return av_shift (coro_ready [prio]); 1378 return av_shift (coro_ready [prio]);
1340 1379
1341 return 0; 1380 return 0;
1342} 1381}
… …
1344static int 1383static int
1345api_ready (SV *coro_sv) 1384api_ready (SV *coro_sv)
1346{ 1385{
1347 dTHX; 1386 dTHX;
1348 struct coro *coro; 1387 struct coro *coro;
1388 SV *sv_hook;
1389 void (*xs_hook)(void);
1349 1390
1350 if (SvROK (coro_sv)) 1391 if (SvROK (coro_sv))
1351 coro_sv = SvRV (coro_sv); 1392 coro_sv = SvRV (coro_sv);
1352 1393
1353 coro = SvSTATE (coro_sv); 1394 coro = SvSTATE (coro_sv);
… …
1356 return 0; 1397 return 0;
1357 1398
1358 coro->flags |= CF_READY; 1399 coro->flags |= CF_READY;
1359 1400
1360 LOCK; 1401 LOCK;
1402
1403 sv_hook = coro_nready ? 0 : coro_readyhook;
1404 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1405
1361 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1406 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1362 ++coro_nready; 1407 ++coro_nready;
1408
1363 UNLOCK; 1409 UNLOCK;
1410
1411 if (sv_hook)
1412 {
1413 dSP;
1414
1415 ENTER;
1416 SAVETMPS;
1417
1418 PUSHMARK (SP);
1419 PUTBACK;
1420 call_sv (sv_hook, G_DISCARD);
1421 SPAGAIN;
1422
1423 FREETMPS;
1424 LEAVE;
1425 }
1426
1427 if (xs_hook)
1428 xs_hook ();
1364 1429
1365 return 1; 1430 return 1;
1366} 1431}
1367 1432
1368static int 1433static int
… …
1378 SV *prev_sv, *next_sv; 1443 SV *prev_sv, *next_sv;
1379 1444
1380 for (;;) 1445 for (;;)
1381 { 1446 {
1382 LOCK; 1447 LOCK;
1383 next_sv = coro_deq (aTHX_ PRIO_MIN); 1448 next_sv = coro_deq (aTHX);
1384 1449
1385 /* nothing to schedule: call the idle handler */ 1450 /* nothing to schedule: call the idle handler */
1386 if (expect_false (!next_sv)) 1451 if (expect_false (!next_sv))
1387 { 1452 {
1388 dSP; 1453 dSP;
… …
1392 SAVETMPS; 1457 SAVETMPS;
1393 1458
1394 PUSHMARK (SP); 1459 PUSHMARK (SP);
1395 PUTBACK; 1460 PUTBACK;
1396 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1461 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1462 SPAGAIN;
1397 1463
1398 FREETMPS; 1464 FREETMPS;
1399 LEAVE; 1465 LEAVE;
1400 continue; 1466 continue;
1401 } 1467 }
… …
1456{ 1522{
1457 dTHX; 1523 dTHX;
1458 struct transfer_args ta; 1524 struct transfer_args ta;
1459 1525
1460 prepare_schedule (aTHX_ &ta); 1526 prepare_schedule (aTHX_ &ta);
1461 TRANSFER (ta); 1527 TRANSFER (ta, 1);
1462} 1528}
1463 1529
1464static int 1530static int
1465api_cede (void) 1531api_cede (void)
1466{ 1532{
… …
1469 1535
1470 prepare_cede (aTHX_ &ta); 1536 prepare_cede (aTHX_ &ta);
1471 1537
1472 if (expect_true (ta.prev != ta.next)) 1538 if (expect_true (ta.prev != ta.next))
1473 { 1539 {
1474 TRANSFER (ta); 1540 TRANSFER (ta, 1);
1475 return 1; 1541 return 1;
1476 } 1542 }
1477 else 1543 else
1478 return 0; 1544 return 0;
1479} 1545}
… …
1484 dTHX; 1550 dTHX;
1485 struct transfer_args ta; 1551 struct transfer_args ta;
1486 1552
1487 if (prepare_cede_notself (aTHX_ &ta)) 1553 if (prepare_cede_notself (aTHX_ &ta))
1488 { 1554 {
1489 TRANSFER (ta); 1555 TRANSFER (ta, 1);
1490 return 1; 1556 return 1;
1491 } 1557 }
1492 else 1558 else
1493 return 0; 1559 return 0;
1494} 1560}
… …
1533 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1599 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1534 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1600 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1535 1601
1536 orig_sigelem_get = PL_vtbl_sigelem.svt_get; 1602 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1537 PL_vtbl_sigelem.svt_get = coro_sigelem_get; 1603 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1604 orig_sigelem_set = PL_vtbl_sigelem.svt_set;
1605 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1538 1606
1539 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE); 1607 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1540 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 1608 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)); 1609 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1542 1610
… …
1551 main_top_env = PL_top_env; 1619 main_top_env = PL_top_env;
1552 1620
1553 while (main_top_env->je_prev) 1621 while (main_top_env->je_prev)
1554 main_top_env = main_top_env->je_prev; 1622 main_top_env = main_top_env->je_prev;
1555 1623
1556 coroapi.ver = CORO_API_VERSION; 1624 coroapi.ver = CORO_API_VERSION;
1557 coroapi.rev = CORO_API_REVISION; 1625 coroapi.rev = CORO_API_REVISION;
1558 coroapi.transfer = api_transfer; 1626 coroapi.transfer = api_transfer;
1559 1627
1560 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1628 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1561} 1629}
1562 1630
1563SV * 1631SV *
… …
1601 Coro::cede_notself = 4 1669 Coro::cede_notself = 4
1602 CODE: 1670 CODE:
1603{ 1671{
1604 struct transfer_args ta; 1672 struct transfer_args ta;
1605 1673
1674 PUTBACK;
1606 switch (ix) 1675 switch (ix)
1607 { 1676 {
1608 case 0: 1677 case 0:
1609 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1678 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1610 ta.next = 0; 1679 ta.next = 0;
… …
1629 if (!prepare_cede_notself (aTHX_ &ta)) 1698 if (!prepare_cede_notself (aTHX_ &ta))
1630 XSRETURN_EMPTY; 1699 XSRETURN_EMPTY;
1631 1700
1632 break; 1701 break;
1633 } 1702 }
1703 SPAGAIN;
1634 1704
1635 BARRIER; 1705 BARRIER;
1636 PUTBACK; 1706 PUTBACK;
1637 TRANSFER (ta); 1707 TRANSFER (ta, 0);
1638 SPAGAIN; /* might be the sp of a different coroutine now */ 1708 SPAGAIN; /* might be the sp of a different coroutine now */
1639 /* be extra careful not to ever do anything after TRANSFER */ 1709 /* be extra careful not to ever do anything after TRANSFER */
1640} 1710}
1641 1711
1642bool 1712bool
… …
1645 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 1715 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1646 OUTPUT: 1716 OUTPUT:
1647 RETVAL 1717 RETVAL
1648 1718
1649void 1719void
1650_exit (code) 1720_exit (int code)
1651 int code
1652 PROTOTYPE: $ 1721 PROTOTYPE: $
1653 CODE: 1722 CODE:
1654 _exit (code); 1723 _exit (code);
1655 1724
1656int 1725int
… …
1696 { 1765 {
1697 struct coro temp; 1766 struct coro temp;
1698 1767
1699 if (!(coro->flags & CF_RUNNING)) 1768 if (!(coro->flags & CF_RUNNING))
1700 { 1769 {
1770 PUTBACK;
1701 save_perl (aTHX_ &temp); 1771 save_perl (aTHX_ &temp);
1702 load_perl (aTHX_ coro); 1772 load_perl (aTHX_ coro);
1703 } 1773 }
1704 1774
1705 { 1775 {
… …
1724 1794
1725 if (!(coro->flags & CF_RUNNING)) 1795 if (!(coro->flags & CF_RUNNING))
1726 { 1796 {
1727 save_perl (aTHX_ coro); 1797 save_perl (aTHX_ coro);
1728 load_perl (aTHX_ &temp); 1798 load_perl (aTHX_ &temp);
1799 SPAGAIN;
1729 } 1800 }
1730 } 1801 }
1731} 1802}
1732 1803
1733SV * 1804SV *
… …
1745 1816
1746void 1817void
1747api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 1818api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1748 1819
1749SV * 1820SV *
1750has_stack (Coro::State coro) 1821has_cctx (Coro::State coro)
1751 PROTOTYPE: $ 1822 PROTOTYPE: $
1752 CODE: 1823 CODE:
1753 RETVAL = boolSV (!!coro->cctx); 1824 RETVAL = boolSV (!!coro->cctx);
1754 OUTPUT: 1825 OUTPUT:
1755 RETVAL 1826 RETVAL
… …
1774 case 1: RETVAL = coro->usecount; break; 1845 case 1: RETVAL = coro->usecount; break;
1775 } 1846 }
1776 OUTPUT: 1847 OUTPUT:
1777 RETVAL 1848 RETVAL
1778 1849
1850void
1851force_cctx ()
1852 CODE:
1853 struct coro *coro = SvSTATE (coro_current);
1854 coro->cctx->idle_sp = 0;
1779 1855
1780MODULE = Coro::State PACKAGE = Coro 1856MODULE = Coro::State PACKAGE = Coro
1781 1857
1782BOOT: 1858BOOT:
1783{ 1859{
1784 int i; 1860 int i;
1785 1861
1862 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1786 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 1863 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1787 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 1864 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1788 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1789 1865
1790 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 1866 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1791 SvREADONLY_on (coro_current); 1867 SvREADONLY_on (coro_current);
1792 1868
1793 coro_stash = gv_stashpv ("Coro", TRUE); 1869 coro_stash = gv_stashpv ("Coro", TRUE);
… …
1825 PROTOTYPE: $ 1901 PROTOTYPE: $
1826 CODE: 1902 CODE:
1827 SvREFCNT_dec (SvRV (coro_current)); 1903 SvREFCNT_dec (SvRV (coro_current));
1828 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 1904 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1829 1905
1906void
1907_set_readyhook (SV *hook)
1908 PROTOTYPE: $
1909 CODE:
1910 LOCK;
1911 SvREFCNT_dec (coro_readyhook);
1912 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
1913 UNLOCK;
1914
1830int 1915int
1831prio (Coro::State coro, int newprio = 0) 1916prio (Coro::State coro, int newprio = 0)
1832 ALIAS: 1917 ALIAS:
1833 nice = 1 1918 nice = 1
1834 CODE: 1919 CODE:
… …
1870 PROTOTYPE: $;$ 1955 PROTOTYPE: $;$
1871 CODE: 1956 CODE:
1872 SvREFCNT_dec (self->throw); 1957 SvREFCNT_dec (self->throw);
1873 self->throw = SvOK (throw) ? newSVsv (throw) : 0; 1958 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1874 1959
1960void
1961swap_defsv (Coro::State self)
1962 PROTOTYPE: $
1963 ALIAS:
1964 swap_defav = 1
1965 CODE:
1966 if (!self->slot)
1967 croak ("cannot swap state with coroutine that has no saved state");
1968 else
1969 {
1970 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1971 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1972
1973 SV *tmp = *src; *src = *dst; *dst = tmp;
1974 }
1975
1875# for async_pool speedup 1976# for async_pool speedup
1876void 1977void
1877_pool_1 (SV *cb) 1978_pool_1 (SV *cb)
1878 CODE: 1979 CODE:
1879{ 1980{
… …
1883 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1984 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1884 AV *invoke_av; 1985 AV *invoke_av;
1885 int i, len; 1986 int i, len;
1886 1987
1887 if (!invoke) 1988 if (!invoke)
1989 {
1990 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1888 croak ("\3async_pool terminate\2\n"); 1991 croak ("\3async_pool terminate\2\n");
1992 }
1889 1993
1890 SvREFCNT_dec (coro->saved_deffh); 1994 SvREFCNT_dec (coro->saved_deffh);
1891 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1995 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1892 1996
1893 hv_store (hv, "desc", sizeof ("desc") - 1, 1997 hv_store (hv, "desc", sizeof ("desc") - 1,
… …
1919 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2023 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1920 coro->saved_deffh = 0; 2024 coro->saved_deffh = 0;
1921 2025
1922 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2026 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1923 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2027 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2028 {
2029 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1924 croak ("\3async_pool terminate\2\n"); 2030 croak ("\3async_pool terminate\2\n");
2031 }
1925 2032
1926 av_clear (GvAV (PL_defgv)); 2033 av_clear (GvAV (PL_defgv));
1927 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2034 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1928 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2035 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1929 2036
… …
1968 PL_laststype = data->laststype; 2075 PL_laststype = data->laststype;
1969 PL_laststatval = data->laststatval; 2076 PL_laststatval = data->laststatval;
1970 PL_statcache = data->statcache; 2077 PL_statcache = data->statcache;
1971} 2078}
1972 2079
2080
2081MODULE = Coro::State PACKAGE = Coro::AnyEvent
2082
2083BOOT:
2084 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2085
2086SV *
2087_schedule (...)
2088 PROTOTYPE: @
2089 CODE:
2090{
2091 static int incede;
2092
2093 api_cede_notself ();
2094
2095 ++incede;
2096 while (coro_nready >= incede && api_cede ())
2097 ;
2098
2099 sv_setsv (sv_activity, &PL_sv_undef);
2100 if (coro_nready >= incede)
2101 {
2102 PUSHMARK (SP);
2103 PUTBACK;
2104 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2105 SPAGAIN;
2106 }
2107
2108 --incede;
2109}
2110

Diff Legend

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