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.119 by root, Sat Dec 2 15:41:28 2006 UTC vs.
Revision 1.132 by root, Fri Dec 29 13:03:05 2006 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/* the maximum number of idle cctx that will be pooled */
14#define MAX_IDLE_CCTX 8
15
16#define PERL_VERSION_ATLEAST(a,b,c) \
17 (PERL_REVISION > (a) \
18 || (PERL_REVISION == (a) \
19 && (PERL_VERSION > (b) \
20 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c)))))
21
22#if !PERL_VERSION_ATLEAST (5,6,0)
23# ifndef PL_ppaddr
24# define PL_ppaddr ppaddr
25# endif
26# ifndef call_sv
27# define call_sv perl_call_sv
28# endif
29# ifndef get_sv
30# define get_sv perl_get_sv
31# endif
32# ifndef get_cv
33# define get_cv perl_get_cv
34# endif
35# ifndef IS_PADGV
36# define IS_PADGV(v) 0
37# endif
38# ifndef IS_PADCONST
39# define IS_PADCONST(v) 0
40# endif
41#endif
42
43#include <stdio.h> 9#include <stdio.h>
44#include <errno.h> 10#include <errno.h>
45 11#include <assert.h>
46#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
47# undef STACKGUARD
48#endif
49
50#ifndef STACKGUARD
51# define STACKGUARD 0
52#endif
53 12
54#ifdef HAVE_MMAP 13#ifdef HAVE_MMAP
55# include <unistd.h> 14# include <unistd.h>
56# include <sys/mman.h> 15# include <sys/mman.h>
57# ifndef MAP_ANONYMOUS 16# ifndef MAP_ANONYMOUS
72#else 31#else
73# define PAGESIZE 0 32# define PAGESIZE 0
74# define BOOT_PAGESIZE (void)0 33# define BOOT_PAGESIZE (void)0
75#endif 34#endif
76 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
77/* 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
78 * 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
79 * and should be unique. */ 90 * and should be unique. */
80#define dSTACKLEVEL int stacklevel 91#define dSTACKLEVEL int stacklevel
81#define STACKLEVEL ((void *)&stacklevel) 92#define STACKLEVEL ((void *)&stacklevel)
82 93
83#define IN_DESTRUCT (PL_main_cv == Nullcv) 94#define IN_DESTRUCT (PL_main_cv == Nullcv)
84 95
85#if __GNUC__ >= 3 96#if __GNUC__ >= 3
86# define attribute(x) __attribute__(x) 97# define attribute(x) __attribute__(x)
98# define BARRIER __asm__ __volatile__ ("" : : : "memory")
87#else 99#else
88# define attribute(x) 100# define attribute(x)
101# define BARRIER
89#endif 102#endif
90 103
91#define NOINLINE attribute ((noinline)) 104#define NOINLINE attribute ((noinline))
92 105
93#include "CoroAPI.h" 106#include "CoroAPI.h"
94
95#define TRANSFER_SET_STACKLEVEL 0x8bfbfbfb /* magic cookie */
96 107
97#ifdef USE_ITHREADS 108#ifdef USE_ITHREADS
98static perl_mutex coro_mutex; 109static perl_mutex coro_mutex;
99# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) 110# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0)
100# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0) 111# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0)
101#else 112#else
102# define LOCK (void)0 113# define LOCK (void)0
103# define UNLOCK (void)0 114# define UNLOCK (void)0
104#endif 115#endif
105 116
117struct io_state
118{
119 int errorno;
120 I32 laststype;
121 int laststatval;
122 Stat_t statcache;
123};
124
106static struct CoroAPI coroapi; 125static struct CoroAPI coroapi;
107static AV *main_mainstack; /* used to differentiate between $main and others */ 126static AV *main_mainstack; /* used to differentiate between $main and others */
108static HV *coro_state_stash, *coro_stash; 127static HV *coro_state_stash, *coro_stash;
109static SV *coro_mortal; /* will be freed after next transfer */ 128static SV *coro_mortal; /* will be freed after next transfer */
110 129
118 /* the stack */ 137 /* the stack */
119 void *sptr; 138 void *sptr;
120 long ssize; /* positive == mmap, otherwise malloc */ 139 long ssize; /* positive == mmap, otherwise malloc */
121 140
122 /* cpu state */ 141 /* cpu state */
123 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 */
124 JMPENV *top_env; 144 JMPENV *top_env;
125 coro_context cctx; 145 coro_context cctx;
126 146
127 int inuse; 147 int inuse;
128 148
143 coro_cctx *cctx; 163 coro_cctx *cctx;
144 164
145 /* data associated with this coroutine (initial args) */ 165 /* data associated with this coroutine (initial args) */
146 AV *args; 166 AV *args;
147 int refcnt; 167 int refcnt;
148 int flags; 168 int save; /* CORO_SAVE flags */
169 int flags; /* CF_ flags */
149 170
150 /* optionally saved, might be zero */ 171 /* optionally saved, might be zero */
151 AV *defav; 172 AV *defav; /* @_ */
152 SV *defsv; 173 SV *defsv; /* $_ */
153 SV *errsv; 174 SV *errsv; /* $@ */
175 SV *irssv; /* $/ */
176 SV *irssv_sv; /* real $/ cache */
154 177
155#define VAR(name,type) type name; 178#define VAR(name,type) type name;
156# include "state.h" 179# include "state.h"
157#undef VAR 180#undef VAR
158 181
244 267
245 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 268 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)
246 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 269 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
247 else 270 else
248 { 271 {
249#if 0 272#if PREFER_PERL_FUNCTIONS
250 /* this is probably cleaner, but also slower? */ 273 /* this is probably cleaner, but also slower? */
251 CV *cp = Perl_cv_clone (cv); 274 CV *cp = Perl_cv_clone (cv);
252 CvPADLIST (cv) = CvPADLIST (cp); 275 CvPADLIST (cv) = CvPADLIST (cp);
253 CvPADLIST (cp) = 0; 276 CvPADLIST (cp) = 0;
254 SvREFCNT_dec (cp); 277 SvREFCNT_dec (cp);
281} 304}
282 305
283#define SB do { 306#define SB do {
284#define SE } while (0) 307#define SE } while (0)
285 308
286#define LOAD(state) load_state ((state))
287#define SAVE(state,flags) save_state ((state),(flags))
288
289#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE 309#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
290 310
291static void 311static void
292load_state (Coro__State c) 312load_perl (Coro__State c)
293{ 313{
294#define VAR(name,type) PL_ ## name = c->name; 314#define VAR(name,type) PL_ ## name = c->name;
295# include "state.h" 315# include "state.h"
296#undef VAR 316#undef VAR
297 317
298 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 318 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
299 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 319 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
300 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 320 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
321 if (c->irssv)
322 {
323 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
324 SvREFCNT_dec (c->irssv);
325 else
326 {
327 REPLACE_SV (PL_rs, c->irssv);
328 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
329 sv_setsv (c->irssv_sv, PL_rs);
330 }
331 }
301 332
302 { 333 {
303 dSP; 334 dSP;
304 CV *cv; 335 CV *cv;
305 336
314 PUTBACK; 345 PUTBACK;
315 } 346 }
316} 347}
317 348
318static void 349static void
319save_state (Coro__State c, int flags) 350save_perl (Coro__State c)
320{ 351{
321 { 352 {
322 dSP; 353 dSP;
323 I32 cxix = cxstack_ix; 354 I32 cxix = cxstack_ix;
324 PERL_CONTEXT *ccstk = cxstack; 355 PERL_CONTEXT *ccstk = cxstack;
327 /* 358 /*
328 * the worst thing you can imagine happens first - we have to save 359 * the worst thing you can imagine happens first - we have to save
329 * (and reinitialize) all cv's in the whole callchain :( 360 * (and reinitialize) all cv's in the whole callchain :(
330 */ 361 */
331 362
363 EXTEND (SP, 3 + 1);
332 PUSHs (Nullsv); 364 PUSHs (Nullsv);
333 /* this loop was inspired by pp_caller */ 365 /* this loop was inspired by pp_caller */
334 for (;;) 366 for (;;)
335 { 367 {
336 while (cxix >= 0) 368 while (cxix >= 0)
342 CV *cv = cx->blk_sub.cv; 374 CV *cv = cx->blk_sub.cv;
343 375
344 if (CvDEPTH (cv)) 376 if (CvDEPTH (cv))
345 { 377 {
346 EXTEND (SP, 3); 378 EXTEND (SP, 3);
347
348 PUSHs ((SV *)CvPADLIST (cv)); 379 PUSHs ((SV *)CvPADLIST (cv));
349 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 380 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
350 PUSHs ((SV *)cv); 381 PUSHs ((SV *)cv);
351 382
352 CvDEPTH (cv) = 0; 383 CvDEPTH (cv) = 0;
353 get_padlist (cv); 384 get_padlist (cv);
354 } 385 }
355 } 386 }
356#ifdef CXt_FORMAT
357 else if (CxTYPE (cx) == CXt_FORMAT)
358 {
359 /* I never used formats, so how should I know how these are implemented? */
360 /* my bold guess is as a simple, plain sub... */
361 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
362 }
363#endif
364 } 387 }
365 388
366 if (top_si->si_type == PERLSI_MAIN) 389 if (top_si->si_type == PERLSI_MAIN)
367 break; 390 break;
368 391
372 } 395 }
373 396
374 PUTBACK; 397 PUTBACK;
375 } 398 }
376 399
377 c->defav = flags & TRANSFER_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 400 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0;
378 c->defsv = flags & TRANSFER_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 401 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0;
379 c->errsv = flags & TRANSFER_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 402 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0;
403 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0;
380 404
381#define VAR(name,type)c->name = PL_ ## name; 405#define VAR(name,type)c->name = PL_ ## name;
382# include "state.h" 406# include "state.h"
383#undef VAR 407#undef VAR
384} 408}
387 * allocate various perl stacks. This is an exact copy 411 * allocate various perl stacks. This is an exact copy
388 * of perl.c:init_stacks, except that it uses less memory 412 * of perl.c:init_stacks, except that it uses less memory
389 * on the (sometimes correct) assumption that coroutines do 413 * on the (sometimes correct) assumption that coroutines do
390 * not usually need a lot of stackspace. 414 * not usually need a lot of stackspace.
391 */ 415 */
416#if PREFER_PERL_FUNCTIONS
417# define coro_init_stacks init_stacks
418#else
392static void 419static void
393coro_init_stacks () 420coro_init_stacks ()
394{ 421{
395 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT)); 422 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT));
396 PL_curstackinfo->si_type = PERLSI_MAIN; 423 PL_curstackinfo->si_type = PERLSI_MAIN;
426 New(54,PL_retstack,16,OP*); 453 New(54,PL_retstack,16,OP*);
427 PL_retstack_ix = 0; 454 PL_retstack_ix = 0;
428 PL_retstack_max = 16; 455 PL_retstack_max = 16;
429#endif 456#endif
430} 457}
458#endif
431 459
432/* 460/*
433 * destroy the stacks, the callchain etc... 461 * destroy the stacks, the callchain etc...
434 */ 462 */
435static void 463static void
436coro_destroy_stacks () 464coro_destroy_stacks ()
437{ 465{
438 if (!IN_DESTRUCT) 466 if (!IN_DESTRUCT)
439 { 467 {
440 /* is this ugly, I ask? */ 468 /* restore all saved variables and stuff */
441 LEAVE_SCOPE (0); 469 LEAVE_SCOPE (0);
470 assert (PL_tmps_floor == -1);
442 471
443 /* sure it is, but more important: is it correct?? :/ */ 472 /* free all temporaries */
444 FREETMPS; 473 FREETMPS;
474 assert (PL_tmps_ix == -1);
445 475
446 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/ 476 POPSTACK_TO (PL_mainstack);
447 } 477 }
448 478
449 while (PL_curstackinfo->si_next) 479 while (PL_curstackinfo->si_next)
450 PL_curstackinfo = PL_curstackinfo->si_next; 480 PL_curstackinfo = PL_curstackinfo->si_next;
451 481
452 while (PL_curstackinfo) 482 while (PL_curstackinfo)
453 { 483 {
454 PERL_SI *p = PL_curstackinfo->si_prev; 484 PERL_SI *p = PL_curstackinfo->si_prev;
455 485
456 { /*D*//*remove*/
457 dSP;
458 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
459 PUTBACK; /* possibly superfluous */
460 }
461
462 if (!IN_DESTRUCT) 486 if (!IN_DESTRUCT)
463 {
464 dounwind (-1);/*D*//*remove*/
465 SvREFCNT_dec (PL_curstackinfo->si_stack); 487 SvREFCNT_dec (PL_curstackinfo->si_stack);
466 }
467 488
468 Safefree (PL_curstackinfo->si_cxstack); 489 Safefree (PL_curstackinfo->si_cxstack);
469 Safefree (PL_curstackinfo); 490 Safefree (PL_curstackinfo);
470 PL_curstackinfo = p; 491 PL_curstackinfo = p;
471 } 492 }
497 518
498 { 519 {
499 dSP; 520 dSP;
500 LOGOP myop; 521 LOGOP myop;
501 522
502 /* I have no idea why this is needed, but it is */
503 PUSHMARK (SP);
504
505 SvREFCNT_dec (GvAV (PL_defgv)); 523 SvREFCNT_dec (GvAV (PL_defgv));
506 GvAV (PL_defgv) = coro->args; coro->args = 0; 524 GvAV (PL_defgv) = coro->args; coro->args = 0;
507 525
508 Zero (&myop, 1, LOGOP); 526 Zero (&myop, 1, LOGOP);
509 myop.op_next = Nullop; 527 myop.op_next = Nullop;
510 myop.op_flags = OPf_WANT_VOID; 528 myop.op_flags = OPf_WANT_VOID;
511 529
512 PL_op = (OP *)&myop;
513
514 PUSHMARK (SP); 530 PUSHMARK (SP);
515 XPUSHs ((SV *)get_cv ("Coro::State::_coro_init", FALSE)); 531 XPUSHs ((SV *)get_cv ("Coro::State::_coro_init", FALSE));
516 PUTBACK; 532 PUTBACK;
533 PL_op = (OP *)&myop;
517 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 534 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
518 SPAGAIN; 535 SPAGAIN;
519 } 536 }
520 537
521 ENTER; /* necessary e.g. for dounwind */ 538 ENTER; /* necessary e.g. for dounwind */
529 SvREFCNT_dec (coro_mortal); 546 SvREFCNT_dec (coro_mortal);
530 coro_mortal = 0; 547 coro_mortal = 0;
531 } 548 }
532} 549}
533 550
551/* inject a fake call to Coro::State::_cctx_init into the execution */
534static void NOINLINE 552static void NOINLINE
535prepare_cctx (coro_cctx *cctx) 553prepare_cctx (coro_cctx *cctx)
536{ 554{
537 dSP; 555 dSP;
538 LOGOP myop; 556 LOGOP myop;
539 557
540 Zero (&myop, 1, LOGOP); 558 Zero (&myop, 1, LOGOP);
541 myop.op_next = PL_op; 559 myop.op_next = PL_op;
542 myop.op_flags = OPf_WANT_VOID; 560 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
543
544 sv_setiv (get_sv ("Coro::State::_cctx", FALSE), PTR2IV (cctx));
545 561
546 PUSHMARK (SP); 562 PUSHMARK (SP);
563 EXTEND (SP, 2);
564 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx))));
547 XPUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 565 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
548 PUTBACK; 566 PUTBACK;
567 PL_op = (OP *)&myop;
549 PL_restartop = PL_ppaddr[OP_ENTERSUB](aTHX); 568 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
550 SPAGAIN; 569 SPAGAIN;
551} 570}
552 571
553static void 572static void
554coro_run (void *arg) 573coro_run (void *arg)
555{ 574{
556 /* coro_run is the alternative epilogue of transfer() */ 575 /* coro_run is the alternative tail of transfer(), so unlock here. */
557 UNLOCK; 576 UNLOCK;
558 577
559 /* 578 /*
560 * this is a _very_ stripped down perl interpreter ;) 579 * this is a _very_ stripped down perl interpreter ;)
561 */ 580 */
563 582
564 /* inject call to cctx_init */ 583 /* inject call to cctx_init */
565 prepare_cctx ((coro_cctx *)arg); 584 prepare_cctx ((coro_cctx *)arg);
566 585
567 /* somebody will hit me for both perl_run and PL_restartop */ 586 /* somebody will hit me for both perl_run and PL_restartop */
587 PL_restartop = PL_op;
568 perl_run (PL_curinterp); 588 perl_run (PL_curinterp);
569 589
570 fputs ("FATAL: C coroutine fell over the edge of the world, aborting. Did you call exit in a coroutine?\n", stderr); 590 fputs ("FATAL: C coroutine fell over the edge of the world, aborting. Did you call exit in a coroutine?\n", stderr);
571 abort (); 591 abort ();
572} 592}
576{ 596{
577 coro_cctx *cctx; 597 coro_cctx *cctx;
578 598
579 ++cctx_count; 599 ++cctx_count;
580 600
581 New (0, cctx, 1, coro_cctx); 601 Newz (0, cctx, 1, coro_cctx);
582 602
583#if HAVE_MMAP 603#if HAVE_MMAP
584 604
585 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; 605 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE;
586 /* mmap suppsedly does allocate-on-write for us */ 606 /* mmap supposedly does allocate-on-write for us */
587 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 607 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
588 608
589 if (cctx->sptr == (void *)-1) 609 if (cctx->sptr == (void *)-1)
590 { 610 {
591 perror ("FATAL: unable to mmap stack for coroutine"); 611 perror ("FATAL: unable to mmap stack for coroutine");
681 cctx_first = cctx; 701 cctx_first = cctx;
682} 702}
683 703
684/* never call directly, always through the coro_state_transfer global variable */ 704/* never call directly, always through the coro_state_transfer global variable */
685static void NOINLINE 705static void NOINLINE
686transfer (struct coro *prev, struct coro *next, int flags) 706transfer (struct coro *prev, struct coro *next)
687{ 707{
688 dSTACKLEVEL; 708 dSTACKLEVEL;
689 709
690 /* sometimes transfer is only called to set idle_sp */ 710 /* sometimes transfer is only called to set idle_sp */
691 if (flags == TRANSFER_SET_STACKLEVEL) 711 if (!next)
712 {
692 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 713 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
714 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
715 }
693 else if (prev != next) 716 else if (prev != next)
694 { 717 {
695 coro_cctx *prev__cctx; 718 coro_cctx *prev__cctx;
696 719
697 if (prev->flags & CF_NEW) 720 if (prev->flags & CF_NEW)
718 if (next->flags & CF_NEW) 741 if (next->flags & CF_NEW)
719 { 742 {
720 /* need to start coroutine */ 743 /* need to start coroutine */
721 next->flags &= ~CF_NEW; 744 next->flags &= ~CF_NEW;
722 /* first get rid of the old state */ 745 /* first get rid of the old state */
723 SAVE (prev, -1); 746 save_perl (prev);
724 /* setup coroutine call */ 747 /* setup coroutine call */
725 setup_coro (next); 748 setup_coro (next);
726 /* need a new stack */ 749 /* need a new stack */
727 assert (!next->stack); 750 assert (!next->cctx);
728 } 751 }
729 else 752 else
730 { 753 {
731 /* coroutine already started */ 754 /* coroutine already started */
732 SAVE (prev, flags); 755 save_perl (prev);
733 LOAD (next); 756 load_perl (next);
734 } 757 }
735 758
736 prev__cctx = prev->cctx; 759 prev__cctx = prev->cctx;
737 760
738 /* possibly "free" the cctx */ 761 /* possibly "free" the cctx */
739 if (prev__cctx->idle_sp == STACKLEVEL) 762 if (prev__cctx->idle_sp == STACKLEVEL)
740 { 763 {
741 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 764 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
742 assert (PL_top_env == prev__cctx->top_env); 765 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
743 766
744 prev->cctx = 0; 767 prev->cctx = 0;
745 768
746 cctx_put (prev__cctx); 769 cctx_put (prev__cctx);
747 prev__cctx->inuse = 0; 770 prev__cctx->inuse = 0;
768} 791}
769 792
770struct transfer_args 793struct transfer_args
771{ 794{
772 struct coro *prev, *next; 795 struct coro *prev, *next;
773 int flags;
774}; 796};
775 797
776#define TRANSFER(ta) transfer ((ta).prev, (ta).next, (ta).flags) 798#define TRANSFER(ta) transfer ((ta).prev, (ta).next)
777 799
778static void 800static void
779coro_state_destroy (struct coro *coro) 801coro_state_destroy (struct coro *coro)
780{ 802{
781 if (coro->refcnt--) 803 if (coro->refcnt--)
782 return; 804 return;
783 805
784 if (coro->mainstack && coro->mainstack != main_mainstack) 806 if (coro->mainstack && coro->mainstack != main_mainstack)
785 { 807 {
786 struct coro temp; 808 struct coro temp;
809 Zero (&temp, 1, struct coro);
810 temp.save = CORO_SAVE_ALL;
787 811
788 if (coro->flags & CF_RUNNING) 812 if (coro->flags & CF_RUNNING)
789 croak ("FATAL: tried to destroy currently running coroutine"); 813 croak ("FATAL: tried to destroy currently running coroutine");
790 814
791 SAVE ((&temp), TRANSFER_SAVE_ALL); 815 save_perl (&temp);
792 LOAD (coro); 816 load_perl (coro);
793 817
794 coro_destroy_stacks (); 818 coro_destroy_stacks ();
795 819
796 LOAD ((&temp)); /* this will get rid of defsv etc.. */ 820 load_perl (&temp); /* this will get rid of defsv etc.. */
797 821
798 coro->mainstack = 0; 822 coro->mainstack = 0;
799 } 823 }
800 824
801 cctx_destroy (coro->cctx); 825 cctx_destroy (coro->cctx);
856 assert (mg->mg_type == PERL_MAGIC_ext); 880 assert (mg->mg_type == PERL_MAGIC_ext);
857 return (struct coro *)mg->mg_ptr; 881 return (struct coro *)mg->mg_ptr;
858} 882}
859 883
860static void 884static void
861prepare_transfer (struct transfer_args *ta, SV *prev, SV *next, int flags) 885prepare_transfer (struct transfer_args *ta, SV *prev_sv, SV *next_sv)
862{ 886{
863 ta->prev = SvSTATE (prev); 887 ta->prev = SvSTATE (prev_sv);
864 ta->next = SvSTATE (next); 888 ta->next = SvSTATE (next_sv);
865 ta->flags = flags;
866} 889}
867 890
868static void 891static void
869api_transfer (SV *prev, SV *next, int flags) 892api_transfer (SV *prev_sv, SV *next_sv)
870{ 893{
871 struct transfer_args ta; 894 struct transfer_args ta;
872 895
873 prepare_transfer (&ta, prev, next, flags); 896 prepare_transfer (&ta, prev_sv, next_sv);
874 TRANSFER (ta); 897 TRANSFER (ta);
898}
899
900static int
901api_save (SV *coro_sv, int new_save)
902{
903 struct coro *coro = SvSTATE (coro_sv);
904 int old_save = coro->save;
905
906 if (new_save >= 0)
907 coro->save = new_save;
908
909 return old_save;
875} 910}
876 911
877/** Coro ********************************************************************/ 912/** Coro ********************************************************************/
878 913
879#define PRIO_MAX 3 914#define PRIO_MAX 3
925 coro = SvSTATE (coro_sv); 960 coro = SvSTATE (coro_sv);
926 961
927 if (coro->flags & CF_READY) 962 if (coro->flags & CF_READY)
928 return 0; 963 return 0;
929 964
930#if 0 /* this is actually harmless */
931 if (coro->flags & CF_RUNNING)
932 croak ("Coro::ready called on currently running coroutine");
933#endif
934
935 coro->flags |= CF_READY; 965 coro->flags |= CF_READY;
936 966
937 LOCK; 967 LOCK;
938 coro_enq (SvREFCNT_inc (coro_sv)); 968 coro_enq (SvREFCNT_inc (coro_sv));
939 UNLOCK; 969 UNLOCK;
942} 972}
943 973
944static int 974static int
945api_is_ready (SV *coro_sv) 975api_is_ready (SV *coro_sv)
946{ 976{
947 return !!SvSTATE (coro_sv)->flags & CF_READY; 977 return !!(SvSTATE (coro_sv)->flags & CF_READY);
948} 978}
949 979
950static void 980static void
951prepare_schedule (struct transfer_args *ta) 981prepare_schedule (struct transfer_args *ta)
952{ 982{
988 assert (!SvROK(prev));//D 1018 assert (!SvROK(prev));//D
989 assert (!SvROK(next));//D 1019 assert (!SvROK(next));//D
990 1020
991 ta->prev = SvSTATE (prev); 1021 ta->prev = SvSTATE (prev);
992 ta->next = SvSTATE (next); 1022 ta->next = SvSTATE (next);
993 ta->flags = TRANSFER_SAVE_ALL;
994 1023
995 assert (ta->flags & CF_READY); 1024 assert (ta->next->flags & CF_READY);
996 ta->next->flags &= ~CF_READY; 1025 ta->next->flags &= ~CF_READY;
997} 1026}
998 1027
999static void 1028static void
1000prepare_cede (struct transfer_args *ta) 1029prepare_cede (struct transfer_args *ta)
1001{ 1030{
1002 api_ready (coro_current); 1031 api_ready (coro_current);
1003
1004 prepare_schedule (ta); 1032 prepare_schedule (ta);
1033}
1034
1035static int
1036prepare_cede_notself (struct transfer_args *ta)
1037{
1038 if (coro_nready)
1039 {
1040 SV *prev = SvRV (coro_current);
1041 prepare_schedule (ta);
1042 api_ready (prev);
1043 return 1;
1044 }
1045 else
1046 return 0;
1005} 1047}
1006 1048
1007static void 1049static void
1008api_schedule (void) 1050api_schedule (void)
1009{ 1051{
1011 1053
1012 prepare_schedule (&ta); 1054 prepare_schedule (&ta);
1013 TRANSFER (ta); 1055 TRANSFER (ta);
1014} 1056}
1015 1057
1016static void 1058static int
1017api_cede (void) 1059api_cede (void)
1018{ 1060{
1019 struct transfer_args ta; 1061 struct transfer_args ta;
1020 1062
1021 prepare_cede (&ta); 1063 prepare_cede (&ta);
1064
1065 if (ta.prev != ta.next)
1066 {
1022 TRANSFER (ta); 1067 TRANSFER (ta);
1068 return 1;
1069 }
1070 else
1071 return 0;
1072}
1073
1074static int
1075api_cede_notself (void)
1076{
1077 struct transfer_args ta;
1078
1079 if (prepare_cede_notself (&ta))
1080 {
1081 TRANSFER (ta);
1082 return 1;
1083 }
1084 else
1085 return 0;
1023} 1086}
1024 1087
1025MODULE = Coro::State PACKAGE = Coro::State 1088MODULE = Coro::State PACKAGE = Coro::State
1026 1089
1027PROTOTYPES: DISABLE 1090PROTOTYPES: DISABLE
1033#endif 1096#endif
1034 BOOT_PAGESIZE; 1097 BOOT_PAGESIZE;
1035 1098
1036 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1099 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1037 1100
1038 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 1101 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1039 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 1102 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1040 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 1103 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1104 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1105 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1041 1106
1042 main_mainstack = PL_mainstack; 1107 main_mainstack = PL_mainstack;
1043 1108
1044 coroapi.ver = CORO_API_VERSION; 1109 coroapi.ver = CORO_API_VERSION;
1045 coroapi.transfer = api_transfer; 1110 coroapi.transfer = api_transfer;
1055 HV *hv; 1120 HV *hv;
1056 int i; 1121 int i;
1057 1122
1058 Newz (0, coro, 1, struct coro); 1123 Newz (0, coro, 1, struct coro);
1059 coro->args = newAV (); 1124 coro->args = newAV ();
1125 coro->save = CORO_SAVE_ALL;
1060 coro->flags = CF_NEW; 1126 coro->flags = CF_NEW;
1061 1127
1062 hv = newHV (); 1128 hv = newHV ();
1063 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1129 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1064 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1130 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1065 1131
1066 for (i = 1; i < items; i++) 1132 for (i = 1; i < items; i++)
1067 av_push (coro->args, newSVsv (ST (i))); 1133 av_push (coro->args, newSVsv (ST (i)));
1068} 1134}
1069 OUTPUT: 1135 OUTPUT:
1136 RETVAL
1137
1138int
1139save (SV *coro, int new_save = -1)
1140 CODE:
1141 RETVAL = api_save (coro, new_save);
1142 OUTPUT:
1070 RETVAL 1143 RETVAL
1071 1144
1072void 1145void
1073_set_stacklevel (...) 1146_set_stacklevel (...)
1074 ALIAS: 1147 ALIAS:
1075 Coro::State::transfer = 1 1148 Coro::State::transfer = 1
1076 Coro::schedule = 2 1149 Coro::schedule = 2
1077 Coro::cede = 3 1150 Coro::cede = 3
1151 Coro::cede_notself = 4
1078 CODE: 1152 CODE:
1079{ 1153{
1080 struct transfer_args ta; 1154 struct transfer_args ta;
1081 1155
1082 switch (ix) 1156 switch (ix)
1083 { 1157 {
1084 case 0: 1158 case 0:
1085 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1159 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1086 ta.next = 0; 1160 ta.next = 0;
1087 ta.flags = TRANSFER_SET_STACKLEVEL;
1088 break; 1161 break;
1089 1162
1090 case 1: 1163 case 1:
1091 if (items != 3) 1164 if (items != 2)
1092 croak ("Coro::State::transfer (prev,next,flags) expects three arguments, not %d", items); 1165 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1093 1166
1094 prepare_transfer (&ta, ST (0), ST (1), SvIV (ST (2))); 1167 prepare_transfer (&ta, ST (0), ST (1));
1095 break; 1168 break;
1096 1169
1097 case 2: 1170 case 2:
1098 prepare_schedule (&ta); 1171 prepare_schedule (&ta);
1099 break; 1172 break;
1100 1173
1101 case 3: 1174 case 3:
1102 prepare_cede (&ta); 1175 prepare_cede (&ta);
1103 break; 1176 break;
1177
1178 case 4:
1179 if (!prepare_cede_notself (&ta))
1180 XSRETURN_EMPTY;
1181
1182 break;
1104 } 1183 }
1105 1184
1185 BARRIER;
1106 TRANSFER (ta); 1186 TRANSFER (ta);
1107} 1187}
1108 1188
1109void 1189void
1110_clone_state_from (SV *dst, SV *src) 1190_clone_state_from (SV *dst, SV *src)
1161 coro_ready[i] = newAV (); 1241 coro_ready[i] = newAV ();
1162 1242
1163 { 1243 {
1164 SV *sv = perl_get_sv("Coro::API", 1); 1244 SV *sv = perl_get_sv("Coro::API", 1);
1165 1245
1166 coroapi.schedule = api_schedule; 1246 coroapi.schedule = api_schedule;
1247 coroapi.save = api_save;
1167 coroapi.cede = api_cede; 1248 coroapi.cede = api_cede;
1249 coroapi.cede_notself = api_cede_notself;
1168 coroapi.ready = api_ready; 1250 coroapi.ready = api_ready;
1169 coroapi.is_ready = api_is_ready; 1251 coroapi.is_ready = api_is_ready;
1170 coroapi.nready = &coro_nready; 1252 coroapi.nready = &coro_nready;
1171 coroapi.current = coro_current; 1253 coroapi.current = coro_current;
1172 1254
1173 GCoroAPI = &coroapi; 1255 GCoroAPI = &coroapi;
1174 sv_setiv (sv, (IV)&coroapi); 1256 sv_setiv (sv, (IV)&coroapi);
1175 SvREADONLY_on (sv); 1257 SvREADONLY_on (sv);
1176 } 1258 }
1177} 1259}
1260
1261void
1262_set_current (SV *current)
1263 PROTOTYPE: $
1264 CODE:
1265 SvREFCNT_dec (SvRV (coro_current));
1266 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1178 1267
1179int 1268int
1180prio (Coro::State coro, int newprio = 0) 1269prio (Coro::State coro, int newprio = 0)
1181 ALIAS: 1270 ALIAS:
1182 nice = 1 1271 nice = 1
1185 RETVAL = coro->prio; 1274 RETVAL = coro->prio;
1186 1275
1187 if (items > 1) 1276 if (items > 1)
1188 { 1277 {
1189 if (ix) 1278 if (ix)
1190 newprio += coro->prio; 1279 newprio = coro->prio - newprio;
1191 1280
1192 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 1281 if (newprio < PRIO_MIN) newprio = PRIO_MIN;
1193 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 1282 if (newprio > PRIO_MAX) newprio = PRIO_MAX;
1194 1283
1195 coro->prio = newprio; 1284 coro->prio = newprio;
1196 } 1285 }
1197} 1286}
1287 OUTPUT:
1288 RETVAL
1198 1289
1199SV * 1290SV *
1200ready (SV *self) 1291ready (SV *self)
1201 PROTOTYPE: $ 1292 PROTOTYPE: $
1202 CODE: 1293 CODE:
1218 CODE: 1309 CODE:
1219 RETVAL = coro_nready; 1310 RETVAL = coro_nready;
1220 OUTPUT: 1311 OUTPUT:
1221 RETVAL 1312 RETVAL
1222 1313
1223void
1224_set_current (SV *current)
1225 PROTOTYPE: $
1226 CODE:
1227 SvREFCNT_dec (SvRV (coro_current));
1228 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1229
1230MODULE = Coro::State PACKAGE = Coro::AIO 1314MODULE = Coro::State PACKAGE = Coro::AIO
1231 1315
1232SV * 1316SV *
1233_get_state () 1317_get_state ()
1234 CODE: 1318 CODE:
1235{ 1319{
1236 struct { 1320 struct io_state *data;
1237 int errorno;
1238 int laststype;
1239 int laststatval;
1240 Stat_t statcache;
1241 } data;
1242 1321
1322 RETVAL = newSV (sizeof (struct io_state));
1323 data = (struct io_state *)SvPVX (RETVAL);
1324 SvCUR_set (RETVAL, sizeof (struct io_state));
1325 SvPOK_only (RETVAL);
1326
1243 data.errorno = errno; 1327 data->errorno = errno;
1244 data.laststype = PL_laststype; 1328 data->laststype = PL_laststype;
1245 data.laststatval = PL_laststatval; 1329 data->laststatval = PL_laststatval;
1246 data.statcache = PL_statcache; 1330 data->statcache = PL_statcache;
1247
1248 RETVAL = newSVpvn ((char *)&data, sizeof data);
1249} 1331}
1250 OUTPUT: 1332 OUTPUT:
1251 RETVAL 1333 RETVAL
1252 1334
1253void 1335void
1254_set_state (char *data_) 1336_set_state (char *data_)
1255 PROTOTYPE: $ 1337 PROTOTYPE: $
1256 CODE: 1338 CODE:
1257{ 1339{
1258 struct { 1340 struct io_state *data = (void *)data_;
1259 int errorno;
1260 int laststype;
1261 int laststatval;
1262 Stat_t statcache;
1263 } *data = (void *)data_;
1264 1341
1265 errno = data->errorno; 1342 errno = data->errorno;
1266 PL_laststype = data->laststype; 1343 PL_laststype = data->laststype;
1267 PL_laststatval = data->laststatval; 1344 PL_laststatval = data->laststatval;
1268 PL_statcache = data->statcache; 1345 PL_statcache = data->statcache;
1269} 1346}
1347

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines