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.94 by root, Sun Nov 26 17:14:15 2006 UTC vs.
Revision 1.130 by root, Mon Dec 25 13:25:55 2006 UTC

1#define PERL_NO_GET_CONTEXT
2
3#include "libcoro/coro.c" 1#include "libcoro/coro.c"
4 2
5#include "EXTERN.h" 3#include "EXTERN.h"
6#include "perl.h" 4#include "perl.h"
7#include "XSUB.h" 5#include "XSUB.h"
8 6
9#include "patchlevel.h" 7#include "patchlevel.h"
10 8
11#if PERL_VERSION < 6 9#include <stdio.h>
10#include <errno.h>
11#include <assert.h>
12
13#ifdef HAVE_MMAP
14# include <unistd.h>
15# include <sys/mman.h>
16# ifndef MAP_ANONYMOUS
17# ifdef MAP_ANON
18# define MAP_ANONYMOUS MAP_ANON
19# else
20# undef HAVE_MMAP
21# endif
22# endif
23# include <limits.h>
24# ifndef PAGESIZE
25# define PAGESIZE pagesize
26# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
27static long pagesize;
28# else
29# define BOOT_PAGESIZE (void)0
30# endif
31#else
32# define PAGESIZE 0
33# define BOOT_PAGESIZE (void)0
34#endif
35
36#if USE_VALGRIND
37# include <valgrind/valgrind.h>
38#endif
39
40/* the maximum number of idle cctx that will be pooled */
41#define MAX_IDLE_CCTX 8
42
43#define PERL_VERSION_ATLEAST(a,b,c) \
44 (PERL_REVISION > (a) \
45 || (PERL_REVISION == (a) \
46 && (PERL_VERSION > (b) \
47 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c)))))
48
49#if !PERL_VERSION_ATLEAST (5,6,0)
12# ifndef PL_ppaddr 50# ifndef PL_ppaddr
13# define PL_ppaddr ppaddr 51# define PL_ppaddr ppaddr
14# endif 52# endif
15# ifndef call_sv 53# ifndef call_sv
16# define call_sv perl_call_sv 54# define call_sv perl_call_sv
27# ifndef IS_PADCONST 65# ifndef IS_PADCONST
28# define IS_PADCONST(v) 0 66# define IS_PADCONST(v) 0
29# endif 67# endif
30#endif 68#endif
31 69
32#include <stdio.h> 70/* 5.8.7 */
33#include <errno.h> 71#ifndef SvRV_set
72# define SvRV_set(s,v) SvRV(s) = (v)
73#endif
34 74
35#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 75#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
36# undef STACKGUARD 76# undef STACKGUARD
37#endif 77#endif
38 78
39#ifndef STACKGUARD 79#ifndef STACKGUARD
40# define STACKGUARD 0 80# define STACKGUARD 0
41#endif 81#endif
42 82
43#ifdef HAVE_MMAP 83/* prefer perl internal functions over our own? */
44# include <unistd.h> 84#ifndef PREFER_PERL_FUNCTIONS
45# include <sys/mman.h> 85# define PREFER_PERL_FUNCTIONS 0
46# ifndef MAP_ANONYMOUS
47# ifdef MAP_ANON
48# define MAP_ANONYMOUS MAP_ANON
49# else
50# undef HAVE_MMAP
51# endif
52# endif
53# include <limits.h>
54# ifndef PAGESIZE
55# define PAGESIZE pagesize
56# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
57static long pagesize;
58# else
59# define BOOT_PAGESIZE
60# endif
61#endif 86#endif
62 87
63/* The next macro should declare a variable stacklevel that contains and approximation 88/* The next macro should declare a variable stacklevel that contains and approximation
64 * to the current C stack pointer. Its property is that it changes with each call 89 * to the current C stack pointer. Its property is that it changes with each call
65 * and should be unique. */ 90 * and should be unique. */
66#define dSTACKLEVEL int stacklevel 91#define dSTACKLEVEL int stacklevel
67#define STACKLEVEL ((void *)&stacklevel) 92#define STACKLEVEL ((void *)&stacklevel)
68 93
69#define IN_DESTRUCT (PL_main_cv == Nullcv) 94#define IN_DESTRUCT (PL_main_cv == Nullcv)
70 95
96#if __GNUC__ >= 3
97# define attribute(x) __attribute__(x)
98#else
99# define attribute(x)
100#endif
101
102#define NOINLINE attribute ((noinline))
103
71#include "CoroAPI.h" 104#include "CoroAPI.h"
72
73#define TRANSFER_SET_STACKLEVEL 0x8bfbfbfb /* magic cookie */
74 105
75#ifdef USE_ITHREADS 106#ifdef USE_ITHREADS
76static perl_mutex coro_mutex; 107static perl_mutex coro_mutex;
77# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) 108# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0)
78# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0) 109# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0)
79#else 110#else
80# define LOCK (void)0 111# define LOCK (void)0
81# define UNLOCK (void)0 112# define UNLOCK (void)0
82#endif 113#endif
83 114
115struct io_state
116{
117 int errorno;
118 I32 laststype;
119 int laststatval;
120 Stat_t statcache;
121};
122
84static struct CoroAPI coroapi; 123static struct CoroAPI coroapi;
85static AV *main_mainstack; /* used to differentiate between $main and others */ 124static AV *main_mainstack; /* used to differentiate between $main and others */
86static HV *coro_state_stash, *coro_stash; 125static HV *coro_state_stash, *coro_stash;
87static SV *coro_mortal; /* will be freed after next transfer */ 126static SV *coro_mortal; /* will be freed after next transfer */
88 127
128static struct coro_cctx *cctx_first;
129static int cctx_count, cctx_idle;
130
89/* this is a structure representing a c-level coroutine */ 131/* this is a structure representing a c-level coroutine */
90typedef struct coro_stack { 132typedef struct coro_cctx {
91 struct coro_stack *next; 133 struct coro_cctx *next;
92 134
93 /* the stack */ 135 /* the stack */
94 void *sptr; 136 void *sptr;
95 long ssize; /* positive == mmap, otherwise malloc */ 137 long ssize; /* positive == mmap, otherwise malloc */
96 138
97 /* cpu state */ 139 /* cpu state */
98 void *idle_sp; /* original stacklevel when coroutine was created */ 140 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
99 JMPENV *top_env; 141 JMPENV *top_env;
100 coro_context cctx; 142 coro_context cctx;
101} coro_stack;
102 143
103/* the (fake) coro_stack representing the main program */ 144 int inuse;
104static coro_stack *main_stack; 145
146#if USE_VALGRIND
147 int valgrind_id;
148#endif
149} coro_cctx;
150
151enum {
152 CF_RUNNING = 0x0001, /* coroutine is running */
153 CF_READY = 0x0002, /* coroutine is ready */
154 CF_NEW = 0x0004, /* ahs never been switched to */
155};
105 156
106/* this is a structure representing a perl-level coroutine */ 157/* this is a structure representing a perl-level coroutine */
107struct coro { 158struct coro {
108 /* the c coroutine allocated to this perl coroutine, if any */ 159 /* the c coroutine allocated to this perl coroutine, if any */
109 coro_stack *stack; 160 coro_cctx *cctx;
110 161
111 /* data associated with this coroutine (initial args) */ 162 /* data associated with this coroutine (initial args) */
112 AV *args; 163 AV *args;
113 int refcnt; 164 int refcnt;
165 int save; /* CORO_SAVE flags */
166 int flags; /* CF_ flags */
114 167
115 /* optionally saved, might be zero */ 168 /* optionally saved, might be zero */
116 AV *defav; 169 AV *defav; /* @_ */
117 SV *defsv; 170 SV *defsv; /* $_ */
118 SV *errsv; 171 SV *errsv; /* $@ */
172 SV *irssv; /* $/ */
173 SV *irssv_sv; /* real $/ cache */
119 174
120 /* saved global state not related to stacks */ 175#define VAR(name,type) type name;
121 U8 dowarn; 176# include "state.h"
122 I32 in_eval; 177#undef VAR
123
124 /* the stacks and related info (callchain etc..) */
125 PERL_SI *curstackinfo;
126 AV *curstack;
127 AV *mainstack;
128 SV **stack_sp;
129 OP *op;
130 SV **curpad;
131 AV *comppad;
132 CV *compcv;
133 SV **stack_base;
134 SV **stack_max;
135 SV **tmps_stack;
136 I32 tmps_floor;
137 I32 tmps_ix;
138 I32 tmps_max;
139 I32 *markstack;
140 I32 *markstack_ptr;
141 I32 *markstack_max;
142 I32 *scopestack;
143 I32 scopestack_ix;
144 I32 scopestack_max;
145 ANY *savestack;
146 I32 savestack_ix;
147 I32 savestack_max;
148 OP **retstack;
149 I32 retstack_ix;
150 I32 retstack_max;
151 PMOP *curpm;
152 COP *curcop;
153 178
154 /* coro process data */ 179 /* coro process data */
155 int prio; 180 int prio;
156}; 181};
157 182
158typedef struct coro *Coro__State; 183typedef struct coro *Coro__State;
159typedef struct coro *Coro__State_or_hashref; 184typedef struct coro *Coro__State_or_hashref;
160 185
161static AV * 186static AV *
162coro_clone_padlist (pTHX_ CV *cv) 187coro_clone_padlist (CV *cv)
163{ 188{
164 AV *padlist = CvPADLIST (cv); 189 AV *padlist = CvPADLIST (cv);
165 AV *newpadlist, *newpad; 190 AV *newpadlist, *newpad;
166 191
167 newpadlist = newAV (); 192 newpadlist = newAV ();
168 AvREAL_off (newpadlist); 193 AvREAL_off (newpadlist);
169#if PERL_VERSION < 9 194#if PERL_VERSION_ATLEAST (5,9,0)
195 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
196#else
170 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 197 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
171#else
172 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
173#endif 198#endif
174 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 199 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
175 --AvFILLp (padlist); 200 --AvFILLp (padlist);
176 201
177 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 202 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE)));
179 204
180 return newpadlist; 205 return newpadlist;
181} 206}
182 207
183static void 208static void
184free_padlist (pTHX_ AV *padlist) 209free_padlist (AV *padlist)
185{ 210{
186 /* may be during global destruction */ 211 /* may be during global destruction */
187 if (SvREFCNT (padlist)) 212 if (SvREFCNT (padlist))
188 { 213 {
189 I32 i = AvFILLp (padlist); 214 I32 i = AvFILLp (padlist);
210 AV *padlist; 235 AV *padlist;
211 AV *av = (AV *)mg->mg_obj; 236 AV *av = (AV *)mg->mg_obj;
212 237
213 /* casting is fun. */ 238 /* casting is fun. */
214 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 239 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
215 free_padlist (aTHX_ padlist); 240 free_padlist (padlist);
216 241
217 SvREFCNT_dec (av); 242 SvREFCNT_dec (av);
218 243
219 return 0; 244 return 0;
220} 245}
221 246
222#define PERL_MAGIC_coro PERL_MAGIC_ext 247#define PERL_MAGIC_coro PERL_MAGIC_ext
223 248
224static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 249static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
225 250
251#define CORO_MAGIC(cv) \
252 SvMAGIC (cv) \
253 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \
254 ? SvMAGIC (cv) \
255 : mg_find ((SV *)cv, PERL_MAGIC_coro) \
256 : 0
257
226/* the next two functions merely cache the padlists */ 258/* the next two functions merely cache the padlists */
227static void 259static void
228get_padlist (pTHX_ CV *cv) 260get_padlist (CV *cv)
229{ 261{
230 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 262 MAGIC *mg = CORO_MAGIC (cv);
263 AV *av;
231 264
232 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0) 265 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)
233 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj); 266 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
234 else 267 else
235 { 268 {
236#if 0 269#if PREFER_PERL_FUNCTIONS
237 /* this should work - but it doesn't :( */ 270 /* this is probably cleaner, but also slower? */
238 CV *cp = Perl_cv_clone (aTHX_ cv); 271 CV *cp = Perl_cv_clone (cv);
239 CvPADLIST (cv) = CvPADLIST (cp); 272 CvPADLIST (cv) = CvPADLIST (cp);
240 CvPADLIST (cp) = 0; 273 CvPADLIST (cp) = 0;
241 SvREFCNT_dec (cp); 274 SvREFCNT_dec (cp);
242#else 275#else
243 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 276 CvPADLIST (cv) = coro_clone_padlist (cv);
244#endif 277#endif
245 } 278 }
246} 279}
247 280
248static void 281static void
249put_padlist (pTHX_ CV *cv) 282put_padlist (CV *cv)
250{ 283{
251 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 284 MAGIC *mg = CORO_MAGIC (cv);
285 AV *av;
252 286
253 if (!mg) 287 if (!mg)
254 { 288 {
255 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 289 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
256 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 290 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
257 mg->mg_virtual = &vtbl_coro; 291 mg->mg_virtual = &vtbl_coro;
258 mg->mg_obj = (SV *)newAV (); 292 mg->mg_obj = (SV *)newAV ();
259 } 293 }
260 294
261 av_push ((AV *)mg->mg_obj, (SV *)CvPADLIST (cv)); 295 av = (AV *)mg->mg_obj;
296
297 if (AvFILLp (av) >= AvMAX (av))
298 av_extend (av, AvMAX (av) + 1);
299
300 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
262} 301}
263 302
264#define SB do { 303#define SB do {
265#define SE } while (0) 304#define SE } while (0)
266 305
267#define LOAD(state) load_state(aTHX_ (state));
268#define SAVE(state,flags) save_state(aTHX_ (state),(flags));
269
270#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE 306#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
271 307
272static void 308static void
273load_state(pTHX_ Coro__State c) 309load_perl (Coro__State c)
274{ 310{
275 PL_dowarn = c->dowarn; 311#define VAR(name,type) PL_ ## name = c->name;
276 PL_in_eval = c->in_eval; 312# include "state.h"
277 313#undef VAR
278 PL_curstackinfo = c->curstackinfo;
279 PL_curstack = c->curstack;
280 PL_mainstack = c->mainstack;
281 PL_stack_sp = c->stack_sp;
282 PL_op = c->op;
283 PL_curpad = c->curpad;
284 PL_comppad = c->comppad;
285 PL_compcv = c->compcv;
286 PL_stack_base = c->stack_base;
287 PL_stack_max = c->stack_max;
288 PL_tmps_stack = c->tmps_stack;
289 PL_tmps_floor = c->tmps_floor;
290 PL_tmps_ix = c->tmps_ix;
291 PL_tmps_max = c->tmps_max;
292 PL_markstack = c->markstack;
293 PL_markstack_ptr = c->markstack_ptr;
294 PL_markstack_max = c->markstack_max;
295 PL_scopestack = c->scopestack;
296 PL_scopestack_ix = c->scopestack_ix;
297 PL_scopestack_max = c->scopestack_max;
298 PL_savestack = c->savestack;
299 PL_savestack_ix = c->savestack_ix;
300 PL_savestack_max = c->savestack_max;
301#if PERL_VERSION < 9
302 PL_retstack = c->retstack;
303 PL_retstack_ix = c->retstack_ix;
304 PL_retstack_max = c->retstack_max;
305#endif
306 PL_curpm = c->curpm;
307 PL_curcop = c->curcop;
308 314
309 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 315 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
310 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 316 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
311 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 317 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
318 if (c->irssv)
319 {
320 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
321 SvREFCNT_dec (c->irssv);
322 else
323 {
324 REPLACE_SV (PL_rs, c->irssv);
325 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
326 sv_setsv (c->irssv_sv, PL_rs);
327 }
328 }
312 329
313 { 330 {
314 dSP; 331 dSP;
315 CV *cv; 332 CV *cv;
316 333
317 /* now do the ugly restore mess */ 334 /* now do the ugly restore mess */
318 while ((cv = (CV *)POPs)) 335 while ((cv = (CV *)POPs))
319 { 336 {
320 AV *padlist = (AV *)POPs;
321
322 if (padlist)
323 {
324 put_padlist (aTHX_ cv); /* mark this padlist as available */ 337 put_padlist (cv); /* mark this padlist as available */
325 CvPADLIST(cv) = padlist; 338 CvDEPTH (cv) = PTR2IV (POPs);
326 } 339 CvPADLIST (cv) = (AV *)POPs;
327
328 ++CvDEPTH(cv);
329 } 340 }
330 341
331 PUTBACK; 342 PUTBACK;
332 } 343 }
333} 344}
334 345
335static void 346static void
336save_state(pTHX_ Coro__State c, int flags) 347save_perl (Coro__State c)
337{ 348{
338 { 349 {
339 dSP; 350 dSP;
340 I32 cxix = cxstack_ix; 351 I32 cxix = cxstack_ix;
341 PERL_CONTEXT *ccstk = cxstack; 352 PERL_CONTEXT *ccstk = cxstack;
344 /* 355 /*
345 * the worst thing you can imagine happens first - we have to save 356 * the worst thing you can imagine happens first - we have to save
346 * (and reinitialize) all cv's in the whole callchain :( 357 * (and reinitialize) all cv's in the whole callchain :(
347 */ 358 */
348 359
360 EXTEND (SP, 3 + 1);
349 PUSHs (Nullsv); 361 PUSHs (Nullsv);
350 /* this loop was inspired by pp_caller */ 362 /* this loop was inspired by pp_caller */
351 for (;;) 363 for (;;)
352 { 364 {
353 while (cxix >= 0) 365 while (cxix >= 0)
354 { 366 {
355 PERL_CONTEXT *cx = &ccstk[cxix--]; 367 PERL_CONTEXT *cx = &ccstk[cxix--];
356 368
357 if (CxTYPE(cx) == CXt_SUB) 369 if (CxTYPE (cx) == CXt_SUB)
358 { 370 {
359 CV *cv = cx->blk_sub.cv; 371 CV *cv = cx->blk_sub.cv;
372
360 if (CvDEPTH(cv)) 373 if (CvDEPTH (cv))
361 { 374 {
362 EXTEND (SP, CvDEPTH(cv)*2); 375 EXTEND (SP, 3);
363
364 while (--CvDEPTH(cv))
365 {
366 /* this tells the restore code to increment CvDEPTH */
367 PUSHs (Nullsv);
368 PUSHs ((SV *)cv);
369 }
370
371 PUSHs ((SV *)CvPADLIST(cv)); 376 PUSHs ((SV *)CvPADLIST (cv));
377 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
372 PUSHs ((SV *)cv); 378 PUSHs ((SV *)cv);
373 379
380 CvDEPTH (cv) = 0;
374 get_padlist (aTHX_ cv); 381 get_padlist (cv);
375 } 382 }
376 } 383 }
377#ifdef CXt_FORMAT
378 else if (CxTYPE(cx) == CXt_FORMAT)
379 {
380 /* I never used formats, so how should I know how these are implemented? */
381 /* my bold guess is as a simple, plain sub... */
382 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
383 }
384#endif
385 } 384 }
386 385
387 if (top_si->si_type == PERLSI_MAIN) 386 if (top_si->si_type == PERLSI_MAIN)
388 break; 387 break;
389 388
393 } 392 }
394 393
395 PUTBACK; 394 PUTBACK;
396 } 395 }
397 396
398 c->defav = flags & TRANSFER_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 397 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0;
399 c->defsv = flags & TRANSFER_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 398 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0;
400 c->errsv = flags & TRANSFER_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 399 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0;
400 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0;
401 401
402 c->dowarn = PL_dowarn; 402#define VAR(name,type)c->name = PL_ ## name;
403 c->in_eval = PL_in_eval; 403# include "state.h"
404 404#undef VAR
405 c->curstackinfo = PL_curstackinfo;
406 c->curstack = PL_curstack;
407 c->mainstack = PL_mainstack;
408 c->stack_sp = PL_stack_sp;
409 c->op = PL_op;
410 c->curpad = PL_curpad;
411 c->comppad = PL_comppad;
412 c->compcv = PL_compcv;
413 c->stack_base = PL_stack_base;
414 c->stack_max = PL_stack_max;
415 c->tmps_stack = PL_tmps_stack;
416 c->tmps_floor = PL_tmps_floor;
417 c->tmps_ix = PL_tmps_ix;
418 c->tmps_max = PL_tmps_max;
419 c->markstack = PL_markstack;
420 c->markstack_ptr = PL_markstack_ptr;
421 c->markstack_max = PL_markstack_max;
422 c->scopestack = PL_scopestack;
423 c->scopestack_ix = PL_scopestack_ix;
424 c->scopestack_max = PL_scopestack_max;
425 c->savestack = PL_savestack;
426 c->savestack_ix = PL_savestack_ix;
427 c->savestack_max = PL_savestack_max;
428#if PERL_VERSION < 9
429 c->retstack = PL_retstack;
430 c->retstack_ix = PL_retstack_ix;
431 c->retstack_max = PL_retstack_max;
432#endif
433 c->curpm = PL_curpm;
434 c->curcop = PL_curcop;
435} 405}
436 406
437/* 407/*
438 * allocate various perl stacks. This is an exact copy 408 * allocate various perl stacks. This is an exact copy
439 * of perl.c:init_stacks, except that it uses less memory 409 * of perl.c:init_stacks, except that it uses less memory
440 * on the (sometimes correct) assumption that coroutines do 410 * on the (sometimes correct) assumption that coroutines do
441 * not usually need a lot of stackspace. 411 * not usually need a lot of stackspace.
442 */ 412 */
413#if PREFER_PERL_FUNCTIONS
414# define coro_init_stacks init_stacks
415#else
443static void 416static void
444coro_init_stacks (pTHX) 417coro_init_stacks ()
445{ 418{
446 LOCK;
447
448 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 419 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT));
449 PL_curstackinfo->si_type = PERLSI_MAIN; 420 PL_curstackinfo->si_type = PERLSI_MAIN;
450 PL_curstack = PL_curstackinfo->si_stack; 421 PL_curstack = PL_curstackinfo->si_stack;
451 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 422 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
452 423
453 PL_stack_base = AvARRAY(PL_curstack); 424 PL_stack_base = AvARRAY(PL_curstack);
454 PL_stack_sp = PL_stack_base; 425 PL_stack_sp = PL_stack_base;
455 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 426 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
456 427
457 New(50,PL_tmps_stack,96,SV*); 428 New(50,PL_tmps_stack,128,SV*);
458 PL_tmps_floor = -1; 429 PL_tmps_floor = -1;
459 PL_tmps_ix = -1; 430 PL_tmps_ix = -1;
460 PL_tmps_max = 96; 431 PL_tmps_max = 128;
461 432
462 New(54,PL_markstack,16,I32); 433 New(54,PL_markstack,32,I32);
463 PL_markstack_ptr = PL_markstack; 434 PL_markstack_ptr = PL_markstack;
464 PL_markstack_max = PL_markstack + 16; 435 PL_markstack_max = PL_markstack + 32;
465 436
466#ifdef SET_MARK_OFFSET 437#ifdef SET_MARK_OFFSET
467 SET_MARK_OFFSET; 438 SET_MARK_OFFSET;
468#endif 439#endif
469 440
470 New(54,PL_scopestack,16,I32); 441 New(54,PL_scopestack,32,I32);
471 PL_scopestack_ix = 0; 442 PL_scopestack_ix = 0;
472 PL_scopestack_max = 16; 443 PL_scopestack_max = 32;
473 444
474 New(54,PL_savestack,96,ANY); 445 New(54,PL_savestack,64,ANY);
475 PL_savestack_ix = 0; 446 PL_savestack_ix = 0;
476 PL_savestack_max = 96; 447 PL_savestack_max = 64;
477 448
478#if PERL_VERSION < 9 449#if !PERL_VERSION_ATLEAST (5,9,0)
479 New(54,PL_retstack,8,OP*); 450 New(54,PL_retstack,16,OP*);
480 PL_retstack_ix = 0; 451 PL_retstack_ix = 0;
481 PL_retstack_max = 8; 452 PL_retstack_max = 16;
482#endif 453#endif
483
484 UNLOCK;
485} 454}
455#endif
486 456
487/* 457/*
488 * destroy the stacks, the callchain etc... 458 * destroy the stacks, the callchain etc...
489 */ 459 */
490static void 460static void
491destroy_stacks(pTHX) 461coro_destroy_stacks ()
492{ 462{
493 if (!IN_DESTRUCT) 463 if (!IN_DESTRUCT)
494 { 464 {
495 /* is this ugly, I ask? */ 465 /* restore all saved variables and stuff */
496 LEAVE_SCOPE (0); 466 LEAVE_SCOPE (0);
467 assert (PL_tmps_floor == -1);
497 468
498 /* sure it is, but more important: is it correct?? :/ */ 469 /* free all temporaries */
499 FREETMPS; 470 FREETMPS;
471 assert (PL_tmps_ix == -1);
500 472
501 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/ 473 POPSTACK_TO (PL_mainstack);
502 } 474 }
503 475
504 while (PL_curstackinfo->si_next) 476 while (PL_curstackinfo->si_next)
505 PL_curstackinfo = PL_curstackinfo->si_next; 477 PL_curstackinfo = PL_curstackinfo->si_next;
506 478
507 while (PL_curstackinfo) 479 while (PL_curstackinfo)
508 { 480 {
509 PERL_SI *p = PL_curstackinfo->si_prev; 481 PERL_SI *p = PL_curstackinfo->si_prev;
510 482
511 { /*D*//*remove*/
512 dSP;
513 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
514 PUTBACK; /* possibly superfluous */
515 }
516
517 if (!IN_DESTRUCT) 483 if (!IN_DESTRUCT)
518 {
519 dounwind (-1);/*D*//*remove*/
520 SvREFCNT_dec (PL_curstackinfo->si_stack); 484 SvREFCNT_dec (PL_curstackinfo->si_stack);
521 }
522 485
523 Safefree (PL_curstackinfo->si_cxstack); 486 Safefree (PL_curstackinfo->si_cxstack);
524 Safefree (PL_curstackinfo); 487 Safefree (PL_curstackinfo);
525 PL_curstackinfo = p; 488 PL_curstackinfo = p;
526 } 489 }
527 490
528 Safefree (PL_tmps_stack); 491 Safefree (PL_tmps_stack);
529 Safefree (PL_markstack); 492 Safefree (PL_markstack);
530 Safefree (PL_scopestack); 493 Safefree (PL_scopestack);
531 Safefree (PL_savestack); 494 Safefree (PL_savestack);
532#if PERL_VERSION < 9 495#if !PERL_VERSION_ATLEAST (5,9,0)
533 Safefree (PL_retstack); 496 Safefree (PL_retstack);
534#endif 497#endif
535} 498}
536 499
537static void 500static void
538setup_coro (struct coro *coro) 501setup_coro (struct coro *coro)
539{ 502{
540 /* 503 /*
541 * emulate part of the perl startup here. 504 * emulate part of the perl startup here.
542 */ 505 */
543 dTHX;
544 dSP;
545 UNOP myop;
546 SV *sub_init = (SV *)get_cv ("Coro::State::coro_init", FALSE);
547 506
548 coro_init_stacks (aTHX); 507 coro_init_stacks ();
549 /*PL_curcop = 0;*/ 508
550 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 509 PL_curcop = &PL_compiling;
510 PL_in_eval = EVAL_NULL;
511 PL_curpm = 0;
512 PL_localizing = 0;
513 PL_dirty = 0;
514 PL_restartop = 0;
515
516 {
517 dSP;
518 LOGOP myop;
519
551 SvREFCNT_dec (GvAV (PL_defgv)); 520 SvREFCNT_dec (GvAV (PL_defgv));
552 GvAV (PL_defgv) = coro->args; coro->args = 0; 521 GvAV (PL_defgv) = coro->args; coro->args = 0;
553 522
554 SPAGAIN;
555
556 Zero (&myop, 1, UNOP); 523 Zero (&myop, 1, LOGOP);
557 myop.op_next = Nullop; 524 myop.op_next = Nullop;
558 myop.op_flags = OPf_WANT_VOID; 525 myop.op_flags = OPf_WANT_VOID;
559 526
527 PUSHMARK (SP);
528 XPUSHs ((SV *)get_cv ("Coro::State::_coro_init", FALSE));
529 PUTBACK;
560 PL_op = (OP *)&myop; 530 PL_op = (OP *)&myop;
561
562 PUSHMARK(SP);
563 XPUSHs (sub_init);
564 PUTBACK;
565 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 531 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
566 SPAGAIN; 532 SPAGAIN;
533 }
567 534
568 ENTER; /* necessary e.g. for dounwind */ 535 ENTER; /* necessary e.g. for dounwind */
569} 536}
570 537
571static void 538static void
576 SvREFCNT_dec (coro_mortal); 543 SvREFCNT_dec (coro_mortal);
577 coro_mortal = 0; 544 coro_mortal = 0;
578 } 545 }
579} 546}
580 547
548/* inject a fake call to Coro::State::_cctx_init into the execution */
549static void NOINLINE
550prepare_cctx (coro_cctx *cctx)
551{
552 dSP;
553 LOGOP myop;
554
555 Zero (&myop, 1, LOGOP);
556 myop.op_next = PL_op;
557 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
558
559 PUSHMARK (SP);
560 EXTEND (SP, 2);
561 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx))));
562 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
563 PUTBACK;
564 PL_op = (OP *)&myop;
565 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
566 SPAGAIN;
567}
568
581static void 569static void
582coro_run (void *arg) 570coro_run (void *arg)
583{ 571{
572 /* coro_run is the alternative tail of transfer(), so unlock here. */
573 UNLOCK;
574
584 /* 575 /*
585 * this is a _very_ stripped down perl interpreter ;) 576 * this is a _very_ stripped down perl interpreter ;)
586 */ 577 */
587 dTHX;
588 int ret;
589
590 UNLOCK;
591
592 PL_top_env = &PL_start_env; 578 PL_top_env = &PL_start_env;
593 579
594 sv_setiv (get_sv ("Coro::State::cctx_stack", FALSE), PTR2IV ((coro_stack *)arg)); 580 /* inject call to cctx_init */
595 sv_setiv (get_sv ("Coro::State::cctx_restartop", FALSE), PTR2IV (PL_op)); 581 prepare_cctx ((coro_cctx *)arg);
596
597 /* continue at cctx_init, without entersub */
598 PL_restartop = CvSTART (get_cv ("Coro::State::cctx_init", FALSE));
599 582
600 /* somebody will hit me for both perl_run and PL_restartop */ 583 /* somebody will hit me for both perl_run and PL_restartop */
601 ret = perl_run (aTHX_ PERL_GET_CONTEXT); 584 PL_restartop = PL_op;
602 printf ("ret %d\n", ret);//D 585 perl_run (PL_curinterp);
603 586
604 fputs ("FATAL: C coroutine fell over the edge of the world, aborting.\n", stderr); 587 fputs ("FATAL: C coroutine fell over the edge of the world, aborting. Did you call exit in a coroutine?\n", stderr);
605 abort (); 588 abort ();
606} 589}
607 590
608static coro_stack * 591static coro_cctx *
609stack_new () 592cctx_new ()
610{ 593{
611 coro_stack *stack; 594 coro_cctx *cctx;
612 595
596 ++cctx_count;
597
613 New (0, stack, 1, coro_stack); 598 Newz (0, cctx, 1, coro_cctx);
614 599
615#if HAVE_MMAP 600#if HAVE_MMAP
616 601
617 stack->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; 602 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE;
618 /* mmap suppsedly does allocate-on-write for us */ 603 /* mmap supposedly does allocate-on-write for us */
619 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 604 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
620 605
621 if (stack->sptr == (void *)-1) 606 if (cctx->sptr == (void *)-1)
622 { 607 {
623 perror ("FATAL: unable to mmap stack for coroutine"); 608 perror ("FATAL: unable to mmap stack for coroutine");
624 _exit (EXIT_FAILURE); 609 _exit (EXIT_FAILURE);
625 } 610 }
626 611
627# if STACKGUARD 612# if STACKGUARD
628 mprotect (stack->sptr, STACKGUARD * PAGESIZE, PROT_NONE); 613 mprotect (cctx->sptr, STACKGUARD * PAGESIZE, PROT_NONE);
629# endif 614# endif
630 615
631#else 616#else
632 617
633 stack->ssize = STACKSIZE * (long)sizeof (long); 618 cctx->ssize = STACKSIZE * (long)sizeof (long);
634 New (0, stack->sptr, STACKSIZE, long); 619 New (0, cctx->sptr, STACKSIZE, long);
635 620
636 if (!stack->sptr) 621 if (!cctx->sptr)
637 { 622 {
638 perror (stderr, "FATAL: unable to malloc stack for coroutine"); 623 perror ("FATAL: unable to malloc stack for coroutine");
639 _exit (EXIT_FAILURE); 624 _exit (EXIT_FAILURE);
640 } 625 }
641 626
642#endif 627#endif
643 628
629#if USE_VALGRIND
630 cctx->valgrind_id = VALGRIND_STACK_REGISTER (
631 STACKGUARD * PAGESIZE + (char *)cctx->sptr,
632 cctx->ssize + (char *)cctx->sptr
633 );
634#endif
635
644 coro_create (&stack->cctx, coro_run, (void *)stack, stack->sptr, stack->ssize); 636 coro_create (&cctx->cctx, coro_run, (void *)cctx, cctx->sptr, cctx->ssize);
645 637
646 return stack; 638 return cctx;
647} 639}
648 640
649static void 641static void
650stack_free (coro_stack *stack) 642cctx_destroy (coro_cctx *cctx)
651{ 643{
652 if (!stack || stack == main_stack) 644 if (!cctx)
653 return; 645 return;
654 646
647 --cctx_count;
648
649#if USE_VALGRIND
650 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
651#endif
652
655#if HAVE_MMAP 653#if HAVE_MMAP
656 munmap (stack->sptr, stack->ssize); 654 munmap (cctx->sptr, cctx->ssize);
657#else 655#else
658 Safefree (stack->sptr); 656 Safefree (cctx->sptr);
659#endif 657#endif
660 658
661 Safefree (stack); 659 Safefree (cctx);
662} 660}
663 661
664static coro_stack *stack_first;
665
666static coro_stack * 662static coro_cctx *
667stack_get () 663cctx_get ()
668{ 664{
669 coro_stack *stack; 665 coro_cctx *cctx;
670 666
671 if (stack_first) 667 if (cctx_first)
672 { 668 {
673 stack = stack_first; 669 cctx = cctx_first;
674 stack_first = stack->next; 670 cctx_first = cctx->next;
671 --cctx_idle;
675 } 672 }
676 else 673 else
677 { 674 {
678 stack = stack_new (); 675 cctx = cctx_new ();
679 PL_op = PL_op->op_next; 676 PL_op = PL_op->op_next;
680 } 677 }
681 678
682 return stack; 679 return cctx;
683} 680}
684 681
685static void 682static void
686stack_put (coro_stack *stack) 683cctx_put (coro_cctx *cctx)
687{ 684{
688 stack->next = stack_first; 685 /* free another cctx if overlimit */
689 stack_first = stack; 686 if (cctx_idle >= MAX_IDLE_CCTX)
687 {
688 coro_cctx *first = cctx_first;
689 cctx_first = first->next;
690 --cctx_idle;
691
692 assert (!first->inuse);
693 cctx_destroy (first);
694 }
695
696 ++cctx_idle;
697 cctx->next = cctx_first;
698 cctx_first = cctx;
690} 699}
691 700
692/* never call directly, always through the coro_state_transfer global variable */ 701/* never call directly, always through the coro_state_transfer global variable */
693static void 702static void NOINLINE
694transfer_impl (pTHX_ struct coro *prev, struct coro *next, int flags) 703transfer (struct coro *prev, struct coro *next)
695{ 704{
696 dSTACKLEVEL; 705 dSTACKLEVEL;
697 706
698 /* sometimes transfer is only called to set idle_sp */ 707 /* sometimes transfer is only called to set idle_sp */
699 if (flags == TRANSFER_SET_STACKLEVEL) 708 if (!next)
709 {
700 ((coro_stack *)prev)->idle_sp = STACKLEVEL; 710 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
711 assert (((coro_cctx *)prev)->top_env = PL_top_env); /* just for the side effetc when assert is enabled */
712 }
701 else if (prev != next) 713 else if (prev != next)
702 { 714 {
703 coro_stack *prev__stack; 715 coro_cctx *prev__cctx;
716
717 if (prev->flags & CF_NEW)
718 {
719 /* create a new empty context */
720 Newz (0, prev->cctx, 1, coro_cctx);
721 prev->cctx->inuse = 1;
722 prev->flags &= ~CF_NEW;
723 prev->flags |= CF_RUNNING;
724 }
725
726 /*TODO: must not croak here */
727 if (!prev->flags & CF_RUNNING)
728 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states");
729
730 if (next->flags & CF_RUNNING)
731 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
732
733 prev->flags &= ~CF_RUNNING;
734 next->flags |= CF_RUNNING;
704 735
705 LOCK; 736 LOCK;
706 737
707 if (next->mainstack) 738 if (next->flags & CF_NEW)
708 { 739 {
709 /* coroutine already started */ 740 /* need to start coroutine */
710 SAVE (prev, flags); 741 next->flags &= ~CF_NEW;
711 LOAD (next); 742 /* first get rid of the old state */
743 save_perl (prev);
744 /* setup coroutine call */
745 setup_coro (next);
746 /* need a new stack */
747 assert (!next->cctx);
712 } 748 }
713 else 749 else
714 { 750 {
715 /* need to start coroutine */ 751 /* coroutine already started */
716 /* first get rid of the old state */ 752 save_perl (prev);
717 SAVE (prev, -1); 753 load_perl (next);
718 /* setup coroutine call */
719 setup_coro (next);
720 /* need a stack */
721 next->stack = 0;
722 } 754 }
723 755
724 prev__stack = prev->stack; 756 prev__cctx = prev->cctx;
725 757
726 /* possibly "free" the stack */ 758 /* possibly "free" the cctx */
727 if (prev__stack->idle_sp == STACKLEVEL) 759 if (prev__cctx->idle_sp == STACKLEVEL)
728 { 760 {
729 stack_put (prev__stack); 761 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
762 assert (PL_top_env == prev__cctx->top_env);
763
730 prev->stack = 0; 764 prev->cctx = 0;
765
766 cctx_put (prev__cctx);
767 prev__cctx->inuse = 0;
731 } 768 }
732 769
733 if (!next->stack) 770 if (!next->cctx)
734 next->stack = stack_get ();
735
736 if (prev__stack != next->stack)
737 { 771 {
772 next->cctx = cctx_get ();
773 assert (!next->cctx->inuse);
774 next->cctx->inuse = 1;
775 }
776
777 if (prev__cctx != next->cctx)
778 {
738 prev__stack->top_env = PL_top_env; 779 prev__cctx->top_env = PL_top_env;
739 PL_top_env = next->stack->top_env; 780 PL_top_env = next->cctx->top_env;
740 printf ("stacksw %p %p\n", prev__stack->idle_sp, next->stack->idle_sp);//D
741 coro_transfer (&prev__stack->cctx, &next->stack->cctx); 781 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
742 } 782 }
743 783
744 free_coro_mortal (); 784 free_coro_mortal ();
745 785
746 UNLOCK; 786 UNLOCK;
747 } 787 }
748} 788}
749 789
750/* use this function pointer to call the above function */
751/* this is done to increase chances of the compiler not inlining the call */
752/* not static to make it even harder for the compiler (and theoretically impossible in most cases */
753void (*coro_state_transfer)(pTHX_ struct coro *prev, struct coro *next, int flags) = transfer_impl;
754
755struct transfer_args 790struct transfer_args
756{ 791{
757 struct coro *prev, *next; 792 struct coro *prev, *next;
758 int flags;
759}; 793};
760 794
761#define TRANSFER(ta) coro_state_transfer ((ta).prev, (ta).next, (ta).flags) 795#define TRANSFER(ta) transfer ((ta).prev, (ta).next)
762 796
763static void 797static void
764coro_state_destroy (struct coro *coro) 798coro_state_destroy (struct coro *coro)
765{ 799{
766 if (coro->refcnt--) 800 if (coro->refcnt--)
767 return; 801 return;
768 802
769 if (coro->mainstack && coro->mainstack != main_mainstack) 803 if (coro->mainstack && coro->mainstack != main_mainstack)
770 { 804 {
771 struct coro temp; 805 struct coro temp;
806 Zero (&temp, 1, struct coro);
807 temp.save = CORO_SAVE_ALL;
772 808
773 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL); 809 if (coro->flags & CF_RUNNING)
774 LOAD (aTHX_ coro); 810 croak ("FATAL: tried to destroy currently running coroutine");
775 811
812 save_perl (&temp);
813 load_perl (coro);
814
776 destroy_stacks (aTHX); 815 coro_destroy_stacks ();
777 816
778 LOAD ((&temp)); /* this will get rid of defsv etc.. */ 817 load_perl (&temp); /* this will get rid of defsv etc.. */
779 818
780 coro->mainstack = 0; 819 coro->mainstack = 0;
781 } 820 }
782 821
783 stack_free (coro->stack); 822 cctx_destroy (coro->cctx);
784 SvREFCNT_dec (coro->args); 823 SvREFCNT_dec (coro->args);
785 Safefree (coro); 824 Safefree (coro);
786} 825}
787 826
788static int 827static int
789coro_state_clear (SV *sv, MAGIC *mg) 828coro_state_clear (pTHX_ SV *sv, MAGIC *mg)
790{ 829{
791 struct coro *coro = (struct coro *)mg->mg_ptr; 830 struct coro *coro = (struct coro *)mg->mg_ptr;
792 mg->mg_ptr = 0; 831 mg->mg_ptr = 0;
793 832
794 coro_state_destroy (coro); 833 coro_state_destroy (coro);
795 834
796 return 0; 835 return 0;
797} 836}
798 837
799static int 838static int
800coro_state_dup (MAGIC *mg, CLONE_PARAMS *params) 839coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
801{ 840{
802 struct coro *coro = (struct coro *)mg->mg_ptr; 841 struct coro *coro = (struct coro *)mg->mg_ptr;
803 842
804 ++coro->refcnt; 843 ++coro->refcnt;
805 844
806 return 0; 845 return 0;
807} 846}
808 847
809static MGVTBL coro_state_vtbl = { 0, 0, 0, 0, coro_state_clear, 0, coro_state_dup, 0 }; 848static MGVTBL coro_state_vtbl = {
849 0, 0, 0, 0,
850 coro_state_clear,
851 0,
852#ifdef MGf_DUP
853 coro_state_dup,
854#else
855# define MGf_DUP 0
856#endif
857};
810 858
811static struct coro * 859static struct coro *
812SvSTATE (SV *coro) 860SvSTATE (SV *coro)
813{ 861{
814 HV *stash; 862 HV *stash;
829 assert (mg->mg_type == PERL_MAGIC_ext); 877 assert (mg->mg_type == PERL_MAGIC_ext);
830 return (struct coro *)mg->mg_ptr; 878 return (struct coro *)mg->mg_ptr;
831} 879}
832 880
833static void 881static void
834prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev, SV *next, int flags) 882prepare_transfer (struct transfer_args *ta, SV *prev_sv, SV *next_sv)
835{ 883{
836 ta->prev = SvSTATE (prev); 884 ta->prev = SvSTATE (prev_sv);
837 ta->next = SvSTATE (next); 885 ta->next = SvSTATE (next_sv);
838 ta->flags = flags;
839} 886}
840 887
841static void 888static void
842api_transfer (SV *prev, SV *next, int flags) 889api_transfer (SV *prev_sv, SV *next_sv)
843{ 890{
844 dTHX;
845 struct transfer_args ta; 891 struct transfer_args ta;
846 892
847 prepare_transfer (aTHX_ &ta, prev, next, flags); 893 prepare_transfer (&ta, prev_sv, next_sv);
848 TRANSFER (ta); 894 TRANSFER (ta);
895}
896
897static int
898api_save (SV *coro_sv, int new_save)
899{
900 struct coro *coro = SvSTATE (coro_sv);
901 int old_save = coro->save;
902
903 if (new_save >= 0)
904 coro->save = new_save;
905
906 return old_save;
849} 907}
850 908
851/** Coro ********************************************************************/ 909/** Coro ********************************************************************/
852 910
853#define PRIO_MAX 3 911#define PRIO_MAX 3
856#define PRIO_LOW -1 914#define PRIO_LOW -1
857#define PRIO_IDLE -3 915#define PRIO_IDLE -3
858#define PRIO_MIN -4 916#define PRIO_MIN -4
859 917
860/* for Coro.pm */ 918/* for Coro.pm */
861static GV *coro_current, *coro_idle; 919static SV *coro_current;
862static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 920static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
863static int coro_nready; 921static int coro_nready;
864 922
865static void 923static void
866coro_enq (pTHX_ SV *sv) 924coro_enq (SV *coro_sv)
867{ 925{
868 int prio;
869
870 if (SvTYPE (sv) != SVt_PVHV)
871 croak ("Coro::ready tried to enqueue something that is not a coroutine");
872
873 prio = SvSTATE (sv)->prio;
874
875 av_push (coro_ready [prio - PRIO_MIN], sv); 926 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
876 coro_nready++; 927 coro_nready++;
877} 928}
878 929
879static SV * 930static SV *
880coro_deq (pTHX_ int min_prio) 931coro_deq (int min_prio)
881{ 932{
882 int prio = PRIO_MAX - PRIO_MIN; 933 int prio = PRIO_MAX - PRIO_MIN;
883 934
884 min_prio -= PRIO_MIN; 935 min_prio -= PRIO_MIN;
885 if (min_prio < 0) 936 if (min_prio < 0)
893 } 944 }
894 945
895 return 0; 946 return 0;
896} 947}
897 948
898static void 949static int
899api_ready (SV *coro) 950api_ready (SV *coro_sv)
900{ 951{
901 dTHX; 952 struct coro *coro;
902 953
903 if (SvROK (coro)) 954 if (SvROK (coro_sv))
904 coro = SvRV (coro); 955 coro_sv = SvRV (coro_sv);
956
957 coro = SvSTATE (coro_sv);
958
959 if (coro->flags & CF_READY)
960 return 0;
961
962 coro->flags |= CF_READY;
905 963
906 LOCK; 964 LOCK;
907 coro_enq (aTHX_ SvREFCNT_inc (coro)); 965 coro_enq (SvREFCNT_inc (coro_sv));
908 UNLOCK; 966 UNLOCK;
909}
910 967
968 return 1;
969}
970
911static void 971static int
972api_is_ready (SV *coro_sv)
973{
974 return !!(SvSTATE (coro_sv)->flags & CF_READY);
975}
976
977static void
912prepare_schedule (aTHX_ struct transfer_args *ta) 978prepare_schedule (struct transfer_args *ta)
913{ 979{
914 SV *current, *prev, *next; 980 SV *prev, *next;
915
916 LOCK;
917
918 current = GvSV (coro_current);
919 981
920 for (;;) 982 for (;;)
921 { 983 {
922 LOCK; 984 LOCK;
923
924 next = coro_deq (aTHX_ PRIO_MIN); 985 next = coro_deq (PRIO_MIN);
986 UNLOCK;
925 987
926 if (next) 988 if (next)
927 break; 989 break;
928 990
929 UNLOCK;
930
931 { 991 {
932 dSP; 992 dSP;
933 993
934 ENTER; 994 ENTER;
935 SAVETMPS; 995 SAVETMPS;
936 996
937 PUSHMARK (SP); 997 PUSHMARK (SP);
938 PUTBACK; 998 PUTBACK;
939 call_sv (GvSV (coro_idle), G_DISCARD); 999 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
940 1000
941 FREETMPS; 1001 FREETMPS;
942 LEAVE; 1002 LEAVE;
943 } 1003 }
944 } 1004 }
945 1005
946 prev = SvRV (current); 1006 prev = SvRV (coro_current);
947 SvRV (current) = next; 1007 SvRV_set (coro_current, next);
948 1008
949 /* free this only after the transfer */ 1009 /* free this only after the transfer */
1010 LOCK;
950 free_coro_mortal (); 1011 free_coro_mortal ();
1012 UNLOCK;
951 coro_mortal = prev; 1013 coro_mortal = prev;
952 1014
1015 assert (!SvROK(prev));//D
1016 assert (!SvROK(next));//D
1017
953 ta->prev = SvSTATE (prev); 1018 ta->prev = SvSTATE (prev);
954 ta->next = SvSTATE (next); 1019 ta->next = SvSTATE (next);
955 ta->flags = TRANSFER_SAVE_ALL;
956 1020
957 UNLOCK; 1021 assert (ta->next->flags & CF_READY);
1022 ta->next->flags &= ~CF_READY;
958} 1023}
959 1024
960static void 1025static void
961prepare_cede (aTHX_ struct transfer_args *ta) 1026prepare_cede (struct transfer_args *ta)
962{ 1027{
963 LOCK; 1028 api_ready (coro_current);
964 coro_enq (aTHX_ SvREFCNT_inc (SvRV (GvSV (coro_current))));
965 UNLOCK;
966 1029
967 prepare_schedule (ta); 1030 prepare_schedule (ta);
968} 1031}
969 1032
970static void 1033static void
971api_schedule (void) 1034api_schedule (void)
972{ 1035{
973 dTHX;
974 struct transfer_args ta; 1036 struct transfer_args ta;
975 1037
976 prepare_schedule (&ta); 1038 prepare_schedule (&ta);
977 TRANSFER (ta); 1039 TRANSFER (ta);
978} 1040}
979 1041
980static void 1042static void
981api_cede (void) 1043api_cede (void)
982{ 1044{
983 dTHX;
984 struct transfer_args ta; 1045 struct transfer_args ta;
985 1046
986 prepare_cede (&ta); 1047 prepare_cede (&ta);
987 TRANSFER (ta); 1048 TRANSFER (ta);
988} 1049}
998#endif 1059#endif
999 BOOT_PAGESIZE; 1060 BOOT_PAGESIZE;
1000 1061
1001 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1062 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1002 1063
1003 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 1064 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1004 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 1065 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1005 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 1066 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1067 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1068 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1006 1069
1007 main_mainstack = PL_mainstack; 1070 main_mainstack = PL_mainstack;
1008 1071
1009 coroapi.ver = CORO_API_VERSION; 1072 coroapi.ver = CORO_API_VERSION;
1010 coroapi.transfer = api_transfer; 1073 coroapi.transfer = api_transfer;
1011
1012 Newz (0, main_stack, 1, coro_stack);
1013 main_stack->idle_sp = (void *)-1;
1014 1074
1015 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1075 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1016} 1076}
1017 1077
1018SV * 1078SV *
1023 HV *hv; 1083 HV *hv;
1024 int i; 1084 int i;
1025 1085
1026 Newz (0, coro, 1, struct coro); 1086 Newz (0, coro, 1, struct coro);
1027 coro->args = newAV (); 1087 coro->args = newAV ();
1088 coro->save = CORO_SAVE_ALL;
1089 coro->flags = CF_NEW;
1028 1090
1029 hv = newHV (); 1091 hv = newHV ();
1030 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1092 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1031 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1093 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1032 1094
1033 for (i = 1; i < items; i++) 1095 for (i = 1; i < items; i++)
1034 av_push (coro->args, newSVsv (ST (i))); 1096 av_push (coro->args, newSVsv (ST (i)));
1035
1036 coro->stack = main_stack;
1037 /*coro->mainstack = 0; *//*actual work is done inside transfer */
1038 /*coro->stack = 0;*/
1039} 1097}
1040 OUTPUT: 1098 OUTPUT:
1099 RETVAL
1100
1101int
1102save (SV *coro, int new_save = -1)
1103 CODE:
1104 RETVAL = api_save (coro, new_save);
1105 OUTPUT:
1041 RETVAL 1106 RETVAL
1042 1107
1043void 1108void
1044_set_stacklevel (...) 1109_set_stacklevel (...)
1045 ALIAS: 1110 ALIAS:
1046 Coro::State::transfer = 1 1111 Coro::State::transfer = 1
1047 Coro::schedule = 2 1112 Coro::schedule = 2
1048 Coro::cede = 3 1113 Coro::cede = 3
1049 Coro::Cont::yield = 4
1050 CODE: 1114 CODE:
1051{ 1115{
1052 struct transfer_args ta; 1116 struct transfer_args ta;
1053 1117
1054 switch (ix) 1118 switch (ix)
1055 { 1119 {
1056 case 0: 1120 case 0:
1057 ta.prev = (struct coro *)INT2PTR (coro_stack *, SvIV (ST (0))); 1121 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1058 ta.next = 0; 1122 ta.next = 0;
1059 ta.flags = TRANSFER_SET_STACKLEVEL;
1060 break; 1123 break;
1061 1124
1062 case 1: 1125 case 1:
1063 if (items != 3) 1126 if (items != 2)
1064 croak ("Coro::State::transfer(prev,next,flags) expects three arguments, not %d", items); 1127 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1065 1128
1066 prepare_transfer (&ta, ST (0), ST (1), SvIV (ST (2))); 1129 prepare_transfer (&ta, ST (0), ST (1));
1067 break; 1130 break;
1068 1131
1069 case 2: 1132 case 2:
1070 prepare_schedule (&ta); 1133 prepare_schedule (&ta);
1071 break; 1134 break;
1072 1135
1073 case 3: 1136 case 3:
1074 prepare_cede (&ta); 1137 prepare_cede (&ta);
1075 break; 1138 break;
1076
1077 case 4:
1078 {
1079 SV *yieldstack;
1080 SV *sv;
1081 AV *defav = GvAV (PL_defgv);
1082
1083 yieldstack = *hv_fetch (
1084 (HV *)SvRV (GvSV (coro_current)),
1085 "yieldstack", sizeof ("yieldstack") - 1,
1086 0
1087 );
1088
1089 /* set up @_ -- ugly */
1090 av_clear (defav);
1091 av_fill (defav, items - 1);
1092 while (items--)
1093 av_store (defav, items, SvREFCNT_inc (ST(items)));
1094
1095 sv = av_pop ((AV *)SvRV (yieldstack));
1096 ta.prev = SvSTATE (*av_fetch ((AV *)SvRV (sv), 0, 0));
1097 ta.next = SvSTATE (*av_fetch ((AV *)SvRV (sv), 1, 0));
1098 ta.flags = 0;
1099 SvREFCNT_dec (sv);
1100 }
1101 break;
1102
1103 } 1139 }
1104 1140
1105 TRANSFER (ta); 1141 TRANSFER (ta);
1106} 1142}
1107 1143
1114 sv_unmagic (SvRV (dst), PERL_MAGIC_ext); 1150 sv_unmagic (SvRV (dst), PERL_MAGIC_ext);
1115 1151
1116 ++coro_src->refcnt; 1152 ++coro_src->refcnt;
1117 sv_magicext (SvRV (dst), 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro_src, 0)->mg_flags |= MGf_DUP; 1153 sv_magicext (SvRV (dst), 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro_src, 0)->mg_flags |= MGf_DUP;
1118} 1154}
1119
1120void
1121_nonlocal_goto (IV nextop)
1122 CODE:
1123 /* uuh, somebody will kill me again for this */
1124 PL_op->op_next = INT2PTR (OP *, nextop);
1125 1155
1126void 1156void
1127_exit (code) 1157_exit (code)
1128 int code 1158 int code
1129 PROTOTYPE: $ 1159 PROTOTYPE: $
1130 CODE: 1160 CODE:
1131 _exit (code); 1161 _exit (code);
1132 1162
1163int
1164cctx_count ()
1165 CODE:
1166 RETVAL = cctx_count;
1167 OUTPUT:
1168 RETVAL
1169
1170int
1171cctx_idle ()
1172 CODE:
1173 RETVAL = cctx_idle;
1174 OUTPUT:
1175 RETVAL
1176
1133MODULE = Coro::State PACKAGE = Coro 1177MODULE = Coro::State PACKAGE = Coro
1134 1178
1135BOOT: 1179BOOT:
1136{ 1180{
1137 int i; 1181 int i;
1143 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1187 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1144 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1188 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1145 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 1189 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
1146 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 1190 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
1147 1191
1148 coro_current = gv_fetchpv ("Coro::current", TRUE, SVt_PV); 1192 coro_current = get_sv ("Coro::current", FALSE);
1149 coro_idle = gv_fetchpv ("Coro::idle" , TRUE, SVt_PV); 1193 SvREADONLY_on (coro_current);
1150 1194
1151 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1195 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1152 coro_ready[i] = newAV (); 1196 coro_ready[i] = newAV ();
1153 1197
1154 { 1198 {
1155 SV *sv = perl_get_sv("Coro::API", 1); 1199 SV *sv = perl_get_sv("Coro::API", 1);
1156 1200
1157 coroapi.schedule = api_schedule; 1201 coroapi.schedule = api_schedule;
1202 coroapi.save = api_save;
1158 coroapi.cede = api_cede; 1203 coroapi.cede = api_cede;
1159 coroapi.ready = api_ready; 1204 coroapi.ready = api_ready;
1205 coroapi.is_ready = api_is_ready;
1160 coroapi.nready = &coro_nready; 1206 coroapi.nready = &coro_nready;
1161 coroapi.current = coro_current; 1207 coroapi.current = coro_current;
1162 1208
1163 GCoroAPI = &coroapi; 1209 GCoroAPI = &coroapi;
1164 sv_setiv (sv, (IV)&coroapi); 1210 sv_setiv (sv, (IV)&coroapi);
1165 SvREADONLY_on (sv); 1211 SvREADONLY_on (sv);
1166 } 1212 }
1167} 1213}
1214
1215void
1216_set_current (SV *current)
1217 PROTOTYPE: $
1218 CODE:
1219 SvREFCNT_dec (SvRV (coro_current));
1220 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1168 1221
1169int 1222int
1170prio (Coro::State coro, int newprio = 0) 1223prio (Coro::State coro, int newprio = 0)
1171 ALIAS: 1224 ALIAS:
1172 nice = 1 1225 nice = 1
1175 RETVAL = coro->prio; 1228 RETVAL = coro->prio;
1176 1229
1177 if (items > 1) 1230 if (items > 1)
1178 { 1231 {
1179 if (ix) 1232 if (ix)
1180 newprio += coro->prio; 1233 newprio = coro->prio - newprio;
1181 1234
1182 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 1235 if (newprio < PRIO_MIN) newprio = PRIO_MIN;
1183 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 1236 if (newprio > PRIO_MAX) newprio = PRIO_MAX;
1184 1237
1185 coro->prio = newprio; 1238 coro->prio = newprio;
1186 } 1239 }
1187} 1240}
1241 OUTPUT:
1242 RETVAL
1188 1243
1189void 1244SV *
1190ready (SV *self) 1245ready (SV *self)
1191 PROTOTYPE: $ 1246 PROTOTYPE: $
1192 CODE: 1247 CODE:
1193 api_ready (self); 1248 RETVAL = boolSV (api_ready (self));
1249 OUTPUT:
1250 RETVAL
1251
1252SV *
1253is_ready (SV *self)
1254 PROTOTYPE: $
1255 CODE:
1256 RETVAL = boolSV (api_is_ready (self));
1257 OUTPUT:
1258 RETVAL
1194 1259
1195int 1260int
1196nready (...) 1261nready (...)
1197 PROTOTYPE: 1262 PROTOTYPE:
1198 CODE: 1263 CODE:
1204 1269
1205SV * 1270SV *
1206_get_state () 1271_get_state ()
1207 CODE: 1272 CODE:
1208{ 1273{
1209 struct { 1274 struct io_state *data;
1210 int errorno;
1211 int laststype;
1212 int laststatval;
1213 Stat_t statcache;
1214 } data;
1215 1275
1276 RETVAL = newSV (sizeof (struct io_state));
1277 data = (struct io_state *)SvPVX (RETVAL);
1278 SvCUR_set (RETVAL, sizeof (struct io_state));
1279 SvPOK_only (RETVAL);
1280
1216 data.errorno = errno; 1281 data->errorno = errno;
1217 data.laststype = PL_laststype; 1282 data->laststype = PL_laststype;
1218 data.laststatval = PL_laststatval; 1283 data->laststatval = PL_laststatval;
1219 data.statcache = PL_statcache; 1284 data->statcache = PL_statcache;
1220
1221 RETVAL = newSVpvn ((char *)&data, sizeof data);
1222} 1285}
1223 OUTPUT: 1286 OUTPUT:
1224 RETVAL 1287 RETVAL
1225 1288
1226void 1289void
1227_set_state (char *data_) 1290_set_state (char *data_)
1228 PROTOTYPE: $ 1291 PROTOTYPE: $
1229 CODE: 1292 CODE:
1230{ 1293{
1231 struct { 1294 struct io_state *data = (void *)data_;
1232 int errorno;
1233 int laststype;
1234 int laststatval;
1235 Stat_t statcache;
1236 } *data = (void *)data_;
1237 1295
1238 errno = data->errorno; 1296 errno = data->errorno;
1239 PL_laststype = data->laststype; 1297 PL_laststype = data->laststype;
1240 PL_laststatval = data->laststatval; 1298 PL_laststatval = data->laststatval;
1241 PL_statcache = data->statcache; 1299 PL_statcache = data->statcache;
1242} 1300}
1301

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines