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.190 by root, Fri Oct 5 20:39:39 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
… …
79 80
80/* 5.8.8 */ 81/* 5.8.8 */
81#ifndef GV_NOTQUAL 82#ifndef GV_NOTQUAL
82# define GV_NOTQUAL 0 83# define GV_NOTQUAL 0
83#endif 84#endif
85#ifndef newSV
86# define newSV(l) NEWSV(0,l)
87#endif
84 88
85#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 89#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
86# undef CORO_STACKGUARD 90# undef CORO_STACKGUARD
87#endif 91#endif
88 92
… …
103#define IN_DESTRUCT (PL_main_cv == Nullcv) 107#define IN_DESTRUCT (PL_main_cv == Nullcv)
104 108
105#if __GNUC__ >= 3 109#if __GNUC__ >= 3
106# define attribute(x) __attribute__(x) 110# define attribute(x) __attribute__(x)
107# define BARRIER __asm__ __volatile__ ("" : : : "memory") 111# define BARRIER __asm__ __volatile__ ("" : : : "memory")
112# define expect(expr,value) __builtin_expect ((expr),(value))
108#else 113#else
109# define attribute(x) 114# define attribute(x)
110# define BARRIER 115# define BARRIER
116# define expect(expr,value) (expr)
111#endif 117#endif
118
119#define expect_false(expr) expect ((expr) != 0, 0)
120#define expect_true(expr) expect ((expr) != 0, 1)
112 121
113#define NOINLINE attribute ((noinline)) 122#define NOINLINE attribute ((noinline))
114 123
115#include "CoroAPI.h" 124#include "CoroAPI.h"
116 125
… …
121#else 130#else
122# define LOCK (void)0 131# define LOCK (void)0
123# define UNLOCK (void)0 132# define UNLOCK (void)0
124#endif 133#endif
125 134
135#define strpair(const) const, sizeof (const) - 1
136
126/* helper storage struct for Coro::AIO */ 137/* helper storage struct for Coro::AIO */
127struct io_state 138struct io_state
128{ 139{
129 int errorno; 140 int errorno;
130 I32 laststype; 141 I32 laststype;
… …
139static HV *coro_state_stash, *coro_stash; 150static HV *coro_state_stash, *coro_stash;
140static SV *coro_mortal; /* will be freed after next transfer */ 151static SV *coro_mortal; /* will be freed after next transfer */
141 152
142static GV *irsgv; /* $/ */ 153static GV *irsgv; /* $/ */
143static GV *stdoutgv; /* *STDOUT */ 154static GV *stdoutgv; /* *STDOUT */
155
156static HV *hv_sig; /* %SIG */
157static SV *sv_diehook;
158static SV *sv_warnhook;
144 159
145/* async_pool helper stuff */ 160/* async_pool helper stuff */
146static SV *sv_pool_rss; 161static SV *sv_pool_rss;
147static SV *sv_pool_size; 162static SV *sv_pool_size;
148static AV *av_async_pool; 163static AV *av_async_pool;
… …
184 CF_READY = 0x0002, /* coroutine is ready */ 199 CF_READY = 0x0002, /* coroutine is ready */
185 CF_NEW = 0x0004, /* has never been switched to */ 200 CF_NEW = 0x0004, /* has never been switched to */
186 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 201 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
187}; 202};
188 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
189/* this is a structure representing a perl-level coroutine */ 217/* this is a structure representing a perl-level coroutine */
190struct coro { 218struct coro {
191 /* the c coroutine allocated to this perl coroutine, if any */ 219 /* the c coroutine allocated to this perl coroutine, if any */
192 coro_cctx *cctx; 220 coro_cctx *cctx;
193 221
222 /* process data */
223 AV *mainstack;
224 perl_slots *slot; /* basically the saved sp */
225
194 /* data associated with this coroutine (initial args) */ 226 /* data associated with this coroutine (initial args) */
195 AV *args; 227 AV *args;
196 int refcnt; 228 int refcnt;
197 int flags; /* CF_ flags */ 229 int flags; /* CF_ flags */
198 230
199 /* optionally saved, might be zero */
200 AV *defav; /* @_ */
201 SV *defsv; /* $_ */
202 SV *errsv; /* $@ */
203 SV *deffh; /* default filehandle */
204 SV *irssv; /* $/ */
205 SV *irssv_sv; /* real $/ cache */
206
207#define VAR(name,type) type name;
208# include "state.h"
209#undef VAR
210
211 /* statistics */ 231 /* statistics */
212 int usecount; /* number of transfers to this coro */ 232 int usecount; /* number of transfers to this coro */
213 233
214 /* coro process data */ 234 /* coro process data */
215 int prio; 235 int prio;
216 //SV *throw; 236 SV *throw;
217 237
218 /* async_pool */ 238 /* async_pool */
219 SV *saved_deffh; 239 SV *saved_deffh;
220 240
221 /* linked list */ 241 /* linked list */
… …
240static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 260static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
241static int coro_nready; 261static int coro_nready;
242static struct coro *coro_first; 262static struct coro *coro_first;
243 263
244/** 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}
245 295
246static AV * 296static AV *
247coro_clone_padlist (pTHX_ CV *cv) 297coro_clone_padlist (pTHX_ CV *cv)
248{ 298{
249 AV *padlist = CvPADLIST (cv); 299 AV *padlist = CvPADLIST (cv);
… …
322 MAGIC *mg; 372 MAGIC *mg;
323 373
324 if (SvROK (coro)) 374 if (SvROK (coro))
325 coro = SvRV (coro); 375 coro = SvRV (coro);
326 376
327 if (SvTYPE (coro) != SVt_PVHV) 377 if (expect_false (SvTYPE (coro) != SVt_PVHV))
328 croak ("Coro::State object required"); 378 croak ("Coro::State object required");
329 379
330 stash = SvSTASH (coro); 380 stash = SvSTASH (coro);
331 if (stash != coro_stash && stash != coro_state_stash) 381 if (expect_false (stash != coro_stash && stash != coro_state_stash))
332 { 382 {
333 /* very slow, but rare, check */ 383 /* very slow, but rare, check */
334 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 384 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
335 croak ("Coro::State object required"); 385 croak ("Coro::State object required");
336 } 386 }
… …
346get_padlist (pTHX_ CV *cv) 396get_padlist (pTHX_ CV *cv)
347{ 397{
348 MAGIC *mg = CORO_MAGIC (cv); 398 MAGIC *mg = CORO_MAGIC (cv);
349 AV *av; 399 AV *av;
350 400
351 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 401 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
352 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 402 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
353 else 403 else
354 { 404 {
355#if CORO_PREFER_PERL_FUNCTIONS 405#if CORO_PREFER_PERL_FUNCTIONS
356 /* this is probably cleaner, but also slower? */ 406 /* this is probably cleaner, but also slower? */
… …
368put_padlist (pTHX_ CV *cv) 418put_padlist (pTHX_ CV *cv)
369{ 419{
370 MAGIC *mg = CORO_MAGIC (cv); 420 MAGIC *mg = CORO_MAGIC (cv);
371 AV *av; 421 AV *av;
372 422
373 if (!mg) 423 if (expect_false (!mg))
374 { 424 {
375 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 425 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
376 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 426 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
377 mg->mg_virtual = &vtbl_coro; 427 mg->mg_virtual = &vtbl_coro;
378 mg->mg_obj = (SV *)newAV (); 428 mg->mg_obj = (SV *)newAV ();
379 } 429 }
380 430
381 av = (AV *)mg->mg_obj; 431 av = (AV *)mg->mg_obj;
382 432
383 if (AvFILLp (av) >= AvMAX (av)) 433 if (expect_false (AvFILLp (av) >= AvMAX (av)))
384 av_extend (av, AvMAX (av) + 1); 434 av_extend (av, AvMAX (av) + 1);
385 435
386 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 436 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
387} 437}
388 438
389/** load & save, init *******************************************************/ 439/** load & save, init *******************************************************/
390 440
391static void 441static void
392load_perl (pTHX_ Coro__State c) 442load_perl (pTHX_ Coro__State c)
393{ 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
394#define VAR(name,type) PL_ ## name = c->name; 454 #define VAR(name,type) PL_ ## name = slot->name;
395# include "state.h" 455 # include "state.h"
396#undef VAR 456 #undef VAR
397 457
398 GvSV (PL_defgv) = c->defsv; 458 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
399 GvAV (PL_defgv) = c->defav; 459 /*hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);*/
400 GvSV (PL_errgv) = c->errsv;
401 GvSV (irsgv) = c->irssv_sv;
402 460
403 { 461 {
404 dSP; 462 dSP;
463
405 CV *cv; 464 CV *cv;
406 465
407 /* now do the ugly restore mess */ 466 /* now do the ugly restore mess */
408 while ((cv = (CV *)POPs)) 467 while (expect_true (cv = (CV *)POPs))
409 { 468 {
410 put_padlist (aTHX_ cv); /* mark this padlist as available */ 469 put_padlist (aTHX_ cv); /* mark this padlist as available */
411 CvDEPTH (cv) = PTR2IV (POPs); 470 CvDEPTH (cv) = PTR2IV (POPs);
412 CvPADLIST (cv) = (AV *)POPs; 471 CvPADLIST (cv) = (AV *)POPs;
413 } 472 }
… …
432 491
433 XPUSHs (Nullsv); 492 XPUSHs (Nullsv);
434 /* this loop was inspired by pp_caller */ 493 /* this loop was inspired by pp_caller */
435 for (;;) 494 for (;;)
436 { 495 {
437 while (cxix >= 0) 496 while (expect_true (cxix >= 0))
438 { 497 {
439 PERL_CONTEXT *cx = &ccstk[cxix--]; 498 PERL_CONTEXT *cx = &ccstk[cxix--];
440 499
441 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 500 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
442 { 501 {
443 CV *cv = cx->blk_sub.cv; 502 CV *cv = cx->blk_sub.cv;
444 503
445 if (CvDEPTH (cv)) 504 if (expect_true (CvDEPTH (cv)))
446 { 505 {
447 EXTEND (SP, 3); 506 EXTEND (SP, 3);
448 PUSHs ((SV *)CvPADLIST (cv)); 507 PUSHs ((SV *)CvPADLIST (cv));
449 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 508 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
450 PUSHs ((SV *)cv); 509 PUSHs ((SV *)cv);
… …
453 get_padlist (aTHX_ cv); 512 get_padlist (aTHX_ cv);
454 } 513 }
455 } 514 }
456 } 515 }
457 516
458 if (top_si->si_type == PERLSI_MAIN) 517 if (expect_true (top_si->si_type == PERLSI_MAIN))
459 break; 518 break;
460 519
461 top_si = top_si->si_prev; 520 top_si = top_si->si_prev;
462 ccstk = top_si->si_cxstack; 521 ccstk = top_si->si_cxstack;
463 cxix = top_si->si_cxix; 522 cxix = top_si->si_cxix;
464 } 523 }
465 524
466 PUTBACK; 525 PUTBACK;
467 } 526 }
468 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
469 c->defav = GvAV (PL_defgv); 545 slot->defav = GvAV (PL_defgv);
470 c->defsv = DEFSV; 546 slot->defsv = DEFSV;
471 c->errsv = ERRSV; 547 slot->errsv = ERRSV;
472 c->irssv_sv = GvSV (irsgv); 548 slot->irsgv = GvSV (irsgv);
473 549
474#define VAR(name,type)c->name = PL_ ## name; 550 #define VAR(name,type) slot->name = PL_ ## name;
475# include "state.h" 551 # include "state.h"
476#undef VAR 552 #undef VAR
553 }
477} 554}
478 555
479/* 556/*
480 * allocate various perl stacks. This is an exact copy 557 * allocate various perl stacks. This is an exact copy
481 * of perl.c:init_stacks, except that it uses less memory 558 * of perl.c:init_stacks, except that it uses less memory
482 * on the (sometimes correct) assumption that coroutines do 559 * on the (sometimes correct) assumption that coroutines do
483 * not usually need a lot of stackspace. 560 * not usually need a lot of stackspace.
484 */ 561 */
485#if CORO_PREFER_PERL_FUNCTIONS 562#if 1
486# define coro_init_stacks init_stacks 563# define coro_init_stacks init_stacks
487#else 564#else
488static void 565static void
489coro_init_stacks (pTHX) 566coro_init_stacks (pTHX)
490{ 567{
491 PL_curstackinfo = new_stackinfo(64, 6); 568 PL_curstackinfo = new_stackinfo(32, 8);
492 PL_curstackinfo->si_type = PERLSI_MAIN; 569 PL_curstackinfo->si_type = PERLSI_MAIN;
493 PL_curstack = PL_curstackinfo->si_stack; 570 PL_curstack = PL_curstackinfo->si_stack;
494 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 571 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
495 572
496 PL_stack_base = AvARRAY(PL_curstack); 573 PL_stack_base = AvARRAY(PL_curstack);
497 PL_stack_sp = PL_stack_base; 574 PL_stack_sp = PL_stack_base;
498 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 575 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
499 576
500 New(50,PL_tmps_stack,64,SV*); 577 New(50,PL_tmps_stack,32,SV*);
501 PL_tmps_floor = -1; 578 PL_tmps_floor = -1;
502 PL_tmps_ix = -1; 579 PL_tmps_ix = -1;
503 PL_tmps_max = 64; 580 PL_tmps_max = 32;
504 581
505 New(54,PL_markstack,16,I32); 582 New(54,PL_markstack,16,I32);
506 PL_markstack_ptr = PL_markstack; 583 PL_markstack_ptr = PL_markstack;
507 PL_markstack_max = PL_markstack + 16; 584 PL_markstack_max = PL_markstack + 16;
508 585
509#ifdef SET_MARK_OFFSET 586#ifdef SET_MARK_OFFSET
510 SET_MARK_OFFSET; 587 SET_MARK_OFFSET;
511#endif 588#endif
512 589
513 New(54,PL_scopestack,16,I32); 590 New(54,PL_scopestack,8,I32);
514 PL_scopestack_ix = 0; 591 PL_scopestack_ix = 0;
515 PL_scopestack_max = 16; 592 PL_scopestack_max = 8;
516 593
517 New(54,PL_savestack,64,ANY); 594 New(54,PL_savestack,24,ANY);
518 PL_savestack_ix = 0; 595 PL_savestack_ix = 0;
519 PL_savestack_max = 64; 596 PL_savestack_max = 24;
520 597
521#if !PERL_VERSION_ATLEAST (5,9,0) 598#if !PERL_VERSION_ATLEAST (5,9,0)
522 New(54,PL_retstack,4,OP*); 599 New(54,PL_retstack,4,OP*);
523 PL_retstack_ix = 0; 600 PL_retstack_ix = 0;
524 PL_retstack_max = 4; 601 PL_retstack_max = 4;
… …
561{ 638{
562 size_t rss = sizeof (*coro); 639 size_t rss = sizeof (*coro);
563 640
564 if (coro->mainstack) 641 if (coro->mainstack)
565 { 642 {
643 perl_slots tmp_slot;
644 perl_slots *slot;
645
566 if (coro->flags & CF_RUNNING) 646 if (coro->flags & CF_RUNNING)
567 { 647 {
648 slot = &tmp_slot;
649
568 #define VAR(name,type)coro->name = PL_ ## name; 650 #define VAR(name,type) slot->name = PL_ ## name;
569 # include "state.h" 651 # include "state.h"
570 #undef VAR 652 #undef VAR
571 } 653 }
654 else
655 slot = coro->slot;
572 656
573 rss += sizeof (coro->curstackinfo); 657 rss += sizeof (slot->curstackinfo);
574 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
575 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 658 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
576 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 *);
577 rss += coro->tmps_max * sizeof (SV *); 660 rss += slot->tmps_max * sizeof (SV *);
578 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 661 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
579 rss += coro->scopestack_max * sizeof (I32); 662 rss += slot->scopestack_max * sizeof (I32);
580 rss += coro->savestack_max * sizeof (ANY); 663 rss += slot->savestack_max * sizeof (ANY);
581 664
582#if !PERL_VERSION_ATLEAST (5,9,0) 665#if !PERL_VERSION_ATLEAST (5,9,0)
583 rss += coro->retstack_max * sizeof (OP *); 666 rss += slot->retstack_max * sizeof (OP *);
584#endif 667#endif
585 } 668 }
586 669
587 return rss; 670 return rss;
588} 671}
… …
600 PL_runops = RUNOPS_DEFAULT; 683 PL_runops = RUNOPS_DEFAULT;
601 PL_curcop = &PL_compiling; 684 PL_curcop = &PL_compiling;
602 PL_in_eval = EVAL_NULL; 685 PL_in_eval = EVAL_NULL;
603 PL_comppad = 0; 686 PL_comppad = 0;
604 PL_curpm = 0; 687 PL_curpm = 0;
688 PL_curpad = 0;
605 PL_localizing = 0; 689 PL_localizing = 0;
606 PL_dirty = 0; 690 PL_dirty = 0;
607 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);
608 694
609 GvSV (PL_defgv) = NEWSV (0, 0); 695 GvSV (PL_defgv) = newSV (0);
610 GvAV (PL_defgv) = coro->args; coro->args = 0; 696 GvAV (PL_defgv) = coro->args; coro->args = 0;
611 GvSV (PL_errgv) = NEWSV (0, 0); 697 GvSV (PL_errgv) = newSV (0);
612 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);
613 PL_rs = newSVsv (GvSV (irsgv)); 699 PL_rs = newSVsv (GvSV (irsgv));
614 PL_defoutgv = SvREFCNT_inc (stdoutgv); 700 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
615 701
616 { 702 {
617 dSP; 703 dSP;
618 LOGOP myop; 704 LOGOP myop;
619 705
620 Zero (&myop, 1, LOGOP); 706 Zero (&myop, 1, LOGOP);
621 myop.op_next = Nullop; 707 myop.op_next = Nullop;
622 myop.op_flags = OPf_WANT_VOID; 708 myop.op_flags = OPf_WANT_VOID;
623 709
624 PUSHMARK (SP); 710 PUSHMARK (SP);
625 XPUSHs (av_shift (GvAV (PL_defgv))); 711 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
626 PUTBACK; 712 PUTBACK;
627 PL_op = (OP *)&myop; 713 PL_op = (OP *)&myop;
628 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 714 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
629 SPAGAIN; 715 SPAGAIN;
630 } 716 }
631 717
632 ENTER; /* necessary e.g. for dounwind */ 718 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */
633} 719}
634 720
635static void 721static void
636coro_destroy (pTHX_ struct coro *coro) 722coro_destroy (pTHX_ struct coro *coro)
637{ 723{
… …
657 SvREFCNT_dec (GvSV (PL_errgv)); 743 SvREFCNT_dec (GvSV (PL_errgv));
658 SvREFCNT_dec (PL_defoutgv); 744 SvREFCNT_dec (PL_defoutgv);
659 SvREFCNT_dec (PL_rs); 745 SvREFCNT_dec (PL_rs);
660 SvREFCNT_dec (GvSV (irsgv)); 746 SvREFCNT_dec (GvSV (irsgv));
661 747
748 SvREFCNT_dec (PL_diehook);
749 SvREFCNT_dec (PL_warnhook);
750
662 SvREFCNT_dec (coro->saved_deffh); 751 SvREFCNT_dec (coro->saved_deffh);
663 //SvREFCNT_dec (coro->throw); 752 SvREFCNT_dec (coro->throw);
664 753
665 coro_destroy_stacks (aTHX); 754 coro_destroy_stacks (aTHX);
666} 755}
667 756
668static void 757static void
669free_coro_mortal (pTHX) 758free_coro_mortal (pTHX)
670{ 759{
671 if (coro_mortal) 760 if (expect_true (coro_mortal))
672 { 761 {
673 SvREFCNT_dec (coro_mortal); 762 SvREFCNT_dec (coro_mortal);
674 coro_mortal = 0; 763 coro_mortal = 0;
675 } 764 }
676} 765}
… …
705 bot = PL_stack_base + cx->blk_oldsp + 1; 794 bot = PL_stack_base + cx->blk_oldsp + 1;
706 top = cx->blk_gimme == G_ARRAY ? SP + 1 795 top = cx->blk_gimme == G_ARRAY ? SP + 1
707 : cx->blk_gimme == G_SCALAR ? bot + 1 796 : cx->blk_gimme == G_SCALAR ? bot + 1
708 : bot; 797 : bot;
709 798
799 av_extend (av, top - bot);
710 while (bot < top) 800 while (bot < top)
711 av_push (av, SvREFCNT_inc (*bot++)); 801 av_push (av, SvREFCNT_inc (*bot++));
712 802
713 PL_runops = RUNOPS_DEFAULT; 803 PL_runops = RUNOPS_DEFAULT;
714 ENTER; 804 ENTER;
… …
717 PUSHMARK (SP); 807 PUSHMARK (SP);
718 PUSHs (&PL_sv_no); 808 PUSHs (&PL_sv_no);
719 PUSHs (fullname); 809 PUSHs (fullname);
720 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 810 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
721 PUTBACK; 811 PUTBACK;
722 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);
723 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);
724 SPAGAIN; 814 SPAGAIN;
725 FREETMPS; 815 FREETMPS;
726 LEAVE; 816 LEAVE;
727 PL_runops = runops_trace; 817 PL_runops = runops_trace;
… …
756 PUSHMARK (SP); 846 PUSHMARK (SP);
757 PUSHs (&PL_sv_yes); 847 PUSHs (&PL_sv_yes);
758 PUSHs (fullname); 848 PUSHs (fullname);
759 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);
760 PUTBACK; 850 PUTBACK;
761 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);
762 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);
763 SPAGAIN; 853 SPAGAIN;
764 FREETMPS; 854 FREETMPS;
765 LEAVE; 855 LEAVE;
766 PL_runops = runops_trace; 856 PL_runops = runops_trace;
… …
780 PL_runops = RUNOPS_DEFAULT; 870 PL_runops = RUNOPS_DEFAULT;
781 PUSHMARK (SP); 871 PUSHMARK (SP);
782 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 872 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
783 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 873 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
784 PUTBACK; 874 PUTBACK;
785 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);
786 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);
787 SPAGAIN; 877 SPAGAIN;
788 FREETMPS; 878 FREETMPS;
789 LEAVE; 879 LEAVE;
790 PL_runops = runops_trace; 880 PL_runops = runops_trace;
… …
800 890
801/* 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 */
802/* _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 */
803/* during execution of a perl program */ 893/* during execution of a perl program */
804static void NOINLINE 894static void NOINLINE
805prepare_cctx (pTHX_ coro_cctx *cctx) 895cctx_prepare (pTHX_ coro_cctx *cctx)
806{ 896{
807 dSP; 897 dSP;
808 LOGOP myop; 898 LOGOP myop;
809 899
810 PL_top_env = &PL_start_env; 900 PL_top_env = &PL_start_env;
… …
828 918
829/* 919/*
830 * this is a _very_ stripped down perl interpreter ;) 920 * this is a _very_ stripped down perl interpreter ;)
831 */ 921 */
832static void 922static void
833coro_run (void *arg) 923cctx_run (void *arg)
834{ 924{
835 dTHX; 925 dTHX;
836 926
837 /* coro_run is the alternative tail of transfer(), so unlock here. */ 927 /* cctx_run is the alternative tail of transfer(), so unlock here. */
838 UNLOCK; 928 UNLOCK;
839 929
840 /* we now skip the entersub that lead to transfer() */ 930 /* we now skip the entersub that lead to transfer() */
841 PL_op = PL_op->op_next; 931 PL_op = PL_op->op_next;
842 932
843 /* inject a fake subroutine call to cctx_init */ 933 /* inject a fake subroutine call to cctx_init */
844 prepare_cctx (aTHX_ (coro_cctx *)arg); 934 cctx_prepare (aTHX_ (coro_cctx *)arg);
845 935
846 /* 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 */
847 PL_restartop = PL_op; 937 PL_restartop = PL_op;
848 perl_run (PL_curinterp); 938 perl_run (PL_curinterp);
849 939
… …
868 ++cctx_count; 958 ++cctx_count;
869 959
870 Newz (0, cctx, 1, coro_cctx); 960 Newz (0, cctx, 1, coro_cctx);
871 961
872#if HAVE_MMAP 962#if HAVE_MMAP
873
874 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;
875 /* mmap supposedly does allocate-on-write for us */ 964 /* mmap supposedly does allocate-on-write for us */
876 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);
877 966
878 if (cctx->sptr != (void *)-1) 967 if (cctx->sptr != (void *)-1)
… …
899 stack_start = cctx->sptr; 988 stack_start = cctx->sptr;
900 stack_size = cctx->ssize; 989 stack_size = cctx->ssize;
901 } 990 }
902 991
903 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 992 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
904 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);
905 994
906 return cctx; 995 return cctx;
907} 996}
908 997
909static void 998static void
… …
926 Safefree (cctx->sptr); 1015 Safefree (cctx->sptr);
927 1016
928 Safefree (cctx); 1017 Safefree (cctx);
929} 1018}
930 1019
1020/* wether this cctx should be destructed */
1021#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1022
931static coro_cctx * 1023static coro_cctx *
932cctx_get (pTHX) 1024cctx_get (pTHX)
933{ 1025{
934 while (cctx_first) 1026 while (expect_true (cctx_first))
935 { 1027 {
936 coro_cctx *cctx = cctx_first; 1028 coro_cctx *cctx = cctx_first;
937 cctx_first = cctx->next; 1029 cctx_first = cctx->next;
938 --cctx_idle; 1030 --cctx_idle;
939 1031
940 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1032 if (expect_true (!CCTX_EXPIRED (cctx)))
941 return cctx; 1033 return cctx;
942 1034
943 cctx_destroy (cctx); 1035 cctx_destroy (cctx);
944 } 1036 }
945 1037
… …
948 1040
949static void 1041static void
950cctx_put (coro_cctx *cctx) 1042cctx_put (coro_cctx *cctx)
951{ 1043{
952 /* free another cctx if overlimit */ 1044 /* free another cctx if overlimit */
953 if (cctx_idle >= MAX_IDLE_CCTX) 1045 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
954 { 1046 {
955 coro_cctx *first = cctx_first; 1047 coro_cctx *first = cctx_first;
956 cctx_first = first->next; 1048 cctx_first = first->next;
957 --cctx_idle; 1049 --cctx_idle;
958 1050
… …
964 cctx_first = cctx; 1056 cctx_first = cctx;
965} 1057}
966 1058
967/** coroutine switching *****************************************************/ 1059/** coroutine switching *****************************************************/
968 1060
969static void NOINLINE 1061static void
970transfer_check (pTHX_ struct coro *prev, struct coro *next) 1062transfer_check (pTHX_ struct coro *prev, struct coro *next)
971{ 1063{
972 if (prev != next) 1064 if (expect_true (prev != next))
973 { 1065 {
974 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1066 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
975 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");
976 1068
977 if (next->flags & CF_RUNNING) 1069 if (expect_false (next->flags & CF_RUNNING))
978 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");
979 1071
980 if (next->flags & CF_DESTROYED) 1072 if (expect_false (next->flags & CF_DESTROYED))
981 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");
982 1074
1075 if (
1076#if PERL_VERSION_ATLEAST (5,9,0)
1077 expect_false (PL_parser)
1078#else
983 if (PL_lex_state != LEX_NOTPARSING) 1079 expect_false (PL_lex_state != LEX_NOTPARSING)
1080#endif
1081 )
984 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");
985 } 1083 }
986} 1084}
987 1085
988/* always use the TRANSFER macro */ 1086/* always use the TRANSFER macro */
… …
990transfer (pTHX_ struct coro *prev, struct coro *next) 1088transfer (pTHX_ struct coro *prev, struct coro *next)
991{ 1089{
992 dSTACKLEVEL; 1090 dSTACKLEVEL;
993 1091
994 /* sometimes transfer is only called to set idle_sp */ 1092 /* sometimes transfer is only called to set idle_sp */
995 if (!next) 1093 if (expect_false (!next))
996 { 1094 {
997 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1095 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
998 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 */
999 } 1097 }
1000 else if (prev != next) 1098 else if (expect_true (prev != next))
1001 { 1099 {
1002 coro_cctx *prev__cctx; 1100 coro_cctx *prev__cctx;
1003 1101
1004 if (prev->flags & CF_NEW) 1102 if (expect_false (prev->flags & CF_NEW))
1005 { 1103 {
1006 /* create a new empty context */ 1104 /* create a new empty context */
1007 Newz (0, prev->cctx, 1, coro_cctx); 1105 Newz (0, prev->cctx, 1, coro_cctx);
1008 prev->flags &= ~CF_NEW; 1106 prev->flags &= ~CF_NEW;
1009 prev->flags |= CF_RUNNING; 1107 prev->flags |= CF_RUNNING;
… …
1012 prev->flags &= ~CF_RUNNING; 1110 prev->flags &= ~CF_RUNNING;
1013 next->flags |= CF_RUNNING; 1111 next->flags |= CF_RUNNING;
1014 1112
1015 LOCK; 1113 LOCK;
1016 1114
1017 if (next->flags & CF_NEW) 1115 if (expect_false (next->flags & CF_NEW))
1018 { 1116 {
1019 /* need to start coroutine */ 1117 /* need to start coroutine */
1020 next->flags &= ~CF_NEW; 1118 next->flags &= ~CF_NEW;
1021 /* first get rid of the old state */ 1119 /* first get rid of the old state */
1022 save_perl (aTHX_ prev); 1120 save_perl (aTHX_ prev);
… …
1031 } 1129 }
1032 1130
1033 prev__cctx = prev->cctx; 1131 prev__cctx = prev->cctx;
1034 1132
1035 /* possibly "free" the cctx */ 1133 /* possibly "free" the cctx */
1036 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)))
1037 { 1135 {
1038 /* 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 */
1039 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));
1040 1138
1041 prev->cctx = 0; 1139 prev->cctx = 0;
1042 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
1043 cctx_put (prev__cctx); 1147 cctx_put (prev__cctx);
1044 } 1148 }
1045 1149
1046 ++next->usecount; 1150 ++next->usecount;
1047 1151
1048 if (!next->cctx) 1152 if (expect_true (!next->cctx))
1049 next->cctx = cctx_get (aTHX); 1153 next->cctx = cctx_get (aTHX);
1050 1154
1051 if (prev__cctx != next->cctx) 1155 if (expect_false (prev__cctx != next->cctx))
1052 { 1156 {
1053 prev__cctx->top_env = PL_top_env; 1157 prev__cctx->top_env = PL_top_env;
1054 PL_top_env = next->cctx->top_env; 1158 PL_top_env = next->cctx->top_env;
1055 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1159 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1056 } 1160 }
1057 1161
1058 free_coro_mortal (aTHX); 1162 free_coro_mortal (aTHX);
1059 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 }
1060 } 1177 }
1061} 1178}
1062 1179
1063struct transfer_args 1180struct transfer_args
1064{ 1181{
… …
1099 save_perl (aTHX_ &temp); 1216 save_perl (aTHX_ &temp);
1100 load_perl (aTHX_ coro); 1217 load_perl (aTHX_ coro);
1101 1218
1102 coro_destroy (aTHX_ coro); 1219 coro_destroy (aTHX_ coro);
1103 1220
1104 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1221 load_perl (aTHX_ &temp);
1105 1222
1106 coro->mainstack = 0; 1223 coro->slot = 0;
1107 } 1224 }
1108 1225
1109 cctx_destroy (coro->cctx); 1226 cctx_destroy (coro->cctx);
1110 SvREFCNT_dec (coro->args); 1227 SvREFCNT_dec (coro->args);
1111 1228
… …
1236 { 1353 {
1237 LOCK; 1354 LOCK;
1238 next_sv = coro_deq (aTHX_ PRIO_MIN); 1355 next_sv = coro_deq (aTHX_ PRIO_MIN);
1239 1356
1240 /* nothing to schedule: call the idle handler */ 1357 /* nothing to schedule: call the idle handler */
1241 if (!next_sv) 1358 if (expect_false (!next_sv))
1242 { 1359 {
1243 dSP; 1360 dSP;
1244 UNLOCK; 1361 UNLOCK;
1245 1362
1246 ENTER; 1363 ENTER;
… …
1256 } 1373 }
1257 1374
1258 ta->next = SvSTATE (next_sv); 1375 ta->next = SvSTATE (next_sv);
1259 1376
1260 /* cannot transfer to destroyed coros, skip and look for next */ 1377 /* cannot transfer to destroyed coros, skip and look for next */
1261 if (ta->next->flags & CF_DESTROYED) 1378 if (expect_false (ta->next->flags & CF_DESTROYED))
1262 { 1379 {
1263 UNLOCK; 1380 UNLOCK;
1264 SvREFCNT_dec (next_sv); 1381 SvREFCNT_dec (next_sv);
1265 /* coro_nready is already taken care of by destroy */ 1382 /* coro_nready is already taken care of by destroy */
1266 continue; 1383 continue;
… …
1322 dTHX; 1439 dTHX;
1323 struct transfer_args ta; 1440 struct transfer_args ta;
1324 1441
1325 prepare_cede (aTHX_ &ta); 1442 prepare_cede (aTHX_ &ta);
1326 1443
1327 if (ta.prev != ta.next) 1444 if (expect_true (ta.prev != ta.next))
1328 { 1445 {
1329 TRANSFER (ta); 1446 TRANSFER (ta);
1330 return 1; 1447 return 1;
1331 } 1448 }
1332 else 1449 else
… …
1368 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1485 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1369 1486
1370 if (coro->flags & CF_RUNNING) 1487 if (coro->flags & CF_RUNNING)
1371 PL_runops = RUNOPS_DEFAULT; 1488 PL_runops = RUNOPS_DEFAULT;
1372 else 1489 else
1373 coro->runops = RUNOPS_DEFAULT; 1490 coro->slot->runops = RUNOPS_DEFAULT;
1374 } 1491 }
1375} 1492}
1376 1493
1377MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1494MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1378 1495
… …
1385#endif 1502#endif
1386 BOOT_PAGESIZE; 1503 BOOT_PAGESIZE;
1387 1504
1388 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1505 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1389 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);
1390 1514
1391 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1515 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1392 1516
1393 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1517 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1394 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1518 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1425 1549
1426 coro->hv = hv = newHV (); 1550 coro->hv = hv = newHV ();
1427 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;
1428 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1552 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1429 1553
1554 av_extend (coro->args, items - 1);
1430 for (i = 1; i < items; i++) 1555 for (i = 1; i < items; i++)
1431 av_push (coro->args, newSVsv (ST (i))); 1556 av_push (coro->args, newSVsv (ST (i)));
1432} 1557}
1433 OUTPUT: 1558 OUTPUT:
1434 RETVAL 1559 RETVAL
… …
1477 } 1602 }
1478 1603
1479 BARRIER; 1604 BARRIER;
1480 TRANSFER (ta); 1605 TRANSFER (ta);
1481 1606
1482 if (GIMME_V != G_VOID && ta.next != ta.prev) 1607 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev))
1483 XSRETURN_YES; 1608 XSRETURN_YES;
1484} 1609}
1485 1610
1486bool 1611bool
1487_destroy (SV *coro_sv) 1612_destroy (SV *coro_sv)
… …
1537 CODE: 1662 CODE:
1538{ 1663{
1539 if (coro->mainstack) 1664 if (coro->mainstack)
1540 { 1665 {
1541 struct coro temp; 1666 struct coro temp;
1542 Zero (&temp, 1, struct coro);
1543 1667
1544 if (!(coro->flags & CF_RUNNING)) 1668 if (!(coro->flags & CF_RUNNING))
1545 { 1669 {
1546 save_perl (aTHX_ &temp); 1670 save_perl (aTHX_ &temp);
1547 load_perl (aTHX_ coro); 1671 load_perl (aTHX_ coro);
… …
1551 dSP; 1675 dSP;
1552 ENTER; 1676 ENTER;
1553 SAVETMPS; 1677 SAVETMPS;
1554 PUSHMARK (SP); 1678 PUSHMARK (SP);
1555 PUTBACK; 1679 PUTBACK;
1680
1556 if (ix) 1681 if (ix)
1557 eval_sv (coderef, 0); 1682 eval_sv (coderef, 0);
1558 else 1683 else
1559 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1684 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1685
1560 SPAGAIN; 1686 SPAGAIN;
1561 FREETMPS; 1687 FREETMPS;
1562 LEAVE; 1688 LEAVE;
1563 PUTBACK; 1689 PUTBACK;
1564 } 1690 }
… …
1622 1748
1623BOOT: 1749BOOT:
1624{ 1750{
1625 int i; 1751 int i;
1626 1752
1627 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1753 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1628 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1754 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1629 av_async_pool = get_av ("Coro::async_pool", TRUE); 1755 av_async_pool = coro_get_av ("Coro::async_pool", TRUE);
1630 1756
1631 coro_current = get_sv ("Coro::current", FALSE); 1757 coro_current = coro_get_sv ("Coro::current", FALSE);
1632 SvREADONLY_on (coro_current); 1758 SvREADONLY_on (coro_current);
1633 1759
1634 coro_stash = gv_stashpv ("Coro", TRUE); 1760 coro_stash = gv_stashpv ("Coro", TRUE);
1635 1761
1636 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1762 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1637 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1763 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1638 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1764 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1639 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1765 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
… …
1642 1768
1643 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1769 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1644 coro_ready[i] = newAV (); 1770 coro_ready[i] = newAV ();
1645 1771
1646 { 1772 {
1647 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 */
1648 1775
1649 coroapi.schedule = api_schedule; 1776 coroapi.schedule = api_schedule;
1650 coroapi.cede = api_cede; 1777 coroapi.cede = api_cede;
1651 coroapi.cede_notself = api_cede_notself; 1778 coroapi.cede_notself = api_cede_notself;
1652 coroapi.ready = api_ready; 1779 coroapi.ready = api_ready;
… …
1703 CODE: 1830 CODE:
1704 RETVAL = coro_nready; 1831 RETVAL = coro_nready;
1705 OUTPUT: 1832 OUTPUT:
1706 RETVAL 1833 RETVAL
1707 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
1708# for async_pool speedup 1842# for async_pool speedup
1709void 1843void
1710_pool_1 (SV *cb) 1844_pool_1 (SV *cb)
1711 CODE: 1845 CODE:
1712{ 1846{
1713 struct coro *coro = SvSTATE (coro_current); 1847 struct coro *coro = SvSTATE (coro_current);
1714 HV *hv = (HV *)SvRV (coro_current); 1848 HV *hv = (HV *)SvRV (coro_current);
1715 AV *defav = GvAV (PL_defgv); 1849 AV *defav = GvAV (PL_defgv);
1716 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1850 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0);
1717 AV *invoke_av; 1851 AV *invoke_av;
1718 int i, len; 1852 int i, len;
1719 1853
1720 if (!invoke) 1854 if (!invoke)
1721 croak ("\3terminate\2\n"); 1855 croak ("\3async_pool terminate\2\n");
1722 1856
1723 SvREFCNT_dec (coro->saved_deffh); 1857 SvREFCNT_dec (coro->saved_deffh);
1724 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1858 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1725 1859
1726 hv_store (hv, "desc", sizeof ("desc") - 1, 1860 hv_store (hv, "desc", sizeof ("desc") - 1,
1727 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1861 newSVpvn (strpair ("[async_pool]")), 0);
1728 1862
1729 invoke_av = (AV *)SvRV (invoke); 1863 invoke_av = (AV *)SvRV (invoke);
1730 len = av_len (invoke_av); 1864 len = av_len (invoke_av);
1731 1865
1732 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1866 sv_setsv (cb, AvARRAY (invoke_av)[0]);
… …
1752 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1886 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1753 coro->saved_deffh = 0; 1887 coro->saved_deffh = 0;
1754 1888
1755 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1889 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1756 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1890 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1757 croak ("\3terminate\2\n"); 1891 croak ("\3async_pool terminate\2\n");
1758 1892
1759 av_clear (GvAV (PL_defgv)); 1893 av_clear (GvAV (PL_defgv));
1760 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1894 hv_store ((HV *)SvRV (coro_current), strpair ("desc"),
1761 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1895 newSVpvn (strpair ("[async_pool idle]")), 0);
1762 1896
1763 coro->prio = 0; 1897 coro->prio = 0;
1764 1898
1765 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1899 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1766 api_trace (coro_current, 0); 1900 api_trace (coro_current, 0);

Diff Legend

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