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.191 by root, Fri Oct 5 20:47:49 2007 UTC vs.
Revision 1.200 by root, Sun Oct 7 15:08:23 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
… …
106#define IN_DESTRUCT (PL_main_cv == Nullcv) 107#define IN_DESTRUCT (PL_main_cv == Nullcv)
107 108
108#if __GNUC__ >= 3 109#if __GNUC__ >= 3
109# define attribute(x) __attribute__(x) 110# define attribute(x) __attribute__(x)
110# define BARRIER __asm__ __volatile__ ("" : : : "memory") 111# define BARRIER __asm__ __volatile__ ("" : : : "memory")
112# define expect(expr,value) __builtin_expect ((expr),(value))
111#else 113#else
112# define attribute(x) 114# define attribute(x)
113# define BARRIER 115# define BARRIER
116# define expect(expr,value) (expr)
114#endif 117#endif
118
119#define expect_false(expr) expect ((expr) != 0, 0)
120#define expect_true(expr) expect ((expr) != 0, 1)
115 121
116#define NOINLINE attribute ((noinline)) 122#define NOINLINE attribute ((noinline))
117 123
118#include "CoroAPI.h" 124#include "CoroAPI.h"
119 125
… …
124#else 130#else
125# define LOCK (void)0 131# define LOCK (void)0
126# define UNLOCK (void)0 132# define UNLOCK (void)0
127#endif 133#endif
128 134
135#define strpair(const) const, sizeof (const) - 1
136
129/* helper storage struct for Coro::AIO */ 137/* helper storage struct for Coro::AIO */
130struct io_state 138struct io_state
131{ 139{
132 int errorno; 140 int errorno;
133 I32 laststype; 141 I32 laststype;
… …
142static HV *coro_state_stash, *coro_stash; 150static HV *coro_state_stash, *coro_stash;
143static SV *coro_mortal; /* will be freed after next transfer */ 151static SV *coro_mortal; /* will be freed after next transfer */
144 152
145static GV *irsgv; /* $/ */ 153static GV *irsgv; /* $/ */
146static GV *stdoutgv; /* *STDOUT */ 154static GV *stdoutgv; /* *STDOUT */
155
156static HV *hv_sig; /* %SIG */
157static SV *sv_diehook;
158static SV *sv_warnhook;
147 159
148/* async_pool helper stuff */ 160/* async_pool helper stuff */
149static SV *sv_pool_rss; 161static SV *sv_pool_rss;
150static SV *sv_pool_size; 162static SV *sv_pool_size;
151static AV *av_async_pool; 163static AV *av_async_pool;
… …
187 CF_READY = 0x0002, /* coroutine is ready */ 199 CF_READY = 0x0002, /* coroutine is ready */
188 CF_NEW = 0x0004, /* has never been switched to */ 200 CF_NEW = 0x0004, /* has never been switched to */
189 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 201 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
190}; 202};
191 203
204/* the structure where most of the perl state is stored, overlaid on the cxstack */
205typedef struct {
206 SV *defsv;
207 AV *defav;
208 SV *errsv;
209 SV *irsgv;
210#define VAR(name,type) type name;
211# include "state.h"
212#undef VAR
213} perl_slots;
214
215#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
216
192/* this is a structure representing a perl-level coroutine */ 217/* this is a structure representing a perl-level coroutine */
193struct coro { 218struct coro {
194 /* the c coroutine allocated to this perl coroutine, if any */ 219 /* the c coroutine allocated to this perl coroutine, if any */
195 coro_cctx *cctx; 220 coro_cctx *cctx;
196 221
222 /* process data */
223 AV *mainstack;
224 perl_slots *slot; /* basically the saved sp */
225
197 /* data associated with this coroutine (initial args) */ 226 /* data associated with this coroutine (initial args) */
198 AV *args; 227 AV *args;
199 int refcnt; 228 int refcnt;
200 int flags; /* CF_ flags */ 229 int flags; /* CF_ flags */
201 230
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
214 /* statistics */ 231 /* statistics */
215 int usecount; /* number of transfers to this coro */ 232 int usecount; /* number of transfers to this coro */
216 233
217 /* coro process data */ 234 /* coro process data */
218 int prio; 235 int prio;
219 //SV *throw; 236 SV *throw;
220 237
221 /* async_pool */ 238 /* async_pool */
222 SV *saved_deffh; 239 SV *saved_deffh;
223 240
224 /* linked list */ 241 /* linked list */
… …
243static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 260static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
244static int coro_nready; 261static int coro_nready;
245static struct coro *coro_first; 262static struct coro *coro_first;
246 263
247/** lowlevel stuff **********************************************************/ 264/** lowlevel stuff **********************************************************/
265
266static SV *
267coro_get_sv (const char *name, int create)
268{
269#if PERL_VERSION_ATLEAST (5,9,0)
270 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
271 get_sv (name, create);
272#endif
273 return get_sv (name, create);
274}
275
276static AV *
277coro_get_av (const char *name, int create)
278{
279#if PERL_VERSION_ATLEAST (5,9,0)
280 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
281 get_av (name, create);
282#endif
283 return get_av (name, create);
284}
285
286static HV *
287coro_get_hv (const char *name, int create)
288{
289#if PERL_VERSION_ATLEAST (5,9,0)
290 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
291 get_hv (name, create);
292#endif
293 return get_hv (name, create);
294}
248 295
249static AV * 296static AV *
250coro_clone_padlist (pTHX_ CV *cv) 297coro_clone_padlist (pTHX_ CV *cv)
251{ 298{
252 AV *padlist = CvPADLIST (cv); 299 AV *padlist = CvPADLIST (cv);
… …
325 MAGIC *mg; 372 MAGIC *mg;
326 373
327 if (SvROK (coro)) 374 if (SvROK (coro))
328 coro = SvRV (coro); 375 coro = SvRV (coro);
329 376
330 if (SvTYPE (coro) != SVt_PVHV) 377 if (expect_false (SvTYPE (coro) != SVt_PVHV))
331 croak ("Coro::State object required"); 378 croak ("Coro::State object required");
332 379
333 stash = SvSTASH (coro); 380 stash = SvSTASH (coro);
334 if (stash != coro_stash && stash != coro_state_stash) 381 if (expect_false (stash != coro_stash && stash != coro_state_stash))
335 { 382 {
336 /* very slow, but rare, check */ 383 /* very slow, but rare, check */
337 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 384 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
338 croak ("Coro::State object required"); 385 croak ("Coro::State object required");
339 } 386 }
… …
349get_padlist (pTHX_ CV *cv) 396get_padlist (pTHX_ CV *cv)
350{ 397{
351 MAGIC *mg = CORO_MAGIC (cv); 398 MAGIC *mg = CORO_MAGIC (cv);
352 AV *av; 399 AV *av;
353 400
354 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 401 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
355 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 402 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
356 else 403 else
357 { 404 {
358#if CORO_PREFER_PERL_FUNCTIONS 405#if CORO_PREFER_PERL_FUNCTIONS
359 /* this is probably cleaner, but also slower? */ 406 /* this is probably cleaner, but also slower? */
… …
371put_padlist (pTHX_ CV *cv) 418put_padlist (pTHX_ CV *cv)
372{ 419{
373 MAGIC *mg = CORO_MAGIC (cv); 420 MAGIC *mg = CORO_MAGIC (cv);
374 AV *av; 421 AV *av;
375 422
376 if (!mg) 423 if (expect_false (!mg))
377 { 424 {
378 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 425 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
379 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 426 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
380 mg->mg_virtual = &vtbl_coro; 427 mg->mg_virtual = &vtbl_coro;
381 mg->mg_obj = (SV *)newAV (); 428 mg->mg_obj = (SV *)newAV ();
382 } 429 }
383 430
384 av = (AV *)mg->mg_obj; 431 av = (AV *)mg->mg_obj;
385 432
386 if (AvFILLp (av) >= AvMAX (av)) 433 if (expect_false (AvFILLp (av) >= AvMAX (av)))
387 av_extend (av, AvMAX (av) + 1); 434 av_extend (av, AvMAX (av) + 1);
388 435
389 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 436 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
390} 437}
391 438
392/** load & save, init *******************************************************/ 439/** load & save, init *******************************************************/
393 440
394static void 441static void
395load_perl (pTHX_ Coro__State c) 442load_perl (pTHX_ Coro__State c)
396{ 443{
444 perl_slots *slot = c->slot;
445 c->slot = 0;
446
447 PL_mainstack = c->mainstack;
448
449 GvSV (PL_defgv) = slot->defsv;
450 GvAV (PL_defgv) = slot->defav;
451 GvSV (PL_errgv) = slot->errsv;
452 GvSV (irsgv) = slot->irsgv;
453
397#define VAR(name,type) PL_ ## name = c->name; 454 #define VAR(name,type) PL_ ## name = slot->name;
398# include "state.h" 455 # include "state.h"
399#undef VAR 456 #undef VAR
400
401 GvSV (PL_defgv) = c->defsv;
402 GvAV (PL_defgv) = c->defav;
403 GvSV (PL_errgv) = c->errsv;
404 GvSV (irsgv) = c->irssv_sv;
405 457
406 { 458 {
407 dSP; 459 dSP;
460
408 CV *cv; 461 CV *cv;
409 462
410 /* now do the ugly restore mess */ 463 /* now do the ugly restore mess */
411 while ((cv = (CV *)POPs)) 464 while (expect_true (cv = (CV *)POPs))
412 { 465 {
413 put_padlist (aTHX_ cv); /* mark this padlist as available */ 466 put_padlist (aTHX_ cv); /* mark this padlist as available */
414 CvDEPTH (cv) = PTR2IV (POPs); 467 CvDEPTH (cv) = PTR2IV (POPs);
415 CvPADLIST (cv) = (AV *)POPs; 468 CvPADLIST (cv) = (AV *)POPs;
416 } 469 }
… …
435 488
436 XPUSHs (Nullsv); 489 XPUSHs (Nullsv);
437 /* this loop was inspired by pp_caller */ 490 /* this loop was inspired by pp_caller */
438 for (;;) 491 for (;;)
439 { 492 {
440 while (cxix >= 0) 493 while (expect_true (cxix >= 0))
441 { 494 {
442 PERL_CONTEXT *cx = &ccstk[cxix--]; 495 PERL_CONTEXT *cx = &ccstk[cxix--];
443 496
444 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 497 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
445 { 498 {
446 CV *cv = cx->blk_sub.cv; 499 CV *cv = cx->blk_sub.cv;
447 500
448 if (CvDEPTH (cv)) 501 if (expect_true (CvDEPTH (cv)))
449 { 502 {
450 EXTEND (SP, 3); 503 EXTEND (SP, 3);
451 PUSHs ((SV *)CvPADLIST (cv)); 504 PUSHs ((SV *)CvPADLIST (cv));
452 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 505 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
453 PUSHs ((SV *)cv); 506 PUSHs ((SV *)cv);
… …
456 get_padlist (aTHX_ cv); 509 get_padlist (aTHX_ cv);
457 } 510 }
458 } 511 }
459 } 512 }
460 513
461 if (top_si->si_type == PERLSI_MAIN) 514 if (expect_true (top_si->si_type == PERLSI_MAIN))
462 break; 515 break;
463 516
464 top_si = top_si->si_prev; 517 top_si = top_si->si_prev;
465 ccstk = top_si->si_cxstack; 518 ccstk = top_si->si_cxstack;
466 cxix = top_si->si_cxix; 519 cxix = top_si->si_cxix;
467 } 520 }
468 521
469 PUTBACK; 522 PUTBACK;
470 } 523 }
471 524
525 /* allocate some space on the context stack for our purposes */
526 {
527 /* we manually unroll here, as usually 2 slots is enough */
528 int i;
529 if (SLOT_COUNT >= 1) CXINC;
530 if (SLOT_COUNT >= 2) CXINC;
531 if (SLOT_COUNT >= 3) CXINC;
532 for (i = 3; i < SLOT_COUNT; ++i)
533 CXINC;
534
535 cxstack_ix -= SLOT_COUNT; /* undo allocation */
536 }
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 SvREFCNT_inc (PL_diehook ); hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
691 SvREFCNT_inc (PL_warnhook); hv_store (hv_sig, strpair ("__WARN__"), 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 699
619 { 700 {
620 dSP; 701 dSP;
621 LOGOP myop; 702 LOGOP myop;
622 703
623 Zero (&myop, 1, LOGOP); 704 Zero (&myop, 1, LOGOP);
624 myop.op_next = Nullop; 705 myop.op_next = Nullop;
625 myop.op_flags = OPf_WANT_VOID; 706 myop.op_flags = OPf_WANT_VOID;
626 707
627 PUSHMARK (SP); 708 PUSHMARK (SP);
628 XPUSHs (av_shift (GvAV (PL_defgv))); 709 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
629 PUTBACK; 710 PUTBACK;
630 PL_op = (OP *)&myop; 711 PL_op = (OP *)&myop;
631 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 712 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
632 SPAGAIN; 713 SPAGAIN;
633 } 714 }
634 715
635 ENTER; /* necessary e.g. for dounwind */ 716 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */
636} 717}
637 718
638static void 719static void
639coro_destroy (pTHX_ struct coro *coro) 720coro_destroy (pTHX_ struct coro *coro)
640{ 721{
… …
660 SvREFCNT_dec (GvSV (PL_errgv)); 741 SvREFCNT_dec (GvSV (PL_errgv));
661 SvREFCNT_dec (PL_defoutgv); 742 SvREFCNT_dec (PL_defoutgv);
662 SvREFCNT_dec (PL_rs); 743 SvREFCNT_dec (PL_rs);
663 SvREFCNT_dec (GvSV (irsgv)); 744 SvREFCNT_dec (GvSV (irsgv));
664 745
746 SvREFCNT_dec (PL_diehook);
747 SvREFCNT_dec (PL_warnhook);
748
665 SvREFCNT_dec (coro->saved_deffh); 749 SvREFCNT_dec (coro->saved_deffh);
666 //SvREFCNT_dec (coro->throw); 750 SvREFCNT_dec (coro->throw);
667 751
668 coro_destroy_stacks (aTHX); 752 coro_destroy_stacks (aTHX);
669} 753}
670 754
671static void 755static void
672free_coro_mortal (pTHX) 756free_coro_mortal (pTHX)
673{ 757{
674 if (coro_mortal) 758 if (expect_true (coro_mortal))
675 { 759 {
676 SvREFCNT_dec (coro_mortal); 760 SvREFCNT_dec (coro_mortal);
677 coro_mortal = 0; 761 coro_mortal = 0;
678 } 762 }
679} 763}
… …
708 bot = PL_stack_base + cx->blk_oldsp + 1; 792 bot = PL_stack_base + cx->blk_oldsp + 1;
709 top = cx->blk_gimme == G_ARRAY ? SP + 1 793 top = cx->blk_gimme == G_ARRAY ? SP + 1
710 : cx->blk_gimme == G_SCALAR ? bot + 1 794 : cx->blk_gimme == G_SCALAR ? bot + 1
711 : bot; 795 : bot;
712 796
797 av_extend (av, top - bot);
713 while (bot < top) 798 while (bot < top)
714 av_push (av, SvREFCNT_inc (*bot++)); 799 av_push (av, SvREFCNT_inc (*bot++));
715 800
716 PL_runops = RUNOPS_DEFAULT; 801 PL_runops = RUNOPS_DEFAULT;
717 ENTER; 802 ENTER;
… …
720 PUSHMARK (SP); 805 PUSHMARK (SP);
721 PUSHs (&PL_sv_no); 806 PUSHs (&PL_sv_no);
722 PUSHs (fullname); 807 PUSHs (fullname);
723 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 808 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
724 PUTBACK; 809 PUTBACK;
725 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 810 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0);
726 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 811 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
727 SPAGAIN; 812 SPAGAIN;
728 FREETMPS; 813 FREETMPS;
729 LEAVE; 814 LEAVE;
730 PL_runops = runops_trace; 815 PL_runops = runops_trace;
… …
759 PUSHMARK (SP); 844 PUSHMARK (SP);
760 PUSHs (&PL_sv_yes); 845 PUSHs (&PL_sv_yes);
761 PUSHs (fullname); 846 PUSHs (fullname);
762 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 847 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
763 PUTBACK; 848 PUTBACK;
764 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 849 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0);
765 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 850 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
766 SPAGAIN; 851 SPAGAIN;
767 FREETMPS; 852 FREETMPS;
768 LEAVE; 853 LEAVE;
769 PL_runops = runops_trace; 854 PL_runops = runops_trace;
… …
783 PL_runops = RUNOPS_DEFAULT; 868 PL_runops = RUNOPS_DEFAULT;
784 PUSHMARK (SP); 869 PUSHMARK (SP);
785 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 870 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
786 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 871 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
787 PUTBACK; 872 PUTBACK;
788 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0); 873 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0);
789 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 874 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
790 SPAGAIN; 875 SPAGAIN;
791 FREETMPS; 876 FREETMPS;
792 LEAVE; 877 LEAVE;
793 PL_runops = runops_trace; 878 PL_runops = runops_trace;
… …
929 Safefree (cctx->sptr); 1014 Safefree (cctx->sptr);
930 1015
931 Safefree (cctx); 1016 Safefree (cctx);
932} 1017}
933 1018
1019/* wether this cctx should be destructed */
1020#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1021
934static coro_cctx * 1022static coro_cctx *
935cctx_get (pTHX) 1023cctx_get (pTHX)
936{ 1024{
937 while (cctx_first) 1025 while (expect_true (cctx_first))
938 { 1026 {
939 coro_cctx *cctx = cctx_first; 1027 coro_cctx *cctx = cctx_first;
940 cctx_first = cctx->next; 1028 cctx_first = cctx->next;
941 --cctx_idle; 1029 --cctx_idle;
942 1030
943 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1031 if (expect_true (!CCTX_EXPIRED (cctx)))
944 return cctx; 1032 return cctx;
945 1033
946 cctx_destroy (cctx); 1034 cctx_destroy (cctx);
947 } 1035 }
948 1036
… …
951 1039
952static void 1040static void
953cctx_put (coro_cctx *cctx) 1041cctx_put (coro_cctx *cctx)
954{ 1042{
955 /* free another cctx if overlimit */ 1043 /* free another cctx if overlimit */
956 if (cctx_idle >= MAX_IDLE_CCTX) 1044 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
957 { 1045 {
958 coro_cctx *first = cctx_first; 1046 coro_cctx *first = cctx_first;
959 cctx_first = first->next; 1047 cctx_first = first->next;
960 --cctx_idle; 1048 --cctx_idle;
961 1049
… …
967 cctx_first = cctx; 1055 cctx_first = cctx;
968} 1056}
969 1057
970/** coroutine switching *****************************************************/ 1058/** coroutine switching *****************************************************/
971 1059
972static void NOINLINE 1060static void
973transfer_check (pTHX_ struct coro *prev, struct coro *next) 1061transfer_check (pTHX_ struct coro *prev, struct coro *next)
974{ 1062{
975 if (prev != next) 1063 if (expect_true (prev != next))
976 { 1064 {
977 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1065 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"); 1066 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
979 1067
980 if (next->flags & CF_RUNNING) 1068 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"); 1069 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
982 1070
983 if (next->flags & CF_DESTROYED) 1071 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"); 1072 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
985 1073
1074 if (
1075#if PERL_VERSION_ATLEAST (5,9,0)
1076 expect_false (PL_parser)
1077#else
986 if (PL_lex_state != LEX_NOTPARSING) 1078 expect_false (PL_lex_state != LEX_NOTPARSING)
1079#endif
1080 )
987 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1081 croak ("Coro::State::transfer called while parsing, but this is not supported");
988 } 1082 }
989} 1083}
990 1084
991/* always use the TRANSFER macro */ 1085/* always use the TRANSFER macro */
… …
993transfer (pTHX_ struct coro *prev, struct coro *next) 1087transfer (pTHX_ struct coro *prev, struct coro *next)
994{ 1088{
995 dSTACKLEVEL; 1089 dSTACKLEVEL;
996 1090
997 /* sometimes transfer is only called to set idle_sp */ 1091 /* sometimes transfer is only called to set idle_sp */
998 if (!next) 1092 if (expect_false (!next))
999 { 1093 {
1000 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1094 ((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 */ 1095 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1002 } 1096 }
1003 else if (prev != next) 1097 else if (expect_true (prev != next))
1004 { 1098 {
1005 coro_cctx *prev__cctx; 1099 coro_cctx *prev__cctx;
1006 1100
1007 if (prev->flags & CF_NEW) 1101 if (expect_false (prev->flags & CF_NEW))
1008 { 1102 {
1009 /* create a new empty context */ 1103 /* create a new empty context */
1010 Newz (0, prev->cctx, 1, coro_cctx); 1104 Newz (0, prev->cctx, 1, coro_cctx);
1011 prev->flags &= ~CF_NEW; 1105 prev->flags &= ~CF_NEW;
1012 prev->flags |= CF_RUNNING; 1106 prev->flags |= CF_RUNNING;
… …
1015 prev->flags &= ~CF_RUNNING; 1109 prev->flags &= ~CF_RUNNING;
1016 next->flags |= CF_RUNNING; 1110 next->flags |= CF_RUNNING;
1017 1111
1018 LOCK; 1112 LOCK;
1019 1113
1020 if (next->flags & CF_NEW) 1114 if (expect_false (next->flags & CF_NEW))
1021 { 1115 {
1022 /* need to start coroutine */ 1116 /* need to start coroutine */
1023 next->flags &= ~CF_NEW; 1117 next->flags &= ~CF_NEW;
1024 /* first get rid of the old state */ 1118 /* first get rid of the old state */
1025 save_perl (aTHX_ prev); 1119 save_perl (aTHX_ prev);
… …
1034 } 1128 }
1035 1129
1036 prev__cctx = prev->cctx; 1130 prev__cctx = prev->cctx;
1037 1131
1038 /* possibly "free" the cctx */ 1132 /* possibly "free" the cctx */
1039 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1133 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1040 { 1134 {
1041 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1135 /* 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)); 1136 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1043 1137
1044 prev->cctx = 0; 1138 prev->cctx = 0;
1045 1139
1140 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1141 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1142 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1143 next->cctx = cctx_get (aTHX);
1144
1046 cctx_put (prev__cctx); 1145 cctx_put (prev__cctx);
1047 } 1146 }
1048 1147
1049 ++next->usecount; 1148 ++next->usecount;
1050 1149
1051 if (!next->cctx) 1150 if (expect_true (!next->cctx))
1052 next->cctx = cctx_get (aTHX); 1151 next->cctx = cctx_get (aTHX);
1053 1152
1054 if (prev__cctx != next->cctx) 1153 if (expect_false (prev__cctx != next->cctx))
1055 { 1154 {
1056 prev__cctx->top_env = PL_top_env; 1155 prev__cctx->top_env = PL_top_env;
1057 PL_top_env = next->cctx->top_env; 1156 PL_top_env = next->cctx->top_env;
1058 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1157 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1059 } 1158 }
1060 1159
1061 free_coro_mortal (aTHX); 1160 free_coro_mortal (aTHX);
1062 UNLOCK; 1161 UNLOCK;
1162
1163 if (expect_false (prev->throw || next->throw))
1164 {
1165 struct coro *coro = SvSTATE (coro_current);
1166
1167 if (coro->throw)
1168 {
1169 SV *exception = coro->throw;
1170 coro->throw = 0;
1171 sv_setsv (ERRSV, exception);
1172 croak (0);
1173 }
1174 }
1063 } 1175 }
1064} 1176}
1065 1177
1066struct transfer_args 1178struct transfer_args
1067{ 1179{
… …
1102 save_perl (aTHX_ &temp); 1214 save_perl (aTHX_ &temp);
1103 load_perl (aTHX_ coro); 1215 load_perl (aTHX_ coro);
1104 1216
1105 coro_destroy (aTHX_ coro); 1217 coro_destroy (aTHX_ coro);
1106 1218
1107 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1219 load_perl (aTHX_ &temp);
1108 1220
1109 coro->mainstack = 0; 1221 coro->slot = 0;
1110 } 1222 }
1111 1223
1112 cctx_destroy (coro->cctx); 1224 cctx_destroy (coro->cctx);
1113 SvREFCNT_dec (coro->args); 1225 SvREFCNT_dec (coro->args);
1114 1226
… …
1239 { 1351 {
1240 LOCK; 1352 LOCK;
1241 next_sv = coro_deq (aTHX_ PRIO_MIN); 1353 next_sv = coro_deq (aTHX_ PRIO_MIN);
1242 1354
1243 /* nothing to schedule: call the idle handler */ 1355 /* nothing to schedule: call the idle handler */
1244 if (!next_sv) 1356 if (expect_false (!next_sv))
1245 { 1357 {
1246 dSP; 1358 dSP;
1247 UNLOCK; 1359 UNLOCK;
1248 1360
1249 ENTER; 1361 ENTER;
… …
1259 } 1371 }
1260 1372
1261 ta->next = SvSTATE (next_sv); 1373 ta->next = SvSTATE (next_sv);
1262 1374
1263 /* cannot transfer to destroyed coros, skip and look for next */ 1375 /* cannot transfer to destroyed coros, skip and look for next */
1264 if (ta->next->flags & CF_DESTROYED) 1376 if (expect_false (ta->next->flags & CF_DESTROYED))
1265 { 1377 {
1266 UNLOCK; 1378 UNLOCK;
1267 SvREFCNT_dec (next_sv); 1379 SvREFCNT_dec (next_sv);
1268 /* coro_nready is already taken care of by destroy */ 1380 /* coro_nready is already taken care of by destroy */
1269 continue; 1381 continue;
… …
1325 dTHX; 1437 dTHX;
1326 struct transfer_args ta; 1438 struct transfer_args ta;
1327 1439
1328 prepare_cede (aTHX_ &ta); 1440 prepare_cede (aTHX_ &ta);
1329 1441
1330 if (ta.prev != ta.next) 1442 if (expect_true (ta.prev != ta.next))
1331 { 1443 {
1332 TRANSFER (ta); 1444 TRANSFER (ta);
1333 return 1; 1445 return 1;
1334 } 1446 }
1335 else 1447 else
… …
1371 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1483 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1372 1484
1373 if (coro->flags & CF_RUNNING) 1485 if (coro->flags & CF_RUNNING)
1374 PL_runops = RUNOPS_DEFAULT; 1486 PL_runops = RUNOPS_DEFAULT;
1375 else 1487 else
1376 coro->runops = RUNOPS_DEFAULT; 1488 coro->slot->runops = RUNOPS_DEFAULT;
1377 } 1489 }
1378} 1490}
1379 1491
1380MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1492MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1381 1493
… …
1388#endif 1500#endif
1389 BOOT_PAGESIZE; 1501 BOOT_PAGESIZE;
1390 1502
1391 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1503 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1392 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1504 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1505
1506 hv_sig = coro_get_hv ("SIG", TRUE);
1507 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE);
1508 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE);
1509
1510 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1511 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1393 1512
1394 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1513 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1395 1514
1396 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1515 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1397 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1516 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1428 1547
1429 coro->hv = hv = newHV (); 1548 coro->hv = hv = newHV ();
1430 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1549 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)); 1550 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1432 1551
1552 av_extend (coro->args, items - 1);
1433 for (i = 1; i < items; i++) 1553 for (i = 1; i < items; i++)
1434 av_push (coro->args, newSVsv (ST (i))); 1554 av_push (coro->args, newSVsv (ST (i)));
1435} 1555}
1436 OUTPUT: 1556 OUTPUT:
1437 RETVAL 1557 RETVAL
… …
1480 } 1600 }
1481 1601
1482 BARRIER; 1602 BARRIER;
1483 TRANSFER (ta); 1603 TRANSFER (ta);
1484 1604
1485 if (GIMME_V != G_VOID && ta.next != ta.prev) 1605 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev))
1486 XSRETURN_YES; 1606 XSRETURN_YES;
1487} 1607}
1488 1608
1489bool 1609bool
1490_destroy (SV *coro_sv) 1610_destroy (SV *coro_sv)
… …
1540 CODE: 1660 CODE:
1541{ 1661{
1542 if (coro->mainstack) 1662 if (coro->mainstack)
1543 { 1663 {
1544 struct coro temp; 1664 struct coro temp;
1545 Zero (&temp, 1, struct coro);
1546 1665
1547 if (!(coro->flags & CF_RUNNING)) 1666 if (!(coro->flags & CF_RUNNING))
1548 { 1667 {
1549 save_perl (aTHX_ &temp); 1668 save_perl (aTHX_ &temp);
1550 load_perl (aTHX_ coro); 1669 load_perl (aTHX_ coro);
… …
1554 dSP; 1673 dSP;
1555 ENTER; 1674 ENTER;
1556 SAVETMPS; 1675 SAVETMPS;
1557 PUSHMARK (SP); 1676 PUSHMARK (SP);
1558 PUTBACK; 1677 PUTBACK;
1678
1559 if (ix) 1679 if (ix)
1560 eval_sv (coderef, 0); 1680 eval_sv (coderef, 0);
1561 else 1681 else
1562 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1682 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1683
1563 SPAGAIN; 1684 SPAGAIN;
1564 FREETMPS; 1685 FREETMPS;
1565 LEAVE; 1686 LEAVE;
1566 PUTBACK; 1687 PUTBACK;
1567 } 1688 }
… …
1625 1746
1626BOOT: 1747BOOT:
1627{ 1748{
1628 int i; 1749 int i;
1629 1750
1630 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1751 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1631 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1752 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1632 av_async_pool = get_av ("Coro::async_pool", TRUE); 1753 av_async_pool = coro_get_av ("Coro::async_pool", TRUE);
1633 1754
1634 coro_current = get_sv ("Coro::current", FALSE); 1755 coro_current = coro_get_sv ("Coro::current", FALSE);
1635 SvREADONLY_on (coro_current); 1756 SvREADONLY_on (coro_current);
1636 1757
1637 coro_stash = gv_stashpv ("Coro", TRUE); 1758 coro_stash = gv_stashpv ("Coro", TRUE);
1638 1759
1639 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1760 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1640 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1761 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1641 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1762 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1642 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1763 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
… …
1645 1766
1646 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1767 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1647 coro_ready[i] = newAV (); 1768 coro_ready[i] = newAV ();
1648 1769
1649 { 1770 {
1650 SV *sv = perl_get_sv("Coro::API", 1); 1771 SV *sv = perl_get_sv ("Coro::API", TRUE);
1772 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1651 1773
1652 coroapi.schedule = api_schedule; 1774 coroapi.schedule = api_schedule;
1653 coroapi.cede = api_cede; 1775 coroapi.cede = api_cede;
1654 coroapi.cede_notself = api_cede_notself; 1776 coroapi.cede_notself = api_cede_notself;
1655 coroapi.ready = api_ready; 1777 coroapi.ready = api_ready;
… …
1706 CODE: 1828 CODE:
1707 RETVAL = coro_nready; 1829 RETVAL = coro_nready;
1708 OUTPUT: 1830 OUTPUT:
1709 RETVAL 1831 RETVAL
1710 1832
1833void
1834throw (Coro::State self, SV *throw = &PL_sv_undef)
1835 PROTOTYPE: $;$
1836 CODE:
1837 SvREFCNT_dec (self->throw);
1838 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1839
1711# for async_pool speedup 1840# for async_pool speedup
1712void 1841void
1713_pool_1 (SV *cb) 1842_pool_1 (SV *cb)
1714 CODE: 1843 CODE:
1715{ 1844{
1716 struct coro *coro = SvSTATE (coro_current); 1845 struct coro *coro = SvSTATE (coro_current);
1717 HV *hv = (HV *)SvRV (coro_current); 1846 HV *hv = (HV *)SvRV (coro_current);
1718 AV *defav = GvAV (PL_defgv); 1847 AV *defav = GvAV (PL_defgv);
1719 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1848 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0);
1720 AV *invoke_av; 1849 AV *invoke_av;
1721 int i, len; 1850 int i, len;
1722 1851
1723 if (!invoke) 1852 if (!invoke)
1724 croak ("\3terminate\2\n"); 1853 croak ("\3async_pool terminate\2\n");
1725 1854
1726 SvREFCNT_dec (coro->saved_deffh); 1855 SvREFCNT_dec (coro->saved_deffh);
1727 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1856 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1728 1857
1729 hv_store (hv, "desc", sizeof ("desc") - 1, 1858 hv_store (hv, "desc", sizeof ("desc") - 1,
1730 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1859 newSVpvn (strpair ("[async_pool]")), 0);
1731 1860
1732 invoke_av = (AV *)SvRV (invoke); 1861 invoke_av = (AV *)SvRV (invoke);
1733 len = av_len (invoke_av); 1862 len = av_len (invoke_av);
1734 1863
1735 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1864 sv_setsv (cb, AvARRAY (invoke_av)[0]);
… …
1755 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1884 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1756 coro->saved_deffh = 0; 1885 coro->saved_deffh = 0;
1757 1886
1758 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1887 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1759 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1888 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1760 croak ("\3terminate\2\n"); 1889 croak ("\3async_pool terminate\2\n");
1761 1890
1762 av_clear (GvAV (PL_defgv)); 1891 av_clear (GvAV (PL_defgv));
1763 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1892 hv_store ((HV *)SvRV (coro_current), strpair ("desc"),
1764 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1893 newSVpvn (strpair ("[async_pool idle]")), 0);
1765 1894
1766 coro->prio = 0; 1895 coro->prio = 0;
1767 1896
1768 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1897 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1769 api_trace (coro_current, 0); 1898 api_trace (coro_current, 0);

Diff Legend

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