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.252 by root, Tue Nov 4 12:08:44 2008 UTC vs.
Revision 1.255 by root, Sat Nov 8 04:52:01 2008 UTC

… …
52#else 52#else
53# define REGISTER_STACK(cctx,start,end) 53# define REGISTER_STACK(cctx,start,end)
54#endif 54#endif
55 55
56/* the maximum number of idle cctx that will be pooled */ 56/* the maximum number of idle cctx that will be pooled */
57#define MAX_IDLE_CCTX 8 57static int cctx_max_idle = 4;
58 58
59#define PERL_VERSION_ATLEAST(a,b,c) \ 59#define PERL_VERSION_ATLEAST(a,b,c) \
60 (PERL_REVISION > (a) \ 60 (PERL_REVISION > (a) \
61 || (PERL_REVISION == (a) \ 61 || (PERL_REVISION == (a) \
62 && (PERL_VERSION > (b) \ 62 && (PERL_VERSION > (b) \
… …
142#define NOINLINE attribute ((noinline)) 142#define NOINLINE attribute ((noinline))
143 143
144#include "CoroAPI.h" 144#include "CoroAPI.h"
145 145
146#ifdef USE_ITHREADS 146#ifdef USE_ITHREADS
147static perl_mutex coro_mutex; 147static perl_mutex coro_lock;
148# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) 148# define LOCK do { MUTEX_LOCK (&coro_lock); } while (0)
149# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0) 149# define UNLOCK do { MUTEX_UNLOCK (&coro_lock); } while (0)
150#else 150#else
151# define LOCK (void)0 151# define LOCK (void)0
152# define UNLOCK (void)0 152# define UNLOCK (void)0
153#endif 153#endif
154 154
155/* helper storage struct for Coro::AIO */ 155/* helper storage struct for Coro::AIO */
156struct io_state 156struct io_state
157{ 157{
158 AV *res; 158 AV *res;
159 int errorno; 159 int errorno;
160 I32 laststype; 160 I32 laststype; /* U16 in 5.10.0 */
161 int laststatval; 161 int laststatval;
162 Stat_t statcache; 162 Stat_t statcache;
163}; 163};
164 164
165static double (*nvtime)(); /* so why doesn't it take void? */ 165static double (*nvtime)(); /* so why doesn't it take void? */
166 166
167static U32 cctx_gen;
167static size_t coro_stacksize = CORO_STACKSIZE; 168static size_t cctx_stacksize = CORO_STACKSIZE;
168static struct CoroAPI coroapi; 169static struct CoroAPI coroapi;
169static AV *main_mainstack; /* used to differentiate between $main and others */ 170static AV *main_mainstack; /* used to differentiate between $main and others */
170static JMPENV *main_top_env; 171static JMPENV *main_top_env;
171static HV *coro_state_stash, *coro_stash; 172static HV *coro_state_stash, *coro_stash;
172static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 173static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
… …
209 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 210 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
210 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 211 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */
211 JMPENV *top_env; 212 JMPENV *top_env;
212 coro_context cctx; 213 coro_context cctx;
213 214
215 U32 gen;
214#if CORO_USE_VALGRIND 216#if CORO_USE_VALGRIND
215 int valgrind_id; 217 int valgrind_id;
216#endif 218#endif
217 unsigned char flags; 219 unsigned char flags;
218} coro_cctx; 220} coro_cctx;
… …
383static MGVTBL coro_cv_vtbl = { 385static MGVTBL coro_cv_vtbl = {
384 0, 0, 0, 0, 386 0, 0, 0, 0,
385 coro_cv_free 387 coro_cv_free
386}; 388};
387 389
388#define CORO_MAGIC(sv,type) \ 390#define CORO_MAGIC(sv, type) \
389 SvMAGIC (sv) \ 391 SvMAGIC (sv) \
390 ? SvMAGIC (sv)->mg_type == type \ 392 ? SvMAGIC (sv)->mg_type == type \
391 ? SvMAGIC (sv) \ 393 ? SvMAGIC (sv) \
392 : mg_find (sv, type) \ 394 : mg_find (sv, type) \
393 : 0 395 : 0
394 396
395#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 397#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
396#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state) 398#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
397 399
398static struct coro * 400static struct coro *
… …
628 630
629/* 631/*
630 * destroy the stacks, the callchain etc... 632 * destroy the stacks, the callchain etc...
631 */ 633 */
632static void 634static void
633coro_destroy_stacks (pTHX) 635coro_destruct_stacks (pTHX)
634{ 636{
635 while (PL_curstackinfo->si_next) 637 while (PL_curstackinfo->si_next)
636 PL_curstackinfo = PL_curstackinfo->si_next; 638 PL_curstackinfo = PL_curstackinfo->si_next;
637 639
638 while (PL_curstackinfo) 640 while (PL_curstackinfo)
… …
843 */ 845 */
844 ENTER; 846 ENTER;
845} 847}
846 848
847static void 849static void
848coro_destroy (pTHX_ struct coro *coro) 850coro_destruct (pTHX_ struct coro *coro)
849{ 851{
850 if (!IN_DESTRUCT) 852 if (!IN_DESTRUCT)
851 { 853 {
852 /* restore all saved variables and stuff */ 854 /* restore all saved variables and stuff */
853 LEAVE_SCOPE (0); 855 LEAVE_SCOPE (0);
… …
875 SvREFCNT_dec (PL_warnhook); 877 SvREFCNT_dec (PL_warnhook);
876 878
877 SvREFCNT_dec (coro->saved_deffh); 879 SvREFCNT_dec (coro->saved_deffh);
878 SvREFCNT_dec (coro->throw); 880 SvREFCNT_dec (coro->throw);
879 881
880 coro_destroy_stacks (aTHX); 882 coro_destruct_stacks (aTHX);
881} 883}
882 884
883static void 885static void
884free_coro_mortal (pTHX) 886free_coro_mortal (pTHX)
885{ 887{
… …
1080 coro_cctx *cctx; 1082 coro_cctx *cctx;
1081 void *stack_start; 1083 void *stack_start;
1082 size_t stack_size; 1084 size_t stack_size;
1083 1085
1084 ++cctx_count; 1086 ++cctx_count;
1085
1086 Newz (0, cctx, 1, coro_cctx); 1087 Newz (0, cctx, 1, coro_cctx);
1087 1088
1089 cctx->gen = cctx_gen;
1090
1088#if HAVE_MMAP 1091#if HAVE_MMAP
1089 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1092 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1090 /* mmap supposedly does allocate-on-write for us */ 1093 /* mmap supposedly does allocate-on-write for us */
1091 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1094 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1092 1095
1093 if (cctx->sptr != (void *)-1) 1096 if (cctx->sptr != (void *)-1)
1094 { 1097 {
… …
1100 cctx->flags |= CC_MAPPED; 1103 cctx->flags |= CC_MAPPED;
1101 } 1104 }
1102 else 1105 else
1103#endif 1106#endif
1104 { 1107 {
1105 cctx->ssize = coro_stacksize * (long)sizeof (long); 1108 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1106 New (0, cctx->sptr, coro_stacksize, long); 1109 New (0, cctx->sptr, cctx_stacksize, long);
1107 1110
1108 if (!cctx->sptr) 1111 if (!cctx->sptr)
1109 { 1112 {
1110 perror ("FATAL: unable to allocate stack for coroutine"); 1113 perror ("FATAL: unable to allocate stack for coroutine");
1111 _exit (EXIT_FAILURE); 1114 _exit (EXIT_FAILURE);
… …
1126{ 1129{
1127 if (!cctx) 1130 if (!cctx)
1128 return; 1131 return;
1129 1132
1130 --cctx_count; 1133 --cctx_count;
1134 coro_destroy (&cctx->cctx);
1131 1135
1136 /* coro_transfer creates new, empty cctx's */
1137 if (cctx->sptr)
1138 {
1132#if CORO_USE_VALGRIND 1139#if CORO_USE_VALGRIND
1133 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1140 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1134#endif 1141#endif
1135 1142
1136#if HAVE_MMAP 1143#if HAVE_MMAP
1137 if (cctx->flags & CC_MAPPED) 1144 if (cctx->flags & CC_MAPPED)
1138 munmap (cctx->sptr, cctx->ssize); 1145 munmap (cctx->sptr, cctx->ssize);
1139 else 1146 else
1140#endif 1147#endif
1141 Safefree (cctx->sptr); 1148 Safefree (cctx->sptr);
1149 }
1142 1150
1143 Safefree (cctx); 1151 Safefree (cctx);
1144} 1152}
1145 1153
1146/* wether this cctx should be destructed */ 1154/* wether this cctx should be destructed */
1147#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE)) 1155#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1148 1156
1149static coro_cctx * 1157static coro_cctx *
1150cctx_get (pTHX) 1158cctx_get (pTHX)
1151{ 1159{
1152 while (expect_true (cctx_first)) 1160 while (expect_true (cctx_first))
… …
1165} 1173}
1166 1174
1167static void 1175static void
1168cctx_put (coro_cctx *cctx) 1176cctx_put (coro_cctx *cctx)
1169{ 1177{
1178 assert (("cctx_put called on non-initialised cctx", cctx->sptr));
1179
1170 /* free another cctx if overlimit */ 1180 /* free another cctx if overlimit */
1171 if (expect_false (cctx_idle >= MAX_IDLE_CCTX)) 1181 if (expect_false (cctx_idle >= cctx_max_idle))
1172 { 1182 {
1173 coro_cctx *first = cctx_first; 1183 coro_cctx *first = cctx_first;
1174 cctx_first = first->next; 1184 cctx_first = first->next;
1175 --cctx_idle; 1185 --cctx_idle;
1176 1186
… …
1222 static volatile int has_throw; 1232 static volatile int has_throw;
1223 coro_cctx *prev__cctx; 1233 coro_cctx *prev__cctx;
1224 1234
1225 if (expect_false (prev->flags & CF_NEW)) 1235 if (expect_false (prev->flags & CF_NEW))
1226 { 1236 {
1227 /* create a new empty context */ 1237 /* create a new empty/source context */
1238 ++cctx_count;
1228 Newz (0, prev->cctx, 1, coro_cctx); 1239 New (0, prev->cctx, 1, coro_cctx);
1240 prev->cctx->sptr = 0;
1241 coro_create (&prev->cctx->cctx, 0, 0, 0, 0);
1242
1229 prev->flags &= ~CF_NEW; 1243 prev->flags &= ~CF_NEW;
1230 prev->flags |= CF_RUNNING; 1244 prev->flags |= CF_RUNNING;
1231 } 1245 }
1232 1246
1233 prev->flags &= ~CF_RUNNING; 1247 prev->flags &= ~CF_RUNNING;
… …
1340 croak ("FATAL: tried to destroy currently running coroutine"); 1354 croak ("FATAL: tried to destroy currently running coroutine");
1341 1355
1342 save_perl (aTHX_ &temp); 1356 save_perl (aTHX_ &temp);
1343 load_perl (aTHX_ coro); 1357 load_perl (aTHX_ coro);
1344 1358
1345 coro_destroy (aTHX_ coro); 1359 coro_destruct (aTHX_ coro);
1346 1360
1347 load_perl (aTHX_ &temp); 1361 load_perl (aTHX_ &temp);
1348 1362
1349 coro->slot = 0; 1363 coro->slot = 0;
1350 } 1364 }
… …
1638 else 1652 else
1639 coro->slot->runops = RUNOPS_DEFAULT; 1653 coro->slot->runops = RUNOPS_DEFAULT;
1640 } 1654 }
1641} 1655}
1642 1656
1657#if 0
1643static int 1658static int
1644coro_gensub_free (pTHX_ SV *sv, MAGIC *mg) 1659coro_gensub_free (pTHX_ SV *sv, MAGIC *mg)
1645{ 1660{
1646 AV *padlist; 1661 AV *padlist;
1647 AV *av = (AV *)mg->mg_obj; 1662 AV *av = (AV *)mg->mg_obj;
… …
1653 1668
1654static MGVTBL coro_gensub_vtbl = { 1669static MGVTBL coro_gensub_vtbl = {
1655 0, 0, 0, 0, 1670 0, 0, 0, 0,
1656 coro_gensub_free 1671 coro_gensub_free
1657}; 1672};
1673#endif
1658 1674
1659/*****************************************************************************/ 1675/*****************************************************************************/
1660/* PerlIO::cede */ 1676/* PerlIO::cede */
1661 1677
1662typedef struct 1678typedef struct
… …
1737PROTOTYPES: DISABLE 1753PROTOTYPES: DISABLE
1738 1754
1739BOOT: 1755BOOT:
1740{ 1756{
1741#ifdef USE_ITHREADS 1757#ifdef USE_ITHREADS
1742 MUTEX_INIT (&coro_mutex); 1758 MUTEX_INIT (&coro_lock);
1743#endif 1759#endif
1744 BOOT_PAGESIZE; 1760 BOOT_PAGESIZE;
1745 1761
1746 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1762 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1747 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1763 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
1878 _exit (code); 1894 _exit (code);
1879 1895
1880int 1896int
1881cctx_stacksize (int new_stacksize = 0) 1897cctx_stacksize (int new_stacksize = 0)
1882 CODE: 1898 CODE:
1883 RETVAL = coro_stacksize; 1899 RETVAL = cctx_stacksize;
1884 if (new_stacksize) 1900 if (new_stacksize)
1901 {
1885 coro_stacksize = new_stacksize; 1902 cctx_stacksize = new_stacksize;
1903 ++cctx_gen;
1904 }
1905 OUTPUT:
1906 RETVAL
1907
1908int
1909cctx_max_idle (int max_idle = 0)
1910 CODE:
1911 RETVAL = cctx_max_idle;
1912 if (max_idle > 1)
1913 cctx_max_idle = max_idle;
1886 OUTPUT: 1914 OUTPUT:
1887 RETVAL 1915 RETVAL
1888 1916
1889int 1917int
1890cctx_count () 1918cctx_count ()
… …
1986 CODE: 2014 CODE:
1987 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL; 2015 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1988 OUTPUT: 2016 OUTPUT:
1989 RETVAL 2017 RETVAL
1990 2018
1991IV 2019UV
1992rss (Coro::State coro) 2020rss (Coro::State coro)
1993 PROTOTYPE: $ 2021 PROTOTYPE: $
1994 ALIAS: 2022 ALIAS:
1995 usecount = 1 2023 usecount = 1
1996 CODE: 2024 CODE:
… …
2178 sv_setsv (cb, &PL_sv_undef); 2206 sv_setsv (cb, &PL_sv_undef);
2179 2207
2180 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2208 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2181 coro->saved_deffh = 0; 2209 coro->saved_deffh = 0;
2182 2210
2183 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2211 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2184 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2212 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2185 { 2213 {
2186 SV *old = PL_diehook; 2214 SV *old = PL_diehook;
2187 PL_diehook = 0; 2215 PL_diehook = 0;
2188 SvREFCNT_dec (old); 2216 SvREFCNT_dec (old);

Diff Legend

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