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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines