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.176 by root, Sun Sep 30 13:50:38 2007 UTC vs.
Revision 1.199 by root, Sun Oct 7 13:53: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
… …
131static struct CoroAPI coroapi; 145static struct CoroAPI coroapi;
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 */
150
151static GV *irsgv; /* $/ */
152static GV *stdoutgv; /* *STDOUT */
153static SV *sv_diehook;
154static SV *sv_warnhook;
136 155
137/* async_pool helper stuff */ 156/* async_pool helper stuff */
138static SV *sv_pool_rss; 157static SV *sv_pool_rss;
139static SV *sv_pool_size; 158static SV *sv_pool_size;
140static AV *av_async_pool; 159static AV *av_async_pool;
… …
176 CF_READY = 0x0002, /* coroutine is ready */ 195 CF_READY = 0x0002, /* coroutine is ready */
177 CF_NEW = 0x0004, /* has never been switched to */ 196 CF_NEW = 0x0004, /* has never been switched to */
178 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 197 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
179}; 198};
180 199
200/* the structure where most of the perl state is stored, overlaid on the cxstack */
201typedef struct {
202 SV *defsv;
203 AV *defav;
204 SV *errsv;
205 SV *irsgv;
206#define VAR(name,type) type name;
207# include "state.h"
208#undef VAR
209} perl_slots;
210
211#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
212
181/* this is a structure representing a perl-level coroutine */ 213/* this is a structure representing a perl-level coroutine */
182struct coro { 214struct coro {
183 /* the c coroutine allocated to this perl coroutine, if any */ 215 /* the c coroutine allocated to this perl coroutine, if any */
184 coro_cctx *cctx; 216 coro_cctx *cctx;
185 217
218 /* process data */
219 AV *mainstack;
220 perl_slots *slot; /* basically the saved sp */
221
186 /* data associated with this coroutine (initial args) */ 222 /* data associated with this coroutine (initial args) */
187 AV *args; 223 AV *args;
188 int refcnt; 224 int refcnt;
189 int save; /* CORO_SAVE flags */
190 int flags; /* CF_ flags */ 225 int flags; /* CF_ flags */
191 226
192 /* optionally saved, might be zero */
193 AV *defav; /* @_ */
194 SV *defsv; /* $_ */
195 SV *errsv; /* $@ */
196 GV *deffh; /* default filehandle */
197 SV *irssv; /* $/ */
198 SV *irssv_sv; /* real $/ cache */
199
200#define VAR(name,type) type name;
201# include "state.h"
202#undef VAR
203
204 /* statistics */ 227 /* statistics */
205 int usecount; /* number of switches to this coro */ 228 int usecount; /* number of transfers to this coro */
206 229
207 /* coro process data */ 230 /* coro process data */
208 int prio; 231 int prio;
232 SV *throw;
233
234 /* async_pool */
235 SV *saved_deffh;
209 236
210 /* linked list */ 237 /* linked list */
211 struct coro *next, *prev; 238 struct coro *next, *prev;
212 HV *hv; /* the perl hash associated with this coro, if any */ 239 HV *hv; /* the perl hash associated with this coro, if any */
213}; 240};
… …
229static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 256static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
230static int coro_nready; 257static int coro_nready;
231static struct coro *coro_first; 258static struct coro *coro_first;
232 259
233/** lowlevel stuff **********************************************************/ 260/** lowlevel stuff **********************************************************/
261
262static SV *
263coro_get_sv (const char *name, int create)
264{
265#if PERL_VERSION_ATLEAST (5,9,0)
266 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
267 get_sv (name, create);
268#endif
269 return get_sv (name, create);
270}
271
272static SV *
273coro_get_av (const char *name, int create)
274{
275#if PERL_VERSION_ATLEAST (5,9,0)
276 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
277 get_av (name, create);
278#endif
279 return get_av (name, create);
280}
234 281
235static AV * 282static AV *
236coro_clone_padlist (pTHX_ CV *cv) 283coro_clone_padlist (pTHX_ CV *cv)
237{ 284{
238 AV *padlist = CvPADLIST (cv); 285 AV *padlist = CvPADLIST (cv);
… …
311 MAGIC *mg; 358 MAGIC *mg;
312 359
313 if (SvROK (coro)) 360 if (SvROK (coro))
314 coro = SvRV (coro); 361 coro = SvRV (coro);
315 362
316 if (SvTYPE (coro) != SVt_PVHV) 363 if (expect_false (SvTYPE (coro) != SVt_PVHV))
317 croak ("Coro::State object required"); 364 croak ("Coro::State object required");
318 365
319 stash = SvSTASH (coro); 366 stash = SvSTASH (coro);
320 if (stash != coro_stash && stash != coro_state_stash) 367 if (expect_false (stash != coro_stash && stash != coro_state_stash))
321 { 368 {
322 /* very slow, but rare, check */ 369 /* very slow, but rare, check */
323 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 370 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
324 croak ("Coro::State object required"); 371 croak ("Coro::State object required");
325 } 372 }
… …
335get_padlist (pTHX_ CV *cv) 382get_padlist (pTHX_ CV *cv)
336{ 383{
337 MAGIC *mg = CORO_MAGIC (cv); 384 MAGIC *mg = CORO_MAGIC (cv);
338 AV *av; 385 AV *av;
339 386
340 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 387 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
341 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 388 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
342 else 389 else
343 { 390 {
344#if CORO_PREFER_PERL_FUNCTIONS 391#if CORO_PREFER_PERL_FUNCTIONS
345 /* this is probably cleaner, but also slower? */ 392 /* this is probably cleaner, but also slower? */
… …
357put_padlist (pTHX_ CV *cv) 404put_padlist (pTHX_ CV *cv)
358{ 405{
359 MAGIC *mg = CORO_MAGIC (cv); 406 MAGIC *mg = CORO_MAGIC (cv);
360 AV *av; 407 AV *av;
361 408
362 if (!mg) 409 if (expect_false (!mg))
363 { 410 {
364 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 411 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
365 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 412 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
366 mg->mg_virtual = &vtbl_coro; 413 mg->mg_virtual = &vtbl_coro;
367 mg->mg_obj = (SV *)newAV (); 414 mg->mg_obj = (SV *)newAV ();
368 } 415 }
369 416
370 av = (AV *)mg->mg_obj; 417 av = (AV *)mg->mg_obj;
371 418
372 if (AvFILLp (av) >= AvMAX (av)) 419 if (expect_false (AvFILLp (av) >= AvMAX (av)))
373 av_extend (av, AvMAX (av) + 1); 420 av_extend (av, AvMAX (av) + 1);
374 421
375 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 422 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
376} 423}
377 424
378/** load & save, init *******************************************************/ 425/** load & save, init *******************************************************/
379 426
380#define SB do {
381#define SE } while (0)
382
383#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
384
385static void 427static void
386load_perl (pTHX_ Coro__State c) 428load_perl (pTHX_ Coro__State c)
387{ 429{
430 perl_slots *slot = c->slot;
431 c->slot = 0;
432
433 PL_mainstack = c->mainstack;
434
435 GvSV (PL_defgv) = slot->defsv;
436 GvAV (PL_defgv) = slot->defav;
437 GvSV (PL_errgv) = slot->errsv;
438 GvSV (irsgv) = slot->irsgv;
439
388#define VAR(name,type) PL_ ## name = c->name; 440 #define VAR(name,type) PL_ ## name = slot->name;
389# include "state.h" 441 # include "state.h"
390#undef VAR 442 #undef VAR
391
392 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
393 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
394 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
395 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh);
396
397 if (c->irssv)
398 {
399 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
400 {
401 SvREFCNT_dec (c->irssv);
402 c->irssv = 0;
403 }
404 else
405 {
406 REPLACE_SV (PL_rs, c->irssv);
407 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
408 sv_setsv (c->irssv_sv, PL_rs);
409 }
410 }
411 443
412 { 444 {
413 dSP; 445 dSP;
446
414 CV *cv; 447 CV *cv;
415 448
416 /* now do the ugly restore mess */ 449 /* now do the ugly restore mess */
417 while ((cv = (CV *)POPs)) 450 while (expect_true (cv = (CV *)POPs))
418 { 451 {
419 put_padlist (aTHX_ cv); /* mark this padlist as available */ 452 put_padlist (aTHX_ cv); /* mark this padlist as available */
420 CvDEPTH (cv) = PTR2IV (POPs); 453 CvDEPTH (cv) = PTR2IV (POPs);
421 CvPADLIST (cv) = (AV *)POPs; 454 CvPADLIST (cv) = (AV *)POPs;
422 } 455 }
… …
441 474
442 XPUSHs (Nullsv); 475 XPUSHs (Nullsv);
443 /* this loop was inspired by pp_caller */ 476 /* this loop was inspired by pp_caller */
444 for (;;) 477 for (;;)
445 { 478 {
446 while (cxix >= 0) 479 while (expect_true (cxix >= 0))
447 { 480 {
448 PERL_CONTEXT *cx = &ccstk[cxix--]; 481 PERL_CONTEXT *cx = &ccstk[cxix--];
449 482
450 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 483 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
451 { 484 {
452 CV *cv = cx->blk_sub.cv; 485 CV *cv = cx->blk_sub.cv;
453 486
454 if (CvDEPTH (cv)) 487 if (expect_true (CvDEPTH (cv)))
455 { 488 {
456 EXTEND (SP, 3); 489 EXTEND (SP, 3);
457 PUSHs ((SV *)CvPADLIST (cv)); 490 PUSHs ((SV *)CvPADLIST (cv));
458 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 491 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
459 PUSHs ((SV *)cv); 492 PUSHs ((SV *)cv);
… …
462 get_padlist (aTHX_ cv); 495 get_padlist (aTHX_ cv);
463 } 496 }
464 } 497 }
465 } 498 }
466 499
467 if (top_si->si_type == PERLSI_MAIN) 500 if (expect_true (top_si->si_type == PERLSI_MAIN))
468 break; 501 break;
469 502
470 top_si = top_si->si_prev; 503 top_si = top_si->si_prev;
471 ccstk = top_si->si_cxstack; 504 ccstk = top_si->si_cxstack;
472 cxix = top_si->si_cxix; 505 cxix = top_si->si_cxix;
473 } 506 }
474 507
475 PUTBACK; 508 PUTBACK;
476 } 509 }
477 510
478 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 511 /* allocate some space on the context stack for our purposes */
479 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 512 {
480 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 513 /* we manually unroll here, as usually 2 slots is enough */
481 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 514 int i;
482 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0; 515 if (SLOT_COUNT >= 1) CXINC;
516 if (SLOT_COUNT >= 2) CXINC;
517 if (SLOT_COUNT >= 3) CXINC;
518 for (i = 3; i < SLOT_COUNT; ++i)
519 CXINC;
483 520
521 cxstack_ix -= SLOT_COUNT; /* undo allocation */
522 }
523
524 c->mainstack = PL_mainstack;
525
526 {
527 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
528
529 slot->defav = GvAV (PL_defgv);
530 slot->defsv = DEFSV;
531 slot->errsv = ERRSV;
532 slot->irsgv = GvSV (irsgv);
533
484#define VAR(name,type)c->name = PL_ ## name; 534 #define VAR(name,type) slot->name = PL_ ## name;
485# include "state.h" 535 # include "state.h"
486#undef VAR 536 #undef VAR
537 }
487} 538}
488 539
489/* 540/*
490 * allocate various perl stacks. This is an exact copy 541 * allocate various perl stacks. This is an exact copy
491 * of perl.c:init_stacks, except that it uses less memory 542 * of perl.c:init_stacks, except that it uses less memory
… …
496# define coro_init_stacks init_stacks 547# define coro_init_stacks init_stacks
497#else 548#else
498static void 549static void
499coro_init_stacks (pTHX) 550coro_init_stacks (pTHX)
500{ 551{
501 PL_curstackinfo = new_stackinfo(64, 6); 552 PL_curstackinfo = new_stackinfo(32, 8);
502 PL_curstackinfo->si_type = PERLSI_MAIN; 553 PL_curstackinfo->si_type = PERLSI_MAIN;
503 PL_curstack = PL_curstackinfo->si_stack; 554 PL_curstack = PL_curstackinfo->si_stack;
504 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 555 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
505 556
506 PL_stack_base = AvARRAY(PL_curstack); 557 PL_stack_base = AvARRAY(PL_curstack);
507 PL_stack_sp = PL_stack_base; 558 PL_stack_sp = PL_stack_base;
508 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 559 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
509 560
510 New(50,PL_tmps_stack,64,SV*); 561 New(50,PL_tmps_stack,32,SV*);
511 PL_tmps_floor = -1; 562 PL_tmps_floor = -1;
512 PL_tmps_ix = -1; 563 PL_tmps_ix = -1;
513 PL_tmps_max = 64; 564 PL_tmps_max = 32;
514 565
515 New(54,PL_markstack,16,I32); 566 New(54,PL_markstack,16,I32);
516 PL_markstack_ptr = PL_markstack; 567 PL_markstack_ptr = PL_markstack;
517 PL_markstack_max = PL_markstack + 16; 568 PL_markstack_max = PL_markstack + 16;
518 569
519#ifdef SET_MARK_OFFSET 570#ifdef SET_MARK_OFFSET
520 SET_MARK_OFFSET; 571 SET_MARK_OFFSET;
521#endif 572#endif
522 573
523 New(54,PL_scopestack,16,I32); 574 New(54,PL_scopestack,8,I32);
524 PL_scopestack_ix = 0; 575 PL_scopestack_ix = 0;
525 PL_scopestack_max = 16; 576 PL_scopestack_max = 8;
526 577
527 New(54,PL_savestack,64,ANY); 578 New(54,PL_savestack,24,ANY);
528 PL_savestack_ix = 0; 579 PL_savestack_ix = 0;
529 PL_savestack_max = 64; 580 PL_savestack_max = 24;
530 581
531#if !PERL_VERSION_ATLEAST (5,9,0) 582#if !PERL_VERSION_ATLEAST (5,9,0)
532 New(54,PL_retstack,4,OP*); 583 New(54,PL_retstack,4,OP*);
533 PL_retstack_ix = 0; 584 PL_retstack_ix = 0;
534 PL_retstack_max = 4; 585 PL_retstack_max = 4;
… …
540 * destroy the stacks, the callchain etc... 591 * destroy the stacks, the callchain etc...
541 */ 592 */
542static void 593static void
543coro_destroy_stacks (pTHX) 594coro_destroy_stacks (pTHX)
544{ 595{
545 if (!IN_DESTRUCT)
546 {
547 /* restore all saved variables and stuff */
548 LEAVE_SCOPE (0);
549 assert (PL_tmps_floor == -1);
550
551 /* free all temporaries */
552 FREETMPS;
553 assert (PL_tmps_ix == -1);
554
555 /* unwind all extra stacks */
556 POPSTACK_TO (PL_mainstack);
557
558 /* unwind main stack */
559 dounwind (-1);
560 }
561
562 while (PL_curstackinfo->si_next) 596 while (PL_curstackinfo->si_next)
563 PL_curstackinfo = PL_curstackinfo->si_next; 597 PL_curstackinfo = PL_curstackinfo->si_next;
564 598
565 while (PL_curstackinfo) 599 while (PL_curstackinfo)
566 { 600 {
… …
584} 618}
585 619
586static size_t 620static size_t
587coro_rss (pTHX_ struct coro *coro) 621coro_rss (pTHX_ struct coro *coro)
588{ 622{
589 size_t rss = sizeof (coro); 623 size_t rss = sizeof (*coro);
590 624
591 if (coro->mainstack) 625 if (coro->mainstack)
592 { 626 {
627 perl_slots tmp_slot;
628 perl_slots *slot;
629
593 if (coro->flags & CF_RUNNING) 630 if (coro->flags & CF_RUNNING)
594 { 631 {
632 slot = &tmp_slot;
633
595 #define VAR(name,type)coro->name = PL_ ## name; 634 #define VAR(name,type) slot->name = PL_ ## name;
596 # include "state.h" 635 # include "state.h"
597 #undef VAR 636 #undef VAR
598 } 637 }
638 else
639 slot = coro->slot;
599 640
600 rss += sizeof (coro->curstackinfo); 641 rss += sizeof (slot->curstackinfo);
601 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
602 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 642 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
603 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 643 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
604 rss += coro->tmps_max * sizeof (SV *); 644 rss += slot->tmps_max * sizeof (SV *);
605 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 645 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
606 rss += coro->scopestack_max * sizeof (I32); 646 rss += slot->scopestack_max * sizeof (I32);
607 rss += coro->savestack_max * sizeof (ANY); 647 rss += slot->savestack_max * sizeof (ANY);
608 648
609#if !PERL_VERSION_ATLEAST (5,9,0) 649#if !PERL_VERSION_ATLEAST (5,9,0)
610 rss += coro->retstack_max * sizeof (OP *); 650 rss += slot->retstack_max * sizeof (OP *);
611#endif 651#endif
612 } 652 }
613 653
614 return rss; 654 return rss;
615} 655}
616 656
617/** coroutine stack handling ************************************************/ 657/** coroutine stack handling ************************************************/
618 658
619static void 659static void
620setup_coro (pTHX_ struct coro *coro) 660coro_setup (pTHX_ struct coro *coro)
621{ 661{
622 /* 662 /*
623 * emulate part of the perl startup here. 663 * emulate part of the perl startup here.
624 */ 664 */
625 coro_init_stacks (aTHX); 665 coro_init_stacks (aTHX);
… …
627 PL_runops = RUNOPS_DEFAULT; 667 PL_runops = RUNOPS_DEFAULT;
628 PL_curcop = &PL_compiling; 668 PL_curcop = &PL_compiling;
629 PL_in_eval = EVAL_NULL; 669 PL_in_eval = EVAL_NULL;
630 PL_comppad = 0; 670 PL_comppad = 0;
631 PL_curpm = 0; 671 PL_curpm = 0;
672 PL_curpad = 0;
632 PL_localizing = 0; 673 PL_localizing = 0;
633 PL_dirty = 0; 674 PL_dirty = 0;
634 PL_restartop = 0; 675 PL_restartop = 0;
676 PL_diehook = SvREFCNT_inc (sv_diehook);
677 PL_warnhook = SvREFCNT_inc (sv_warnhook);
678
679 GvSV (PL_defgv) = newSV (0);
680 GvAV (PL_defgv) = coro->args; coro->args = 0;
681 GvSV (PL_errgv) = newSV (0);
682 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
683 PL_rs = newSVsv (GvSV (irsgv));
684 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
635 685
636 { 686 {
637 dSP; 687 dSP;
638 LOGOP myop; 688 LOGOP myop;
639 689
640 SvREFCNT_dec (GvAV (PL_defgv));
641 GvAV (PL_defgv) = coro->args; coro->args = 0;
642
643 Zero (&myop, 1, LOGOP); 690 Zero (&myop, 1, LOGOP);
644 myop.op_next = Nullop; 691 myop.op_next = Nullop;
645 myop.op_flags = OPf_WANT_VOID; 692 myop.op_flags = OPf_WANT_VOID;
646 693
647 PUSHMARK (SP); 694 PUSHMARK (SP);
648 XPUSHs (av_shift (GvAV (PL_defgv))); 695 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
649 PUTBACK; 696 PUTBACK;
650 PL_op = (OP *)&myop; 697 PL_op = (OP *)&myop;
651 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 698 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
652 SPAGAIN; 699 SPAGAIN;
653 } 700 }
654 701
655 ENTER; /* necessary e.g. for dounwind */ 702 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */
703}
704
705static void
706coro_destroy (pTHX_ struct coro *coro)
707{
708 if (!IN_DESTRUCT)
709 {
710 /* restore all saved variables and stuff */
711 LEAVE_SCOPE (0);
712 assert (PL_tmps_floor == -1);
713
714 /* free all temporaries */
715 FREETMPS;
716 assert (PL_tmps_ix == -1);
717
718 /* unwind all extra stacks */
719 POPSTACK_TO (PL_mainstack);
720
721 /* unwind main stack */
722 dounwind (-1);
723 }
724
725 SvREFCNT_dec (GvSV (PL_defgv));
726 SvREFCNT_dec (GvAV (PL_defgv));
727 SvREFCNT_dec (GvSV (PL_errgv));
728 SvREFCNT_dec (PL_defoutgv);
729 SvREFCNT_dec (PL_rs);
730 SvREFCNT_dec (GvSV (irsgv));
731
732 SvREFCNT_dec (PL_diehook);
733 SvREFCNT_dec (PL_warnhook);
734
735 SvREFCNT_dec (coro->saved_deffh);
736 SvREFCNT_dec (coro->throw);
737
738 coro_destroy_stacks (aTHX);
656} 739}
657 740
658static void 741static void
659free_coro_mortal (pTHX) 742free_coro_mortal (pTHX)
660{ 743{
661 if (coro_mortal) 744 if (expect_true (coro_mortal))
662 { 745 {
663 SvREFCNT_dec (coro_mortal); 746 SvREFCNT_dec (coro_mortal);
664 coro_mortal = 0; 747 coro_mortal = 0;
665 } 748 }
666} 749}
… …
695 bot = PL_stack_base + cx->blk_oldsp + 1; 778 bot = PL_stack_base + cx->blk_oldsp + 1;
696 top = cx->blk_gimme == G_ARRAY ? SP + 1 779 top = cx->blk_gimme == G_ARRAY ? SP + 1
697 : cx->blk_gimme == G_SCALAR ? bot + 1 780 : cx->blk_gimme == G_SCALAR ? bot + 1
698 : bot; 781 : bot;
699 782
783 av_extend (av, top - bot);
700 while (bot < top) 784 while (bot < top)
701 av_push (av, SvREFCNT_inc (*bot++)); 785 av_push (av, SvREFCNT_inc (*bot++));
702 786
703 PL_runops = RUNOPS_DEFAULT; 787 PL_runops = RUNOPS_DEFAULT;
704 ENTER; 788 ENTER;
… …
916 Safefree (cctx->sptr); 1000 Safefree (cctx->sptr);
917 1001
918 Safefree (cctx); 1002 Safefree (cctx);
919} 1003}
920 1004
1005/* wether this cctx should be destructed */
1006#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1007
921static coro_cctx * 1008static coro_cctx *
922cctx_get (pTHX) 1009cctx_get (pTHX)
923{ 1010{
924 while (cctx_first) 1011 while (expect_true (cctx_first))
925 { 1012 {
926 coro_cctx *cctx = cctx_first; 1013 coro_cctx *cctx = cctx_first;
927 cctx_first = cctx->next; 1014 cctx_first = cctx->next;
928 --cctx_idle; 1015 --cctx_idle;
929 1016
930 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1017 if (expect_true (!CCTX_EXPIRED (cctx)))
931 return cctx; 1018 return cctx;
932 1019
933 cctx_destroy (cctx); 1020 cctx_destroy (cctx);
934 } 1021 }
935 1022
… …
938 1025
939static void 1026static void
940cctx_put (coro_cctx *cctx) 1027cctx_put (coro_cctx *cctx)
941{ 1028{
942 /* free another cctx if overlimit */ 1029 /* free another cctx if overlimit */
943 if (cctx_idle >= MAX_IDLE_CCTX) 1030 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
944 { 1031 {
945 coro_cctx *first = cctx_first; 1032 coro_cctx *first = cctx_first;
946 cctx_first = first->next; 1033 cctx_first = first->next;
947 --cctx_idle; 1034 --cctx_idle;
948 1035
… …
954 cctx_first = cctx; 1041 cctx_first = cctx;
955} 1042}
956 1043
957/** coroutine switching *****************************************************/ 1044/** coroutine switching *****************************************************/
958 1045
959static void NOINLINE 1046static void
960transfer_check (pTHX_ struct coro *prev, struct coro *next) 1047transfer_check (pTHX_ struct coro *prev, struct coro *next)
961{ 1048{
962 if (prev != next) 1049 if (expect_true (prev != next))
963 { 1050 {
964 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1051 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
965 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1052 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
966 1053
967 if (next->flags & CF_RUNNING) 1054 if (expect_false (next->flags & CF_RUNNING))
968 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1055 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
969 1056
970 if (next->flags & CF_DESTROYED) 1057 if (expect_false (next->flags & CF_DESTROYED))
971 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1058 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
972 1059
1060 if (
1061#if PERL_VERSION_ATLEAST (5,9,0)
1062 expect_false (PL_parser)
1063#else
973 if (PL_lex_state != LEX_NOTPARSING) 1064 expect_false (PL_lex_state != LEX_NOTPARSING)
1065#endif
1066 )
974 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1067 croak ("Coro::State::transfer called while parsing, but this is not supported");
975 } 1068 }
976} 1069}
977 1070
978/* always use the TRANSFER macro */ 1071/* always use the TRANSFER macro */
… …
980transfer (pTHX_ struct coro *prev, struct coro *next) 1073transfer (pTHX_ struct coro *prev, struct coro *next)
981{ 1074{
982 dSTACKLEVEL; 1075 dSTACKLEVEL;
983 1076
984 /* sometimes transfer is only called to set idle_sp */ 1077 /* sometimes transfer is only called to set idle_sp */
985 if (!next) 1078 if (expect_false (!next))
986 { 1079 {
987 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1080 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
988 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1081 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
989 } 1082 }
990 else if (prev != next) 1083 else if (expect_true (prev != next))
991 { 1084 {
992 coro_cctx *prev__cctx; 1085 coro_cctx *prev__cctx;
993 1086
994 if (prev->flags & CF_NEW) 1087 if (expect_false (prev->flags & CF_NEW))
995 { 1088 {
996 /* create a new empty context */ 1089 /* create a new empty context */
997 Newz (0, prev->cctx, 1, coro_cctx); 1090 Newz (0, prev->cctx, 1, coro_cctx);
998 prev->flags &= ~CF_NEW; 1091 prev->flags &= ~CF_NEW;
999 prev->flags |= CF_RUNNING; 1092 prev->flags |= CF_RUNNING;
… …
1002 prev->flags &= ~CF_RUNNING; 1095 prev->flags &= ~CF_RUNNING;
1003 next->flags |= CF_RUNNING; 1096 next->flags |= CF_RUNNING;
1004 1097
1005 LOCK; 1098 LOCK;
1006 1099
1007 if (next->flags & CF_NEW) 1100 if (expect_false (next->flags & CF_NEW))
1008 { 1101 {
1009 /* need to start coroutine */ 1102 /* need to start coroutine */
1010 next->flags &= ~CF_NEW; 1103 next->flags &= ~CF_NEW;
1011 /* first get rid of the old state */ 1104 /* first get rid of the old state */
1012 save_perl (aTHX_ prev); 1105 save_perl (aTHX_ prev);
1013 /* setup coroutine call */ 1106 /* setup coroutine call */
1014 setup_coro (aTHX_ next); 1107 coro_setup (aTHX_ next);
1015 } 1108 }
1016 else 1109 else
1017 { 1110 {
1018 /* coroutine already started */ 1111 /* coroutine already started */
1019 save_perl (aTHX_ prev); 1112 save_perl (aTHX_ prev);
… …
1021 } 1114 }
1022 1115
1023 prev__cctx = prev->cctx; 1116 prev__cctx = prev->cctx;
1024 1117
1025 /* possibly "free" the cctx */ 1118 /* possibly "free" the cctx */
1026 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1119 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1027 { 1120 {
1028 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1121 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1029 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1122 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1030 1123
1031 prev->cctx = 0; 1124 prev->cctx = 0;
1032 1125
1126 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1127 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1128 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1129 next->cctx = cctx_get (aTHX);
1130
1033 cctx_put (prev__cctx); 1131 cctx_put (prev__cctx);
1034 } 1132 }
1035 1133
1036 ++next->usecount; 1134 ++next->usecount;
1037 1135
1038 if (!next->cctx) 1136 if (expect_true (!next->cctx))
1039 next->cctx = cctx_get (aTHX); 1137 next->cctx = cctx_get (aTHX);
1040 1138
1041 if (prev__cctx != next->cctx) 1139 if (expect_false (prev__cctx != next->cctx))
1042 { 1140 {
1043 prev__cctx->top_env = PL_top_env; 1141 prev__cctx->top_env = PL_top_env;
1044 PL_top_env = next->cctx->top_env; 1142 PL_top_env = next->cctx->top_env;
1045 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1143 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1046 } 1144 }
1047 1145
1048 free_coro_mortal (aTHX); 1146 free_coro_mortal (aTHX);
1049 UNLOCK; 1147 UNLOCK;
1148
1149 if (expect_false (prev->throw || next->throw))
1150 {
1151 struct coro *coro = SvSTATE (coro_current);
1152
1153 if (coro->throw)
1154 {
1155 SV *exception = coro->throw;
1156 coro->throw = 0;
1157 sv_setsv (ERRSV, exception);
1158 croak (0);
1159 }
1160 }
1050 } 1161 }
1051} 1162}
1052 1163
1053struct transfer_args 1164struct transfer_args
1054{ 1165{
… …
1081 1192
1082 if (coro->mainstack && coro->mainstack != main_mainstack) 1193 if (coro->mainstack && coro->mainstack != main_mainstack)
1083 { 1194 {
1084 struct coro temp; 1195 struct coro temp;
1085 1196
1086 assert (!(coro->flags & CF_RUNNING));
1087
1088 Zero (&temp, 1, struct coro);
1089 temp.save = CORO_SAVE_ALL;
1090
1091 if (coro->flags & CF_RUNNING) 1197 if (coro->flags & CF_RUNNING)
1092 croak ("FATAL: tried to destroy currently running coroutine"); 1198 croak ("FATAL: tried to destroy currently running coroutine");
1093 1199
1094 save_perl (aTHX_ &temp); 1200 save_perl (aTHX_ &temp);
1095 load_perl (aTHX_ coro); 1201 load_perl (aTHX_ coro);
1096 1202
1097 coro_destroy_stacks (aTHX); 1203 coro_destroy (aTHX_ coro);
1098 1204
1099 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1205 load_perl (aTHX_ &temp);
1100 1206
1101 coro->mainstack = 0; 1207 coro->slot = 0;
1102 } 1208 }
1103 1209
1104 cctx_destroy (coro->cctx); 1210 cctx_destroy (coro->cctx);
1105 SvREFCNT_dec (coro->args); 1211 SvREFCNT_dec (coro->args);
1106 1212
… …
1165 1271
1166 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1272 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1167 TRANSFER (ta); 1273 TRANSFER (ta);
1168} 1274}
1169 1275
1170static int
1171api_save (SV *coro_sv, int new_save)
1172{
1173 dTHX;
1174 struct coro *coro = SvSTATE (coro_sv);
1175 int old_save = coro->save;
1176
1177 if (new_save >= 0)
1178 coro->save = new_save;
1179
1180 return old_save;
1181}
1182
1183/** Coro ********************************************************************/ 1276/** Coro ********************************************************************/
1184 1277
1185static void 1278static void
1186coro_enq (pTHX_ SV *coro_sv) 1279coro_enq (pTHX_ SV *coro_sv)
1187{ 1280{
… …
1244 { 1337 {
1245 LOCK; 1338 LOCK;
1246 next_sv = coro_deq (aTHX_ PRIO_MIN); 1339 next_sv = coro_deq (aTHX_ PRIO_MIN);
1247 1340
1248 /* nothing to schedule: call the idle handler */ 1341 /* nothing to schedule: call the idle handler */
1249 if (!next_sv) 1342 if (expect_false (!next_sv))
1250 { 1343 {
1251 dSP; 1344 dSP;
1252 UNLOCK; 1345 UNLOCK;
1253 1346
1254 ENTER; 1347 ENTER;
… …
1264 } 1357 }
1265 1358
1266 ta->next = SvSTATE (next_sv); 1359 ta->next = SvSTATE (next_sv);
1267 1360
1268 /* cannot transfer to destroyed coros, skip and look for next */ 1361 /* cannot transfer to destroyed coros, skip and look for next */
1269 if (ta->next->flags & CF_DESTROYED) 1362 if (expect_false (ta->next->flags & CF_DESTROYED))
1270 { 1363 {
1271 UNLOCK; 1364 UNLOCK;
1272 SvREFCNT_dec (next_sv); 1365 SvREFCNT_dec (next_sv);
1273 /* coro_nready is already taken care of by destroy */ 1366 /* coro_nready is already taken care of by destroy */
1274 continue; 1367 continue;
… …
1330 dTHX; 1423 dTHX;
1331 struct transfer_args ta; 1424 struct transfer_args ta;
1332 1425
1333 prepare_cede (aTHX_ &ta); 1426 prepare_cede (aTHX_ &ta);
1334 1427
1335 if (ta.prev != ta.next) 1428 if (expect_true (ta.prev != ta.next))
1336 { 1429 {
1337 TRANSFER (ta); 1430 TRANSFER (ta);
1338 return 1; 1431 return 1;
1339 } 1432 }
1340 else 1433 else
… …
1376 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1469 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1377 1470
1378 if (coro->flags & CF_RUNNING) 1471 if (coro->flags & CF_RUNNING)
1379 PL_runops = RUNOPS_DEFAULT; 1472 PL_runops = RUNOPS_DEFAULT;
1380 else 1473 else
1381 coro->runops = RUNOPS_DEFAULT; 1474 coro->slot->runops = RUNOPS_DEFAULT;
1382 } 1475 }
1383} 1476}
1384 1477
1385MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1478MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1386 1479
… …
1390{ 1483{
1391#ifdef USE_ITHREADS 1484#ifdef USE_ITHREADS
1392 MUTEX_INIT (&coro_mutex); 1485 MUTEX_INIT (&coro_mutex);
1393#endif 1486#endif
1394 BOOT_PAGESIZE; 1487 BOOT_PAGESIZE;
1488
1489 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1490 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1491
1492 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE);
1493 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE);
1494
1495 if (!PL_diehook) PL_diehook = SvREFCNT_inc (sv_diehook);
1496 if (!PL_warnhook) PL_warnhook = SvREFCNT_inc (sv_warnhook);
1395 1497
1396 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1498 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1397 1499
1398 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1500 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1399 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1501 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1400 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1502 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1401 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1503 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1402 1504
1403 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1404 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1405 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1406 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1407 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1408 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1409 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1410
1411 main_mainstack = PL_mainstack; 1505 main_mainstack = PL_mainstack;
1412 main_top_env = PL_top_env; 1506 main_top_env = PL_top_env;
1413 1507
1414 while (main_top_env->je_prev) 1508 while (main_top_env->je_prev)
1415 main_top_env = main_top_env->je_prev; 1509 main_top_env = main_top_env->je_prev;
… …
1427 struct coro *coro; 1521 struct coro *coro;
1428 HV *hv; 1522 HV *hv;
1429 int i; 1523 int i;
1430 1524
1431 Newz (0, coro, 1, struct coro); 1525 Newz (0, coro, 1, struct coro);
1432 coro->args = newAV (); 1526 coro->args = newAV ();
1433 coro->save = CORO_SAVE_DEF;
1434 coro->flags = CF_NEW; 1527 coro->flags = CF_NEW;
1435 1528
1436 if (coro_first) coro_first->prev = coro; 1529 if (coro_first) coro_first->prev = coro;
1437 coro->next = coro_first; 1530 coro->next = coro_first;
1438 coro_first = coro; 1531 coro_first = coro;
1439 1532
1440 coro->hv = hv = newHV (); 1533 coro->hv = hv = newHV ();
1441 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1534 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1442 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1535 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1443 1536
1537 av_extend (coro->args, items - 1);
1444 for (i = 1; i < items; i++) 1538 for (i = 1; i < items; i++)
1445 av_push (coro->args, newSVsv (ST (i))); 1539 av_push (coro->args, newSVsv (ST (i)));
1446} 1540}
1447 OUTPUT: 1541 OUTPUT:
1448 RETVAL
1449
1450int
1451save (SV *coro, int new_save = -1)
1452 CODE:
1453 RETVAL = api_save (coro, new_save);
1454 OUTPUT:
1455 RETVAL
1456
1457int
1458save_also (SV *coro_sv, int save_also)
1459 CODE:
1460{
1461 struct coro *coro = SvSTATE (coro_sv);
1462 RETVAL = coro->save;
1463 coro->save |= save_also;
1464}
1465 OUTPUT:
1466 RETVAL 1542 RETVAL
1467 1543
1468# these not obviously related functions are all rolled into the same xs 1544# these not obviously related functions are all rolled into the same xs
1469# function to increase chances that they all will call transfer with the same 1545# function to increase chances that they all will call transfer with the same
1470# stack offset 1546# stack offset
… …
1509 } 1585 }
1510 1586
1511 BARRIER; 1587 BARRIER;
1512 TRANSFER (ta); 1588 TRANSFER (ta);
1513 1589
1514 if (GIMME_V != G_VOID && ta.next != ta.prev) 1590 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev))
1515 XSRETURN_YES; 1591 XSRETURN_YES;
1516} 1592}
1517 1593
1518bool 1594bool
1519_destroy (SV *coro_sv) 1595_destroy (SV *coro_sv)
… …
1569 CODE: 1645 CODE:
1570{ 1646{
1571 if (coro->mainstack) 1647 if (coro->mainstack)
1572 { 1648 {
1573 struct coro temp; 1649 struct coro temp;
1574 Zero (&temp, 1, struct coro);
1575 temp.save = CORO_SAVE_ALL;
1576 1650
1577 if (!(coro->flags & CF_RUNNING)) 1651 if (!(coro->flags & CF_RUNNING))
1578 { 1652 {
1579 save_perl (aTHX_ &temp); 1653 save_perl (aTHX_ &temp);
1580 load_perl (aTHX_ coro); 1654 load_perl (aTHX_ coro);
… …
1584 dSP; 1658 dSP;
1585 ENTER; 1659 ENTER;
1586 SAVETMPS; 1660 SAVETMPS;
1587 PUSHMARK (SP); 1661 PUSHMARK (SP);
1588 PUTBACK; 1662 PUTBACK;
1663
1589 if (ix) 1664 if (ix)
1590 eval_sv (coderef, 0); 1665 eval_sv (coderef, 0);
1591 else 1666 else
1592 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1667 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1668
1593 SPAGAIN; 1669 SPAGAIN;
1594 FREETMPS; 1670 FREETMPS;
1595 LEAVE; 1671 LEAVE;
1596 PUTBACK; 1672 PUTBACK;
1597 } 1673 }
… …
1655 1731
1656BOOT: 1732BOOT:
1657{ 1733{
1658 int i; 1734 int i;
1659 1735
1660 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1736 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1661 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1737 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1662 av_async_pool = get_av ("Coro::async_pool", TRUE); 1738 av_async_pool = coro_get_av ("Coro::async_pool", TRUE);
1663 1739
1664 coro_current = get_sv ("Coro::current", FALSE); 1740 coro_current = coro_get_sv ("Coro::current", FALSE);
1665 SvREADONLY_on (coro_current); 1741 SvREADONLY_on (coro_current);
1666 1742
1667 coro_stash = gv_stashpv ("Coro", TRUE); 1743 coro_stash = gv_stashpv ("Coro", TRUE);
1668 1744
1669 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1745 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1670 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1746 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1671 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1747 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1672 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1748 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
… …
1675 1751
1676 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1752 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1677 coro_ready[i] = newAV (); 1753 coro_ready[i] = newAV ();
1678 1754
1679 { 1755 {
1680 SV *sv = perl_get_sv("Coro::API", 1); 1756 SV *sv = perl_get_sv ("Coro::API", TRUE);
1757 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1681 1758
1682 coroapi.schedule = api_schedule; 1759 coroapi.schedule = api_schedule;
1683 coroapi.save = api_save;
1684 coroapi.cede = api_cede; 1760 coroapi.cede = api_cede;
1685 coroapi.cede_notself = api_cede_notself; 1761 coroapi.cede_notself = api_cede_notself;
1686 coroapi.ready = api_ready; 1762 coroapi.ready = api_ready;
1687 coroapi.is_ready = api_is_ready; 1763 coroapi.is_ready = api_is_ready;
1688 coroapi.nready = &coro_nready; 1764 coroapi.nready = &coro_nready;
… …
1737 CODE: 1813 CODE:
1738 RETVAL = coro_nready; 1814 RETVAL = coro_nready;
1739 OUTPUT: 1815 OUTPUT:
1740 RETVAL 1816 RETVAL
1741 1817
1818void
1819throw (Coro::State self, SV *throw = &PL_sv_undef)
1820 PROTOTYPE: $;$
1821 CODE:
1822 SvREFCNT_dec (self->throw);
1823 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1824
1742# for async_pool speedup 1825# for async_pool speedup
1743void 1826void
1744_pool_1 (SV *cb) 1827_pool_1 (SV *cb)
1745 CODE: 1828 CODE:
1746{ 1829{
1747 int i, len; 1830 struct coro *coro = SvSTATE (coro_current);
1748 HV *hv = (HV *)SvRV (coro_current); 1831 HV *hv = (HV *)SvRV (coro_current);
1749 AV *defav = GvAV (PL_defgv); 1832 AV *defav = GvAV (PL_defgv);
1750 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1833 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1751 AV *invoke_av; 1834 AV *invoke_av;
1835 int i, len;
1752 1836
1753 if (!invoke) 1837 if (!invoke)
1754 croak ("\3terminate\2\n"); 1838 croak ("\3async_pool terminate\2\n");
1839
1840 SvREFCNT_dec (coro->saved_deffh);
1841 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1755 1842
1756 hv_store (hv, "desc", sizeof ("desc") - 1, 1843 hv_store (hv, "desc", sizeof ("desc") - 1,
1757 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1844 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1758 1845
1759 invoke_av = (AV *)SvRV (invoke); 1846 invoke_av = (AV *)SvRV (invoke);
… …
1777{ 1864{
1778 struct coro *coro = SvSTATE (coro_current); 1865 struct coro *coro = SvSTATE (coro_current);
1779 1866
1780 sv_setsv (cb, &PL_sv_undef); 1867 sv_setsv (cb, &PL_sv_undef);
1781 1868
1869 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1870 coro->saved_deffh = 0;
1871
1782 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1872 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1783 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1873 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1784 croak ("\3terminate\2\n"); 1874 croak ("\3async_pool terminate\2\n");
1785 1875
1786 av_clear (GvAV (PL_defgv)); 1876 av_clear (GvAV (PL_defgv));
1787 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1877 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1788 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1878 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1789 1879
1790 coro->save = CORO_SAVE_DEF;
1791 coro->prio = 0; 1880 coro->prio = 0;
1792 1881
1793 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1882 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1794 api_trace (coro_current, 0); 1883 api_trace (coro_current, 0);
1795 1884

Diff Legend

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