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

Diff Legend

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