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.112 by root, Thu Nov 30 20:52:52 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
124 int inuse; 147 int inuse;
125 148
127 int valgrind_id; 150 int valgrind_id;
128#endif 151#endif
129} coro_cctx; 152} coro_cctx;
130 153
131enum { 154enum {
132 CF_RUNNING, /* coroutine is running */ 155 CF_RUNNING = 0x0001, /* coroutine is running */
133 CF_READY, /* coroutine is ready */ 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 */
134}; 159};
135 160
136/* this is a structure representing a perl-level coroutine */ 161/* this is a structure representing a perl-level coroutine */
137struct coro { 162struct coro {
138 /* the c coroutine allocated to this perl coroutine, if any */ 163 /* the c coroutine allocated to this perl coroutine, if any */
139 coro_cctx *cctx; 164 coro_cctx *cctx;
140 165
141 /* data associated with this coroutine (initial args) */ 166 /* data associated with this coroutine (initial args) */
142 AV *args; 167 AV *args;
143 int refcnt; 168 int refcnt;
144 int flags; 169 int save; /* CORO_SAVE flags */
170 int flags; /* CF_ flags */
145 171
146 /* optionally saved, might be zero */ 172 /* optionally saved, might be zero */
147 AV *defav; 173 AV *defav; /* @_ */
148 SV *defsv; 174 SV *defsv; /* $_ */
149 SV *errsv; 175 SV *errsv; /* $@ */
176 SV *irssv; /* $/ */
177 SV *irssv_sv; /* real $/ cache */
150 178
151#define VAR(name,type) type name; 179#define VAR(name,type) type name;
152# include "state.h" 180# include "state.h"
153#undef VAR 181#undef VAR
154 182
240 268
241 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 269 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)
242 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 270 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
243 else 271 else
244 { 272 {
245#if 0 273#if PREFER_PERL_FUNCTIONS
246 /* this is probably cleaner, but also slower? */ 274 /* this is probably cleaner, but also slower? */
247 CV *cp = Perl_cv_clone (cv); 275 CV *cp = Perl_cv_clone (cv);
248 CvPADLIST (cv) = CvPADLIST (cp); 276 CvPADLIST (cv) = CvPADLIST (cp);
249 CvPADLIST (cp) = 0; 277 CvPADLIST (cp) = 0;
250 SvREFCNT_dec (cp); 278 SvREFCNT_dec (cp);
277} 305}
278 306
279#define SB do { 307#define SB do {
280#define SE } while (0) 308#define SE } while (0)
281 309
282#define LOAD(state) load_state((state));
283#define SAVE(state,flags) save_state((state),(flags));
284
285#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
286 311
287static void 312static void
288load_state(Coro__State c) 313load_perl (Coro__State c)
289{ 314{
290#define VAR(name,type) PL_ ## name = c->name; 315#define VAR(name,type) PL_ ## name = c->name;
291# include "state.h" 316# include "state.h"
292#undef VAR 317#undef VAR
293 318
294 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 319 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
295 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 320 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
296 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 }
297 333
298 { 334 {
299 dSP; 335 dSP;
300 CV *cv; 336 CV *cv;
301 337
310 PUTBACK; 346 PUTBACK;
311 } 347 }
312} 348}
313 349
314static void 350static void
315save_state(Coro__State c, int flags) 351save_perl (Coro__State c)
316{ 352{
317 { 353 {
318 dSP; 354 dSP;
319 I32 cxix = cxstack_ix; 355 I32 cxix = cxstack_ix;
320 PERL_CONTEXT *ccstk = cxstack; 356 PERL_CONTEXT *ccstk = cxstack;
323 /* 359 /*
324 * 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
325 * (and reinitialize) all cv's in the whole callchain :( 361 * (and reinitialize) all cv's in the whole callchain :(
326 */ 362 */
327 363
364 EXTEND (SP, 3 + 1);
328 PUSHs (Nullsv); 365 PUSHs (Nullsv);
329 /* this loop was inspired by pp_caller */ 366 /* this loop was inspired by pp_caller */
330 for (;;) 367 for (;;)
331 { 368 {
332 while (cxix >= 0) 369 while (cxix >= 0)
333 { 370 {
334 PERL_CONTEXT *cx = &ccstk[cxix--]; 371 PERL_CONTEXT *cx = &ccstk[cxix--];
335 372
336 if (CxTYPE(cx) == CXt_SUB) 373 if (CxTYPE (cx) == CXt_SUB)
337 { 374 {
338 CV *cv = cx->blk_sub.cv; 375 CV *cv = cx->blk_sub.cv;
339 376
340 if (CvDEPTH (cv)) 377 if (CvDEPTH (cv))
341 { 378 {
342 EXTEND (SP, 3); 379 EXTEND (SP, 3);
343
344 PUSHs ((SV *)CvPADLIST(cv)); 380 PUSHs ((SV *)CvPADLIST (cv));
345 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 381 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
346 PUSHs ((SV *)cv); 382 PUSHs ((SV *)cv);
347 383
348 CvDEPTH (cv) = 0; 384 CvDEPTH (cv) = 0;
349 get_padlist (cv); 385 get_padlist (cv);
350 } 386 }
351 } 387 }
352#ifdef CXt_FORMAT
353 else if (CxTYPE(cx) == CXt_FORMAT)
354 {
355 /* I never used formats, so how should I know how these are implemented? */
356 /* my bold guess is as a simple, plain sub... */
357 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
358 }
359#endif
360 } 388 }
361 389
362 if (top_si->si_type == PERLSI_MAIN) 390 if (top_si->si_type == PERLSI_MAIN)
363 break; 391 break;
364 392
368 } 396 }
369 397
370 PUTBACK; 398 PUTBACK;
371 } 399 }
372 400
373 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;
374 c->defsv = flags & TRANSFER_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 402 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0;
375 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;
376 405
377#define VAR(name,type)c->name = PL_ ## name; 406#define VAR(name,type)c->name = PL_ ## name;
378# include "state.h" 407# include "state.h"
379#undef VAR 408#undef VAR
380} 409}
383 * allocate various perl stacks. This is an exact copy 412 * allocate various perl stacks. This is an exact copy
384 * of perl.c:init_stacks, except that it uses less memory 413 * of perl.c:init_stacks, except that it uses less memory
385 * on the (sometimes correct) assumption that coroutines do 414 * on the (sometimes correct) assumption that coroutines do
386 * not usually need a lot of stackspace. 415 * not usually need a lot of stackspace.
387 */ 416 */
417#if PREFER_PERL_FUNCTIONS
418# define coro_init_stacks init_stacks
419#else
388static void 420static void
389coro_init_stacks () 421coro_init_stacks ()
390{ 422{
391 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 423 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT));
392 PL_curstackinfo->si_type = PERLSI_MAIN; 424 PL_curstackinfo->si_type = PERLSI_MAIN;
393 PL_curstack = PL_curstackinfo->si_stack; 425 PL_curstack = PL_curstackinfo->si_stack;
394 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 426 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
395 427
396 PL_stack_base = AvARRAY(PL_curstack); 428 PL_stack_base = AvARRAY(PL_curstack);
397 PL_stack_sp = PL_stack_base; 429 PL_stack_sp = PL_stack_base;
398 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 430 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
399 431
400 New(50,PL_tmps_stack,96,SV*); 432 New(50,PL_tmps_stack,128,SV*);
401 PL_tmps_floor = -1; 433 PL_tmps_floor = -1;
402 PL_tmps_ix = -1; 434 PL_tmps_ix = -1;
403 PL_tmps_max = 96; 435 PL_tmps_max = 128;
404 436
405 New(54,PL_markstack,16,I32); 437 New(54,PL_markstack,32,I32);
406 PL_markstack_ptr = PL_markstack; 438 PL_markstack_ptr = PL_markstack;
407 PL_markstack_max = PL_markstack + 16; 439 PL_markstack_max = PL_markstack + 32;
408 440
409#ifdef SET_MARK_OFFSET 441#ifdef SET_MARK_OFFSET
410 SET_MARK_OFFSET; 442 SET_MARK_OFFSET;
411#endif 443#endif
412 444
413 New(54,PL_scopestack,16,I32); 445 New(54,PL_scopestack,32,I32);
414 PL_scopestack_ix = 0; 446 PL_scopestack_ix = 0;
415 PL_scopestack_max = 16; 447 PL_scopestack_max = 32;
416 448
417 New(54,PL_savestack,96,ANY); 449 New(54,PL_savestack,64,ANY);
418 PL_savestack_ix = 0; 450 PL_savestack_ix = 0;
419 PL_savestack_max = 96; 451 PL_savestack_max = 64;
420 452
421#if !PERL_VERSION_ATLEAST (5,9,0) 453#if !PERL_VERSION_ATLEAST (5,9,0)
422 New(54,PL_retstack,8,OP*); 454 New(54,PL_retstack,16,OP*);
423 PL_retstack_ix = 0; 455 PL_retstack_ix = 0;
424 PL_retstack_max = 8; 456 PL_retstack_max = 16;
425#endif 457#endif
426} 458}
459#endif
427 460
428/* 461/*
429 * destroy the stacks, the callchain etc... 462 * destroy the stacks, the callchain etc...
430 */ 463 */
431static void 464static void
432coro_destroy_stacks () 465coro_destroy_stacks ()
433{ 466{
434 if (!IN_DESTRUCT) 467 if (!IN_DESTRUCT)
435 { 468 {
436 /* is this ugly, I ask? */ 469 /* restore all saved variables and stuff */
437 LEAVE_SCOPE (0); 470 LEAVE_SCOPE (0);
471 assert (PL_tmps_floor == -1);
438 472
439 /* sure it is, but more important: is it correct?? :/ */ 473 /* free all temporaries */
440 FREETMPS; 474 FREETMPS;
475 assert (PL_tmps_ix == -1);
441 476
477 /* unwind all extra stacks */
442 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/ 478 POPSTACK_TO (PL_mainstack);
479
480 /* unwind main stack */
481 dounwind (-1);
443 } 482 }
444 483
445 while (PL_curstackinfo->si_next) 484 while (PL_curstackinfo->si_next)
446 PL_curstackinfo = PL_curstackinfo->si_next; 485 PL_curstackinfo = PL_curstackinfo->si_next;
447 486
448 while (PL_curstackinfo) 487 while (PL_curstackinfo)
449 { 488 {
450 PERL_SI *p = PL_curstackinfo->si_prev; 489 PERL_SI *p = PL_curstackinfo->si_prev;
451 490
452 { /*D*//*remove*/
453 dSP;
454 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
455 PUTBACK; /* possibly superfluous */
456 }
457
458 if (!IN_DESTRUCT) 491 if (!IN_DESTRUCT)
459 {
460 dounwind (-1);/*D*//*remove*/
461 SvREFCNT_dec (PL_curstackinfo->si_stack); 492 SvREFCNT_dec (PL_curstackinfo->si_stack);
462 }
463 493
464 Safefree (PL_curstackinfo->si_cxstack); 494 Safefree (PL_curstackinfo->si_cxstack);
465 Safefree (PL_curstackinfo); 495 Safefree (PL_curstackinfo);
466 PL_curstackinfo = p; 496 PL_curstackinfo = p;
467 } 497 }
482 * emulate part of the perl startup here. 512 * emulate part of the perl startup here.
483 */ 513 */
484 514
485 coro_init_stacks (); 515 coro_init_stacks ();
486 516
487 PL_curcop = 0; 517 PL_curcop = &PL_compiling;
488 PL_in_eval = 0; 518 PL_in_eval = EVAL_NULL;
489 PL_curpm = 0; 519 PL_curpm = 0;
520 PL_localizing = 0;
521 PL_dirty = 0;
522 PL_restartop = 0;
490 523
491 { 524 {
492 dSP; 525 dSP;
493 LOGOP myop; 526 LOGOP myop;
494 527
495 /* I have no idea why this is needed, but it is */
496 PUSHMARK (SP);
497
498 SvREFCNT_dec (GvAV (PL_defgv)); 528 SvREFCNT_dec (GvAV (PL_defgv));
499 GvAV (PL_defgv) = coro->args; coro->args = 0; 529 GvAV (PL_defgv) = coro->args; coro->args = 0;
500 530
501 Zero (&myop, 1, LOGOP); 531 Zero (&myop, 1, LOGOP);
502 myop.op_next = Nullop; 532 myop.op_next = Nullop;
503 myop.op_flags = OPf_WANT_VOID; 533 myop.op_flags = OPf_WANT_VOID;
504 534
505 PL_op = (OP *)&myop;
506
507 PUSHMARK (SP); 535 PUSHMARK (SP);
508 XPUSHs ((SV *)get_cv ("Coro::State::_coro_init", FALSE)); 536 XPUSHs ((SV *)get_cv ("Coro::State::_coro_init", FALSE));
509 PUTBACK; 537 PUTBACK;
538 PL_op = (OP *)&myop;
510 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 539 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
511 SPAGAIN; 540 SPAGAIN;
512
513 ENTER; /* necessary e.g. for dounwind */
514 } 541 }
542
543 ENTER; /* necessary e.g. for dounwind */
515} 544}
516 545
517static void 546static void
518free_coro_mortal () 547free_coro_mortal ()
519{ 548{
522 SvREFCNT_dec (coro_mortal); 551 SvREFCNT_dec (coro_mortal);
523 coro_mortal = 0; 552 coro_mortal = 0;
524 } 553 }
525} 554}
526 555
556/* inject a fake call to Coro::State::_cctx_init into the execution */
527static void NOINLINE 557static void NOINLINE
528prepare_cctx (coro_cctx *cctx) 558prepare_cctx (coro_cctx *cctx)
529{ 559{
530 dSP; 560 dSP;
531 LOGOP myop; 561 LOGOP myop;
532 562
533 Zero (&myop, 1, LOGOP); 563 Zero (&myop, 1, LOGOP);
534 myop.op_next = PL_op; 564 myop.op_next = PL_op;
535 myop.op_flags = OPf_WANT_VOID; 565 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
536
537 sv_setiv (get_sv ("Coro::State::_cctx", FALSE), PTR2IV (cctx));
538 566
539 PUSHMARK (SP); 567 PUSHMARK (SP);
568 EXTEND (SP, 2);
569 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx))));
540 XPUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 570 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
541 PUTBACK; 571 PUTBACK;
572 PL_op = (OP *)&myop;
542 PL_restartop = PL_ppaddr[OP_ENTERSUB](aTHX); 573 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
543 SPAGAIN; 574 SPAGAIN;
544} 575}
545 576
546static void 577static void
547coro_run (void *arg) 578coro_run (void *arg)
548{ 579{
549 /* coro_run is the alternative epilogue of transfer() */ 580 /* coro_run is the alternative tail of transfer(), so unlock here. */
550 UNLOCK; 581 UNLOCK;
551 582
552 /* 583 /*
553 * this is a _very_ stripped down perl interpreter ;) 584 * this is a _very_ stripped down perl interpreter ;)
554 */ 585 */
556 587
557 /* inject call to cctx_init */ 588 /* inject call to cctx_init */
558 prepare_cctx ((coro_cctx *)arg); 589 prepare_cctx ((coro_cctx *)arg);
559 590
560 /* 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;
561 perl_run (PL_curinterp); 593 perl_run (PL_curinterp);
562 594
563 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);
564 abort (); 596 abort ();
565} 597}
569{ 601{
570 coro_cctx *cctx; 602 coro_cctx *cctx;
571 603
572 ++cctx_count; 604 ++cctx_count;
573 605
574 New (0, cctx, 1, coro_cctx); 606 Newz (0, cctx, 1, coro_cctx);
575 607
576#if HAVE_MMAP 608#if HAVE_MMAP
577 609
578 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; 610 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE;
579 /* mmap suppsedly does allocate-on-write for us */ 611 /* mmap supposedly does allocate-on-write for us */
580 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);
581 613
582 if (cctx->sptr == (void *)-1) 614 if (cctx->sptr == (void *)-1)
583 { 615 {
584 perror ("FATAL: unable to mmap stack for coroutine"); 616 perror ("FATAL: unable to mmap stack for coroutine");
613 645
614 return cctx; 646 return cctx;
615} 647}
616 648
617static void 649static void
618cctx_free (coro_cctx *cctx) 650cctx_destroy (coro_cctx *cctx)
619{ 651{
620 if (!cctx) 652 if (!cctx)
621 return; 653 return;
622 654
623 --cctx_count; 655 --cctx_count;
640{ 672{
641 coro_cctx *cctx; 673 coro_cctx *cctx;
642 674
643 if (cctx_first) 675 if (cctx_first)
644 { 676 {
645 --cctx_idle;
646 cctx = cctx_first; 677 cctx = cctx_first;
647 cctx_first = cctx->next; 678 cctx_first = cctx->next;
679 --cctx_idle;
648 } 680 }
649 else 681 else
650 { 682 {
651 cctx = cctx_new (); 683 cctx = cctx_new ();
652 PL_op = PL_op->op_next; 684 PL_op = PL_op->op_next;
656} 688}
657 689
658static void 690static void
659cctx_put (coro_cctx *cctx) 691cctx_put (coro_cctx *cctx)
660{ 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
661 ++cctx_idle; 704 ++cctx_idle;
662 cctx->next = cctx_first; 705 cctx->next = cctx_first;
663 cctx_first = cctx; 706 cctx_first = cctx;
664} 707}
665 708
666/* never call directly, always through the coro_state_transfer global variable */ 709/* never call directly, always through the coro_state_transfer global variable */
667static void NOINLINE 710static void NOINLINE
668transfer (struct coro *prev, struct coro *next, int flags) 711transfer (struct coro *prev, struct coro *next)
669{ 712{
670 dSTACKLEVEL; 713 dSTACKLEVEL;
671 714
672 /* sometimes transfer is only called to set idle_sp */ 715 /* sometimes transfer is only called to set idle_sp */
673 if (flags == TRANSFER_SET_STACKLEVEL) 716 if (!next)
717 {
674 ((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 }
675 else if (prev != next) 721 else if (prev != next)
676 { 722 {
677 coro_cctx *prev__cctx; 723 coro_cctx *prev__cctx;
678 724
679 if (!prev->cctx) 725 if (prev->flags & CF_NEW)
680 { 726 {
681 /* create a new empty context */ 727 /* create a new empty context */
682 Newz (0, prev->cctx, 1, coro_cctx); 728 Newz (0, prev->cctx, 1, coro_cctx);
683 prev->cctx->inuse = 1; 729 prev->cctx->inuse = 1;
730 prev->flags &= ~CF_NEW;
684 prev->flags |= CF_RUNNING; 731 prev->flags |= CF_RUNNING;
685 } 732 }
686 733
734 /*TODO: must not croak here */
687 if (!prev->flags & CF_RUNNING) 735 if (!prev->flags & CF_RUNNING)
688 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states"); 736 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states");
689 737
690 if (next->flags & CF_RUNNING) 738 if (next->flags & CF_RUNNING)
691 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 739 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
692 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
693 prev->flags &= ~CF_RUNNING; 744 prev->flags &= ~CF_RUNNING;
694 next->flags |= CF_RUNNING; 745 next->flags |= CF_RUNNING;
695 746
696 LOCK; 747 LOCK;
697 748
698 if (next->mainstack) 749 if (next->flags & CF_NEW)
699 { 750 {
700 /* coroutine already started */ 751 /* need to start coroutine */
701 SAVE (prev, flags); 752 next->flags &= ~CF_NEW;
702 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);
703 } 759 }
704 else 760 else
705 { 761 {
706 /* need to start coroutine */ 762 /* coroutine already started */
707 /* first get rid of the old state */ 763 save_perl (prev);
708 SAVE (prev, -1); 764 load_perl (next);
709 /* setup coroutine call */
710 setup_coro (next);
711 /* need a new stack */
712 assert (!next->stack);
713 } 765 }
714 766
715 prev__cctx = prev->cctx; 767 prev__cctx = prev->cctx;
716 768
717 /* possibly "free" the cctx */ 769 /* possibly "free" the cctx */
718 if (prev__cctx->idle_sp == STACKLEVEL) 770 if (prev__cctx->idle_sp == STACKLEVEL)
719 { 771 {
720 assert (PL_top_env == prev__cctx->top_env); 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;
721 776
722 cctx_put (prev__cctx); 777 cctx_put (prev__cctx);
723 prev->cctx = 0; 778 prev__cctx->inuse = 0;
724 } 779 }
725 780
726 if (!next->cctx) 781 if (!next->cctx)
782 {
727 next->cctx = cctx_get (); 783 next->cctx = cctx_get ();
784 assert (!next->cctx->inuse);
785 next->cctx->inuse = 1;
786 }
728 787
729 if (prev__cctx != next->cctx) 788 if (prev__cctx != next->cctx)
730 { 789 {
731 assert ( prev__cctx->inuse);
732 assert (!next->cctx->inuse);
733
734 prev__cctx->inuse = 0;
735 next->cctx->inuse = 1;
736
737 prev__cctx->top_env = PL_top_env; 790 prev__cctx->top_env = PL_top_env;
738 PL_top_env = next->cctx->top_env; 791 PL_top_env = next->cctx->top_env;
739 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 792 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
740 } 793 }
741 794
742 free_coro_mortal (); 795 free_coro_mortal ();
743
744 UNLOCK; 796 UNLOCK;
745 } 797 }
746} 798}
747 799
748struct transfer_args 800struct transfer_args
749{ 801{
750 struct coro *prev, *next; 802 struct coro *prev, *next;
751 int flags;
752}; 803};
753 804
754#define TRANSFER(ta) transfer ((ta).prev, (ta).next, (ta).flags) 805#define TRANSFER(ta) transfer ((ta).prev, (ta).next)
755 806
756static void 807static int
757coro_state_destroy (struct coro *coro) 808coro_state_destroy (struct coro *coro)
758{ 809{
759 if (coro->refcnt--) 810 if (coro->flags & CF_DESTROYED)
760 return; 811 return 0;
761 812
762 if (coro->flags & CF_RUNNING) 813 coro->flags |= CF_DESTROYED;
763 croak ("FATAL: tried to destroy currently running coroutine");
764 814
765 if (coro->mainstack && coro->mainstack != main_mainstack) 815 if (coro->mainstack && coro->mainstack != main_mainstack)
766 { 816 {
817 assert (!(coro->flags & CF_RUNNING));
818
767 struct coro temp; 819 struct coro temp;
820 Zero (&temp, 1, struct coro);
821 temp.save = CORO_SAVE_ALL;
768 822
769 SAVE ((&temp), TRANSFER_SAVE_ALL); 823 if (coro->flags & CF_RUNNING)
770 LOAD (coro); 824 croak ("FATAL: tried to destroy currently running coroutine");
825
826 save_perl (&temp);
827 load_perl (coro);
771 828
772 coro_destroy_stacks (); 829 coro_destroy_stacks ();
773 830
774 LOAD ((&temp)); /* this will get rid of defsv etc.. */ 831 load_perl (&temp); /* this will get rid of defsv etc.. */
775 832
776 coro->mainstack = 0; 833 coro->mainstack = 0;
777 } 834 }
778 835
779 cctx_free (coro->cctx); 836 cctx_destroy (coro->cctx);
780 SvREFCNT_dec (coro->args); 837 SvREFCNT_dec (coro->args);
781 Safefree (coro); 838
839 return 1;
782} 840}
783 841
784static int 842static int
785coro_state_clear (pTHX_ SV *sv, MAGIC *mg) 843coro_state_free (pTHX_ SV *sv, MAGIC *mg)
786{ 844{
787 struct coro *coro = (struct coro *)mg->mg_ptr; 845 struct coro *coro = (struct coro *)mg->mg_ptr;
788 mg->mg_ptr = 0; 846 mg->mg_ptr = 0;
789 847
848 if (--coro->refcnt < 0)
849 {
790 coro_state_destroy (coro); 850 coro_state_destroy (coro);
851 Safefree (coro);
852 }
791 853
792 return 0; 854 return 0;
793} 855}
794 856
795static int 857static int
802 return 0; 864 return 0;
803} 865}
804 866
805static MGVTBL coro_state_vtbl = { 867static MGVTBL coro_state_vtbl = {
806 0, 0, 0, 0, 868 0, 0, 0, 0,
807 coro_state_clear, 869 coro_state_free,
808 0, 870 0,
809#ifdef MGf_DUP 871#ifdef MGf_DUP
810 coro_state_dup, 872 coro_state_dup,
811#else 873#else
812# define MGf_DUP 0 874# define MGf_DUP 0
834 assert (mg->mg_type == PERL_MAGIC_ext); 896 assert (mg->mg_type == PERL_MAGIC_ext);
835 return (struct coro *)mg->mg_ptr; 897 return (struct coro *)mg->mg_ptr;
836} 898}
837 899
838static void 900static void
839prepare_transfer (struct transfer_args *ta, SV *prev, SV *next, int flags) 901prepare_transfer (struct transfer_args *ta, SV *prev_sv, SV *next_sv)
840{ 902{
841 ta->prev = SvSTATE (prev); 903 ta->prev = SvSTATE (prev_sv);
842 ta->next = SvSTATE (next); 904 ta->next = SvSTATE (next_sv);
843 ta->flags = flags;
844} 905}
845 906
846static void 907static void
847api_transfer (SV *prev, SV *next, int flags) 908api_transfer (SV *prev_sv, SV *next_sv)
848{ 909{
849 dTHX;
850 struct transfer_args ta; 910 struct transfer_args ta;
851 911
852 prepare_transfer (&ta, prev, next, flags); 912 prepare_transfer (&ta, prev_sv, next_sv);
853 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;
854} 926}
855 927
856/** Coro ********************************************************************/ 928/** Coro ********************************************************************/
857 929
858#define PRIO_MAX 3 930#define PRIO_MAX 3
861#define PRIO_LOW -1 933#define PRIO_LOW -1
862#define PRIO_IDLE -3 934#define PRIO_IDLE -3
863#define PRIO_MIN -4 935#define PRIO_MIN -4
864 936
865/* for Coro.pm */ 937/* for Coro.pm */
866static GV *coro_current, *coro_idle; 938static SV *coro_current;
867static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 939static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
868static int coro_nready; 940static int coro_nready;
869 941
870static void 942static void
871coro_enq (SV *coro_sv) 943coro_enq (SV *coro_sv)
904 coro = SvSTATE (coro_sv); 976 coro = SvSTATE (coro_sv);
905 977
906 if (coro->flags & CF_READY) 978 if (coro->flags & CF_READY)
907 return 0; 979 return 0;
908 980
909 if (coro->flags & CF_RUNNING)
910 croak ("Coro::ready called on currently running coroutine");
911
912 coro->flags |= CF_READY; 981 coro->flags |= CF_READY;
913 982
914 LOCK; 983 LOCK;
915 coro_enq (SvREFCNT_inc (coro_sv)); 984 coro_enq (SvREFCNT_inc (coro_sv));
916 UNLOCK; 985 UNLOCK;
919} 988}
920 989
921static int 990static int
922api_is_ready (SV *coro_sv) 991api_is_ready (SV *coro_sv)
923{ 992{
924 return !!SvSTATE (coro_sv)->flags & CF_READY; 993 return !!(SvSTATE (coro_sv)->flags & CF_READY);
925} 994}
926 995
927static void 996static void
928prepare_schedule (struct transfer_args *ta) 997prepare_schedule (struct transfer_args *ta)
929{ 998{
930 SV *current, *prev, *next; 999 SV *prev_sv, *next_sv;
931
932 current = GvSV (coro_current);
933 1000
934 for (;;) 1001 for (;;)
935 { 1002 {
936 LOCK; 1003 LOCK;
937 next = coro_deq (PRIO_MIN); 1004 next_sv = coro_deq (PRIO_MIN);
938 UNLOCK; 1005 UNLOCK;
939 1006
1007 /* nothing to schedule: call the idle handler */
940 if (next) 1008 if (!next_sv)
941 break;
942
943 { 1009 {
944 dSP; 1010 dSP;
945 1011
946 ENTER; 1012 ENTER;
947 SAVETMPS; 1013 SAVETMPS;
948 1014
949 PUSHMARK (SP); 1015 PUSHMARK (SP);
950 PUTBACK; 1016 PUTBACK;
951 call_sv (GvSV (coro_idle), G_DISCARD); 1017 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
952 1018
953 FREETMPS; 1019 FREETMPS;
954 LEAVE; 1020 LEAVE;
1021 continue;
955 } 1022 }
956 }
957 1023
958 prev = SvRV (current); 1024 ta->next = SvSTATE (next_sv);
959 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 }
960 1035
961 /* 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
962 LOCK; 1044 LOCK;
963 free_coro_mortal (); 1045 free_coro_mortal ();
1046 coro_mortal = prev_sv;
964 UNLOCK; 1047 UNLOCK;
965 coro_mortal = prev;
966
967 ta->prev = SvSTATE (prev);
968 ta->next = SvSTATE (next);
969 ta->flags = TRANSFER_SAVE_ALL;
970
971 ta->next->flags &= ~CF_READY;
972} 1048}
973 1049
974static void 1050static void
975prepare_cede (struct transfer_args *ta) 1051prepare_cede (struct transfer_args *ta)
976{ 1052{
977 api_ready (GvSV (coro_current)); 1053 api_ready (coro_current);
978
979 prepare_schedule (ta); 1054 prepare_schedule (ta);
980} 1055}
981 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
982static void 1071static void
983api_schedule (void) 1072api_schedule (void)
984{ 1073{
985 dTHX;
986 struct transfer_args ta; 1074 struct transfer_args ta;
987 1075
988 prepare_schedule (&ta); 1076 prepare_schedule (&ta);
989 TRANSFER (ta); 1077 TRANSFER (ta);
990} 1078}
991 1079
992static void 1080static int
993api_cede (void) 1081api_cede (void)
994{ 1082{
995 dTHX;
996 struct transfer_args ta; 1083 struct transfer_args ta;
997 1084
998 prepare_cede (&ta); 1085 prepare_cede (&ta);
1086
1087 if (ta.prev != ta.next)
1088 {
999 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;
1000} 1108}
1001 1109
1002MODULE = Coro::State PACKAGE = Coro::State 1110MODULE = Coro::State PACKAGE = Coro::State
1003 1111
1004PROTOTYPES: DISABLE 1112PROTOTYPES: DISABLE
1010#endif 1118#endif
1011 BOOT_PAGESIZE; 1119 BOOT_PAGESIZE;
1012 1120
1013 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1121 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1014 1122
1015 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 1123 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1016 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 1124 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1017 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));
1018 1128
1019 main_mainstack = PL_mainstack; 1129 main_mainstack = PL_mainstack;
1020 1130
1021 coroapi.ver = CORO_API_VERSION; 1131 coroapi.ver = CORO_API_VERSION;
1022 coroapi.transfer = api_transfer; 1132 coroapi.transfer = api_transfer;
1032 HV *hv; 1142 HV *hv;
1033 int i; 1143 int i;
1034 1144
1035 Newz (0, coro, 1, struct coro); 1145 Newz (0, coro, 1, struct coro);
1036 coro->args = newAV (); 1146 coro->args = newAV ();
1147 coro->save = CORO_SAVE_ALL;
1148 coro->flags = CF_NEW;
1037 1149
1038 hv = newHV (); 1150 hv = newHV ();
1039 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;
1040 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1152 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1041 1153
1042 for (i = 1; i < items; i++) 1154 for (i = 1; i < items; i++)
1043 av_push (coro->args, newSVsv (ST (i))); 1155 av_push (coro->args, newSVsv (ST (i)));
1044} 1156}
1045 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:
1046 RETVAL 1165 RETVAL
1047 1166
1048void 1167void
1049_set_stacklevel (...) 1168_set_stacklevel (...)
1050 ALIAS: 1169 ALIAS:
1051 Coro::State::transfer = 1 1170 Coro::State::transfer = 1
1052 Coro::schedule = 2 1171 Coro::schedule = 2
1053 Coro::cede = 3 1172 Coro::cede = 3
1054 Coro::Cont::yield = 4 1173 Coro::cede_notself = 4
1055 CODE: 1174 CODE:
1056{ 1175{
1057 struct transfer_args ta; 1176 struct transfer_args ta;
1058 1177
1059 switch (ix) 1178 switch (ix)
1060 { 1179 {
1061 case 0: 1180 case 0:
1062 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1181 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1063 ta.next = 0; 1182 ta.next = 0;
1064 ta.flags = TRANSFER_SET_STACKLEVEL;
1065 break; 1183 break;
1066 1184
1067 case 1: 1185 case 1:
1068 if (items != 3) 1186 if (items != 2)
1069 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);
1070 1188
1071 prepare_transfer (&ta, ST (0), ST (1), SvIV (ST (2))); 1189 prepare_transfer (&ta, ST (0), ST (1));
1072 break; 1190 break;
1073 1191
1074 case 2: 1192 case 2:
1075 prepare_schedule (&ta); 1193 prepare_schedule (&ta);
1076 break; 1194 break;
1078 case 3: 1196 case 3:
1079 prepare_cede (&ta); 1197 prepare_cede (&ta);
1080 break; 1198 break;
1081 1199
1082 case 4: 1200 case 4:
1083 { 1201 if (!prepare_cede_notself (&ta))
1084 SV *yieldstack; 1202 XSRETURN_EMPTY;
1085 SV *sv;
1086 AV *defav = GvAV (PL_defgv);
1087 1203
1088 yieldstack = *hv_fetch (
1089 (HV *)SvRV (GvSV (coro_current)),
1090 "yieldstack", sizeof ("yieldstack") - 1,
1091 0
1092 );
1093
1094 /* set up @_ -- ugly */
1095 av_clear (defav);
1096 av_fill (defav, items - 1);
1097 while (items--)
1098 av_store (defav, items, SvREFCNT_inc (ST(items)));
1099
1100 sv = av_pop ((AV *)SvRV (yieldstack));
1101 ta.prev = SvSTATE (*av_fetch ((AV *)SvRV (sv), 0, 0));
1102 ta.next = SvSTATE (*av_fetch ((AV *)SvRV (sv), 1, 0));
1103 ta.flags = 0;
1104 SvREFCNT_dec (sv);
1105 }
1106 break; 1204 break;
1107
1108 } 1205 }
1109 1206
1207 BARRIER;
1110 TRANSFER (ta); 1208 TRANSFER (ta);
1111} 1209}
1112 1210
1113void 1211bool
1114_clone_state_from (SV *dst, SV *src) 1212_destroy (SV *coro_sv)
1115 CODE: 1213 CODE:
1116{ 1214 RETVAL = coro_state_destroy (SvSTATE (coro_sv));
1117 struct coro *coro_src = SvSTATE (src); 1215 OUTPUT:
1118 1216 RETVAL
1119 sv_unmagic (SvRV (dst), PERL_MAGIC_ext);
1120
1121 ++coro_src->refcnt;
1122 sv_magicext (SvRV (dst), 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro_src, 0)->mg_flags |= MGf_DUP;
1123}
1124 1217
1125void 1218void
1126_exit (code) 1219_exit (code)
1127 int code 1220 int code
1128 PROTOTYPE: $ 1221 PROTOTYPE: $
1156 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1249 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1157 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1250 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1158 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 1251 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
1159 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 1252 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
1160 1253
1161 coro_current = gv_fetchpv ("Coro::current", TRUE, SVt_PV); 1254 coro_current = get_sv ("Coro::current", FALSE);
1162 coro_idle = gv_fetchpv ("Coro::idle" , TRUE, SVt_PV); 1255 SvREADONLY_on (coro_current);
1163 1256
1164 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1257 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1165 coro_ready[i] = newAV (); 1258 coro_ready[i] = newAV ();
1166 1259
1167 { 1260 {
1168 SV *sv = perl_get_sv("Coro::API", 1); 1261 SV *sv = perl_get_sv("Coro::API", 1);
1169 1262
1170 coroapi.schedule = api_schedule; 1263 coroapi.schedule = api_schedule;
1264 coroapi.save = api_save;
1171 coroapi.cede = api_cede; 1265 coroapi.cede = api_cede;
1266 coroapi.cede_notself = api_cede_notself;
1172 coroapi.ready = api_ready; 1267 coroapi.ready = api_ready;
1173 coroapi.is_ready = api_is_ready; 1268 coroapi.is_ready = api_is_ready;
1174 coroapi.nready = &coro_nready; 1269 coroapi.nready = &coro_nready;
1175 coroapi.current = coro_current; 1270 coroapi.current = coro_current;
1176 1271
1177 GCoroAPI = &coroapi; 1272 GCoroAPI = &coroapi;
1178 sv_setiv (sv, (IV)&coroapi); 1273 sv_setiv (sv, (IV)&coroapi);
1179 SvREADONLY_on (sv); 1274 SvREADONLY_on (sv);
1180 } 1275 }
1181} 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)));
1182 1284
1183int 1285int
1184prio (Coro::State coro, int newprio = 0) 1286prio (Coro::State coro, int newprio = 0)
1185 ALIAS: 1287 ALIAS:
1186 nice = 1 1288 nice = 1
1189 RETVAL = coro->prio; 1291 RETVAL = coro->prio;
1190 1292
1191 if (items > 1) 1293 if (items > 1)
1192 { 1294 {
1193 if (ix) 1295 if (ix)
1194 newprio += coro->prio; 1296 newprio = coro->prio - newprio;
1195 1297
1196 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 1298 if (newprio < PRIO_MIN) newprio = PRIO_MIN;
1197 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 1299 if (newprio > PRIO_MAX) newprio = PRIO_MAX;
1198 1300
1199 coro->prio = newprio; 1301 coro->prio = newprio;
1200 } 1302 }
1201} 1303}
1304 OUTPUT:
1305 RETVAL
1202 1306
1203SV * 1307SV *
1204ready (SV *self) 1308ready (SV *self)
1205 PROTOTYPE: $ 1309 PROTOTYPE: $
1206 CODE: 1310 CODE:
1228 1332
1229SV * 1333SV *
1230_get_state () 1334_get_state ()
1231 CODE: 1335 CODE:
1232{ 1336{
1233 struct { 1337 struct io_state *data;
1234 int errorno;
1235 int laststype;
1236 int laststatval;
1237 Stat_t statcache;
1238 } data;
1239 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
1240 data.errorno = errno; 1344 data->errorno = errno;
1241 data.laststype = PL_laststype; 1345 data->laststype = PL_laststype;
1242 data.laststatval = PL_laststatval; 1346 data->laststatval = PL_laststatval;
1243 data.statcache = PL_statcache; 1347 data->statcache = PL_statcache;
1244
1245 RETVAL = newSVpvn ((char *)&data, sizeof data);
1246} 1348}
1247 OUTPUT: 1349 OUTPUT:
1248 RETVAL 1350 RETVAL
1249 1351
1250void 1352void
1251_set_state (char *data_) 1353_set_state (char *data_)
1252 PROTOTYPE: $ 1354 PROTOTYPE: $
1253 CODE: 1355 CODE:
1254{ 1356{
1255 struct { 1357 struct io_state *data = (void *)data_;
1256 int errorno;
1257 int laststype;
1258 int laststatval;
1259 Stat_t statcache;
1260 } *data = (void *)data_;
1261 1358
1262 errno = data->errorno; 1359 errno = data->errorno;
1263 PL_laststype = data->laststype; 1360 PL_laststype = data->laststype;
1264 PL_laststatval = data->laststatval; 1361 PL_laststatval = data->laststatval;
1265 PL_statcache = data->statcache; 1362 PL_statcache = data->statcache;
1266} 1363}
1364

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines