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.202 by root, Mon Oct 8 02:50: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 457
401 GvSV (PL_defgv) = c->defsv; 458 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
402 GvAV (PL_defgv) = c->defav; 459 /*hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);*/
403 GvSV (PL_errgv) = c->errsv;
404 GvSV (irsgv) = c->irssv_sv;
405 460
406 { 461 {
407 dSP; 462 dSP;
463
408 CV *cv; 464 CV *cv;
409 465
410 /* now do the ugly restore mess */ 466 /* now do the ugly restore mess */
411 while ((cv = (CV *)POPs)) 467 while (expect_true (cv = (CV *)POPs))
412 { 468 {
413 put_padlist (aTHX_ cv); /* mark this padlist as available */ 469 put_padlist (aTHX_ cv); /* mark this padlist as available */
414 CvDEPTH (cv) = PTR2IV (POPs); 470 CvDEPTH (cv) = PTR2IV (POPs);
415 CvPADLIST (cv) = (AV *)POPs; 471 CvPADLIST (cv) = (AV *)POPs;
416 } 472 }
… …
435 491
436 XPUSHs (Nullsv); 492 XPUSHs (Nullsv);
437 /* this loop was inspired by pp_caller */ 493 /* this loop was inspired by pp_caller */
438 for (;;) 494 for (;;)
439 { 495 {
440 while (cxix >= 0) 496 while (expect_true (cxix >= 0))
441 { 497 {
442 PERL_CONTEXT *cx = &ccstk[cxix--]; 498 PERL_CONTEXT *cx = &ccstk[cxix--];
443 499
444 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 500 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
445 { 501 {
446 CV *cv = cx->blk_sub.cv; 502 CV *cv = cx->blk_sub.cv;
447 503
448 if (CvDEPTH (cv)) 504 if (expect_true (CvDEPTH (cv)))
449 { 505 {
450 EXTEND (SP, 3); 506 EXTEND (SP, 3);
451 PUSHs ((SV *)CvPADLIST (cv)); 507 PUSHs ((SV *)CvPADLIST (cv));
452 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 508 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
453 PUSHs ((SV *)cv); 509 PUSHs ((SV *)cv);
… …
456 get_padlist (aTHX_ cv); 512 get_padlist (aTHX_ cv);
457 } 513 }
458 } 514 }
459 } 515 }
460 516
461 if (top_si->si_type == PERLSI_MAIN) 517 if (expect_true (top_si->si_type == PERLSI_MAIN))
462 break; 518 break;
463 519
464 top_si = top_si->si_prev; 520 top_si = top_si->si_prev;
465 ccstk = top_si->si_cxstack; 521 ccstk = top_si->si_cxstack;
466 cxix = top_si->si_cxix; 522 cxix = top_si->si_cxix;
467 } 523 }
468 524
469 PUTBACK; 525 PUTBACK;
470 } 526 }
471 527
528 /* allocate some space on the context stack for our purposes */
529 /* we manually unroll here, as usually 2 slots is enough */
530 if (SLOT_COUNT >= 1) CXINC;
531 if (SLOT_COUNT >= 2) CXINC;
532 if (SLOT_COUNT >= 3) CXINC;
533 {
534 int i;
535 for (i = 3; i < SLOT_COUNT; ++i)
536 CXINC;
537 }
538 cxstack_ix -= SLOT_COUNT; /* undo allocation */
539
540 c->mainstack = PL_mainstack;
541
542 {
543 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
544
472 c->defav = GvAV (PL_defgv); 545 slot->defav = GvAV (PL_defgv);
473 c->defsv = DEFSV; 546 slot->defsv = DEFSV;
474 c->errsv = ERRSV; 547 slot->errsv = ERRSV;
475 c->irssv_sv = GvSV (irsgv); 548 slot->irsgv = GvSV (irsgv);
476 549
477#define VAR(name,type)c->name = PL_ ## name; 550 #define VAR(name,type) slot->name = PL_ ## name;
478# include "state.h" 551 # include "state.h"
479#undef VAR 552 #undef VAR
553 }
480} 554}
481 555
482/* 556/*
483 * allocate various perl stacks. This is an exact copy 557 * allocate various perl stacks. This is an exact copy
484 * of perl.c:init_stacks, except that it uses less memory 558 * of perl.c:init_stacks, except that it uses less memory
485 * on the (sometimes correct) assumption that coroutines do 559 * on the (sometimes correct) assumption that coroutines do
486 * not usually need a lot of stackspace. 560 * not usually need a lot of stackspace.
487 */ 561 */
488#if CORO_PREFER_PERL_FUNCTIONS 562#if 1
489# define coro_init_stacks init_stacks 563# define coro_init_stacks init_stacks
490#else 564#else
491static void 565static void
492coro_init_stacks (pTHX) 566coro_init_stacks (pTHX)
493{ 567{
494 PL_curstackinfo = new_stackinfo(64, 6); 568 PL_curstackinfo = new_stackinfo(32, 8);
495 PL_curstackinfo->si_type = PERLSI_MAIN; 569 PL_curstackinfo->si_type = PERLSI_MAIN;
496 PL_curstack = PL_curstackinfo->si_stack; 570 PL_curstack = PL_curstackinfo->si_stack;
497 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 571 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
498 572
499 PL_stack_base = AvARRAY(PL_curstack); 573 PL_stack_base = AvARRAY(PL_curstack);
500 PL_stack_sp = PL_stack_base; 574 PL_stack_sp = PL_stack_base;
501 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 575 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
502 576
503 New(50,PL_tmps_stack,64,SV*); 577 New(50,PL_tmps_stack,32,SV*);
504 PL_tmps_floor = -1; 578 PL_tmps_floor = -1;
505 PL_tmps_ix = -1; 579 PL_tmps_ix = -1;
506 PL_tmps_max = 64; 580 PL_tmps_max = 32;
507 581
508 New(54,PL_markstack,16,I32); 582 New(54,PL_markstack,16,I32);
509 PL_markstack_ptr = PL_markstack; 583 PL_markstack_ptr = PL_markstack;
510 PL_markstack_max = PL_markstack + 16; 584 PL_markstack_max = PL_markstack + 16;
511 585
512#ifdef SET_MARK_OFFSET 586#ifdef SET_MARK_OFFSET
513 SET_MARK_OFFSET; 587 SET_MARK_OFFSET;
514#endif 588#endif
515 589
516 New(54,PL_scopestack,16,I32); 590 New(54,PL_scopestack,8,I32);
517 PL_scopestack_ix = 0; 591 PL_scopestack_ix = 0;
518 PL_scopestack_max = 16; 592 PL_scopestack_max = 8;
519 593
520 New(54,PL_savestack,64,ANY); 594 New(54,PL_savestack,24,ANY);
521 PL_savestack_ix = 0; 595 PL_savestack_ix = 0;
522 PL_savestack_max = 64; 596 PL_savestack_max = 24;
523 597
524#if !PERL_VERSION_ATLEAST (5,9,0) 598#if !PERL_VERSION_ATLEAST (5,9,0)
525 New(54,PL_retstack,4,OP*); 599 New(54,PL_retstack,4,OP*);
526 PL_retstack_ix = 0; 600 PL_retstack_ix = 0;
527 PL_retstack_max = 4; 601 PL_retstack_max = 4;
… …
564{ 638{
565 size_t rss = sizeof (*coro); 639 size_t rss = sizeof (*coro);
566 640
567 if (coro->mainstack) 641 if (coro->mainstack)
568 { 642 {
643 perl_slots tmp_slot;
644 perl_slots *slot;
645
569 if (coro->flags & CF_RUNNING) 646 if (coro->flags & CF_RUNNING)
570 { 647 {
648 slot = &tmp_slot;
649
571 #define VAR(name,type)coro->name = PL_ ## name; 650 #define VAR(name,type) slot->name = PL_ ## name;
572 # include "state.h" 651 # include "state.h"
573 #undef VAR 652 #undef VAR
574 } 653 }
654 else
655 slot = coro->slot;
575 656
576 rss += sizeof (coro->curstackinfo); 657 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); 658 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
579 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 659 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
580 rss += coro->tmps_max * sizeof (SV *); 660 rss += slot->tmps_max * sizeof (SV *);
581 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 661 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
582 rss += coro->scopestack_max * sizeof (I32); 662 rss += slot->scopestack_max * sizeof (I32);
583 rss += coro->savestack_max * sizeof (ANY); 663 rss += slot->savestack_max * sizeof (ANY);
584 664
585#if !PERL_VERSION_ATLEAST (5,9,0) 665#if !PERL_VERSION_ATLEAST (5,9,0)
586 rss += coro->retstack_max * sizeof (OP *); 666 rss += slot->retstack_max * sizeof (OP *);
587#endif 667#endif
588 } 668 }
589 669
590 return rss; 670 return rss;
591} 671}
… …
603 PL_runops = RUNOPS_DEFAULT; 683 PL_runops = RUNOPS_DEFAULT;
604 PL_curcop = &PL_compiling; 684 PL_curcop = &PL_compiling;
605 PL_in_eval = EVAL_NULL; 685 PL_in_eval = EVAL_NULL;
606 PL_comppad = 0; 686 PL_comppad = 0;
607 PL_curpm = 0; 687 PL_curpm = 0;
688 PL_curpad = 0;
608 PL_localizing = 0; 689 PL_localizing = 0;
609 PL_dirty = 0; 690 PL_dirty = 0;
610 PL_restartop = 0; 691 PL_restartop = 0;
692 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
693 PL_warnhook = 0; hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
611 694
612 GvSV (PL_defgv) = newSV (0); 695 GvSV (PL_defgv) = newSV (0);
613 GvAV (PL_defgv) = coro->args; coro->args = 0; 696 GvAV (PL_defgv) = coro->args; coro->args = 0;
614 GvSV (PL_errgv) = newSV (0); 697 GvSV (PL_errgv) = newSV (0);
615 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 698 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
616 PL_rs = newSVsv (GvSV (irsgv)); 699 PL_rs = newSVsv (GvSV (irsgv));
617 PL_defoutgv = SvREFCNT_inc (stdoutgv); 700 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
618
619 ENTER; /* necessary e.g. for dounwind */
620 701
621 { 702 {
622 dSP; 703 dSP;
623 LOGOP myop; 704 LOGOP myop;
624 705
… …
631 PUTBACK; 712 PUTBACK;
632 PL_op = (OP *)&myop; 713 PL_op = (OP *)&myop;
633 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 714 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
634 SPAGAIN; 715 SPAGAIN;
635 } 716 }
717
718 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */
636} 719}
637 720
638static void 721static void
639coro_destroy (pTHX_ struct coro *coro) 722coro_destroy (pTHX_ struct coro *coro)
640{ 723{
… …
660 SvREFCNT_dec (GvSV (PL_errgv)); 743 SvREFCNT_dec (GvSV (PL_errgv));
661 SvREFCNT_dec (PL_defoutgv); 744 SvREFCNT_dec (PL_defoutgv);
662 SvREFCNT_dec (PL_rs); 745 SvREFCNT_dec (PL_rs);
663 SvREFCNT_dec (GvSV (irsgv)); 746 SvREFCNT_dec (GvSV (irsgv));
664 747
748 SvREFCNT_dec (PL_diehook);
749 SvREFCNT_dec (PL_warnhook);
750
665 SvREFCNT_dec (coro->saved_deffh); 751 SvREFCNT_dec (coro->saved_deffh);
666 //SvREFCNT_dec (coro->throw); 752 SvREFCNT_dec (coro->throw);
667 753
668 coro_destroy_stacks (aTHX); 754 coro_destroy_stacks (aTHX);
669} 755}
670 756
671static void 757static void
672free_coro_mortal (pTHX) 758free_coro_mortal (pTHX)
673{ 759{
674 if (coro_mortal) 760 if (expect_true (coro_mortal))
675 { 761 {
676 SvREFCNT_dec (coro_mortal); 762 SvREFCNT_dec (coro_mortal);
677 coro_mortal = 0; 763 coro_mortal = 0;
678 } 764 }
679} 765}
… …
708 bot = PL_stack_base + cx->blk_oldsp + 1; 794 bot = PL_stack_base + cx->blk_oldsp + 1;
709 top = cx->blk_gimme == G_ARRAY ? SP + 1 795 top = cx->blk_gimme == G_ARRAY ? SP + 1
710 : cx->blk_gimme == G_SCALAR ? bot + 1 796 : cx->blk_gimme == G_SCALAR ? bot + 1
711 : bot; 797 : bot;
712 798
799 av_extend (av, top - bot);
713 while (bot < top) 800 while (bot < top)
714 av_push (av, SvREFCNT_inc (*bot++)); 801 av_push (av, SvREFCNT_inc (*bot++));
715 802
716 PL_runops = RUNOPS_DEFAULT; 803 PL_runops = RUNOPS_DEFAULT;
717 ENTER; 804 ENTER;
… …
720 PUSHMARK (SP); 807 PUSHMARK (SP);
721 PUSHs (&PL_sv_no); 808 PUSHs (&PL_sv_no);
722 PUSHs (fullname); 809 PUSHs (fullname);
723 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 810 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
724 PUTBACK; 811 PUTBACK;
725 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 812 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); 813 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
727 SPAGAIN; 814 SPAGAIN;
728 FREETMPS; 815 FREETMPS;
729 LEAVE; 816 LEAVE;
730 PL_runops = runops_trace; 817 PL_runops = runops_trace;
… …
759 PUSHMARK (SP); 846 PUSHMARK (SP);
760 PUSHs (&PL_sv_yes); 847 PUSHs (&PL_sv_yes);
761 PUSHs (fullname); 848 PUSHs (fullname);
762 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 849 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
763 PUTBACK; 850 PUTBACK;
764 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 851 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); 852 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
766 SPAGAIN; 853 SPAGAIN;
767 FREETMPS; 854 FREETMPS;
768 LEAVE; 855 LEAVE;
769 PL_runops = runops_trace; 856 PL_runops = runops_trace;
… …
783 PL_runops = RUNOPS_DEFAULT; 870 PL_runops = RUNOPS_DEFAULT;
784 PUSHMARK (SP); 871 PUSHMARK (SP);
785 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 872 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
786 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 873 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
787 PUTBACK; 874 PUTBACK;
788 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0); 875 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); 876 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
790 SPAGAIN; 877 SPAGAIN;
791 FREETMPS; 878 FREETMPS;
792 LEAVE; 879 LEAVE;
793 PL_runops = runops_trace; 880 PL_runops = runops_trace;
… …
803 890
804/* inject a fake call to Coro::State::_cctx_init into the execution */ 891/* 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 */ 892/* _cctx_init should be careful, as it could be called at almost any time */
806/* during execution of a perl program */ 893/* during execution of a perl program */
807static void NOINLINE 894static void NOINLINE
808prepare_cctx (pTHX_ coro_cctx *cctx) 895cctx_prepare (pTHX_ coro_cctx *cctx)
809{ 896{
810 dSP; 897 dSP;
811 LOGOP myop; 898 LOGOP myop;
812 899
813 PL_top_env = &PL_start_env; 900 PL_top_env = &PL_start_env;
… …
831 918
832/* 919/*
833 * this is a _very_ stripped down perl interpreter ;) 920 * this is a _very_ stripped down perl interpreter ;)
834 */ 921 */
835static void 922static void
836coro_run (void *arg) 923cctx_run (void *arg)
837{ 924{
838 dTHX; 925 dTHX;
839 926
840 /* coro_run is the alternative tail of transfer(), so unlock here. */ 927 /* cctx_run is the alternative tail of transfer(), so unlock here. */
841 UNLOCK; 928 UNLOCK;
842 929
843 /* we now skip the entersub that lead to transfer() */ 930 /* we now skip the entersub that lead to transfer() */
844 PL_op = PL_op->op_next; 931 PL_op = PL_op->op_next;
845 932
846 /* inject a fake subroutine call to cctx_init */ 933 /* inject a fake subroutine call to cctx_init */
847 prepare_cctx (aTHX_ (coro_cctx *)arg); 934 cctx_prepare (aTHX_ (coro_cctx *)arg);
848 935
849 /* somebody or something will hit me for both perl_run and PL_restartop */ 936 /* somebody or something will hit me for both perl_run and PL_restartop */
850 PL_restartop = PL_op; 937 PL_restartop = PL_op;
851 perl_run (PL_curinterp); 938 perl_run (PL_curinterp);
852 939
… …
871 ++cctx_count; 958 ++cctx_count;
872 959
873 Newz (0, cctx, 1, coro_cctx); 960 Newz (0, cctx, 1, coro_cctx);
874 961
875#if HAVE_MMAP 962#if HAVE_MMAP
876
877 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 963 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
878 /* mmap supposedly does allocate-on-write for us */ 964 /* 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); 965 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
880 966
881 if (cctx->sptr != (void *)-1) 967 if (cctx->sptr != (void *)-1)
… …
902 stack_start = cctx->sptr; 988 stack_start = cctx->sptr;
903 stack_size = cctx->ssize; 989 stack_size = cctx->ssize;
904 } 990 }
905 991
906 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 992 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
907 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 993 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
908 994
909 return cctx; 995 return cctx;
910} 996}
911 997
912static void 998static void
… …
929 Safefree (cctx->sptr); 1015 Safefree (cctx->sptr);
930 1016
931 Safefree (cctx); 1017 Safefree (cctx);
932} 1018}
933 1019
1020/* wether this cctx should be destructed */
1021#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1022
934static coro_cctx * 1023static coro_cctx *
935cctx_get (pTHX) 1024cctx_get (pTHX)
936{ 1025{
937 while (cctx_first) 1026 while (expect_true (cctx_first))
938 { 1027 {
939 coro_cctx *cctx = cctx_first; 1028 coro_cctx *cctx = cctx_first;
940 cctx_first = cctx->next; 1029 cctx_first = cctx->next;
941 --cctx_idle; 1030 --cctx_idle;
942 1031
943 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1032 if (expect_true (!CCTX_EXPIRED (cctx)))
944 return cctx; 1033 return cctx;
945 1034
946 cctx_destroy (cctx); 1035 cctx_destroy (cctx);
947 } 1036 }
948 1037
… …
951 1040
952static void 1041static void
953cctx_put (coro_cctx *cctx) 1042cctx_put (coro_cctx *cctx)
954{ 1043{
955 /* free another cctx if overlimit */ 1044 /* free another cctx if overlimit */
956 if (cctx_idle >= MAX_IDLE_CCTX) 1045 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
957 { 1046 {
958 coro_cctx *first = cctx_first; 1047 coro_cctx *first = cctx_first;
959 cctx_first = first->next; 1048 cctx_first = first->next;
960 --cctx_idle; 1049 --cctx_idle;
961 1050
… …
967 cctx_first = cctx; 1056 cctx_first = cctx;
968} 1057}
969 1058
970/** coroutine switching *****************************************************/ 1059/** coroutine switching *****************************************************/
971 1060
972static void NOINLINE 1061static void
973transfer_check (pTHX_ struct coro *prev, struct coro *next) 1062transfer_check (pTHX_ struct coro *prev, struct coro *next)
974{ 1063{
975 if (prev != next) 1064 if (expect_true (prev != next))
976 { 1065 {
977 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1066 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"); 1067 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
979 1068
980 if (next->flags & CF_RUNNING) 1069 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"); 1070 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
982 1071
983 if (next->flags & CF_DESTROYED) 1072 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"); 1073 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
985 1074
1075 if (
1076#if PERL_VERSION_ATLEAST (5,9,0)
1077 expect_false (PL_parser)
1078#else
986 if (PL_lex_state != LEX_NOTPARSING) 1079 expect_false (PL_lex_state != LEX_NOTPARSING)
1080#endif
1081 )
987 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1082 croak ("Coro::State::transfer called while parsing, but this is not supported");
988 } 1083 }
989} 1084}
990 1085
991/* always use the TRANSFER macro */ 1086/* always use the TRANSFER macro */
… …
993transfer (pTHX_ struct coro *prev, struct coro *next) 1088transfer (pTHX_ struct coro *prev, struct coro *next)
994{ 1089{
995 dSTACKLEVEL; 1090 dSTACKLEVEL;
996 1091
997 /* sometimes transfer is only called to set idle_sp */ 1092 /* sometimes transfer is only called to set idle_sp */
998 if (!next) 1093 if (expect_false (!next))
999 { 1094 {
1000 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1095 ((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 */ 1096 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1002 } 1097 }
1003 else if (prev != next) 1098 else if (expect_true (prev != next))
1004 { 1099 {
1005 coro_cctx *prev__cctx; 1100 coro_cctx *prev__cctx;
1006 1101
1007 if (prev->flags & CF_NEW) 1102 if (expect_false (prev->flags & CF_NEW))
1008 { 1103 {
1009 /* create a new empty context */ 1104 /* create a new empty context */
1010 Newz (0, prev->cctx, 1, coro_cctx); 1105 Newz (0, prev->cctx, 1, coro_cctx);
1011 prev->flags &= ~CF_NEW; 1106 prev->flags &= ~CF_NEW;
1012 prev->flags |= CF_RUNNING; 1107 prev->flags |= CF_RUNNING;
… …
1015 prev->flags &= ~CF_RUNNING; 1110 prev->flags &= ~CF_RUNNING;
1016 next->flags |= CF_RUNNING; 1111 next->flags |= CF_RUNNING;
1017 1112
1018 LOCK; 1113 LOCK;
1019 1114
1020 if (next->flags & CF_NEW) 1115 if (expect_false (next->flags & CF_NEW))
1021 { 1116 {
1022 /* need to start coroutine */ 1117 /* need to start coroutine */
1023 next->flags &= ~CF_NEW; 1118 next->flags &= ~CF_NEW;
1024 /* first get rid of the old state */ 1119 /* first get rid of the old state */
1025 save_perl (aTHX_ prev); 1120 save_perl (aTHX_ prev);
… …
1034 } 1129 }
1035 1130
1036 prev__cctx = prev->cctx; 1131 prev__cctx = prev->cctx;
1037 1132
1038 /* possibly "free" the cctx */ 1133 /* possibly "free" the cctx */
1039 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1134 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1040 { 1135 {
1041 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1136 /* 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)); 1137 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1043 1138
1044 prev->cctx = 0; 1139 prev->cctx = 0;
1045 1140
1141 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1142 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1143 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1144 if (!next->cctx)
1145 next->cctx = cctx_get (aTHX);
1146
1046 cctx_put (prev__cctx); 1147 cctx_put (prev__cctx);
1047 } 1148 }
1048 1149
1049 ++next->usecount; 1150 ++next->usecount;
1050 1151
1051 if (!next->cctx) 1152 if (expect_true (!next->cctx))
1052 next->cctx = cctx_get (aTHX); 1153 next->cctx = cctx_get (aTHX);
1053 1154
1054 if (prev__cctx != next->cctx) 1155 if (expect_false (prev__cctx != next->cctx))
1055 { 1156 {
1056 prev__cctx->top_env = PL_top_env; 1157 prev__cctx->top_env = PL_top_env;
1057 PL_top_env = next->cctx->top_env; 1158 PL_top_env = next->cctx->top_env;
1058 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1159 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1059 } 1160 }
1060 1161
1061 free_coro_mortal (aTHX); 1162 free_coro_mortal (aTHX);
1062 UNLOCK; 1163 UNLOCK;
1164
1165 if (expect_false (prev->throw || next->throw))
1166 {
1167 struct coro *coro = SvSTATE (coro_current);
1168
1169 if (coro->throw)
1170 {
1171 SV *exception = coro->throw;
1172 coro->throw = 0;
1173 sv_setsv (ERRSV, exception);
1174 croak (0);
1175 }
1176 }
1063 } 1177 }
1064} 1178}
1065 1179
1066struct transfer_args 1180struct transfer_args
1067{ 1181{
… …
1102 save_perl (aTHX_ &temp); 1216 save_perl (aTHX_ &temp);
1103 load_perl (aTHX_ coro); 1217 load_perl (aTHX_ coro);
1104 1218
1105 coro_destroy (aTHX_ coro); 1219 coro_destroy (aTHX_ coro);
1106 1220
1107 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1221 load_perl (aTHX_ &temp);
1108 1222
1109 coro->mainstack = 0; 1223 coro->slot = 0;
1110 } 1224 }
1111 1225
1112 cctx_destroy (coro->cctx); 1226 cctx_destroy (coro->cctx);
1113 SvREFCNT_dec (coro->args); 1227 SvREFCNT_dec (coro->args);
1114 1228
… …
1239 { 1353 {
1240 LOCK; 1354 LOCK;
1241 next_sv = coro_deq (aTHX_ PRIO_MIN); 1355 next_sv = coro_deq (aTHX_ PRIO_MIN);
1242 1356
1243 /* nothing to schedule: call the idle handler */ 1357 /* nothing to schedule: call the idle handler */
1244 if (!next_sv) 1358 if (expect_false (!next_sv))
1245 { 1359 {
1246 dSP; 1360 dSP;
1247 UNLOCK; 1361 UNLOCK;
1248 1362
1249 ENTER; 1363 ENTER;
… …
1259 } 1373 }
1260 1374
1261 ta->next = SvSTATE (next_sv); 1375 ta->next = SvSTATE (next_sv);
1262 1376
1263 /* cannot transfer to destroyed coros, skip and look for next */ 1377 /* cannot transfer to destroyed coros, skip and look for next */
1264 if (ta->next->flags & CF_DESTROYED) 1378 if (expect_false (ta->next->flags & CF_DESTROYED))
1265 { 1379 {
1266 UNLOCK; 1380 UNLOCK;
1267 SvREFCNT_dec (next_sv); 1381 SvREFCNT_dec (next_sv);
1268 /* coro_nready is already taken care of by destroy */ 1382 /* coro_nready is already taken care of by destroy */
1269 continue; 1383 continue;
… …
1325 dTHX; 1439 dTHX;
1326 struct transfer_args ta; 1440 struct transfer_args ta;
1327 1441
1328 prepare_cede (aTHX_ &ta); 1442 prepare_cede (aTHX_ &ta);
1329 1443
1330 if (ta.prev != ta.next) 1444 if (expect_true (ta.prev != ta.next))
1331 { 1445 {
1332 TRANSFER (ta); 1446 TRANSFER (ta);
1333 return 1; 1447 return 1;
1334 } 1448 }
1335 else 1449 else
… …
1371 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1485 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1372 1486
1373 if (coro->flags & CF_RUNNING) 1487 if (coro->flags & CF_RUNNING)
1374 PL_runops = RUNOPS_DEFAULT; 1488 PL_runops = RUNOPS_DEFAULT;
1375 else 1489 else
1376 coro->runops = RUNOPS_DEFAULT; 1490 coro->slot->runops = RUNOPS_DEFAULT;
1377 } 1491 }
1378} 1492}
1379 1493
1380MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1494MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1381 1495
… …
1388#endif 1502#endif
1389 BOOT_PAGESIZE; 1503 BOOT_PAGESIZE;
1390 1504
1391 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1505 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1392 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1506 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1507
1508 hv_sig = coro_get_hv ("SIG", TRUE);
1509 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE);
1510 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE);
1511
1512 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1513 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1393 1514
1394 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1515 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1395 1516
1396 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1517 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1397 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1518 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1429 coro->hv = hv = newHV (); 1550 coro->hv = hv = newHV ();
1430 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1551 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)); 1552 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1432 1553
1433 av_extend (coro->args, items - 1); 1554 av_extend (coro->args, items - 1);
1434
1435 for (i = 1; i < items; i++) 1555 for (i = 1; i < items; i++)
1436 av_push (coro->args, newSVsv (ST (i))); 1556 av_push (coro->args, newSVsv (ST (i)));
1437} 1557}
1438 OUTPUT: 1558 OUTPUT:
1439 RETVAL 1559 RETVAL
… …
1482 } 1602 }
1483 1603
1484 BARRIER; 1604 BARRIER;
1485 TRANSFER (ta); 1605 TRANSFER (ta);
1486 1606
1487 if (GIMME_V != G_VOID && ta.next != ta.prev) 1607 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev))
1488 XSRETURN_YES; 1608 XSRETURN_YES;
1489} 1609}
1490 1610
1491bool 1611bool
1492_destroy (SV *coro_sv) 1612_destroy (SV *coro_sv)
… …
1542 CODE: 1662 CODE:
1543{ 1663{
1544 if (coro->mainstack) 1664 if (coro->mainstack)
1545 { 1665 {
1546 struct coro temp; 1666 struct coro temp;
1547 Zero (&temp, 1, struct coro);
1548 1667
1549 if (!(coro->flags & CF_RUNNING)) 1668 if (!(coro->flags & CF_RUNNING))
1550 { 1669 {
1551 save_perl (aTHX_ &temp); 1670 save_perl (aTHX_ &temp);
1552 load_perl (aTHX_ coro); 1671 load_perl (aTHX_ coro);
… …
1556 dSP; 1675 dSP;
1557 ENTER; 1676 ENTER;
1558 SAVETMPS; 1677 SAVETMPS;
1559 PUSHMARK (SP); 1678 PUSHMARK (SP);
1560 PUTBACK; 1679 PUTBACK;
1680
1561 if (ix) 1681 if (ix)
1562 eval_sv (coderef, 0); 1682 eval_sv (coderef, 0);
1563 else 1683 else
1564 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1684 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1685
1565 SPAGAIN; 1686 SPAGAIN;
1566 FREETMPS; 1687 FREETMPS;
1567 LEAVE; 1688 LEAVE;
1568 PUTBACK; 1689 PUTBACK;
1569 } 1690 }
… …
1627 1748
1628BOOT: 1749BOOT:
1629{ 1750{
1630 int i; 1751 int i;
1631 1752
1632 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1753 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1633 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1754 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1634 av_async_pool = get_av ("Coro::async_pool", TRUE); 1755 av_async_pool = coro_get_av ("Coro::async_pool", TRUE);
1635 1756
1636 coro_current = get_sv ("Coro::current", FALSE); 1757 coro_current = coro_get_sv ("Coro::current", FALSE);
1637 SvREADONLY_on (coro_current); 1758 SvREADONLY_on (coro_current);
1638 1759
1639 coro_stash = gv_stashpv ("Coro", TRUE); 1760 coro_stash = gv_stashpv ("Coro", TRUE);
1640 1761
1641 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1762 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1642 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1763 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1643 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1764 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1644 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1765 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
… …
1647 1768
1648 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1769 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1649 coro_ready[i] = newAV (); 1770 coro_ready[i] = newAV ();
1650 1771
1651 { 1772 {
1652 SV *sv = perl_get_sv("Coro::API", 1); 1773 SV *sv = perl_get_sv ("Coro::API", TRUE);
1774 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1653 1775
1654 coroapi.schedule = api_schedule; 1776 coroapi.schedule = api_schedule;
1655 coroapi.cede = api_cede; 1777 coroapi.cede = api_cede;
1656 coroapi.cede_notself = api_cede_notself; 1778 coroapi.cede_notself = api_cede_notself;
1657 coroapi.ready = api_ready; 1779 coroapi.ready = api_ready;
… …
1708 CODE: 1830 CODE:
1709 RETVAL = coro_nready; 1831 RETVAL = coro_nready;
1710 OUTPUT: 1832 OUTPUT:
1711 RETVAL 1833 RETVAL
1712 1834
1835void
1836throw (Coro::State self, SV *throw = &PL_sv_undef)
1837 PROTOTYPE: $;$
1838 CODE:
1839 SvREFCNT_dec (self->throw);
1840 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1841
1713# for async_pool speedup 1842# for async_pool speedup
1714void 1843void
1715_pool_1 (SV *cb) 1844_pool_1 (SV *cb)
1716 CODE: 1845 CODE:
1717{ 1846{
1718 struct coro *coro = SvSTATE (coro_current); 1847 struct coro *coro = SvSTATE (coro_current);
1719 HV *hv = (HV *)SvRV (coro_current); 1848 HV *hv = (HV *)SvRV (coro_current);
1720 AV *defav = GvAV (PL_defgv); 1849 AV *defav = GvAV (PL_defgv);
1721 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1850 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0);
1722 AV *invoke_av; 1851 AV *invoke_av;
1723 int i, len; 1852 int i, len;
1724 1853
1725 if (!invoke) 1854 if (!invoke)
1726 croak ("\3terminate\2\n"); 1855 croak ("\3async_pool terminate\2\n");
1727 1856
1728 SvREFCNT_dec (coro->saved_deffh); 1857 SvREFCNT_dec (coro->saved_deffh);
1729 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1858 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1730 1859
1731 hv_store (hv, "desc", sizeof ("desc") - 1, 1860 hv_store (hv, "desc", sizeof ("desc") - 1,
1732 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1861 newSVpvn (strpair ("[async_pool]")), 0);
1733 1862
1734 invoke_av = (AV *)SvRV (invoke); 1863 invoke_av = (AV *)SvRV (invoke);
1735 len = av_len (invoke_av); 1864 len = av_len (invoke_av);
1736 1865
1737 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1866 sv_setsv (cb, AvARRAY (invoke_av)[0]);
… …
1757 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1886 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1758 coro->saved_deffh = 0; 1887 coro->saved_deffh = 0;
1759 1888
1760 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1889 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1761 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1890 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1762 croak ("\3terminate\2\n"); 1891 croak ("\3async_pool terminate\2\n");
1763 1892
1764 av_clear (GvAV (PL_defgv)); 1893 av_clear (GvAV (PL_defgv));
1765 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1894 hv_store ((HV *)SvRV (coro_current), strpair ("desc"),
1766 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1895 newSVpvn (strpair ("[async_pool idle]")), 0);
1767 1896
1768 coro->prio = 0; 1897 coro->prio = 0;
1769 1898
1770 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1899 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1771 api_trace (coro_current, 0); 1900 api_trace (coro_current, 0);

Diff Legend

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