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.180 by root, Wed Oct 3 17:12:20 2007 UTC vs.
Revision 1.198 by root, Sun Oct 7 03:58:37 2007 UTC

1#include "libcoro/coro.c" 1#include "libcoro/coro.c"
2 2
3#define PERL_NO_GET_CONTEXT 3#define PERL_NO_GET_CONTEXT
4#define PERL_EXT
4 5
5#include "EXTERN.h" 6#include "EXTERN.h"
6#include "perl.h" 7#include "perl.h"
7#include "XSUB.h" 8#include "XSUB.h"
8 9
… …
75/* 5.8.7 */ 76/* 5.8.7 */
76#ifndef SvRV_set 77#ifndef SvRV_set
77# define SvRV_set(s,v) SvRV(s) = (v) 78# define SvRV_set(s,v) SvRV(s) = (v)
78#endif 79#endif
79 80
81/* 5.8.8 */
82#ifndef GV_NOTQUAL
83# define GV_NOTQUAL 0
84#endif
85#ifndef newSV
86# define newSV(l) NEWSV(0,l)
87#endif
88
80#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 89#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
81# undef CORO_STACKGUARD 90# undef CORO_STACKGUARD
82#endif 91#endif
83 92
84#ifndef CORO_STACKGUARD 93#ifndef CORO_STACKGUARD
… …
98#define IN_DESTRUCT (PL_main_cv == Nullcv) 107#define IN_DESTRUCT (PL_main_cv == Nullcv)
99 108
100#if __GNUC__ >= 3 109#if __GNUC__ >= 3
101# define attribute(x) __attribute__(x) 110# define attribute(x) __attribute__(x)
102# define BARRIER __asm__ __volatile__ ("" : : : "memory") 111# define BARRIER __asm__ __volatile__ ("" : : : "memory")
112# define expect(expr,value) __builtin_expect ((expr),(value))
103#else 113#else
104# define attribute(x) 114# define attribute(x)
105# define BARRIER 115# define BARRIER
116# define expect(expr,value) (expr)
106#endif 117#endif
118
119#define expect_false(expr) expect ((expr) != 0, 0)
120#define expect_true(expr) expect ((expr) != 0, 1)
107 121
108#define NOINLINE attribute ((noinline)) 122#define NOINLINE attribute ((noinline))
109 123
110#include "CoroAPI.h" 124#include "CoroAPI.h"
111 125
… …
132static AV *main_mainstack; /* used to differentiate between $main and others */ 146static AV *main_mainstack; /* used to differentiate between $main and others */
133static JMPENV *main_top_env; 147static JMPENV *main_top_env;
134static HV *coro_state_stash, *coro_stash; 148static HV *coro_state_stash, *coro_stash;
135static SV *coro_mortal; /* will be freed after next transfer */ 149static SV *coro_mortal; /* will be freed after next transfer */
136 150
137static GV *irsgv; /* $/ */ 151static GV *irsgv; /* $/ */
152static GV *stdoutgv; /* *STDOUT */
138 153
139/* async_pool helper stuff */ 154/* async_pool helper stuff */
140static SV *sv_pool_rss; 155static SV *sv_pool_rss;
141static SV *sv_pool_size; 156static SV *sv_pool_size;
142static AV *av_async_pool; 157static AV *av_async_pool;
… …
178 CF_READY = 0x0002, /* coroutine is ready */ 193 CF_READY = 0x0002, /* coroutine is ready */
179 CF_NEW = 0x0004, /* has never been switched to */ 194 CF_NEW = 0x0004, /* has never been switched to */
180 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 195 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
181}; 196};
182 197
198/* the structure where most of the perl state is stored, overlaid on the cxstack */
199typedef struct {
200 SV *defsv;
201 AV *defav;
202 SV *errsv;
203 SV *irsgv;
204#define VAR(name,type) type name;
205# include "state.h"
206#undef VAR
207} perl_slots;
208
209#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
210
183/* this is a structure representing a perl-level coroutine */ 211/* this is a structure representing a perl-level coroutine */
184struct coro { 212struct coro {
185 /* the c coroutine allocated to this perl coroutine, if any */ 213 /* the c coroutine allocated to this perl coroutine, if any */
186 coro_cctx *cctx; 214 coro_cctx *cctx;
187 215
216 /* process data */
217 AV *mainstack;
218 perl_slots *slot; /* basically the saved sp */
219
188 /* data associated with this coroutine (initial args) */ 220 /* data associated with this coroutine (initial args) */
189 AV *args; 221 AV *args;
190 int refcnt; 222 int refcnt;
191 int flags; /* CF_ flags */ 223 int flags; /* CF_ flags */
192 224
193 /* optionally saved, might be zero */
194 AV *defav; /* @_ */
195 SV *defsv; /* $_ */
196 SV *errsv; /* $@ */
197 IO *deffh; /* default filehandle */
198 SV *irssv; /* $/ */
199 SV *irssv_sv; /* real $/ cache */
200
201#define VAR(name,type) type name;
202# include "state.h"
203#undef VAR
204
205 /* statistics */ 225 /* statistics */
206 int usecount; /* number of switches to this coro */ 226 int usecount; /* number of transfers to this coro */
207 227
208 /* coro process data */ 228 /* coro process data */
209 int prio; 229 int prio;
230 SV *throw;
231
232 /* async_pool */
233 SV *saved_deffh;
210 234
211 /* linked list */ 235 /* linked list */
212 struct coro *next, *prev; 236 struct coro *next, *prev;
213 HV *hv; /* the perl hash associated with this coro, if any */ 237 HV *hv; /* the perl hash associated with this coro, if any */
214}; 238};
… …
312 MAGIC *mg; 336 MAGIC *mg;
313 337
314 if (SvROK (coro)) 338 if (SvROK (coro))
315 coro = SvRV (coro); 339 coro = SvRV (coro);
316 340
317 if (SvTYPE (coro) != SVt_PVHV) 341 if (expect_false (SvTYPE (coro) != SVt_PVHV))
318 croak ("Coro::State object required"); 342 croak ("Coro::State object required");
319 343
320 stash = SvSTASH (coro); 344 stash = SvSTASH (coro);
321 if (stash != coro_stash && stash != coro_state_stash) 345 if (expect_false (stash != coro_stash && stash != coro_state_stash))
322 { 346 {
323 /* very slow, but rare, check */ 347 /* very slow, but rare, check */
324 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 348 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
325 croak ("Coro::State object required"); 349 croak ("Coro::State object required");
326 } 350 }
… …
336get_padlist (pTHX_ CV *cv) 360get_padlist (pTHX_ CV *cv)
337{ 361{
338 MAGIC *mg = CORO_MAGIC (cv); 362 MAGIC *mg = CORO_MAGIC (cv);
339 AV *av; 363 AV *av;
340 364
341 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 365 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
342 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 366 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
343 else 367 else
344 { 368 {
345#if CORO_PREFER_PERL_FUNCTIONS 369#if CORO_PREFER_PERL_FUNCTIONS
346 /* this is probably cleaner, but also slower? */ 370 /* this is probably cleaner, but also slower? */
… …
358put_padlist (pTHX_ CV *cv) 382put_padlist (pTHX_ CV *cv)
359{ 383{
360 MAGIC *mg = CORO_MAGIC (cv); 384 MAGIC *mg = CORO_MAGIC (cv);
361 AV *av; 385 AV *av;
362 386
363 if (!mg) 387 if (expect_false (!mg))
364 { 388 {
365 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 389 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
366 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 390 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
367 mg->mg_virtual = &vtbl_coro; 391 mg->mg_virtual = &vtbl_coro;
368 mg->mg_obj = (SV *)newAV (); 392 mg->mg_obj = (SV *)newAV ();
369 } 393 }
370 394
371 av = (AV *)mg->mg_obj; 395 av = (AV *)mg->mg_obj;
372 396
373 if (AvFILLp (av) >= AvMAX (av)) 397 if (expect_false (AvFILLp (av) >= AvMAX (av)))
374 av_extend (av, AvMAX (av) + 1); 398 av_extend (av, AvMAX (av) + 1);
375 399
376 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 400 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
377} 401}
378 402
379/** load & save, init *******************************************************/ 403/** load & save, init *******************************************************/
380 404
381static void 405static void
382load_perl (pTHX_ Coro__State c) 406load_perl (pTHX_ Coro__State c)
383{ 407{
408 perl_slots *slot = c->slot;
409 c->slot = 0;
410
411 PL_mainstack = c->mainstack;
412
413 GvSV (PL_defgv) = slot->defsv;
414 GvAV (PL_defgv) = slot->defav;
415 GvSV (PL_errgv) = slot->errsv;
416 GvSV (irsgv) = slot->irsgv;
417
384#define VAR(name,type) PL_ ## name = c->name; 418 #define VAR(name,type) PL_ ## name = slot->name;
385# include "state.h" 419 # include "state.h"
386#undef VAR 420 #undef VAR
387
388 GvSV (PL_defgv) = c->defsv;
389 GvAV (PL_defgv) = c->defav;
390 GvSV (PL_errgv) = c->errsv;
391 PL_defoutgv = c->deffh;
392 PL_rs = c->irssv;
393 GvSV (irsgv) = c->irssv_sv;
394 421
395 { 422 {
396 dSP; 423 dSP;
424
397 CV *cv; 425 CV *cv;
398 426
399 /* now do the ugly restore mess */ 427 /* now do the ugly restore mess */
400 while ((cv = (CV *)POPs)) 428 while (expect_true (cv = (CV *)POPs))
401 { 429 {
402 put_padlist (aTHX_ cv); /* mark this padlist as available */ 430 put_padlist (aTHX_ cv); /* mark this padlist as available */
403 CvDEPTH (cv) = PTR2IV (POPs); 431 CvDEPTH (cv) = PTR2IV (POPs);
404 CvPADLIST (cv) = (AV *)POPs; 432 CvPADLIST (cv) = (AV *)POPs;
405 } 433 }
… …
424 452
425 XPUSHs (Nullsv); 453 XPUSHs (Nullsv);
426 /* this loop was inspired by pp_caller */ 454 /* this loop was inspired by pp_caller */
427 for (;;) 455 for (;;)
428 { 456 {
429 while (cxix >= 0) 457 while (expect_true (cxix >= 0))
430 { 458 {
431 PERL_CONTEXT *cx = &ccstk[cxix--]; 459 PERL_CONTEXT *cx = &ccstk[cxix--];
432 460
433 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 461 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
434 { 462 {
435 CV *cv = cx->blk_sub.cv; 463 CV *cv = cx->blk_sub.cv;
436 464
437 if (CvDEPTH (cv)) 465 if (expect_true (CvDEPTH (cv)))
438 { 466 {
439 EXTEND (SP, 3); 467 EXTEND (SP, 3);
440 PUSHs ((SV *)CvPADLIST (cv)); 468 PUSHs ((SV *)CvPADLIST (cv));
441 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 469 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
442 PUSHs ((SV *)cv); 470 PUSHs ((SV *)cv);
… …
445 get_padlist (aTHX_ cv); 473 get_padlist (aTHX_ cv);
446 } 474 }
447 } 475 }
448 } 476 }
449 477
450 if (top_si->si_type == PERLSI_MAIN) 478 if (expect_true (top_si->si_type == PERLSI_MAIN))
451 break; 479 break;
452 480
453 top_si = top_si->si_prev; 481 top_si = top_si->si_prev;
454 ccstk = top_si->si_cxstack; 482 ccstk = top_si->si_cxstack;
455 cxix = top_si->si_cxix; 483 cxix = top_si->si_cxix;
456 } 484 }
457 485
458 PUTBACK; 486 PUTBACK;
459 } 487 }
460 488
489 /* allocate some space on the context stack for our purposes */
490 {
491 /* we manually unroll here, as usually 2 slots is enough */
492 int i;
493 if (SLOT_COUNT >= 1) CXINC;
494 if (SLOT_COUNT >= 2) CXINC;
495 if (SLOT_COUNT >= 3) CXINC;
496 for (i = 3; i < SLOT_COUNT; ++i)
497 CXINC;
498
499 cxstack_ix -= SLOT_COUNT; /* undo allocation */
500 }
501
502 c->mainstack = PL_mainstack;
503
504 {
505 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
506
461 c->defav = GvAV (PL_defgv); 507 slot->defav = GvAV (PL_defgv);
462 c->defsv = DEFSV; 508 slot->defsv = DEFSV;
463 c->errsv = ERRSV; 509 slot->errsv = ERRSV;
464 c->deffh = PL_defoutgv;
465 c->irssv = PL_rs;
466 c->irssv_sv = GvSV (irsgv); 510 slot->irsgv = GvSV (irsgv);
467 511
468#define VAR(name,type)c->name = PL_ ## name; 512 #define VAR(name,type) slot->name = PL_ ## name;
469# include "state.h" 513 # include "state.h"
470#undef VAR 514 #undef VAR
515 }
471} 516}
472 517
473/* 518/*
474 * allocate various perl stacks. This is an exact copy 519 * allocate various perl stacks. This is an exact copy
475 * of perl.c:init_stacks, except that it uses less memory 520 * of perl.c:init_stacks, except that it uses less memory
… …
480# define coro_init_stacks init_stacks 525# define coro_init_stacks init_stacks
481#else 526#else
482static void 527static void
483coro_init_stacks (pTHX) 528coro_init_stacks (pTHX)
484{ 529{
485 PL_curstackinfo = new_stackinfo(64, 6); 530 PL_curstackinfo = new_stackinfo(32, 8);
486 PL_curstackinfo->si_type = PERLSI_MAIN; 531 PL_curstackinfo->si_type = PERLSI_MAIN;
487 PL_curstack = PL_curstackinfo->si_stack; 532 PL_curstack = PL_curstackinfo->si_stack;
488 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 533 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
489 534
490 PL_stack_base = AvARRAY(PL_curstack); 535 PL_stack_base = AvARRAY(PL_curstack);
491 PL_stack_sp = PL_stack_base; 536 PL_stack_sp = PL_stack_base;
492 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 537 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
493 538
494 New(50,PL_tmps_stack,64,SV*); 539 New(50,PL_tmps_stack,32,SV*);
495 PL_tmps_floor = -1; 540 PL_tmps_floor = -1;
496 PL_tmps_ix = -1; 541 PL_tmps_ix = -1;
497 PL_tmps_max = 64; 542 PL_tmps_max = 32;
498 543
499 New(54,PL_markstack,16,I32); 544 New(54,PL_markstack,16,I32);
500 PL_markstack_ptr = PL_markstack; 545 PL_markstack_ptr = PL_markstack;
501 PL_markstack_max = PL_markstack + 16; 546 PL_markstack_max = PL_markstack + 16;
502 547
503#ifdef SET_MARK_OFFSET 548#ifdef SET_MARK_OFFSET
504 SET_MARK_OFFSET; 549 SET_MARK_OFFSET;
505#endif 550#endif
506 551
507 New(54,PL_scopestack,16,I32); 552 New(54,PL_scopestack,8,I32);
508 PL_scopestack_ix = 0; 553 PL_scopestack_ix = 0;
509 PL_scopestack_max = 16; 554 PL_scopestack_max = 8;
510 555
511 New(54,PL_savestack,64,ANY); 556 New(54,PL_savestack,24,ANY);
512 PL_savestack_ix = 0; 557 PL_savestack_ix = 0;
513 PL_savestack_max = 64; 558 PL_savestack_max = 24;
514 559
515#if !PERL_VERSION_ATLEAST (5,9,0) 560#if !PERL_VERSION_ATLEAST (5,9,0)
516 New(54,PL_retstack,4,OP*); 561 New(54,PL_retstack,4,OP*);
517 PL_retstack_ix = 0; 562 PL_retstack_ix = 0;
518 PL_retstack_max = 4; 563 PL_retstack_max = 4;
… …
551} 596}
552 597
553static size_t 598static size_t
554coro_rss (pTHX_ struct coro *coro) 599coro_rss (pTHX_ struct coro *coro)
555{ 600{
556 size_t rss = sizeof (coro); 601 size_t rss = sizeof (*coro);
557 602
558 if (coro->mainstack) 603 if (coro->mainstack)
559 { 604 {
605 perl_slots tmp_slot;
606 perl_slots *slot;
607
560 if (coro->flags & CF_RUNNING) 608 if (coro->flags & CF_RUNNING)
561 { 609 {
610 slot = &tmp_slot;
611
562 #define VAR(name,type)coro->name = PL_ ## name; 612 #define VAR(name,type) slot->name = PL_ ## name;
563 # include "state.h" 613 # include "state.h"
564 #undef VAR 614 #undef VAR
565 } 615 }
616 else
617 slot = coro->slot;
566 618
567 rss += sizeof (coro->curstackinfo); 619 rss += sizeof (slot->curstackinfo);
568 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
569 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 620 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
570 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 621 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
571 rss += coro->tmps_max * sizeof (SV *); 622 rss += slot->tmps_max * sizeof (SV *);
572 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 623 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
573 rss += coro->scopestack_max * sizeof (I32); 624 rss += slot->scopestack_max * sizeof (I32);
574 rss += coro->savestack_max * sizeof (ANY); 625 rss += slot->savestack_max * sizeof (ANY);
575 626
576#if !PERL_VERSION_ATLEAST (5,9,0) 627#if !PERL_VERSION_ATLEAST (5,9,0)
577 rss += coro->retstack_max * sizeof (OP *); 628 rss += slot->retstack_max * sizeof (OP *);
578#endif 629#endif
579 } 630 }
580 631
581 return rss; 632 return rss;
582} 633}
… …
594 PL_runops = RUNOPS_DEFAULT; 645 PL_runops = RUNOPS_DEFAULT;
595 PL_curcop = &PL_compiling; 646 PL_curcop = &PL_compiling;
596 PL_in_eval = EVAL_NULL; 647 PL_in_eval = EVAL_NULL;
597 PL_comppad = 0; 648 PL_comppad = 0;
598 PL_curpm = 0; 649 PL_curpm = 0;
650 PL_curpad = 0;
599 PL_localizing = 0; 651 PL_localizing = 0;
600 PL_dirty = 0; 652 PL_dirty = 0;
601 PL_restartop = 0; 653 PL_restartop = 0;
654 PL_diehook = 0;
655 PL_warnhook = 0;
602 656
603 GvSV (PL_defgv) = NEWSV (0, 0); 657 GvSV (PL_defgv) = newSV (0);
604 GvAV (PL_defgv) = coro->args; coro->args = 0; 658 GvAV (PL_defgv) = coro->args; coro->args = 0;
605 GvSV (PL_errgv) = NEWSV (0, 0); 659 GvSV (PL_errgv) = newSV (0);
606 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 660 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
607 PL_rs = newSVsv (GvSV (irsgv)); 661 PL_rs = newSVsv (GvSV (irsgv));
608 662 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
609 {
610 IO *io = newIO ();
611 PL_defoutgv = newGVgen ("Coro");
612 GvIOp(PL_defoutgv) = io;
613 IoTYPE (io) = IoTYPE_WRONLY;
614 IoOFP (io) = IoIFP (io) = PerlIO_stdout ();
615 IoFLAGS (io) |= IOf_FLUSH;
616 }
617 663
618 { 664 {
619 dSP; 665 dSP;
620 LOGOP myop; 666 LOGOP myop;
621 667
622 Zero (&myop, 1, LOGOP); 668 Zero (&myop, 1, LOGOP);
623 myop.op_next = Nullop; 669 myop.op_next = Nullop;
624 myop.op_flags = OPf_WANT_VOID; 670 myop.op_flags = OPf_WANT_VOID;
625 671
626 PUSHMARK (SP); 672 PUSHMARK (SP);
627 XPUSHs (av_shift (GvAV (PL_defgv))); 673 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
628 PUTBACK; 674 PUTBACK;
629 PL_op = (OP *)&myop; 675 PL_op = (OP *)&myop;
630 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 676 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
631 SPAGAIN; 677 SPAGAIN;
632 } 678 }
633 679
634 ENTER; /* necessary e.g. for dounwind */ 680 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */
635} 681}
636 682
637static void 683static void
638coro_destroy (pTHX_ struct coro *coro) 684coro_destroy (pTHX_ struct coro *coro)
639{ 685{
… …
659 SvREFCNT_dec (GvSV (PL_errgv)); 705 SvREFCNT_dec (GvSV (PL_errgv));
660 SvREFCNT_dec (PL_defoutgv); 706 SvREFCNT_dec (PL_defoutgv);
661 SvREFCNT_dec (PL_rs); 707 SvREFCNT_dec (PL_rs);
662 SvREFCNT_dec (GvSV (irsgv)); 708 SvREFCNT_dec (GvSV (irsgv));
663 709
710 SvREFCNT_dec (PL_diehook);
711 SvREFCNT_dec (PL_warnhook);
712
713 SvREFCNT_dec (coro->saved_deffh);
714 SvREFCNT_dec (coro->throw);
715
664 coro_destroy_stacks (aTHX); 716 coro_destroy_stacks (aTHX);
665} 717}
666 718
667static void 719static void
668free_coro_mortal (pTHX) 720free_coro_mortal (pTHX)
669{ 721{
670 if (coro_mortal) 722 if (expect_true (coro_mortal))
671 { 723 {
672 SvREFCNT_dec (coro_mortal); 724 SvREFCNT_dec (coro_mortal);
673 coro_mortal = 0; 725 coro_mortal = 0;
674 } 726 }
675} 727}
… …
704 bot = PL_stack_base + cx->blk_oldsp + 1; 756 bot = PL_stack_base + cx->blk_oldsp + 1;
705 top = cx->blk_gimme == G_ARRAY ? SP + 1 757 top = cx->blk_gimme == G_ARRAY ? SP + 1
706 : cx->blk_gimme == G_SCALAR ? bot + 1 758 : cx->blk_gimme == G_SCALAR ? bot + 1
707 : bot; 759 : bot;
708 760
761 av_extend (av, top - bot);
709 while (bot < top) 762 while (bot < top)
710 av_push (av, SvREFCNT_inc (*bot++)); 763 av_push (av, SvREFCNT_inc (*bot++));
711 764
712 PL_runops = RUNOPS_DEFAULT; 765 PL_runops = RUNOPS_DEFAULT;
713 ENTER; 766 ENTER;
… …
925 Safefree (cctx->sptr); 978 Safefree (cctx->sptr);
926 979
927 Safefree (cctx); 980 Safefree (cctx);
928} 981}
929 982
983/* wether this cctx should be destructed */
984#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
985
930static coro_cctx * 986static coro_cctx *
931cctx_get (pTHX) 987cctx_get (pTHX)
932{ 988{
933 while (cctx_first) 989 while (expect_true (cctx_first))
934 { 990 {
935 coro_cctx *cctx = cctx_first; 991 coro_cctx *cctx = cctx_first;
936 cctx_first = cctx->next; 992 cctx_first = cctx->next;
937 --cctx_idle; 993 --cctx_idle;
938 994
939 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 995 if (expect_true (!CCTX_EXPIRED (cctx)))
940 return cctx; 996 return cctx;
941 997
942 cctx_destroy (cctx); 998 cctx_destroy (cctx);
943 } 999 }
944 1000
… …
947 1003
948static void 1004static void
949cctx_put (coro_cctx *cctx) 1005cctx_put (coro_cctx *cctx)
950{ 1006{
951 /* free another cctx if overlimit */ 1007 /* free another cctx if overlimit */
952 if (cctx_idle >= MAX_IDLE_CCTX) 1008 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
953 { 1009 {
954 coro_cctx *first = cctx_first; 1010 coro_cctx *first = cctx_first;
955 cctx_first = first->next; 1011 cctx_first = first->next;
956 --cctx_idle; 1012 --cctx_idle;
957 1013
… …
963 cctx_first = cctx; 1019 cctx_first = cctx;
964} 1020}
965 1021
966/** coroutine switching *****************************************************/ 1022/** coroutine switching *****************************************************/
967 1023
968static void NOINLINE 1024static void
969transfer_check (pTHX_ struct coro *prev, struct coro *next) 1025transfer_check (pTHX_ struct coro *prev, struct coro *next)
970{ 1026{
971 if (prev != next) 1027 if (expect_true (prev != next))
972 { 1028 {
973 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1029 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
974 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1030 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
975 1031
976 if (next->flags & CF_RUNNING) 1032 if (expect_false (next->flags & CF_RUNNING))
977 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1033 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
978 1034
979 if (next->flags & CF_DESTROYED) 1035 if (expect_false (next->flags & CF_DESTROYED))
980 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1036 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
981 1037
1038 if (
1039#if PERL_VERSION_ATLEAST (5,9,0)
1040 expect_false (PL_parser)
1041#else
982 if (PL_lex_state != LEX_NOTPARSING) 1042 expect_false (PL_lex_state != LEX_NOTPARSING)
1043#endif
1044 )
983 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1045 croak ("Coro::State::transfer called while parsing, but this is not supported");
984 } 1046 }
985} 1047}
986 1048
987/* always use the TRANSFER macro */ 1049/* always use the TRANSFER macro */
… …
989transfer (pTHX_ struct coro *prev, struct coro *next) 1051transfer (pTHX_ struct coro *prev, struct coro *next)
990{ 1052{
991 dSTACKLEVEL; 1053 dSTACKLEVEL;
992 1054
993 /* sometimes transfer is only called to set idle_sp */ 1055 /* sometimes transfer is only called to set idle_sp */
994 if (!next) 1056 if (expect_false (!next))
995 { 1057 {
996 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1058 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
997 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1059 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
998 } 1060 }
999 else if (prev != next) 1061 else if (expect_true (prev != next))
1000 { 1062 {
1001 coro_cctx *prev__cctx; 1063 coro_cctx *prev__cctx;
1002 1064
1003 if (prev->flags & CF_NEW) 1065 if (expect_false (prev->flags & CF_NEW))
1004 { 1066 {
1005 /* create a new empty context */ 1067 /* create a new empty context */
1006 Newz (0, prev->cctx, 1, coro_cctx); 1068 Newz (0, prev->cctx, 1, coro_cctx);
1007 prev->flags &= ~CF_NEW; 1069 prev->flags &= ~CF_NEW;
1008 prev->flags |= CF_RUNNING; 1070 prev->flags |= CF_RUNNING;
… …
1011 prev->flags &= ~CF_RUNNING; 1073 prev->flags &= ~CF_RUNNING;
1012 next->flags |= CF_RUNNING; 1074 next->flags |= CF_RUNNING;
1013 1075
1014 LOCK; 1076 LOCK;
1015 1077
1016 if (next->flags & CF_NEW) 1078 if (expect_false (next->flags & CF_NEW))
1017 { 1079 {
1018 /* need to start coroutine */ 1080 /* need to start coroutine */
1019 next->flags &= ~CF_NEW; 1081 next->flags &= ~CF_NEW;
1020 /* first get rid of the old state */ 1082 /* first get rid of the old state */
1021 save_perl (aTHX_ prev); 1083 save_perl (aTHX_ prev);
… …
1030 } 1092 }
1031 1093
1032 prev__cctx = prev->cctx; 1094 prev__cctx = prev->cctx;
1033 1095
1034 /* possibly "free" the cctx */ 1096 /* possibly "free" the cctx */
1035 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1097 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1036 { 1098 {
1037 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1099 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1038 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1100 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1039 1101
1040 prev->cctx = 0; 1102 prev->cctx = 0;
1041 1103
1104 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1105 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1106 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1107 next->cctx = cctx_get (aTHX);
1108
1042 cctx_put (prev__cctx); 1109 cctx_put (prev__cctx);
1043 } 1110 }
1044 1111
1045 ++next->usecount; 1112 ++next->usecount;
1046 1113
1047 if (!next->cctx) 1114 if (expect_true (!next->cctx))
1048 next->cctx = cctx_get (aTHX); 1115 next->cctx = cctx_get (aTHX);
1049 1116
1050 if (prev__cctx != next->cctx) 1117 if (expect_false (prev__cctx != next->cctx))
1051 { 1118 {
1052 prev__cctx->top_env = PL_top_env; 1119 prev__cctx->top_env = PL_top_env;
1053 PL_top_env = next->cctx->top_env; 1120 PL_top_env = next->cctx->top_env;
1054 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1121 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1055 } 1122 }
1056 1123
1057 free_coro_mortal (aTHX); 1124 free_coro_mortal (aTHX);
1058 UNLOCK; 1125 UNLOCK;
1126
1127 if (expect_false (prev->throw || next->throw))
1128 {
1129 struct coro *coro = SvSTATE (coro_current);
1130
1131 if (coro->throw)
1132 {
1133 SV *exception = coro->throw;
1134 coro->throw = 0;
1135 sv_setsv (ERRSV, exception);
1136 croak (0);
1137 }
1138 }
1059 } 1139 }
1060} 1140}
1061 1141
1062struct transfer_args 1142struct transfer_args
1063{ 1143{
… …
1098 save_perl (aTHX_ &temp); 1178 save_perl (aTHX_ &temp);
1099 load_perl (aTHX_ coro); 1179 load_perl (aTHX_ coro);
1100 1180
1101 coro_destroy (aTHX_ coro); 1181 coro_destroy (aTHX_ coro);
1102 1182
1103 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1183 load_perl (aTHX_ &temp);
1104 1184
1105 coro->mainstack = 0; 1185 coro->slot = 0;
1106 } 1186 }
1107 1187
1108 cctx_destroy (coro->cctx); 1188 cctx_destroy (coro->cctx);
1109 SvREFCNT_dec (coro->args); 1189 SvREFCNT_dec (coro->args);
1110 1190
… …
1235 { 1315 {
1236 LOCK; 1316 LOCK;
1237 next_sv = coro_deq (aTHX_ PRIO_MIN); 1317 next_sv = coro_deq (aTHX_ PRIO_MIN);
1238 1318
1239 /* nothing to schedule: call the idle handler */ 1319 /* nothing to schedule: call the idle handler */
1240 if (!next_sv) 1320 if (expect_false (!next_sv))
1241 { 1321 {
1242 dSP; 1322 dSP;
1243 UNLOCK; 1323 UNLOCK;
1244 1324
1245 ENTER; 1325 ENTER;
… …
1255 } 1335 }
1256 1336
1257 ta->next = SvSTATE (next_sv); 1337 ta->next = SvSTATE (next_sv);
1258 1338
1259 /* cannot transfer to destroyed coros, skip and look for next */ 1339 /* cannot transfer to destroyed coros, skip and look for next */
1260 if (ta->next->flags & CF_DESTROYED) 1340 if (expect_false (ta->next->flags & CF_DESTROYED))
1261 { 1341 {
1262 UNLOCK; 1342 UNLOCK;
1263 SvREFCNT_dec (next_sv); 1343 SvREFCNT_dec (next_sv);
1264 /* coro_nready is already taken care of by destroy */ 1344 /* coro_nready is already taken care of by destroy */
1265 continue; 1345 continue;
… …
1321 dTHX; 1401 dTHX;
1322 struct transfer_args ta; 1402 struct transfer_args ta;
1323 1403
1324 prepare_cede (aTHX_ &ta); 1404 prepare_cede (aTHX_ &ta);
1325 1405
1326 if (ta.prev != ta.next) 1406 if (expect_true (ta.prev != ta.next))
1327 { 1407 {
1328 TRANSFER (ta); 1408 TRANSFER (ta);
1329 return 1; 1409 return 1;
1330 } 1410 }
1331 else 1411 else
… …
1367 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1447 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1368 1448
1369 if (coro->flags & CF_RUNNING) 1449 if (coro->flags & CF_RUNNING)
1370 PL_runops = RUNOPS_DEFAULT; 1450 PL_runops = RUNOPS_DEFAULT;
1371 else 1451 else
1372 coro->runops = RUNOPS_DEFAULT; 1452 coro->slot->runops = RUNOPS_DEFAULT;
1373 } 1453 }
1374} 1454}
1375 1455
1376MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1456MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1377 1457
… …
1382#ifdef USE_ITHREADS 1462#ifdef USE_ITHREADS
1383 MUTEX_INIT (&coro_mutex); 1463 MUTEX_INIT (&coro_mutex);
1384#endif 1464#endif
1385 BOOT_PAGESIZE; 1465 BOOT_PAGESIZE;
1386 1466
1387 irsgv = gv_fetchpv ("/", 1, SVt_PV); 1467 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1468 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1388 1469
1389 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1470 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1390 1471
1391 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1472 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1392 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1473 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1423 1504
1424 coro->hv = hv = newHV (); 1505 coro->hv = hv = newHV ();
1425 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1506 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1426 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1507 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1427 1508
1509 av_extend (coro->args, items - 1);
1428 for (i = 1; i < items; i++) 1510 for (i = 1; i < items; i++)
1429 av_push (coro->args, newSVsv (ST (i))); 1511 av_push (coro->args, newSVsv (ST (i)));
1430} 1512}
1431 OUTPUT: 1513 OUTPUT:
1432 RETVAL 1514 RETVAL
… …
1475 } 1557 }
1476 1558
1477 BARRIER; 1559 BARRIER;
1478 TRANSFER (ta); 1560 TRANSFER (ta);
1479 1561
1480 if (GIMME_V != G_VOID && ta.next != ta.prev) 1562 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev))
1481 XSRETURN_YES; 1563 XSRETURN_YES;
1482} 1564}
1483 1565
1484bool 1566bool
1485_destroy (SV *coro_sv) 1567_destroy (SV *coro_sv)
… …
1535 CODE: 1617 CODE:
1536{ 1618{
1537 if (coro->mainstack) 1619 if (coro->mainstack)
1538 { 1620 {
1539 struct coro temp; 1621 struct coro temp;
1540 Zero (&temp, 1, struct coro);
1541 1622
1542 if (!(coro->flags & CF_RUNNING)) 1623 if (!(coro->flags & CF_RUNNING))
1543 { 1624 {
1544 save_perl (aTHX_ &temp); 1625 save_perl (aTHX_ &temp);
1545 load_perl (aTHX_ coro); 1626 load_perl (aTHX_ coro);
… …
1549 dSP; 1630 dSP;
1550 ENTER; 1631 ENTER;
1551 SAVETMPS; 1632 SAVETMPS;
1552 PUSHMARK (SP); 1633 PUSHMARK (SP);
1553 PUTBACK; 1634 PUTBACK;
1635
1554 if (ix) 1636 if (ix)
1555 eval_sv (coderef, 0); 1637 eval_sv (coderef, 0);
1556 else 1638 else
1557 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1639 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1640
1558 SPAGAIN; 1641 SPAGAIN;
1559 FREETMPS; 1642 FREETMPS;
1560 LEAVE; 1643 LEAVE;
1561 PUTBACK; 1644 PUTBACK;
1562 } 1645 }
… …
1621BOOT: 1704BOOT:
1622{ 1705{
1623 int i; 1706 int i;
1624 1707
1625 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1708 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1709 get_sv ("Coro::POOL_RSS" , TRUE); /* silence stupid 5.10 warning */
1626 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1710 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1711 get_sv ("Coro::POOL_SIZE" , TRUE); /* silence stupid 5.10 warning */
1627 av_async_pool = get_av ("Coro::async_pool", TRUE); 1712 av_async_pool = get_av ("Coro::async_pool", TRUE);
1713 get_av ("Coro::async_pool", TRUE); /* silence stupid 5.10 warning */
1628 1714
1629 coro_current = get_sv ("Coro::current", FALSE); 1715 coro_current = get_sv ("Coro::current", FALSE);
1630 SvREADONLY_on (coro_current); 1716 SvREADONLY_on (coro_current);
1631 1717
1632 coro_stash = gv_stashpv ("Coro", TRUE); 1718 coro_stash = gv_stashpv ("Coro", TRUE);
1633 1719
1634 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1720 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1635 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1721 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1636 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1722 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1637 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1723 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
… …
1640 1726
1641 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1727 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1642 coro_ready[i] = newAV (); 1728 coro_ready[i] = newAV ();
1643 1729
1644 { 1730 {
1645 SV *sv = perl_get_sv("Coro::API", 1); 1731 SV *sv = perl_get_sv ("Coro::API", TRUE);
1732 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1646 1733
1647 coroapi.schedule = api_schedule; 1734 coroapi.schedule = api_schedule;
1648 coroapi.cede = api_cede; 1735 coroapi.cede = api_cede;
1649 coroapi.cede_notself = api_cede_notself; 1736 coroapi.cede_notself = api_cede_notself;
1650 coroapi.ready = api_ready; 1737 coroapi.ready = api_ready;
… …
1701 CODE: 1788 CODE:
1702 RETVAL = coro_nready; 1789 RETVAL = coro_nready;
1703 OUTPUT: 1790 OUTPUT:
1704 RETVAL 1791 RETVAL
1705 1792
1793void
1794throw (Coro::State self, SV *throw = &PL_sv_undef)
1795 PROTOTYPE: $;$
1796 CODE:
1797 SvREFCNT_dec (self->throw);
1798 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1799
1706# for async_pool speedup 1800# for async_pool speedup
1707void 1801void
1708_pool_1 (SV *cb) 1802_pool_1 (SV *cb)
1709 CODE: 1803 CODE:
1710{ 1804{
1711 int i, len; 1805 struct coro *coro = SvSTATE (coro_current);
1712 HV *hv = (HV *)SvRV (coro_current); 1806 HV *hv = (HV *)SvRV (coro_current);
1713 AV *defav = GvAV (PL_defgv); 1807 AV *defav = GvAV (PL_defgv);
1714 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1808 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1715 AV *invoke_av; 1809 AV *invoke_av;
1810 int i, len;
1716 1811
1717 if (!invoke) 1812 if (!invoke)
1718 croak ("\3terminate\2\n"); 1813 croak ("\3async_pool terminate\2\n");
1814
1815 SvREFCNT_dec (coro->saved_deffh);
1816 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1719 1817
1720 hv_store (hv, "desc", sizeof ("desc") - 1, 1818 hv_store (hv, "desc", sizeof ("desc") - 1,
1721 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1819 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1722 1820
1723 invoke_av = (AV *)SvRV (invoke); 1821 invoke_av = (AV *)SvRV (invoke);
… …
1741{ 1839{
1742 struct coro *coro = SvSTATE (coro_current); 1840 struct coro *coro = SvSTATE (coro_current);
1743 1841
1744 sv_setsv (cb, &PL_sv_undef); 1842 sv_setsv (cb, &PL_sv_undef);
1745 1843
1844 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1845 coro->saved_deffh = 0;
1846
1746 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1847 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1747 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1848 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1748 croak ("\3terminate\2\n"); 1849 croak ("\3async_pool terminate\2\n");
1749 1850
1750 av_clear (GvAV (PL_defgv)); 1851 av_clear (GvAV (PL_defgv));
1751 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1852 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1752 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1853 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1753 1854

Diff Legend

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