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.220 by root, Thu Jan 10 05:43:14 2008 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
… …
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;
… …
707 if (svp) 720 if (svp)
708 { 721 {
709 SV *old = *svp; 722 SV *old = *svp;
710 *svp = newSVsv (sv); 723 *svp = newSVsv (sv);
711 SvREFCNT_dec (old); 724 SvREFCNT_dec (old);
712 return; 725 return 0;
713 } 726 }
714 } 727 }
715 728
716 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0; 729 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
717} 730}
… …
731 PL_curpm = 0; 744 PL_curpm = 0;
732 PL_curpad = 0; 745 PL_curpad = 0;
733 PL_localizing = 0; 746 PL_localizing = 0;
734 PL_dirty = 0; 747 PL_dirty = 0;
735 PL_restartop = 0; 748 PL_restartop = 0;
749#if PERL_VERSION_ATLEAST (5,10,0)
750 PL_parser = 0;
751#endif
736 752
737 /* recreate the die/warn hooks */ 753 /* recreate the die/warn hooks */
738 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 754 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
739 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 755 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
740 756
… …
895 SAVETMPS; 911 SAVETMPS;
896 EXTEND (SP, 3); 912 EXTEND (SP, 3);
897 PUSHMARK (SP); 913 PUSHMARK (SP);
898 PUSHs (&PL_sv_yes); 914 PUSHs (&PL_sv_yes);
899 PUSHs (fullname); 915 PUSHs (fullname);
900 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);
901 PUTBACK; 917 PUTBACK;
902 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);
903 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);
904 SPAGAIN; 920 SPAGAIN;
905 FREETMPS; 921 FREETMPS;
… …
1121 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");
1122 1138
1123 if (expect_false (next->flags & CF_DESTROYED)) 1139 if (expect_false (next->flags & CF_DESTROYED))
1124 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");
1125 1141
1126 if (
1127#if PERL_VERSION_ATLEAST (5,9,0) 1142#if !PERL_VERSION_ATLEAST (5,10,0)
1128 expect_false (PL_parser)
1129#else
1130 expect_false (PL_lex_state != LEX_NOTPARSING) 1143 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1131#endif
1132 )
1133 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
1134 } 1146 }
1135} 1147}
1136 1148
1137/* always use the TRANSFER macro */ 1149/* always use the TRANSFER macro */
1138static void NOINLINE 1150static void NOINLINE
1139transfer (pTHX_ struct coro *prev, struct coro *next) 1151transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1140{ 1152{
1141 dSTACKLEVEL; 1153 dSTACKLEVEL;
1142 static volatile int has_throw; 1154 static volatile int has_throw;
1143 1155
1144 /* sometimes transfer is only called to set idle_sp */ 1156 /* sometimes transfer is only called to set idle_sp */
… …
1178 load_perl (aTHX_ next); 1190 load_perl (aTHX_ next);
1179 1191
1180 prev__cctx = prev->cctx; 1192 prev__cctx = prev->cctx;
1181 1193
1182 /* possibly "free" the cctx */ 1194 /* possibly "free" the cctx */
1183 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 ))
1184 { 1200 {
1185 /* 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 */
1186 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));
1187 1203
1188 prev->cctx = 0; 1204 prev->cctx = 0;
… …
1231struct transfer_args 1247struct transfer_args
1232{ 1248{
1233 struct coro *prev, *next; 1249 struct coro *prev, *next;
1234}; 1250};
1235 1251
1236#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1252#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1237#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1253#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1238 1254
1239/** high level stuff ********************************************************/ 1255/** high level stuff ********************************************************/
1240 1256
1241static int 1257static int
… …
1335{ 1351{
1336 dTHX; 1352 dTHX;
1337 struct transfer_args ta; 1353 struct transfer_args ta;
1338 1354
1339 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1355 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1340 TRANSFER (ta); 1356 TRANSFER (ta, 1);
1341} 1357}
1342 1358
1343/** Coro ********************************************************************/ 1359/** Coro ********************************************************************/
1344 1360
1345static void 1361static void
… …
1476{ 1492{
1477 dTHX; 1493 dTHX;
1478 struct transfer_args ta; 1494 struct transfer_args ta;
1479 1495
1480 prepare_schedule (aTHX_ &ta); 1496 prepare_schedule (aTHX_ &ta);
1481 TRANSFER (ta); 1497 TRANSFER (ta, 1);
1482} 1498}
1483 1499
1484static int 1500static int
1485api_cede (void) 1501api_cede (void)
1486{ 1502{
… …
1489 1505
1490 prepare_cede (aTHX_ &ta); 1506 prepare_cede (aTHX_ &ta);
1491 1507
1492 if (expect_true (ta.prev != ta.next)) 1508 if (expect_true (ta.prev != ta.next))
1493 { 1509 {
1494 TRANSFER (ta); 1510 TRANSFER (ta, 1);
1495 return 1; 1511 return 1;
1496 } 1512 }
1497 else 1513 else
1498 return 0; 1514 return 0;
1499} 1515}
… …
1504 dTHX; 1520 dTHX;
1505 struct transfer_args ta; 1521 struct transfer_args ta;
1506 1522
1507 if (prepare_cede_notself (aTHX_ &ta)) 1523 if (prepare_cede_notself (aTHX_ &ta))
1508 { 1524 {
1509 TRANSFER (ta); 1525 TRANSFER (ta, 1);
1510 return 1; 1526 return 1;
1511 } 1527 }
1512 else 1528 else
1513 return 0; 1529 return 0;
1514} 1530}
… …
1656 } 1672 }
1657 SPAGAIN; 1673 SPAGAIN;
1658 1674
1659 BARRIER; 1675 BARRIER;
1660 PUTBACK; 1676 PUTBACK;
1661 TRANSFER (ta); 1677 TRANSFER (ta, 0);
1662 SPAGAIN; /* might be the sp of a different coroutine now */ 1678 SPAGAIN; /* might be the sp of a different coroutine now */
1663 /* be extra careful not to ever do anything after TRANSFER */ 1679 /* be extra careful not to ever do anything after TRANSFER */
1664} 1680}
1665 1681
1666bool 1682bool
… …
1800 case 1: RETVAL = coro->usecount; break; 1816 case 1: RETVAL = coro->usecount; break;
1801 } 1817 }
1802 OUTPUT: 1818 OUTPUT:
1803 RETVAL 1819 RETVAL
1804 1820
1821void
1822force_cctx ()
1823 CODE:
1824 struct coro *coro = SvSTATE (coro_current);
1825 coro->cctx->idle_sp = 0;
1805 1826
1806MODULE = Coro::State PACKAGE = Coro 1827MODULE = Coro::State PACKAGE = Coro
1807 1828
1808BOOT: 1829BOOT:
1809{ 1830{
… …
1896 PROTOTYPE: $;$ 1917 PROTOTYPE: $;$
1897 CODE: 1918 CODE:
1898 SvREFCNT_dec (self->throw); 1919 SvREFCNT_dec (self->throw);
1899 self->throw = SvOK (throw) ? newSVsv (throw) : 0; 1920 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1900 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
1901# for async_pool speedup 1938# for async_pool speedup
1902void 1939void
1903_pool_1 (SV *cb) 1940_pool_1 (SV *cb)
1904 CODE: 1941 CODE:
1905{ 1942{
… …
1909 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1946 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1910 AV *invoke_av; 1947 AV *invoke_av;
1911 int i, len; 1948 int i, len;
1912 1949
1913 if (!invoke) 1950 if (!invoke)
1951 {
1952 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1914 croak ("\3async_pool terminate\2\n"); 1953 croak ("\3async_pool terminate\2\n");
1954 }
1915 1955
1916 SvREFCNT_dec (coro->saved_deffh); 1956 SvREFCNT_dec (coro->saved_deffh);
1917 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1957 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1918 1958
1919 hv_store (hv, "desc", sizeof ("desc") - 1, 1959 hv_store (hv, "desc", sizeof ("desc") - 1,
… …
1945 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1985 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1946 coro->saved_deffh = 0; 1986 coro->saved_deffh = 0;
1947 1987
1948 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1988 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1949 || 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;
1950 croak ("\3async_pool terminate\2\n"); 1992 croak ("\3async_pool terminate\2\n");
1993 }
1951 1994
1952 av_clear (GvAV (PL_defgv)); 1995 av_clear (GvAV (PL_defgv));
1953 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1996 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1954 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1997 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1955 1998

Diff Legend

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