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.192 by root, Fri Oct 5 21:51:40 2007 UTC vs.
Revision 1.213 by root, Thu Oct 11 00:40:48 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
9#include "patchlevel.h" 10#include "patchlevel.h"
10 11
11#include <stdio.h> 12#include <stdio.h>
12#include <errno.h> 13#include <errno.h>
13#include <assert.h> 14#include <assert.h>
15#include <inttypes.h> /* portable stdint.h */
14 16
15#ifdef HAVE_MMAP 17#ifdef HAVE_MMAP
16# include <unistd.h> 18# include <unistd.h>
17# include <sys/mman.h> 19# include <sys/mman.h>
18# ifndef MAP_ANONYMOUS 20# ifndef MAP_ANONYMOUS
106#define IN_DESTRUCT (PL_main_cv == Nullcv) 108#define IN_DESTRUCT (PL_main_cv == Nullcv)
107 109
108#if __GNUC__ >= 3 110#if __GNUC__ >= 3
109# define attribute(x) __attribute__(x) 111# define attribute(x) __attribute__(x)
110# define BARRIER __asm__ __volatile__ ("" : : : "memory") 112# define BARRIER __asm__ __volatile__ ("" : : : "memory")
113# define expect(expr,value) __builtin_expect ((expr),(value))
111#else 114#else
112# define attribute(x) 115# define attribute(x)
113# define BARRIER 116# define BARRIER
117# define expect(expr,value) (expr)
114#endif 118#endif
119
120#define expect_false(expr) expect ((expr) != 0, 0)
121#define expect_true(expr) expect ((expr) != 0, 1)
115 122
116#define NOINLINE attribute ((noinline)) 123#define NOINLINE attribute ((noinline))
117 124
118#include "CoroAPI.h" 125#include "CoroAPI.h"
119 126
142static HV *coro_state_stash, *coro_stash; 149static HV *coro_state_stash, *coro_stash;
143static SV *coro_mortal; /* will be freed after next transfer */ 150static SV *coro_mortal; /* will be freed after next transfer */
144 151
145static GV *irsgv; /* $/ */ 152static GV *irsgv; /* $/ */
146static GV *stdoutgv; /* *STDOUT */ 153static GV *stdoutgv; /* *STDOUT */
154
155static HV *hv_sig; /* %SIG */
156static SV *sv_diehook;
157static SV *sv_warnhook;
147 158
148/* async_pool helper stuff */ 159/* async_pool helper stuff */
149static SV *sv_pool_rss; 160static SV *sv_pool_rss;
150static SV *sv_pool_size; 161static SV *sv_pool_size;
151static AV *av_async_pool; 162static AV *av_async_pool;
187 CF_READY = 0x0002, /* coroutine is ready */ 198 CF_READY = 0x0002, /* coroutine is ready */
188 CF_NEW = 0x0004, /* has never been switched to */ 199 CF_NEW = 0x0004, /* has never been switched to */
189 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 200 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
190}; 201};
191 202
203/* the structure where most of the perl state is stored, overlaid on the cxstack */
204typedef struct {
205 SV *defsv;
206 AV *defav;
207 SV *errsv;
208 SV *irsgv;
209#define VAR(name,type) type name;
210# include "state.h"
211#undef VAR
212} perl_slots;
213
214#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
215
192/* this is a structure representing a perl-level coroutine */ 216/* this is a structure representing a perl-level coroutine */
193struct coro { 217struct coro {
194 /* the c coroutine allocated to this perl coroutine, if any */ 218 /* the c coroutine allocated to this perl coroutine, if any */
195 coro_cctx *cctx; 219 coro_cctx *cctx;
196 220
221 /* process data */
222 AV *mainstack;
223 perl_slots *slot; /* basically the saved sp */
224
197 /* data associated with this coroutine (initial args) */ 225 AV *args; /* data associated with this coroutine (initial args) */
198 AV *args; 226 int refcnt; /* coroutines are refcounted, yes */
199 int refcnt;
200 int flags; /* CF_ flags */ 227 int flags; /* CF_ flags */
201 228 HV *hv; /* the perl hash associated with this coro, if any */
202 /* optionally saved, might be zero */
203 AV *defav; /* @_ */
204 SV *defsv; /* $_ */
205 SV *errsv; /* $@ */
206 SV *deffh; /* default filehandle */
207 SV *irssv; /* $/ */
208 SV *irssv_sv; /* real $/ cache */
209
210#define VAR(name,type) type name;
211# include "state.h"
212#undef VAR
213 229
214 /* statistics */ 230 /* statistics */
215 int usecount; /* number of transfers to this coro */ 231 int usecount; /* number of transfers to this coro */
216 232
217 /* coro process data */ 233 /* coro process data */
218 int prio; 234 int prio;
219 //SV *throw; 235 SV *throw; /* exception to be thrown */
220 236
221 /* async_pool */ 237 /* async_pool */
222 SV *saved_deffh; 238 SV *saved_deffh;
223 239
224 /* linked list */ 240 /* linked list */
225 struct coro *next, *prev; 241 struct coro *next, *prev;
226 HV *hv; /* the perl hash associated with this coro, if any */
227}; 242};
228 243
229typedef struct coro *Coro__State; 244typedef struct coro *Coro__State;
230typedef struct coro *Coro__State_or_hashref; 245typedef struct coro *Coro__State_or_hashref;
231 246
243static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 258static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
244static int coro_nready; 259static int coro_nready;
245static struct coro *coro_first; 260static struct coro *coro_first;
246 261
247/** lowlevel stuff **********************************************************/ 262/** lowlevel stuff **********************************************************/
263
264static SV *
265coro_get_sv (pTHX_ const char *name, int create)
266{
267#if PERL_VERSION_ATLEAST (5,9,0)
268 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
269 get_sv (name, create);
270#endif
271 return get_sv (name, create);
272}
273
274static AV *
275coro_get_av (pTHX_ const char *name, int create)
276{
277#if PERL_VERSION_ATLEAST (5,9,0)
278 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
279 get_av (name, create);
280#endif
281 return get_av (name, create);
282}
283
284static HV *
285coro_get_hv (pTHX_ const char *name, int create)
286{
287#if PERL_VERSION_ATLEAST (5,9,0)
288 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
289 get_hv (name, create);
290#endif
291 return get_hv (name, create);
292}
248 293
249static AV * 294static AV *
250coro_clone_padlist (pTHX_ CV *cv) 295coro_clone_padlist (pTHX_ CV *cv)
251{ 296{
252 AV *padlist = CvPADLIST (cv); 297 AV *padlist = CvPADLIST (cv);
325 MAGIC *mg; 370 MAGIC *mg;
326 371
327 if (SvROK (coro)) 372 if (SvROK (coro))
328 coro = SvRV (coro); 373 coro = SvRV (coro);
329 374
330 if (SvTYPE (coro) != SVt_PVHV) 375 if (expect_false (SvTYPE (coro) != SVt_PVHV))
331 croak ("Coro::State object required"); 376 croak ("Coro::State object required");
332 377
333 stash = SvSTASH (coro); 378 stash = SvSTASH (coro);
334 if (stash != coro_stash && stash != coro_state_stash) 379 if (expect_false (stash != coro_stash && stash != coro_state_stash))
335 { 380 {
336 /* very slow, but rare, check */ 381 /* very slow, but rare, check */
337 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 382 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
338 croak ("Coro::State object required"); 383 croak ("Coro::State object required");
339 } 384 }
349get_padlist (pTHX_ CV *cv) 394get_padlist (pTHX_ CV *cv)
350{ 395{
351 MAGIC *mg = CORO_MAGIC (cv); 396 MAGIC *mg = CORO_MAGIC (cv);
352 AV *av; 397 AV *av;
353 398
354 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 399 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
355 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 400 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
356 else 401 else
357 { 402 {
358#if CORO_PREFER_PERL_FUNCTIONS 403#if CORO_PREFER_PERL_FUNCTIONS
359 /* this is probably cleaner, but also slower? */ 404 /* this is probably cleaner, but also slower? */
371put_padlist (pTHX_ CV *cv) 416put_padlist (pTHX_ CV *cv)
372{ 417{
373 MAGIC *mg = CORO_MAGIC (cv); 418 MAGIC *mg = CORO_MAGIC (cv);
374 AV *av; 419 AV *av;
375 420
376 if (!mg) 421 if (expect_false (!mg))
377 { 422 {
378 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 423 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
379 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 424 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
380 mg->mg_virtual = &vtbl_coro; 425 mg->mg_virtual = &vtbl_coro;
381 mg->mg_obj = (SV *)newAV (); 426 mg->mg_obj = (SV *)newAV ();
382 } 427 }
383 428
384 av = (AV *)mg->mg_obj; 429 av = (AV *)mg->mg_obj;
385 430
386 if (AvFILLp (av) >= AvMAX (av)) 431 if (expect_false (AvFILLp (av) >= AvMAX (av)))
387 av_extend (av, AvMAX (av) + 1); 432 av_extend (av, AvMAX (av) + 1);
388 433
389 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 434 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
390} 435}
391 436
392/** load & save, init *******************************************************/ 437/** load & save, init *******************************************************/
393 438
394static void 439static void
395load_perl (pTHX_ Coro__State c) 440load_perl (pTHX_ Coro__State c)
396{ 441{
442 perl_slots *slot = c->slot;
443 c->slot = 0;
444
445 PL_mainstack = c->mainstack;
446
447 GvSV (PL_defgv) = slot->defsv;
448 GvAV (PL_defgv) = slot->defav;
449 GvSV (PL_errgv) = slot->errsv;
450 GvSV (irsgv) = slot->irsgv;
451
397#define VAR(name,type) PL_ ## name = c->name; 452 #define VAR(name,type) PL_ ## name = slot->name;
398# include "state.h" 453 # include "state.h"
399#undef VAR 454 #undef VAR
400 455
401 GvSV (PL_defgv) = c->defsv; 456 /*hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0);*/
402 GvAV (PL_defgv) = c->defav; 457 /*hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0);*/
403 GvSV (PL_errgv) = c->errsv;
404 GvSV (irsgv) = c->irssv_sv;
405 458
406 { 459 {
407 dSP; 460 dSP;
461
408 CV *cv; 462 CV *cv;
409 463
410 /* now do the ugly restore mess */ 464 /* now do the ugly restore mess */
411 while ((cv = (CV *)POPs)) 465 while (expect_true (cv = (CV *)POPs))
412 { 466 {
413 put_padlist (aTHX_ cv); /* mark this padlist as available */ 467 put_padlist (aTHX_ cv); /* mark this padlist as available */
414 CvDEPTH (cv) = PTR2IV (POPs); 468 CvDEPTH (cv) = PTR2IV (POPs);
415 CvPADLIST (cv) = (AV *)POPs; 469 CvPADLIST (cv) = (AV *)POPs;
416 } 470 }
435 489
436 XPUSHs (Nullsv); 490 XPUSHs (Nullsv);
437 /* this loop was inspired by pp_caller */ 491 /* this loop was inspired by pp_caller */
438 for (;;) 492 for (;;)
439 { 493 {
440 while (cxix >= 0) 494 while (expect_true (cxix >= 0))
441 { 495 {
442 PERL_CONTEXT *cx = &ccstk[cxix--]; 496 PERL_CONTEXT *cx = &ccstk[cxix--];
443 497
444 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 498 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
445 { 499 {
446 CV *cv = cx->blk_sub.cv; 500 CV *cv = cx->blk_sub.cv;
447 501
448 if (CvDEPTH (cv)) 502 if (expect_true (CvDEPTH (cv)))
449 { 503 {
450 EXTEND (SP, 3); 504 EXTEND (SP, 3);
451 PUSHs ((SV *)CvPADLIST (cv)); 505 PUSHs ((SV *)CvPADLIST (cv));
452 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 506 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
453 PUSHs ((SV *)cv); 507 PUSHs ((SV *)cv);
456 get_padlist (aTHX_ cv); 510 get_padlist (aTHX_ cv);
457 } 511 }
458 } 512 }
459 } 513 }
460 514
461 if (top_si->si_type == PERLSI_MAIN) 515 if (expect_true (top_si->si_type == PERLSI_MAIN))
462 break; 516 break;
463 517
464 top_si = top_si->si_prev; 518 top_si = top_si->si_prev;
465 ccstk = top_si->si_cxstack; 519 ccstk = top_si->si_cxstack;
466 cxix = top_si->si_cxix; 520 cxix = top_si->si_cxix;
467 } 521 }
468 522
469 PUTBACK; 523 PUTBACK;
470 } 524 }
471 525
526 /* allocate some space on the context stack for our purposes */
527 /* we manually unroll here, as usually 2 slots is enough */
528 if (SLOT_COUNT >= 1) CXINC;
529 if (SLOT_COUNT >= 2) CXINC;
530 if (SLOT_COUNT >= 3) CXINC;
531 {
532 int i;
533 for (i = 3; i < SLOT_COUNT; ++i)
534 CXINC;
535 }
536 cxstack_ix -= SLOT_COUNT; /* undo allocation */
537
538 c->mainstack = PL_mainstack;
539
540 {
541 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
542
472 c->defav = GvAV (PL_defgv); 543 slot->defav = GvAV (PL_defgv);
473 c->defsv = DEFSV; 544 slot->defsv = DEFSV;
474 c->errsv = ERRSV; 545 slot->errsv = ERRSV;
475 c->irssv_sv = GvSV (irsgv); 546 slot->irsgv = GvSV (irsgv);
476 547
477#define VAR(name,type)c->name = PL_ ## name; 548 #define VAR(name,type) slot->name = PL_ ## name;
478# include "state.h" 549 # include "state.h"
479#undef VAR 550 #undef VAR
551 }
480} 552}
481 553
482/* 554/*
483 * allocate various perl stacks. This is an exact copy 555 * allocate various perl stacks. This is an exact copy
484 * of perl.c:init_stacks, except that it uses less memory 556 * of perl.c:init_stacks, except that it uses less memory
489# define coro_init_stacks init_stacks 561# define coro_init_stacks init_stacks
490#else 562#else
491static void 563static void
492coro_init_stacks (pTHX) 564coro_init_stacks (pTHX)
493{ 565{
494 PL_curstackinfo = new_stackinfo(64, 6); 566 PL_curstackinfo = new_stackinfo(32, 8);
495 PL_curstackinfo->si_type = PERLSI_MAIN; 567 PL_curstackinfo->si_type = PERLSI_MAIN;
496 PL_curstack = PL_curstackinfo->si_stack; 568 PL_curstack = PL_curstackinfo->si_stack;
497 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 569 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
498 570
499 PL_stack_base = AvARRAY(PL_curstack); 571 PL_stack_base = AvARRAY(PL_curstack);
500 PL_stack_sp = PL_stack_base; 572 PL_stack_sp = PL_stack_base;
501 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 573 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
502 574
503 New(50,PL_tmps_stack,64,SV*); 575 New(50,PL_tmps_stack,32,SV*);
504 PL_tmps_floor = -1; 576 PL_tmps_floor = -1;
505 PL_tmps_ix = -1; 577 PL_tmps_ix = -1;
506 PL_tmps_max = 64; 578 PL_tmps_max = 32;
507 579
508 New(54,PL_markstack,16,I32); 580 New(54,PL_markstack,16,I32);
509 PL_markstack_ptr = PL_markstack; 581 PL_markstack_ptr = PL_markstack;
510 PL_markstack_max = PL_markstack + 16; 582 PL_markstack_max = PL_markstack + 16;
511 583
512#ifdef SET_MARK_OFFSET 584#ifdef SET_MARK_OFFSET
513 SET_MARK_OFFSET; 585 SET_MARK_OFFSET;
514#endif 586#endif
515 587
516 New(54,PL_scopestack,16,I32); 588 New(54,PL_scopestack,8,I32);
517 PL_scopestack_ix = 0; 589 PL_scopestack_ix = 0;
518 PL_scopestack_max = 16; 590 PL_scopestack_max = 8;
519 591
520 New(54,PL_savestack,64,ANY); 592 New(54,PL_savestack,24,ANY);
521 PL_savestack_ix = 0; 593 PL_savestack_ix = 0;
522 PL_savestack_max = 64; 594 PL_savestack_max = 24;
523 595
524#if !PERL_VERSION_ATLEAST (5,9,0) 596#if !PERL_VERSION_ATLEAST (5,9,0)
525 New(54,PL_retstack,4,OP*); 597 New(54,PL_retstack,4,OP*);
526 PL_retstack_ix = 0; 598 PL_retstack_ix = 0;
527 PL_retstack_max = 4; 599 PL_retstack_max = 4;
564{ 636{
565 size_t rss = sizeof (*coro); 637 size_t rss = sizeof (*coro);
566 638
567 if (coro->mainstack) 639 if (coro->mainstack)
568 { 640 {
641 perl_slots tmp_slot;
642 perl_slots *slot;
643
569 if (coro->flags & CF_RUNNING) 644 if (coro->flags & CF_RUNNING)
570 { 645 {
646 slot = &tmp_slot;
647
571 #define VAR(name,type)coro->name = PL_ ## name; 648 #define VAR(name,type) slot->name = PL_ ## name;
572 # include "state.h" 649 # include "state.h"
573 #undef VAR 650 #undef VAR
574 } 651 }
652 else
653 slot = coro->slot;
575 654
576 rss += sizeof (coro->curstackinfo); 655 rss += sizeof (slot->curstackinfo);
577 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
578 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 656 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
579 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 657 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
580 rss += coro->tmps_max * sizeof (SV *); 658 rss += slot->tmps_max * sizeof (SV *);
581 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 659 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
582 rss += coro->scopestack_max * sizeof (I32); 660 rss += slot->scopestack_max * sizeof (I32);
583 rss += coro->savestack_max * sizeof (ANY); 661 rss += slot->savestack_max * sizeof (ANY);
584 662
585#if !PERL_VERSION_ATLEAST (5,9,0) 663#if !PERL_VERSION_ATLEAST (5,9,0)
586 rss += coro->retstack_max * sizeof (OP *); 664 rss += slot->retstack_max * sizeof (OP *);
587#endif 665#endif
588 } 666 }
589 667
590 return rss; 668 return rss;
591} 669}
603 PL_runops = RUNOPS_DEFAULT; 681 PL_runops = RUNOPS_DEFAULT;
604 PL_curcop = &PL_compiling; 682 PL_curcop = &PL_compiling;
605 PL_in_eval = EVAL_NULL; 683 PL_in_eval = EVAL_NULL;
606 PL_comppad = 0; 684 PL_comppad = 0;
607 PL_curpm = 0; 685 PL_curpm = 0;
686 PL_curpad = 0;
608 PL_localizing = 0; 687 PL_localizing = 0;
609 PL_dirty = 0; 688 PL_dirty = 0;
610 PL_restartop = 0; 689 PL_restartop = 0;
690 PL_diehook = 0; hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0);
691 PL_warnhook = 0; hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0);
611 692
612 GvSV (PL_defgv) = newSV (0); 693 GvSV (PL_defgv) = newSV (0);
613 GvAV (PL_defgv) = coro->args; coro->args = 0; 694 GvAV (PL_defgv) = coro->args; coro->args = 0;
614 GvSV (PL_errgv) = newSV (0); 695 GvSV (PL_errgv) = newSV (0);
615 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 696 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
616 PL_rs = newSVsv (GvSV (irsgv)); 697 PL_rs = newSVsv (GvSV (irsgv));
617 PL_defoutgv = SvREFCNT_inc (stdoutgv); 698 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
618
619 ENTER; /* necessary e.g. for dounwind */
620 699
621 { 700 {
622 dSP; 701 dSP;
623 LOGOP myop; 702 LOGOP myop;
624 703
631 PUTBACK; 710 PUTBACK;
632 PL_op = (OP *)&myop; 711 PL_op = (OP *)&myop;
633 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 712 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
634 SPAGAIN; 713 SPAGAIN;
635 } 714 }
715
716 /* this newly created coroutine might be run on an existing cctx which most
717 * likely was suspended in set_stacklevel, called from entersub.
718 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
719 * so we ENTER here for symmetry
720 */
721 ENTER;
636} 722}
637 723
638static void 724static void
639coro_destroy (pTHX_ struct coro *coro) 725coro_destroy (pTHX_ struct coro *coro)
640{ 726{
660 SvREFCNT_dec (GvSV (PL_errgv)); 746 SvREFCNT_dec (GvSV (PL_errgv));
661 SvREFCNT_dec (PL_defoutgv); 747 SvREFCNT_dec (PL_defoutgv);
662 SvREFCNT_dec (PL_rs); 748 SvREFCNT_dec (PL_rs);
663 SvREFCNT_dec (GvSV (irsgv)); 749 SvREFCNT_dec (GvSV (irsgv));
664 750
751 SvREFCNT_dec (PL_diehook);
752 SvREFCNT_dec (PL_warnhook);
753
665 SvREFCNT_dec (coro->saved_deffh); 754 SvREFCNT_dec (coro->saved_deffh);
666 //SvREFCNT_dec (coro->throw); 755 SvREFCNT_dec (coro->throw);
667 756
668 coro_destroy_stacks (aTHX); 757 coro_destroy_stacks (aTHX);
669} 758}
670 759
671static void 760static void
672free_coro_mortal (pTHX) 761free_coro_mortal (pTHX)
673{ 762{
674 if (coro_mortal) 763 if (expect_true (coro_mortal))
675 { 764 {
676 SvREFCNT_dec (coro_mortal); 765 SvREFCNT_dec (coro_mortal);
677 coro_mortal = 0; 766 coro_mortal = 0;
678 } 767 }
679} 768}
708 bot = PL_stack_base + cx->blk_oldsp + 1; 797 bot = PL_stack_base + cx->blk_oldsp + 1;
709 top = cx->blk_gimme == G_ARRAY ? SP + 1 798 top = cx->blk_gimme == G_ARRAY ? SP + 1
710 : cx->blk_gimme == G_SCALAR ? bot + 1 799 : cx->blk_gimme == G_SCALAR ? bot + 1
711 : bot; 800 : bot;
712 801
802 av_extend (av, top - bot);
713 while (bot < top) 803 while (bot < top)
714 av_push (av, SvREFCNT_inc (*bot++)); 804 av_push (av, SvREFCNT_inc (*bot++));
715 805
716 PL_runops = RUNOPS_DEFAULT; 806 PL_runops = RUNOPS_DEFAULT;
717 ENTER; 807 ENTER;
803 893
804/* inject a fake call to Coro::State::_cctx_init into the execution */ 894/* inject a fake call to Coro::State::_cctx_init into the execution */
805/* _cctx_init should be careful, as it could be called at almost any time */ 895/* _cctx_init should be careful, as it could be called at almost any time */
806/* during execution of a perl program */ 896/* during execution of a perl program */
807static void NOINLINE 897static void NOINLINE
808prepare_cctx (pTHX_ coro_cctx *cctx) 898cctx_prepare (pTHX_ coro_cctx *cctx)
809{ 899{
810 dSP; 900 dSP;
811 LOGOP myop; 901 LOGOP myop;
812 902
813 PL_top_env = &PL_start_env; 903 PL_top_env = &PL_start_env;
831 921
832/* 922/*
833 * this is a _very_ stripped down perl interpreter ;) 923 * this is a _very_ stripped down perl interpreter ;)
834 */ 924 */
835static void 925static void
836coro_run (void *arg) 926cctx_run (void *arg)
837{ 927{
838 dTHX; 928 dTHX;
839 929
840 /* coro_run is the alternative tail of transfer(), so unlock here. */ 930 /* cctx_run is the alternative tail of transfer(), so unlock here. */
841 UNLOCK; 931 UNLOCK;
842 932
843 /* we now skip the entersub that lead to transfer() */ 933 /* we now skip the entersub that lead to transfer() */
844 PL_op = PL_op->op_next; 934 PL_op = PL_op->op_next;
845 935
846 /* inject a fake subroutine call to cctx_init */ 936 /* inject a fake subroutine call to cctx_init */
847 prepare_cctx (aTHX_ (coro_cctx *)arg); 937 cctx_prepare (aTHX_ (coro_cctx *)arg);
848 938
849 /* somebody or something will hit me for both perl_run and PL_restartop */ 939 /* somebody or something will hit me for both perl_run and PL_restartop */
850 PL_restartop = PL_op; 940 PL_restartop = PL_op;
851 perl_run (PL_curinterp); 941 perl_run (PL_curinterp);
852 942
871 ++cctx_count; 961 ++cctx_count;
872 962
873 Newz (0, cctx, 1, coro_cctx); 963 Newz (0, cctx, 1, coro_cctx);
874 964
875#if HAVE_MMAP 965#if HAVE_MMAP
876
877 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 966 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
878 /* mmap supposedly does allocate-on-write for us */ 967 /* mmap supposedly does allocate-on-write for us */
879 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 968 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
880 969
881 if (cctx->sptr != (void *)-1) 970 if (cctx->sptr != (void *)-1)
902 stack_start = cctx->sptr; 991 stack_start = cctx->sptr;
903 stack_size = cctx->ssize; 992 stack_size = cctx->ssize;
904 } 993 }
905 994
906 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 995 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
907 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 996 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
908 997
909 return cctx; 998 return cctx;
910} 999}
911 1000
912static void 1001static void
929 Safefree (cctx->sptr); 1018 Safefree (cctx->sptr);
930 1019
931 Safefree (cctx); 1020 Safefree (cctx);
932} 1021}
933 1022
1023/* wether this cctx should be destructed */
1024#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1025
934static coro_cctx * 1026static coro_cctx *
935cctx_get (pTHX) 1027cctx_get (pTHX)
936{ 1028{
937 while (cctx_first) 1029 while (expect_true (cctx_first))
938 { 1030 {
939 coro_cctx *cctx = cctx_first; 1031 coro_cctx *cctx = cctx_first;
940 cctx_first = cctx->next; 1032 cctx_first = cctx->next;
941 --cctx_idle; 1033 --cctx_idle;
942 1034
943 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1035 if (expect_true (!CCTX_EXPIRED (cctx)))
944 return cctx; 1036 return cctx;
945 1037
946 cctx_destroy (cctx); 1038 cctx_destroy (cctx);
947 } 1039 }
948 1040
951 1043
952static void 1044static void
953cctx_put (coro_cctx *cctx) 1045cctx_put (coro_cctx *cctx)
954{ 1046{
955 /* free another cctx if overlimit */ 1047 /* free another cctx if overlimit */
956 if (cctx_idle >= MAX_IDLE_CCTX) 1048 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
957 { 1049 {
958 coro_cctx *first = cctx_first; 1050 coro_cctx *first = cctx_first;
959 cctx_first = first->next; 1051 cctx_first = first->next;
960 --cctx_idle; 1052 --cctx_idle;
961 1053
967 cctx_first = cctx; 1059 cctx_first = cctx;
968} 1060}
969 1061
970/** coroutine switching *****************************************************/ 1062/** coroutine switching *****************************************************/
971 1063
972static void NOINLINE 1064static void
973transfer_check (pTHX_ struct coro *prev, struct coro *next) 1065transfer_check (pTHX_ struct coro *prev, struct coro *next)
974{ 1066{
975 if (prev != next) 1067 if (expect_true (prev != next))
976 { 1068 {
977 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1069 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
978 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1070 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
979 1071
980 if (next->flags & CF_RUNNING) 1072 if (expect_false (next->flags & CF_RUNNING))
981 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1073 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
982 1074
983 if (next->flags & CF_DESTROYED) 1075 if (expect_false (next->flags & CF_DESTROYED))
984 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1076 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
985 1077
1078 if (
1079#if PERL_VERSION_ATLEAST (5,9,0)
1080 expect_false (PL_parser)
1081#else
986 if (PL_lex_state != LEX_NOTPARSING) 1082 expect_false (PL_lex_state != LEX_NOTPARSING)
1083#endif
1084 )
987 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1085 croak ("Coro::State::transfer called while parsing, but this is not supported");
988 } 1086 }
989} 1087}
990 1088
991/* always use the TRANSFER macro */ 1089/* always use the TRANSFER macro */
993transfer (pTHX_ struct coro *prev, struct coro *next) 1091transfer (pTHX_ struct coro *prev, struct coro *next)
994{ 1092{
995 dSTACKLEVEL; 1093 dSTACKLEVEL;
996 1094
997 /* sometimes transfer is only called to set idle_sp */ 1095 /* sometimes transfer is only called to set idle_sp */
998 if (!next) 1096 if (expect_false (!next))
999 { 1097 {
1000 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1098 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1001 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1099 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1002 } 1100 }
1003 else if (prev != next) 1101 else if (expect_true (prev != next))
1004 { 1102 {
1005 coro_cctx *prev__cctx; 1103 coro_cctx *prev__cctx;
1006 1104
1007 if (prev->flags & CF_NEW) 1105 if (expect_false (prev->flags & CF_NEW))
1008 { 1106 {
1009 /* create a new empty context */ 1107 /* create a new empty context */
1010 Newz (0, prev->cctx, 1, coro_cctx); 1108 Newz (0, prev->cctx, 1, coro_cctx);
1011 prev->flags &= ~CF_NEW; 1109 prev->flags &= ~CF_NEW;
1012 prev->flags |= CF_RUNNING; 1110 prev->flags |= CF_RUNNING;
1015 prev->flags &= ~CF_RUNNING; 1113 prev->flags &= ~CF_RUNNING;
1016 next->flags |= CF_RUNNING; 1114 next->flags |= CF_RUNNING;
1017 1115
1018 LOCK; 1116 LOCK;
1019 1117
1020 if (next->flags & CF_NEW) 1118 if (expect_false (next->flags & CF_NEW))
1021 { 1119 {
1022 /* need to start coroutine */ 1120 /* need to start coroutine */
1023 next->flags &= ~CF_NEW; 1121 next->flags &= ~CF_NEW;
1024 /* first get rid of the old state */ 1122 /* first get rid of the old state */
1025 save_perl (aTHX_ prev); 1123 save_perl (aTHX_ prev);
1034 } 1132 }
1035 1133
1036 prev__cctx = prev->cctx; 1134 prev__cctx = prev->cctx;
1037 1135
1038 /* possibly "free" the cctx */ 1136 /* possibly "free" the cctx */
1039 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1137 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1040 { 1138 {
1041 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1139 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1042 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1140 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1043 1141
1044 prev->cctx = 0; 1142 prev->cctx = 0;
1045 1143
1144 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1145 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1146 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1147 if (!next->cctx)
1148 next->cctx = cctx_get (aTHX);
1149
1046 cctx_put (prev__cctx); 1150 cctx_put (prev__cctx);
1047 } 1151 }
1048 1152
1049 ++next->usecount; 1153 ++next->usecount;
1050 1154
1051 if (!next->cctx) 1155 if (expect_true (!next->cctx))
1052 next->cctx = cctx_get (aTHX); 1156 next->cctx = cctx_get (aTHX);
1053 1157
1054 if (prev__cctx != next->cctx) 1158 if (expect_false (prev__cctx != next->cctx))
1055 { 1159 {
1056 prev__cctx->top_env = PL_top_env; 1160 prev__cctx->top_env = PL_top_env;
1057 PL_top_env = next->cctx->top_env; 1161 PL_top_env = next->cctx->top_env;
1058 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1162 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1059 } 1163 }
1060 1164
1061 free_coro_mortal (aTHX); 1165 free_coro_mortal (aTHX);
1062 UNLOCK; 1166 UNLOCK;
1167
1168 if (expect_false (prev->throw || next->throw))
1169 {
1170 struct coro *coro = SvSTATE (coro_current);
1171
1172 if (coro->throw)
1173 {
1174 SV *exception = coro->throw;
1175 coro->throw = 0;
1176 sv_setsv (ERRSV, exception);
1177 croak (0);
1178 }
1179 }
1063 } 1180 }
1064} 1181}
1065 1182
1066struct transfer_args 1183struct transfer_args
1067{ 1184{
1102 save_perl (aTHX_ &temp); 1219 save_perl (aTHX_ &temp);
1103 load_perl (aTHX_ coro); 1220 load_perl (aTHX_ coro);
1104 1221
1105 coro_destroy (aTHX_ coro); 1222 coro_destroy (aTHX_ coro);
1106 1223
1107 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1224 load_perl (aTHX_ &temp);
1108 1225
1109 coro->mainstack = 0; 1226 coro->slot = 0;
1110 } 1227 }
1111 1228
1112 cctx_destroy (coro->cctx); 1229 cctx_destroy (coro->cctx);
1113 SvREFCNT_dec (coro->args); 1230 SvREFCNT_dec (coro->args);
1114 1231
1239 { 1356 {
1240 LOCK; 1357 LOCK;
1241 next_sv = coro_deq (aTHX_ PRIO_MIN); 1358 next_sv = coro_deq (aTHX_ PRIO_MIN);
1242 1359
1243 /* nothing to schedule: call the idle handler */ 1360 /* nothing to schedule: call the idle handler */
1244 if (!next_sv) 1361 if (expect_false (!next_sv))
1245 { 1362 {
1246 dSP; 1363 dSP;
1247 UNLOCK; 1364 UNLOCK;
1248 1365
1249 ENTER; 1366 ENTER;
1259 } 1376 }
1260 1377
1261 ta->next = SvSTATE (next_sv); 1378 ta->next = SvSTATE (next_sv);
1262 1379
1263 /* cannot transfer to destroyed coros, skip and look for next */ 1380 /* cannot transfer to destroyed coros, skip and look for next */
1264 if (ta->next->flags & CF_DESTROYED) 1381 if (expect_false (ta->next->flags & CF_DESTROYED))
1265 { 1382 {
1266 UNLOCK; 1383 UNLOCK;
1267 SvREFCNT_dec (next_sv); 1384 SvREFCNT_dec (next_sv);
1268 /* coro_nready is already taken care of by destroy */ 1385 /* coro_nready is already taken care of by destroy */
1269 continue; 1386 continue;
1325 dTHX; 1442 dTHX;
1326 struct transfer_args ta; 1443 struct transfer_args ta;
1327 1444
1328 prepare_cede (aTHX_ &ta); 1445 prepare_cede (aTHX_ &ta);
1329 1446
1330 if (ta.prev != ta.next) 1447 if (expect_true (ta.prev != ta.next))
1331 { 1448 {
1332 TRANSFER (ta); 1449 TRANSFER (ta);
1333 return 1; 1450 return 1;
1334 } 1451 }
1335 else 1452 else
1371 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1488 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1372 1489
1373 if (coro->flags & CF_RUNNING) 1490 if (coro->flags & CF_RUNNING)
1374 PL_runops = RUNOPS_DEFAULT; 1491 PL_runops = RUNOPS_DEFAULT;
1375 else 1492 else
1376 coro->runops = RUNOPS_DEFAULT; 1493 coro->slot->runops = RUNOPS_DEFAULT;
1377 } 1494 }
1378} 1495}
1379 1496
1380MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1497MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1381 1498
1388#endif 1505#endif
1389 BOOT_PAGESIZE; 1506 BOOT_PAGESIZE;
1390 1507
1391 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1508 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1392 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1509 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1510
1511 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1512 sv_diehook = coro_get_sv (aTHX_ "Coro::State::DIEHOOK" , TRUE);
1513 sv_warnhook = coro_get_sv (aTHX_ "Coro::State::WARNHOOK", TRUE);
1514
1515 if (!PL_diehook ) hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0);
1516 if (!PL_warnhook) hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0);
1393 1517
1394 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1518 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1395 1519
1396 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1520 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1397 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1521 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1403 1527
1404 while (main_top_env->je_prev) 1528 while (main_top_env->je_prev)
1405 main_top_env = main_top_env->je_prev; 1529 main_top_env = main_top_env->je_prev;
1406 1530
1407 coroapi.ver = CORO_API_VERSION; 1531 coroapi.ver = CORO_API_VERSION;
1532 coroapi.rev = CORO_API_REVISION;
1408 coroapi.transfer = api_transfer; 1533 coroapi.transfer = api_transfer;
1409 1534
1410 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1535 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1411} 1536}
1412 1537
1429 coro->hv = hv = newHV (); 1554 coro->hv = hv = newHV ();
1430 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1555 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1431 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1556 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1432 1557
1433 av_extend (coro->args, items - 1); 1558 av_extend (coro->args, items - 1);
1434
1435 for (i = 1; i < items; i++) 1559 for (i = 1; i < items; i++)
1436 av_push (coro->args, newSVsv (ST (i))); 1560 av_push (coro->args, newSVsv (ST (i)));
1437} 1561}
1438 OUTPUT: 1562 OUTPUT:
1439 RETVAL 1563 RETVAL
1480 1604
1481 break; 1605 break;
1482 } 1606 }
1483 1607
1484 BARRIER; 1608 BARRIER;
1609 PUTBACK;
1485 TRANSFER (ta); 1610 TRANSFER (ta);
1486 1611 SPAGAIN; /* might be the sp of a different coroutine now */
1487 if (GIMME_V != G_VOID && ta.next != ta.prev) 1612 /* be extra careful not to ever do anything after TRANSFER */
1488 XSRETURN_YES;
1489} 1613}
1490 1614
1491bool 1615bool
1492_destroy (SV *coro_sv) 1616_destroy (SV *coro_sv)
1493 CODE: 1617 CODE:
1542 CODE: 1666 CODE:
1543{ 1667{
1544 if (coro->mainstack) 1668 if (coro->mainstack)
1545 { 1669 {
1546 struct coro temp; 1670 struct coro temp;
1547 Zero (&temp, 1, struct coro);
1548 1671
1549 if (!(coro->flags & CF_RUNNING)) 1672 if (!(coro->flags & CF_RUNNING))
1550 { 1673 {
1551 save_perl (aTHX_ &temp); 1674 save_perl (aTHX_ &temp);
1552 load_perl (aTHX_ coro); 1675 load_perl (aTHX_ coro);
1554 1677
1555 { 1678 {
1556 dSP; 1679 dSP;
1557 ENTER; 1680 ENTER;
1558 SAVETMPS; 1681 SAVETMPS;
1682 PUTBACK;
1683 PUSHSTACK;
1559 PUSHMARK (SP); 1684 PUSHMARK (SP);
1560 PUTBACK; 1685
1561 if (ix) 1686 if (ix)
1562 eval_sv (coderef, 0); 1687 eval_sv (coderef, 0);
1563 else 1688 else
1564 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1689 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1690
1691 POPSTACK;
1565 SPAGAIN; 1692 SPAGAIN;
1566 FREETMPS; 1693 FREETMPS;
1567 LEAVE; 1694 LEAVE;
1568 PUTBACK; 1695 PUTBACK;
1569 } 1696 }
1627 1754
1628BOOT: 1755BOOT:
1629{ 1756{
1630 int i; 1757 int i;
1631 1758
1632 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1759 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1633 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1760 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1634 av_async_pool = get_av ("Coro::async_pool", TRUE); 1761 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1635 1762
1636 coro_current = get_sv ("Coro::current", FALSE); 1763 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1637 SvREADONLY_on (coro_current); 1764 SvREADONLY_on (coro_current);
1638 1765
1639 coro_stash = gv_stashpv ("Coro", TRUE); 1766 coro_stash = gv_stashpv ("Coro", TRUE);
1640 1767
1641 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1768 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1642 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1769 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1643 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1770 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1644 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1771 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1647 1774
1648 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1775 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1649 coro_ready[i] = newAV (); 1776 coro_ready[i] = newAV ();
1650 1777
1651 { 1778 {
1652 SV *sv = perl_get_sv("Coro::API", 1); 1779 SV *sv = perl_get_sv ("Coro::API", TRUE);
1780 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1653 1781
1654 coroapi.schedule = api_schedule; 1782 coroapi.schedule = api_schedule;
1655 coroapi.cede = api_cede; 1783 coroapi.cede = api_cede;
1656 coroapi.cede_notself = api_cede_notself; 1784 coroapi.cede_notself = api_cede_notself;
1657 coroapi.ready = api_ready; 1785 coroapi.ready = api_ready;
1708 CODE: 1836 CODE:
1709 RETVAL = coro_nready; 1837 RETVAL = coro_nready;
1710 OUTPUT: 1838 OUTPUT:
1711 RETVAL 1839 RETVAL
1712 1840
1841void
1842throw (Coro::State self, SV *throw = &PL_sv_undef)
1843 PROTOTYPE: $;$
1844 CODE:
1845 SvREFCNT_dec (self->throw);
1846 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1847
1713# for async_pool speedup 1848# for async_pool speedup
1714void 1849void
1715_pool_1 (SV *cb) 1850_pool_1 (SV *cb)
1716 CODE: 1851 CODE:
1717{ 1852{
1721 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1856 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1722 AV *invoke_av; 1857 AV *invoke_av;
1723 int i, len; 1858 int i, len;
1724 1859
1725 if (!invoke) 1860 if (!invoke)
1726 croak ("\3terminate\2\n"); 1861 croak ("\3async_pool terminate\2\n");
1727 1862
1728 SvREFCNT_dec (coro->saved_deffh); 1863 SvREFCNT_dec (coro->saved_deffh);
1729 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1864 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1730 1865
1731 hv_store (hv, "desc", sizeof ("desc") - 1, 1866 hv_store (hv, "desc", sizeof ("desc") - 1,
1757 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1892 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1758 coro->saved_deffh = 0; 1893 coro->saved_deffh = 0;
1759 1894
1760 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1895 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1761 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1896 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1762 croak ("\3terminate\2\n"); 1897 croak ("\3async_pool terminate\2\n");
1763 1898
1764 av_clear (GvAV (PL_defgv)); 1899 av_clear (GvAV (PL_defgv));
1765 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1900 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1766 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1901 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1767 1902

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines