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.216 by root, Wed Nov 14 10:24:14 2007 UTC vs.
Revision 1.231 by root, Thu Apr 24 10:31:59 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#include <setjmp.h>
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;
261/** lowlevel stuff **********************************************************/ 274/** lowlevel stuff **********************************************************/
262 275
263static SV * 276static SV *
264coro_get_sv (pTHX_ const char *name, int create) 277coro_get_sv (pTHX_ const char *name, int create)
265{ 278{
266#if PERL_VERSION_ATLEAST (5,9,0) 279#if PERL_VERSION_ATLEAST (5,10,0)
267 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 280 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
268 get_sv (name, create); 281 get_sv (name, create);
269#endif 282#endif
270 return get_sv (name, create); 283 return get_sv (name, create);
271} 284}
272 285
273static AV * 286static AV *
274coro_get_av (pTHX_ const char *name, int create) 287coro_get_av (pTHX_ const char *name, int create)
275{ 288{
276#if PERL_VERSION_ATLEAST (5,9,0) 289#if PERL_VERSION_ATLEAST (5,10,0)
277 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 290 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
278 get_av (name, create); 291 get_av (name, create);
279#endif 292#endif
280 return get_av (name, create); 293 return get_av (name, create);
281} 294}
282 295
283static HV * 296static HV *
284coro_get_hv (pTHX_ const char *name, int create) 297coro_get_hv (pTHX_ const char *name, int create)
285{ 298{
286#if PERL_VERSION_ATLEAST (5,9,0) 299#if PERL_VERSION_ATLEAST (5,10,0)
287 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 300 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
288 get_hv (name, create); 301 get_hv (name, create);
289#endif 302#endif
290 return get_hv (name, create); 303 return get_hv (name, create);
291} 304}
296 AV *padlist = CvPADLIST (cv); 309 AV *padlist = CvPADLIST (cv);
297 AV *newpadlist, *newpad; 310 AV *newpadlist, *newpad;
298 311
299 newpadlist = newAV (); 312 newpadlist = newAV ();
300 AvREAL_off (newpadlist); 313 AvREAL_off (newpadlist);
301#if PERL_VERSION_ATLEAST (5,9,0) 314#if PERL_VERSION_ATLEAST (5,10,0)
302 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 315 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
303#else 316#else
304 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 317 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
305#endif 318#endif
306 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 319 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
587 600
588 New(54,PL_savestack,24,ANY); 601 New(54,PL_savestack,24,ANY);
589 PL_savestack_ix = 0; 602 PL_savestack_ix = 0;
590 PL_savestack_max = 24; 603 PL_savestack_max = 24;
591 604
592#if !PERL_VERSION_ATLEAST (5,9,0) 605#if !PERL_VERSION_ATLEAST (5,10,0)
593 New(54,PL_retstack,4,OP*); 606 New(54,PL_retstack,4,OP*);
594 PL_retstack_ix = 0; 607 PL_retstack_ix = 0;
595 PL_retstack_max = 4; 608 PL_retstack_max = 4;
596#endif 609#endif
597} 610}
620 633
621 Safefree (PL_tmps_stack); 634 Safefree (PL_tmps_stack);
622 Safefree (PL_markstack); 635 Safefree (PL_markstack);
623 Safefree (PL_scopestack); 636 Safefree (PL_scopestack);
624 Safefree (PL_savestack); 637 Safefree (PL_savestack);
625#if !PERL_VERSION_ATLEAST (5,9,0) 638#if !PERL_VERSION_ATLEAST (5,10,0)
626 Safefree (PL_retstack); 639 Safefree (PL_retstack);
627#endif 640#endif
628} 641}
629 642
630static size_t 643static size_t
654 rss += slot->tmps_max * sizeof (SV *); 667 rss += slot->tmps_max * sizeof (SV *);
655 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 668 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
656 rss += slot->scopestack_max * sizeof (I32); 669 rss += slot->scopestack_max * sizeof (I32);
657 rss += slot->savestack_max * sizeof (ANY); 670 rss += slot->savestack_max * sizeof (ANY);
658 671
659#if !PERL_VERSION_ATLEAST (5,9,0) 672#if !PERL_VERSION_ATLEAST (5,10,0)
660 rss += slot->retstack_max * sizeof (OP *); 673 rss += slot->retstack_max * sizeof (OP *);
661#endif 674#endif
662 } 675 }
663 676
664 return rss; 677 return rss;
665} 678}
666 679
667/** coroutine stack handling ************************************************/ 680/** coroutine stack handling ************************************************/
668 681
669#if 0
670static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg); 682static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
683static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
671 684
672/* 685/*
673 * This overrides the default magic get method of %SIG elements. 686 * 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 687 * 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 688 * and instead of tryign to save and restore the hash elements, we just provide
679 * when a schedule happens then, but we ignore this. 692 * when a schedule happens then, but we ignore this.
680 */ 693 */
681static int 694static int
682coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 695coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
683{ 696{
684 return orig_sigelem_get (aTHX_ sv, mg);
685 const char *s = MgPV_nolen_const (mg); 697 const char *s = MgPV_nolen_const (mg);
686 698
687 if (*s == '_') 699 if (*s == '_')
688 { 700 {
689 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0; 701 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; 702 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
691 } 703 }
692 704
693 return orig_sigelem_get (aTHX_ sv, mg); 705 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
694} 706}
695#endif 707
708static int
709coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
710{
711 const char *s = MgPV_nolen_const (mg);
712
713 if (*s == '_')
714 {
715 SV **svp = 0;
716
717 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
718 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
719
720 if (svp)
721 {
722 SV *old = *svp;
723 *svp = newSVsv (sv);
724 SvREFCNT_dec (old);
725 return 0;
726 }
727 }
728
729 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
730}
696 731
697static void 732static void
698coro_setup (pTHX_ struct coro *coro) 733coro_setup (pTHX_ struct coro *coro)
699{ 734{
700 /* 735 /*
709 PL_curpm = 0; 744 PL_curpm = 0;
710 PL_curpad = 0; 745 PL_curpad = 0;
711 PL_localizing = 0; 746 PL_localizing = 0;
712 PL_dirty = 0; 747 PL_dirty = 0;
713 PL_restartop = 0; 748 PL_restartop = 0;
749#if PERL_VERSION_ATLEAST (5,10,0)
750 PL_parser = 0;
751#endif
714 752
715 /* recreate the die/warn hooks */ 753 /* recreate the die/warn hooks */
716 PL_diehook = 0; 754 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); 755 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 756
724 GvSV (PL_defgv) = newSV (0); 757 GvSV (PL_defgv) = newSV (0);
725 GvAV (PL_defgv) = coro->args; coro->args = 0; 758 GvAV (PL_defgv) = coro->args; coro->args = 0;
726 GvSV (PL_errgv) = newSV (0); 759 GvSV (PL_errgv) = newSV (0);
727 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 760 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
878 SAVETMPS; 911 SAVETMPS;
879 EXTEND (SP, 3); 912 EXTEND (SP, 3);
880 PUSHMARK (SP); 913 PUSHMARK (SP);
881 PUSHs (&PL_sv_yes); 914 PUSHs (&PL_sv_yes);
882 PUSHs (fullname); 915 PUSHs (fullname);
883 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 916 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
884 PUTBACK; 917 PUTBACK;
885 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 918 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); 919 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
887 SPAGAIN; 920 SPAGAIN;
888 FREETMPS; 921 FREETMPS;
1104 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1137 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
1105 1138
1106 if (expect_false (next->flags & CF_DESTROYED)) 1139 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"); 1140 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1108 1141
1109 if (
1110#if PERL_VERSION_ATLEAST (5,9,0) 1142#if !PERL_VERSION_ATLEAST (5,10,0)
1111 expect_false (PL_parser)
1112#else
1113 expect_false (PL_lex_state != LEX_NOTPARSING) 1143 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1114#endif
1115 )
1116 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1144 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1145#endif
1117 } 1146 }
1118} 1147}
1119 1148
1120/* always use the TRANSFER macro */ 1149/* always use the TRANSFER macro */
1121static void NOINLINE 1150static void NOINLINE
1122transfer (pTHX_ struct coro *prev, struct coro *next) 1151transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1123{ 1152{
1124 dSTACKLEVEL; 1153 dSTACKLEVEL;
1125 static volatile int has_throw; 1154 static volatile int has_throw;
1126 1155
1127 /* sometimes transfer is only called to set idle_sp */ 1156 /* sometimes transfer is only called to set idle_sp */
1161 load_perl (aTHX_ next); 1190 load_perl (aTHX_ next);
1162 1191
1163 prev__cctx = prev->cctx; 1192 prev__cctx = prev->cctx;
1164 1193
1165 /* possibly "free" the cctx */ 1194 /* possibly "free" the cctx */
1166 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1195 if (expect_true (
1196 prev__cctx->idle_sp == STACKLEVEL
1197 && !(prev__cctx->flags & CC_TRACE)
1198 && !force_cctx
1199 ))
1167 { 1200 {
1168 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1201 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1169 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1202 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1170 1203
1171 prev->cctx = 0; 1204 prev->cctx = 0;
1214struct transfer_args 1247struct transfer_args
1215{ 1248{
1216 struct coro *prev, *next; 1249 struct coro *prev, *next;
1217}; 1250};
1218 1251
1219#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1252#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1220#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1253#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1221 1254
1222/** high level stuff ********************************************************/ 1255/** high level stuff ********************************************************/
1223 1256
1224static int 1257static int
1318{ 1351{
1319 dTHX; 1352 dTHX;
1320 struct transfer_args ta; 1353 struct transfer_args ta;
1321 1354
1322 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1355 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1323 TRANSFER (ta); 1356 TRANSFER (ta, 1);
1324} 1357}
1325 1358
1326/** Coro ********************************************************************/ 1359/** Coro ********************************************************************/
1327 1360
1328static void 1361static void
1330{ 1363{
1331 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1364 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1332} 1365}
1333 1366
1334static SV * 1367static SV *
1335coro_deq (pTHX_ int min_prio) 1368coro_deq (pTHX)
1336{ 1369{
1337 int prio = PRIO_MAX - PRIO_MIN; 1370 int prio;
1338 1371
1339 min_prio -= PRIO_MIN;
1340 if (min_prio < 0)
1341 min_prio = 0;
1342
1343 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1372 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1344 if (AvFILLp (coro_ready [prio]) >= 0) 1373 if (AvFILLp (coro_ready [prio]) >= 0)
1345 return av_shift (coro_ready [prio]); 1374 return av_shift (coro_ready [prio]);
1346 1375
1347 return 0; 1376 return 0;
1348} 1377}
1384 SV *prev_sv, *next_sv; 1413 SV *prev_sv, *next_sv;
1385 1414
1386 for (;;) 1415 for (;;)
1387 { 1416 {
1388 LOCK; 1417 LOCK;
1389 next_sv = coro_deq (aTHX_ PRIO_MIN); 1418 next_sv = coro_deq (aTHX);
1390 1419
1391 /* nothing to schedule: call the idle handler */ 1420 /* nothing to schedule: call the idle handler */
1392 if (expect_false (!next_sv)) 1421 if (expect_false (!next_sv))
1393 { 1422 {
1394 dSP; 1423 dSP;
1398 SAVETMPS; 1427 SAVETMPS;
1399 1428
1400 PUSHMARK (SP); 1429 PUSHMARK (SP);
1401 PUTBACK; 1430 PUTBACK;
1402 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1431 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1432 SPAGAIN;
1403 1433
1404 FREETMPS; 1434 FREETMPS;
1405 LEAVE; 1435 LEAVE;
1406 continue; 1436 continue;
1407 } 1437 }
1462{ 1492{
1463 dTHX; 1493 dTHX;
1464 struct transfer_args ta; 1494 struct transfer_args ta;
1465 1495
1466 prepare_schedule (aTHX_ &ta); 1496 prepare_schedule (aTHX_ &ta);
1467 TRANSFER (ta); 1497 TRANSFER (ta, 1);
1468} 1498}
1469 1499
1470static int 1500static int
1471api_cede (void) 1501api_cede (void)
1472{ 1502{
1475 1505
1476 prepare_cede (aTHX_ &ta); 1506 prepare_cede (aTHX_ &ta);
1477 1507
1478 if (expect_true (ta.prev != ta.next)) 1508 if (expect_true (ta.prev != ta.next))
1479 { 1509 {
1480 TRANSFER (ta); 1510 TRANSFER (ta, 1);
1481 return 1; 1511 return 1;
1482 } 1512 }
1483 else 1513 else
1484 return 0; 1514 return 0;
1485} 1515}
1490 dTHX; 1520 dTHX;
1491 struct transfer_args ta; 1521 struct transfer_args ta;
1492 1522
1493 if (prepare_cede_notself (aTHX_ &ta)) 1523 if (prepare_cede_notself (aTHX_ &ta))
1494 { 1524 {
1495 TRANSFER (ta); 1525 TRANSFER (ta, 1);
1496 return 1; 1526 return 1;
1497 } 1527 }
1498 else 1528 else
1499 return 0; 1529 return 0;
1500} 1530}
1536#endif 1566#endif
1537 BOOT_PAGESIZE; 1567 BOOT_PAGESIZE;
1538 1568
1539 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1569 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1540 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1570 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1541#if 0 1571
1542 orig_sigelem_get = PL_vtbl_sigelem.svt_get; 1572 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1543 PL_vtbl_sigelem.svt_get = coro_sigelem_get; 1573 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1544#endif 1574 orig_sigelem_set = PL_vtbl_sigelem.svt_set;
1575 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1576
1545 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE); 1577 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1546 rv_diehook = SvREFCNT_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 1578 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1547 rv_warnhook = SvREFCNT_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 1579 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1548 1580
1549 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1581 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1550 1582
1551 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1583 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1552 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1584 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1607 Coro::cede_notself = 4 1639 Coro::cede_notself = 4
1608 CODE: 1640 CODE:
1609{ 1641{
1610 struct transfer_args ta; 1642 struct transfer_args ta;
1611 1643
1644 PUTBACK;
1612 switch (ix) 1645 switch (ix)
1613 { 1646 {
1614 case 0: 1647 case 0:
1615 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1648 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1616 ta.next = 0; 1649 ta.next = 0;
1635 if (!prepare_cede_notself (aTHX_ &ta)) 1668 if (!prepare_cede_notself (aTHX_ &ta))
1636 XSRETURN_EMPTY; 1669 XSRETURN_EMPTY;
1637 1670
1638 break; 1671 break;
1639 } 1672 }
1673 SPAGAIN;
1640 1674
1641 BARRIER; 1675 BARRIER;
1642 PUTBACK; 1676 PUTBACK;
1643 TRANSFER (ta); 1677 TRANSFER (ta, 0);
1644 SPAGAIN; /* might be the sp of a different coroutine now */ 1678 SPAGAIN; /* might be the sp of a different coroutine now */
1645 /* be extra careful not to ever do anything after TRANSFER */ 1679 /* be extra careful not to ever do anything after TRANSFER */
1646} 1680}
1647 1681
1648bool 1682bool
1702 { 1736 {
1703 struct coro temp; 1737 struct coro temp;
1704 1738
1705 if (!(coro->flags & CF_RUNNING)) 1739 if (!(coro->flags & CF_RUNNING))
1706 { 1740 {
1741 PUTBACK;
1707 save_perl (aTHX_ &temp); 1742 save_perl (aTHX_ &temp);
1708 load_perl (aTHX_ coro); 1743 load_perl (aTHX_ coro);
1709 } 1744 }
1710 1745
1711 { 1746 {
1730 1765
1731 if (!(coro->flags & CF_RUNNING)) 1766 if (!(coro->flags & CF_RUNNING))
1732 { 1767 {
1733 save_perl (aTHX_ coro); 1768 save_perl (aTHX_ coro);
1734 load_perl (aTHX_ &temp); 1769 load_perl (aTHX_ &temp);
1770 SPAGAIN;
1735 } 1771 }
1736 } 1772 }
1737} 1773}
1738 1774
1739SV * 1775SV *
1780 case 1: RETVAL = coro->usecount; break; 1816 case 1: RETVAL = coro->usecount; break;
1781 } 1817 }
1782 OUTPUT: 1818 OUTPUT:
1783 RETVAL 1819 RETVAL
1784 1820
1821void
1822force_cctx ()
1823 CODE:
1824 struct coro *coro = SvSTATE (coro_current);
1825 coro->cctx->idle_sp = 0;
1785 1826
1786MODULE = Coro::State PACKAGE = Coro 1827MODULE = Coro::State PACKAGE = Coro
1787 1828
1788BOOT: 1829BOOT:
1789{ 1830{
1876 PROTOTYPE: $;$ 1917 PROTOTYPE: $;$
1877 CODE: 1918 CODE:
1878 SvREFCNT_dec (self->throw); 1919 SvREFCNT_dec (self->throw);
1879 self->throw = SvOK (throw) ? newSVsv (throw) : 0; 1920 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1880 1921
1922void
1923swap_defsv (Coro::State self)
1924 PROTOTYPE: $
1925 ALIAS:
1926 swap_defav = 1
1927 CODE:
1928 if (!self->slot)
1929 croak ("cannot swap state with coroutine that has no saved state");
1930 else
1931 {
1932 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1933 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1934
1935 SV *tmp = *src; *src = *dst; *dst = tmp;
1936 }
1937
1881# for async_pool speedup 1938# for async_pool speedup
1882void 1939void
1883_pool_1 (SV *cb) 1940_pool_1 (SV *cb)
1884 CODE: 1941 CODE:
1885{ 1942{
1889 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1946 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1890 AV *invoke_av; 1947 AV *invoke_av;
1891 int i, len; 1948 int i, len;
1892 1949
1893 if (!invoke) 1950 if (!invoke)
1951 {
1952 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1894 croak ("\3async_pool terminate\2\n"); 1953 croak ("\3async_pool terminate\2\n");
1954 }
1895 1955
1896 SvREFCNT_dec (coro->saved_deffh); 1956 SvREFCNT_dec (coro->saved_deffh);
1897 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1957 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1898 1958
1899 hv_store (hv, "desc", sizeof ("desc") - 1, 1959 hv_store (hv, "desc", sizeof ("desc") - 1,
1925 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1985 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1926 coro->saved_deffh = 0; 1986 coro->saved_deffh = 0;
1927 1987
1928 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1988 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1929 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1989 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1990 {
1991 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1930 croak ("\3async_pool terminate\2\n"); 1992 croak ("\3async_pool terminate\2\n");
1993 }
1931 1994
1932 av_clear (GvAV (PL_defgv)); 1995 av_clear (GvAV (PL_defgv));
1933 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1996 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1934 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1997 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1935 1998

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines