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.189 by root, Fri Oct 5 20:38:43 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
… …
75/* 5.8.7 */ 76/* 5.8.7 */
76#ifndef SvRV_set 77#ifndef SvRV_set
77# define SvRV_set(s,v) SvRV(s) = (v) 78# define SvRV_set(s,v) SvRV(s) = (v)
78#endif 79#endif
79 80
81/* 5.8.8 */
82#ifndef GV_NOTQUAL
83# define GV_NOTQUAL 0
84#endif
85#ifndef newSV
86# define newSV(l) NEWSV(0,l)
87#endif
88
80#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 89#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
81# undef CORO_STACKGUARD 90# undef CORO_STACKGUARD
82#endif 91#endif
83 92
84#ifndef CORO_STACKGUARD 93#ifndef CORO_STACKGUARD
… …
98#define IN_DESTRUCT (PL_main_cv == Nullcv) 107#define IN_DESTRUCT (PL_main_cv == Nullcv)
99 108
100#if __GNUC__ >= 3 109#if __GNUC__ >= 3
101# define attribute(x) __attribute__(x) 110# define attribute(x) __attribute__(x)
102# define BARRIER __asm__ __volatile__ ("" : : : "memory") 111# define BARRIER __asm__ __volatile__ ("" : : : "memory")
112# define expect(expr,value) __builtin_expect ((expr),(value))
103#else 113#else
104# define attribute(x) 114# define attribute(x)
105# define BARRIER 115# define BARRIER
116# define expect(expr,value) (expr)
106#endif 117#endif
118
119#define expect_false(expr) expect ((expr) != 0, 0)
120#define expect_true(expr) expect ((expr) != 0, 1)
107 121
108#define NOINLINE attribute ((noinline)) 122#define NOINLINE attribute ((noinline))
109 123
110#include "CoroAPI.h" 124#include "CoroAPI.h"
111 125
… …
116#else 130#else
117# define LOCK (void)0 131# define LOCK (void)0
118# define UNLOCK (void)0 132# define UNLOCK (void)0
119#endif 133#endif
120 134
135#define strpair(const) const, sizeof (const) - 1
136
121/* helper storage struct for Coro::AIO */ 137/* helper storage struct for Coro::AIO */
122struct io_state 138struct io_state
123{ 139{
124 int errorno; 140 int errorno;
125 I32 laststype; 141 I32 laststype;
… …
134static HV *coro_state_stash, *coro_stash; 150static HV *coro_state_stash, *coro_stash;
135static SV *coro_mortal; /* will be freed after next transfer */ 151static SV *coro_mortal; /* will be freed after next transfer */
136 152
137static GV *irsgv; /* $/ */ 153static GV *irsgv; /* $/ */
138static GV *stdoutgv; /* *STDOUT */ 154static GV *stdoutgv; /* *STDOUT */
155
156static HV *hv_sig; /* %SIG */
157static SV *sv_diehook;
158static SV *sv_warnhook;
139 159
140/* async_pool helper stuff */ 160/* async_pool helper stuff */
141static SV *sv_pool_rss; 161static SV *sv_pool_rss;
142static SV *sv_pool_size; 162static SV *sv_pool_size;
143static AV *av_async_pool; 163static AV *av_async_pool;
… …
179 CF_READY = 0x0002, /* coroutine is ready */ 199 CF_READY = 0x0002, /* coroutine is ready */
180 CF_NEW = 0x0004, /* has never been switched to */ 200 CF_NEW = 0x0004, /* has never been switched to */
181 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 201 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
182}; 202};
183 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
184/* this is a structure representing a perl-level coroutine */ 217/* this is a structure representing a perl-level coroutine */
185struct coro { 218struct coro {
186 /* the c coroutine allocated to this perl coroutine, if any */ 219 /* the c coroutine allocated to this perl coroutine, if any */
187 coro_cctx *cctx; 220 coro_cctx *cctx;
188 221
222 /* process data */
223 AV *mainstack;
224 perl_slots *slot; /* basically the saved sp */
225
189 /* data associated with this coroutine (initial args) */ 226 /* data associated with this coroutine (initial args) */
190 AV *args; 227 AV *args;
191 int refcnt; 228 int refcnt;
192 int flags; /* CF_ flags */ 229 int flags; /* CF_ flags */
193 230
194 /* optionally saved, might be zero */
195 AV *defav; /* @_ */
196 SV *defsv; /* $_ */
197 SV *errsv; /* $@ */
198 SV *deffh; /* default filehandle */
199 SV *irssv; /* $/ */
200 SV *irssv_sv; /* real $/ cache */
201
202#define VAR(name,type) type name;
203# include "state.h"
204#undef VAR
205
206 /* statistics */ 231 /* statistics */
207 int usecount; /* number of transfers to this coro */ 232 int usecount; /* number of transfers to this coro */
208 233
209 /* coro process data */ 234 /* coro process data */
210 int prio; 235 int prio;
211 //SV *throw; 236 SV *throw;
212 237
213 /* async_pool */ 238 /* async_pool */
214 SV *saved_deffh; 239 SV *saved_deffh;
215 240
216 /* linked list */ 241 /* linked list */
… …
235static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 260static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
236static int coro_nready; 261static int coro_nready;
237static struct coro *coro_first; 262static struct coro *coro_first;
238 263
239/** 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}
240 295
241static AV * 296static AV *
242coro_clone_padlist (pTHX_ CV *cv) 297coro_clone_padlist (pTHX_ CV *cv)
243{ 298{
244 AV *padlist = CvPADLIST (cv); 299 AV *padlist = CvPADLIST (cv);
… …
317 MAGIC *mg; 372 MAGIC *mg;
318 373
319 if (SvROK (coro)) 374 if (SvROK (coro))
320 coro = SvRV (coro); 375 coro = SvRV (coro);
321 376
322 if (SvTYPE (coro) != SVt_PVHV) 377 if (expect_false (SvTYPE (coro) != SVt_PVHV))
323 croak ("Coro::State object required"); 378 croak ("Coro::State object required");
324 379
325 stash = SvSTASH (coro); 380 stash = SvSTASH (coro);
326 if (stash != coro_stash && stash != coro_state_stash) 381 if (expect_false (stash != coro_stash && stash != coro_state_stash))
327 { 382 {
328 /* very slow, but rare, check */ 383 /* very slow, but rare, check */
329 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 384 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
330 croak ("Coro::State object required"); 385 croak ("Coro::State object required");
331 } 386 }
… …
341get_padlist (pTHX_ CV *cv) 396get_padlist (pTHX_ CV *cv)
342{ 397{
343 MAGIC *mg = CORO_MAGIC (cv); 398 MAGIC *mg = CORO_MAGIC (cv);
344 AV *av; 399 AV *av;
345 400
346 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 401 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
347 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 402 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
348 else 403 else
349 { 404 {
350#if CORO_PREFER_PERL_FUNCTIONS 405#if CORO_PREFER_PERL_FUNCTIONS
351 /* this is probably cleaner, but also slower? */ 406 /* this is probably cleaner, but also slower? */
… …
363put_padlist (pTHX_ CV *cv) 418put_padlist (pTHX_ CV *cv)
364{ 419{
365 MAGIC *mg = CORO_MAGIC (cv); 420 MAGIC *mg = CORO_MAGIC (cv);
366 AV *av; 421 AV *av;
367 422
368 if (!mg) 423 if (expect_false (!mg))
369 { 424 {
370 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 425 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
371 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 426 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
372 mg->mg_virtual = &vtbl_coro; 427 mg->mg_virtual = &vtbl_coro;
373 mg->mg_obj = (SV *)newAV (); 428 mg->mg_obj = (SV *)newAV ();
374 } 429 }
375 430
376 av = (AV *)mg->mg_obj; 431 av = (AV *)mg->mg_obj;
377 432
378 if (AvFILLp (av) >= AvMAX (av)) 433 if (expect_false (AvFILLp (av) >= AvMAX (av)))
379 av_extend (av, AvMAX (av) + 1); 434 av_extend (av, AvMAX (av) + 1);
380 435
381 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 436 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
382} 437}
383 438
384/** load & save, init *******************************************************/ 439/** load & save, init *******************************************************/
385 440
386static void 441static void
387load_perl (pTHX_ Coro__State c) 442load_perl (pTHX_ Coro__State c)
388{ 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
389#define VAR(name,type) PL_ ## name = c->name; 454 #define VAR(name,type) PL_ ## name = slot->name;
390# include "state.h" 455 # include "state.h"
391#undef VAR 456 #undef VAR
392
393 GvSV (PL_defgv) = c->defsv;
394 GvAV (PL_defgv) = c->defav;
395 GvSV (PL_errgv) = c->errsv;
396 GvSV (irsgv) = c->irssv_sv;
397 457
398 { 458 {
399 dSP; 459 dSP;
460
400 CV *cv; 461 CV *cv;
401 462
402 /* now do the ugly restore mess */ 463 /* now do the ugly restore mess */
403 while ((cv = (CV *)POPs)) 464 while (expect_true (cv = (CV *)POPs))
404 { 465 {
405 put_padlist (aTHX_ cv); /* mark this padlist as available */ 466 put_padlist (aTHX_ cv); /* mark this padlist as available */
406 CvDEPTH (cv) = PTR2IV (POPs); 467 CvDEPTH (cv) = PTR2IV (POPs);
407 CvPADLIST (cv) = (AV *)POPs; 468 CvPADLIST (cv) = (AV *)POPs;
408 } 469 }
… …
427 488
428 XPUSHs (Nullsv); 489 XPUSHs (Nullsv);
429 /* this loop was inspired by pp_caller */ 490 /* this loop was inspired by pp_caller */
430 for (;;) 491 for (;;)
431 { 492 {
432 while (cxix >= 0) 493 while (expect_true (cxix >= 0))
433 { 494 {
434 PERL_CONTEXT *cx = &ccstk[cxix--]; 495 PERL_CONTEXT *cx = &ccstk[cxix--];
435 496
436 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 497 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
437 { 498 {
438 CV *cv = cx->blk_sub.cv; 499 CV *cv = cx->blk_sub.cv;
439 500
440 if (CvDEPTH (cv)) 501 if (expect_true (CvDEPTH (cv)))
441 { 502 {
442 EXTEND (SP, 3); 503 EXTEND (SP, 3);
443 PUSHs ((SV *)CvPADLIST (cv)); 504 PUSHs ((SV *)CvPADLIST (cv));
444 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 505 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
445 PUSHs ((SV *)cv); 506 PUSHs ((SV *)cv);
… …
448 get_padlist (aTHX_ cv); 509 get_padlist (aTHX_ cv);
449 } 510 }
450 } 511 }
451 } 512 }
452 513
453 if (top_si->si_type == PERLSI_MAIN) 514 if (expect_true (top_si->si_type == PERLSI_MAIN))
454 break; 515 break;
455 516
456 top_si = top_si->si_prev; 517 top_si = top_si->si_prev;
457 ccstk = top_si->si_cxstack; 518 ccstk = top_si->si_cxstack;
458 cxix = top_si->si_cxix; 519 cxix = top_si->si_cxix;
459 } 520 }
460 521
461 PUTBACK; 522 PUTBACK;
462 } 523 }
463 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
464 c->defav = GvAV (PL_defgv); 543 slot->defav = GvAV (PL_defgv);
465 c->defsv = DEFSV; 544 slot->defsv = DEFSV;
466 c->errsv = ERRSV; 545 slot->errsv = ERRSV;
467 c->irssv_sv = GvSV (irsgv); 546 slot->irsgv = GvSV (irsgv);
468 547
469#define VAR(name,type)c->name = PL_ ## name; 548 #define VAR(name,type) slot->name = PL_ ## name;
470# include "state.h" 549 # include "state.h"
471#undef VAR 550 #undef VAR
551 }
472} 552}
473 553
474/* 554/*
475 * allocate various perl stacks. This is an exact copy 555 * allocate various perl stacks. This is an exact copy
476 * of perl.c:init_stacks, except that it uses less memory 556 * of perl.c:init_stacks, except that it uses less memory
… …
481# define coro_init_stacks init_stacks 561# define coro_init_stacks init_stacks
482#else 562#else
483static void 563static void
484coro_init_stacks (pTHX) 564coro_init_stacks (pTHX)
485{ 565{
486 PL_curstackinfo = new_stackinfo(64, 6); 566 PL_curstackinfo = new_stackinfo(32, 8);
487 PL_curstackinfo->si_type = PERLSI_MAIN; 567 PL_curstackinfo->si_type = PERLSI_MAIN;
488 PL_curstack = PL_curstackinfo->si_stack; 568 PL_curstack = PL_curstackinfo->si_stack;
489 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 569 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
490 570
491 PL_stack_base = AvARRAY(PL_curstack); 571 PL_stack_base = AvARRAY(PL_curstack);
492 PL_stack_sp = PL_stack_base; 572 PL_stack_sp = PL_stack_base;
493 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 573 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
494 574
495 New(50,PL_tmps_stack,64,SV*); 575 New(50,PL_tmps_stack,32,SV*);
496 PL_tmps_floor = -1; 576 PL_tmps_floor = -1;
497 PL_tmps_ix = -1; 577 PL_tmps_ix = -1;
498 PL_tmps_max = 64; 578 PL_tmps_max = 32;
499 579
500 New(54,PL_markstack,16,I32); 580 New(54,PL_markstack,16,I32);
501 PL_markstack_ptr = PL_markstack; 581 PL_markstack_ptr = PL_markstack;
502 PL_markstack_max = PL_markstack + 16; 582 PL_markstack_max = PL_markstack + 16;
503 583
504#ifdef SET_MARK_OFFSET 584#ifdef SET_MARK_OFFSET
505 SET_MARK_OFFSET; 585 SET_MARK_OFFSET;
506#endif 586#endif
507 587
508 New(54,PL_scopestack,16,I32); 588 New(54,PL_scopestack,8,I32);
509 PL_scopestack_ix = 0; 589 PL_scopestack_ix = 0;
510 PL_scopestack_max = 16; 590 PL_scopestack_max = 8;
511 591
512 New(54,PL_savestack,64,ANY); 592 New(54,PL_savestack,24,ANY);
513 PL_savestack_ix = 0; 593 PL_savestack_ix = 0;
514 PL_savestack_max = 64; 594 PL_savestack_max = 24;
515 595
516#if !PERL_VERSION_ATLEAST (5,9,0) 596#if !PERL_VERSION_ATLEAST (5,9,0)
517 New(54,PL_retstack,4,OP*); 597 New(54,PL_retstack,4,OP*);
518 PL_retstack_ix = 0; 598 PL_retstack_ix = 0;
519 PL_retstack_max = 4; 599 PL_retstack_max = 4;
… …
556{ 636{
557 size_t rss = sizeof (*coro); 637 size_t rss = sizeof (*coro);
558 638
559 if (coro->mainstack) 639 if (coro->mainstack)
560 { 640 {
641 perl_slots tmp_slot;
642 perl_slots *slot;
643
561 if (coro->flags & CF_RUNNING) 644 if (coro->flags & CF_RUNNING)
562 { 645 {
646 slot = &tmp_slot;
647
563 #define VAR(name,type)coro->name = PL_ ## name; 648 #define VAR(name,type) slot->name = PL_ ## name;
564 # include "state.h" 649 # include "state.h"
565 #undef VAR 650 #undef VAR
566 } 651 }
652 else
653 slot = coro->slot;
567 654
568 rss += sizeof (coro->curstackinfo); 655 rss += sizeof (slot->curstackinfo);
569 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
570 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 656 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
571 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 *);
572 rss += coro->tmps_max * sizeof (SV *); 658 rss += slot->tmps_max * sizeof (SV *);
573 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 659 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
574 rss += coro->scopestack_max * sizeof (I32); 660 rss += slot->scopestack_max * sizeof (I32);
575 rss += coro->savestack_max * sizeof (ANY); 661 rss += slot->savestack_max * sizeof (ANY);
576 662
577#if !PERL_VERSION_ATLEAST (5,9,0) 663#if !PERL_VERSION_ATLEAST (5,9,0)
578 rss += coro->retstack_max * sizeof (OP *); 664 rss += slot->retstack_max * sizeof (OP *);
579#endif 665#endif
580 } 666 }
581 667
582 return rss; 668 return rss;
583} 669}
… …
595 PL_runops = RUNOPS_DEFAULT; 681 PL_runops = RUNOPS_DEFAULT;
596 PL_curcop = &PL_compiling; 682 PL_curcop = &PL_compiling;
597 PL_in_eval = EVAL_NULL; 683 PL_in_eval = EVAL_NULL;
598 PL_comppad = 0; 684 PL_comppad = 0;
599 PL_curpm = 0; 685 PL_curpm = 0;
686 PL_curpad = 0;
600 PL_localizing = 0; 687 PL_localizing = 0;
601 PL_dirty = 0; 688 PL_dirty = 0;
602 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);
603 692
604 GvSV (PL_defgv) = NEWSV (0, 0); 693 GvSV (PL_defgv) = newSV (0);
605 GvAV (PL_defgv) = coro->args; coro->args = 0; 694 GvAV (PL_defgv) = coro->args; coro->args = 0;
606 GvSV (PL_errgv) = NEWSV (0, 0); 695 GvSV (PL_errgv) = newSV (0);
607 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);
608 PL_rs = newSVsv (GvSV (irsgv)); 697 PL_rs = newSVsv (GvSV (irsgv));
609 PL_defoutgv = SvREFCNT_inc (stdoutgv); 698 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
610 699
611 { 700 {
612 dSP; 701 dSP;
613 LOGOP myop; 702 LOGOP myop;
614 703
615 Zero (&myop, 1, LOGOP); 704 Zero (&myop, 1, LOGOP);
616 myop.op_next = Nullop; 705 myop.op_next = Nullop;
617 myop.op_flags = OPf_WANT_VOID; 706 myop.op_flags = OPf_WANT_VOID;
618 707
619 PUSHMARK (SP); 708 PUSHMARK (SP);
620 XPUSHs (av_shift (GvAV (PL_defgv))); 709 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
621 PUTBACK; 710 PUTBACK;
622 PL_op = (OP *)&myop; 711 PL_op = (OP *)&myop;
623 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 712 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
624 SPAGAIN; 713 SPAGAIN;
625 } 714 }
626 715
627 ENTER; /* necessary e.g. for dounwind */ 716 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */
628} 717}
629 718
630static void 719static void
631coro_destroy (pTHX_ struct coro *coro) 720coro_destroy (pTHX_ struct coro *coro)
632{ 721{
… …
652 SvREFCNT_dec (GvSV (PL_errgv)); 741 SvREFCNT_dec (GvSV (PL_errgv));
653 SvREFCNT_dec (PL_defoutgv); 742 SvREFCNT_dec (PL_defoutgv);
654 SvREFCNT_dec (PL_rs); 743 SvREFCNT_dec (PL_rs);
655 SvREFCNT_dec (GvSV (irsgv)); 744 SvREFCNT_dec (GvSV (irsgv));
656 745
746 SvREFCNT_dec (PL_diehook);
747 SvREFCNT_dec (PL_warnhook);
748
657 SvREFCNT_dec (coro->saved_deffh); 749 SvREFCNT_dec (coro->saved_deffh);
658 //SvREFCNT_dec (coro->throw); 750 SvREFCNT_dec (coro->throw);
659 751
660 coro_destroy_stacks (aTHX); 752 coro_destroy_stacks (aTHX);
661} 753}
662 754
663static void 755static void
664free_coro_mortal (pTHX) 756free_coro_mortal (pTHX)
665{ 757{
666 if (coro_mortal) 758 if (expect_true (coro_mortal))
667 { 759 {
668 SvREFCNT_dec (coro_mortal); 760 SvREFCNT_dec (coro_mortal);
669 coro_mortal = 0; 761 coro_mortal = 0;
670 } 762 }
671} 763}
… …
700 bot = PL_stack_base + cx->blk_oldsp + 1; 792 bot = PL_stack_base + cx->blk_oldsp + 1;
701 top = cx->blk_gimme == G_ARRAY ? SP + 1 793 top = cx->blk_gimme == G_ARRAY ? SP + 1
702 : cx->blk_gimme == G_SCALAR ? bot + 1 794 : cx->blk_gimme == G_SCALAR ? bot + 1
703 : bot; 795 : bot;
704 796
797 av_extend (av, top - bot);
705 while (bot < top) 798 while (bot < top)
706 av_push (av, SvREFCNT_inc (*bot++)); 799 av_push (av, SvREFCNT_inc (*bot++));
707 800
708 PL_runops = RUNOPS_DEFAULT; 801 PL_runops = RUNOPS_DEFAULT;
709 ENTER; 802 ENTER;
… …
712 PUSHMARK (SP); 805 PUSHMARK (SP);
713 PUSHs (&PL_sv_no); 806 PUSHs (&PL_sv_no);
714 PUSHs (fullname); 807 PUSHs (fullname);
715 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 808 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
716 PUTBACK; 809 PUTBACK;
717 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);
718 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);
719 SPAGAIN; 812 SPAGAIN;
720 FREETMPS; 813 FREETMPS;
721 LEAVE; 814 LEAVE;
722 PL_runops = runops_trace; 815 PL_runops = runops_trace;
… …
751 PUSHMARK (SP); 844 PUSHMARK (SP);
752 PUSHs (&PL_sv_yes); 845 PUSHs (&PL_sv_yes);
753 PUSHs (fullname); 846 PUSHs (fullname);
754 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);
755 PUTBACK; 848 PUTBACK;
756 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);
757 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);
758 SPAGAIN; 851 SPAGAIN;
759 FREETMPS; 852 FREETMPS;
760 LEAVE; 853 LEAVE;
761 PL_runops = runops_trace; 854 PL_runops = runops_trace;
… …
775 PL_runops = RUNOPS_DEFAULT; 868 PL_runops = RUNOPS_DEFAULT;
776 PUSHMARK (SP); 869 PUSHMARK (SP);
777 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 870 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
778 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 871 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
779 PUTBACK; 872 PUTBACK;
780 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);
781 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);
782 SPAGAIN; 875 SPAGAIN;
783 FREETMPS; 876 FREETMPS;
784 LEAVE; 877 LEAVE;
785 PL_runops = runops_trace; 878 PL_runops = runops_trace;
… …
921 Safefree (cctx->sptr); 1014 Safefree (cctx->sptr);
922 1015
923 Safefree (cctx); 1016 Safefree (cctx);
924} 1017}
925 1018
1019/* wether this cctx should be destructed */
1020#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1021
926static coro_cctx * 1022static coro_cctx *
927cctx_get (pTHX) 1023cctx_get (pTHX)
928{ 1024{
929 while (cctx_first) 1025 while (expect_true (cctx_first))
930 { 1026 {
931 coro_cctx *cctx = cctx_first; 1027 coro_cctx *cctx = cctx_first;
932 cctx_first = cctx->next; 1028 cctx_first = cctx->next;
933 --cctx_idle; 1029 --cctx_idle;
934 1030
935 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1031 if (expect_true (!CCTX_EXPIRED (cctx)))
936 return cctx; 1032 return cctx;
937 1033
938 cctx_destroy (cctx); 1034 cctx_destroy (cctx);
939 } 1035 }
940 1036
… …
943 1039
944static void 1040static void
945cctx_put (coro_cctx *cctx) 1041cctx_put (coro_cctx *cctx)
946{ 1042{
947 /* free another cctx if overlimit */ 1043 /* free another cctx if overlimit */
948 if (cctx_idle >= MAX_IDLE_CCTX) 1044 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
949 { 1045 {
950 coro_cctx *first = cctx_first; 1046 coro_cctx *first = cctx_first;
951 cctx_first = first->next; 1047 cctx_first = first->next;
952 --cctx_idle; 1048 --cctx_idle;
953 1049
… …
959 cctx_first = cctx; 1055 cctx_first = cctx;
960} 1056}
961 1057
962/** coroutine switching *****************************************************/ 1058/** coroutine switching *****************************************************/
963 1059
964static void NOINLINE 1060static void
965transfer_check (pTHX_ struct coro *prev, struct coro *next) 1061transfer_check (pTHX_ struct coro *prev, struct coro *next)
966{ 1062{
967 if (prev != next) 1063 if (expect_true (prev != next))
968 { 1064 {
969 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1065 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
970 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");
971 1067
972 if (next->flags & CF_RUNNING) 1068 if (expect_false (next->flags & CF_RUNNING))
973 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");
974 1070
975 if (next->flags & CF_DESTROYED) 1071 if (expect_false (next->flags & CF_DESTROYED))
976 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");
977 1073
1074 if (
1075#if PERL_VERSION_ATLEAST (5,9,0)
1076 expect_false (PL_parser)
1077#else
978 if (PL_lex_state != LEX_NOTPARSING) 1078 expect_false (PL_lex_state != LEX_NOTPARSING)
1079#endif
1080 )
979 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");
980 } 1082 }
981} 1083}
982 1084
983/* always use the TRANSFER macro */ 1085/* always use the TRANSFER macro */
… …
985transfer (pTHX_ struct coro *prev, struct coro *next) 1087transfer (pTHX_ struct coro *prev, struct coro *next)
986{ 1088{
987 dSTACKLEVEL; 1089 dSTACKLEVEL;
988 1090
989 /* sometimes transfer is only called to set idle_sp */ 1091 /* sometimes transfer is only called to set idle_sp */
990 if (!next) 1092 if (expect_false (!next))
991 { 1093 {
992 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1094 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
993 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 */
994 } 1096 }
995 else if (prev != next) 1097 else if (expect_true (prev != next))
996 { 1098 {
997 coro_cctx *prev__cctx; 1099 coro_cctx *prev__cctx;
998 1100
999 if (prev->flags & CF_NEW) 1101 if (expect_false (prev->flags & CF_NEW))
1000 { 1102 {
1001 /* create a new empty context */ 1103 /* create a new empty context */
1002 Newz (0, prev->cctx, 1, coro_cctx); 1104 Newz (0, prev->cctx, 1, coro_cctx);
1003 prev->flags &= ~CF_NEW; 1105 prev->flags &= ~CF_NEW;
1004 prev->flags |= CF_RUNNING; 1106 prev->flags |= CF_RUNNING;
… …
1007 prev->flags &= ~CF_RUNNING; 1109 prev->flags &= ~CF_RUNNING;
1008 next->flags |= CF_RUNNING; 1110 next->flags |= CF_RUNNING;
1009 1111
1010 LOCK; 1112 LOCK;
1011 1113
1012 if (next->flags & CF_NEW) 1114 if (expect_false (next->flags & CF_NEW))
1013 { 1115 {
1014 /* need to start coroutine */ 1116 /* need to start coroutine */
1015 next->flags &= ~CF_NEW; 1117 next->flags &= ~CF_NEW;
1016 /* first get rid of the old state */ 1118 /* first get rid of the old state */
1017 save_perl (aTHX_ prev); 1119 save_perl (aTHX_ prev);
… …
1026 } 1128 }
1027 1129
1028 prev__cctx = prev->cctx; 1130 prev__cctx = prev->cctx;
1029 1131
1030 /* possibly "free" the cctx */ 1132 /* possibly "free" the cctx */
1031 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)))
1032 { 1134 {
1033 /* 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 */
1034 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));
1035 1137
1036 prev->cctx = 0; 1138 prev->cctx = 0;
1037 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
1038 cctx_put (prev__cctx); 1145 cctx_put (prev__cctx);
1039 } 1146 }
1040 1147
1041 ++next->usecount; 1148 ++next->usecount;
1042 1149
1043 if (!next->cctx) 1150 if (expect_true (!next->cctx))
1044 next->cctx = cctx_get (aTHX); 1151 next->cctx = cctx_get (aTHX);
1045 1152
1046 if (prev__cctx != next->cctx) 1153 if (expect_false (prev__cctx != next->cctx))
1047 { 1154 {
1048 prev__cctx->top_env = PL_top_env; 1155 prev__cctx->top_env = PL_top_env;
1049 PL_top_env = next->cctx->top_env; 1156 PL_top_env = next->cctx->top_env;
1050 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1157 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1051 } 1158 }
1052 1159
1053 free_coro_mortal (aTHX); 1160 free_coro_mortal (aTHX);
1054 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 }
1055 } 1175 }
1056} 1176}
1057 1177
1058struct transfer_args 1178struct transfer_args
1059{ 1179{
… …
1094 save_perl (aTHX_ &temp); 1214 save_perl (aTHX_ &temp);
1095 load_perl (aTHX_ coro); 1215 load_perl (aTHX_ coro);
1096 1216
1097 coro_destroy (aTHX_ coro); 1217 coro_destroy (aTHX_ coro);
1098 1218
1099 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1219 load_perl (aTHX_ &temp);
1100 1220
1101 coro->mainstack = 0; 1221 coro->slot = 0;
1102 } 1222 }
1103 1223
1104 cctx_destroy (coro->cctx); 1224 cctx_destroy (coro->cctx);
1105 SvREFCNT_dec (coro->args); 1225 SvREFCNT_dec (coro->args);
1106 1226
… …
1231 { 1351 {
1232 LOCK; 1352 LOCK;
1233 next_sv = coro_deq (aTHX_ PRIO_MIN); 1353 next_sv = coro_deq (aTHX_ PRIO_MIN);
1234 1354
1235 /* nothing to schedule: call the idle handler */ 1355 /* nothing to schedule: call the idle handler */
1236 if (!next_sv) 1356 if (expect_false (!next_sv))
1237 { 1357 {
1238 dSP; 1358 dSP;
1239 UNLOCK; 1359 UNLOCK;
1240 1360
1241 ENTER; 1361 ENTER;
… …
1251 } 1371 }
1252 1372
1253 ta->next = SvSTATE (next_sv); 1373 ta->next = SvSTATE (next_sv);
1254 1374
1255 /* cannot transfer to destroyed coros, skip and look for next */ 1375 /* cannot transfer to destroyed coros, skip and look for next */
1256 if (ta->next->flags & CF_DESTROYED) 1376 if (expect_false (ta->next->flags & CF_DESTROYED))
1257 { 1377 {
1258 UNLOCK; 1378 UNLOCK;
1259 SvREFCNT_dec (next_sv); 1379 SvREFCNT_dec (next_sv);
1260 /* coro_nready is already taken care of by destroy */ 1380 /* coro_nready is already taken care of by destroy */
1261 continue; 1381 continue;
… …
1317 dTHX; 1437 dTHX;
1318 struct transfer_args ta; 1438 struct transfer_args ta;
1319 1439
1320 prepare_cede (aTHX_ &ta); 1440 prepare_cede (aTHX_ &ta);
1321 1441
1322 if (ta.prev != ta.next) 1442 if (expect_true (ta.prev != ta.next))
1323 { 1443 {
1324 TRANSFER (ta); 1444 TRANSFER (ta);
1325 return 1; 1445 return 1;
1326 } 1446 }
1327 else 1447 else
… …
1363 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1483 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1364 1484
1365 if (coro->flags & CF_RUNNING) 1485 if (coro->flags & CF_RUNNING)
1366 PL_runops = RUNOPS_DEFAULT; 1486 PL_runops = RUNOPS_DEFAULT;
1367 else 1487 else
1368 coro->runops = RUNOPS_DEFAULT; 1488 coro->slot->runops = RUNOPS_DEFAULT;
1369 } 1489 }
1370} 1490}
1371 1491
1372MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1492MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1373 1493
… …
1378#ifdef USE_ITHREADS 1498#ifdef USE_ITHREADS
1379 MUTEX_INIT (&coro_mutex); 1499 MUTEX_INIT (&coro_mutex);
1380#endif 1500#endif
1381 BOOT_PAGESIZE; 1501 BOOT_PAGESIZE;
1382 1502
1383 irsgv = gv_fetchpv ("/" , GV_ADD, SVt_PV); 1503 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1384 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD, 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);
1385 1512
1386 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1513 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1387 1514
1388 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1515 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1389 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1516 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1420 1547
1421 coro->hv = hv = newHV (); 1548 coro->hv = hv = newHV ();
1422 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;
1423 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1550 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1424 1551
1552 av_extend (coro->args, items - 1);
1425 for (i = 1; i < items; i++) 1553 for (i = 1; i < items; i++)
1426 av_push (coro->args, newSVsv (ST (i))); 1554 av_push (coro->args, newSVsv (ST (i)));
1427} 1555}
1428 OUTPUT: 1556 OUTPUT:
1429 RETVAL 1557 RETVAL
… …
1472 } 1600 }
1473 1601
1474 BARRIER; 1602 BARRIER;
1475 TRANSFER (ta); 1603 TRANSFER (ta);
1476 1604
1477 if (GIMME_V != G_VOID && ta.next != ta.prev) 1605 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev))
1478 XSRETURN_YES; 1606 XSRETURN_YES;
1479} 1607}
1480 1608
1481bool 1609bool
1482_destroy (SV *coro_sv) 1610_destroy (SV *coro_sv)
… …
1532 CODE: 1660 CODE:
1533{ 1661{
1534 if (coro->mainstack) 1662 if (coro->mainstack)
1535 { 1663 {
1536 struct coro temp; 1664 struct coro temp;
1537 Zero (&temp, 1, struct coro);
1538 1665
1539 if (!(coro->flags & CF_RUNNING)) 1666 if (!(coro->flags & CF_RUNNING))
1540 { 1667 {
1541 save_perl (aTHX_ &temp); 1668 save_perl (aTHX_ &temp);
1542 load_perl (aTHX_ coro); 1669 load_perl (aTHX_ coro);
… …
1546 dSP; 1673 dSP;
1547 ENTER; 1674 ENTER;
1548 SAVETMPS; 1675 SAVETMPS;
1549 PUSHMARK (SP); 1676 PUSHMARK (SP);
1550 PUTBACK; 1677 PUTBACK;
1678
1551 if (ix) 1679 if (ix)
1552 eval_sv (coderef, 0); 1680 eval_sv (coderef, 0);
1553 else 1681 else
1554 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1682 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1683
1555 SPAGAIN; 1684 SPAGAIN;
1556 FREETMPS; 1685 FREETMPS;
1557 LEAVE; 1686 LEAVE;
1558 PUTBACK; 1687 PUTBACK;
1559 } 1688 }
… …
1617 1746
1618BOOT: 1747BOOT:
1619{ 1748{
1620 int i; 1749 int i;
1621 1750
1622 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1751 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1623 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1752 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1624 av_async_pool = get_av ("Coro::async_pool", TRUE); 1753 av_async_pool = coro_get_av ("Coro::async_pool", TRUE);
1625 1754
1626 coro_current = get_sv ("Coro::current", FALSE); 1755 coro_current = coro_get_sv ("Coro::current", FALSE);
1627 SvREADONLY_on (coro_current); 1756 SvREADONLY_on (coro_current);
1628 1757
1629 coro_stash = gv_stashpv ("Coro", TRUE); 1758 coro_stash = gv_stashpv ("Coro", TRUE);
1630 1759
1631 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1760 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1632 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1761 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1633 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1762 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1634 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1763 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
… …
1637 1766
1638 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1767 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1639 coro_ready[i] = newAV (); 1768 coro_ready[i] = newAV ();
1640 1769
1641 { 1770 {
1642 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 */
1643 1773
1644 coroapi.schedule = api_schedule; 1774 coroapi.schedule = api_schedule;
1645 coroapi.cede = api_cede; 1775 coroapi.cede = api_cede;
1646 coroapi.cede_notself = api_cede_notself; 1776 coroapi.cede_notself = api_cede_notself;
1647 coroapi.ready = api_ready; 1777 coroapi.ready = api_ready;
… …
1698 CODE: 1828 CODE:
1699 RETVAL = coro_nready; 1829 RETVAL = coro_nready;
1700 OUTPUT: 1830 OUTPUT:
1701 RETVAL 1831 RETVAL
1702 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
1703# for async_pool speedup 1840# for async_pool speedup
1704void 1841void
1705_pool_1 (SV *cb) 1842_pool_1 (SV *cb)
1706 CODE: 1843 CODE:
1707{ 1844{
1708 struct coro *coro = SvSTATE (coro_current); 1845 struct coro *coro = SvSTATE (coro_current);
1709 HV *hv = (HV *)SvRV (coro_current); 1846 HV *hv = (HV *)SvRV (coro_current);
1710 AV *defav = GvAV (PL_defgv); 1847 AV *defav = GvAV (PL_defgv);
1711 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1848 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0);
1712 AV *invoke_av; 1849 AV *invoke_av;
1713 int i, len; 1850 int i, len;
1714 1851
1715 if (!invoke) 1852 if (!invoke)
1716 croak ("\3terminate\2\n"); 1853 croak ("\3async_pool terminate\2\n");
1717 1854
1718 SvREFCNT_dec (coro->saved_deffh); 1855 SvREFCNT_dec (coro->saved_deffh);
1719 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1856 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1720 1857
1721 hv_store (hv, "desc", sizeof ("desc") - 1, 1858 hv_store (hv, "desc", sizeof ("desc") - 1,
1722 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1859 newSVpvn (strpair ("[async_pool]")), 0);
1723 1860
1724 invoke_av = (AV *)SvRV (invoke); 1861 invoke_av = (AV *)SvRV (invoke);
1725 len = av_len (invoke_av); 1862 len = av_len (invoke_av);
1726 1863
1727 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1864 sv_setsv (cb, AvARRAY (invoke_av)[0]);
… …
1747 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1884 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1748 coro->saved_deffh = 0; 1885 coro->saved_deffh = 0;
1749 1886
1750 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1887 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1751 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1888 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1752 croak ("\3terminate\2\n"); 1889 croak ("\3async_pool terminate\2\n");
1753 1890
1754 av_clear (GvAV (PL_defgv)); 1891 av_clear (GvAV (PL_defgv));
1755 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1892 hv_store ((HV *)SvRV (coro_current), strpair ("desc"),
1756 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1893 newSVpvn (strpair ("[async_pool idle]")), 0);
1757 1894
1758 coro->prio = 0; 1895 coro->prio = 0;
1759 1896
1760 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1897 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1761 api_trace (coro_current, 0); 1898 api_trace (coro_current, 0);

Diff Legend

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