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.107 by root, Mon Nov 27 02:15:51 2006 UTC vs.
Revision 1.134 by root, Thu Jan 4 23:49:27 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines