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.98 by root, Sun Nov 26 21:25:53 2006 UTC vs.
Revision 1.136 by root, Fri Jan 12 01:05:55 2007 UTC

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

Diff Legend

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