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

Diff Legend

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