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.102 by root, Mon Nov 27 01:28:03 2006 UTC vs.
Revision 1.135 by root, Fri Jan 5 18:25:51 2007 UTC

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

Diff Legend

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