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.185 by root, Thu Oct 4 19:35:08 2007 UTC vs.
Revision 1.201 by root, Mon Oct 8 01:23:14 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;
132static AV *main_mainstack; /* used to differentiate between $main and others */ 148static AV *main_mainstack; /* used to differentiate between $main and others */
133static JMPENV *main_top_env; 149static JMPENV *main_top_env;
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; /* $/ */
154static GV *stdoutgv; /* *STDOUT */
155
156static HV *hv_sig; /* %SIG */
157static SV *sv_diehook;
158static SV *sv_warnhook;
138 159
139/* async_pool helper stuff */ 160/* async_pool helper stuff */
140static SV *sv_pool_rss; 161static SV *sv_pool_rss;
141static SV *sv_pool_size; 162static SV *sv_pool_size;
142static AV *av_async_pool; 163static AV *av_async_pool;
178 CF_READY = 0x0002, /* coroutine is ready */ 199 CF_READY = 0x0002, /* coroutine is ready */
179 CF_NEW = 0x0004, /* has never been switched to */ 200 CF_NEW = 0x0004, /* has never been switched to */
180 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 201 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
181}; 202};
182 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
183/* this is a structure representing a perl-level coroutine */ 217/* this is a structure representing a perl-level coroutine */
184struct coro { 218struct coro {
185 /* the c coroutine allocated to this perl coroutine, if any */ 219 /* the c coroutine allocated to this perl coroutine, if any */
186 coro_cctx *cctx; 220 coro_cctx *cctx;
187 221
222 /* process data */
223 AV *mainstack;
224 perl_slots *slot; /* basically the saved sp */
225
188 /* data associated with this coroutine (initial args) */ 226 /* data associated with this coroutine (initial args) */
189 AV *args; 227 AV *args;
190 int refcnt; 228 int refcnt;
191 int flags; /* CF_ flags */ 229 int flags; /* CF_ flags */
192 230
193 /* optionally saved, might be zero */
194 AV *defav; /* @_ */
195 SV *defsv; /* $_ */
196 SV *errsv; /* $@ */
197 SV *deffh; /* default filehandle */
198 SV *irssv; /* $/ */
199 SV *irssv_sv; /* real $/ cache */
200
201#define VAR(name,type) type name;
202# include "state.h"
203#undef VAR
204
205 /* statistics */ 231 /* statistics */
206 int usecount; /* number of transfers to this coro */ 232 int usecount; /* number of transfers to this coro */
207 233
208 /* coro process data */ 234 /* coro process data */
209 int prio; 235 int prio;
210 //SV *throw; 236 SV *throw;
211 237
212 /* async_pool */ 238 /* async_pool */
213 SV *saved_deffh; 239 SV *saved_deffh;
214 240
215 /* linked list */ 241 /* linked list */
234static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 260static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
235static int coro_nready; 261static int coro_nready;
236static struct coro *coro_first; 262static struct coro *coro_first;
237 263
238/** 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}
239 295
240static AV * 296static AV *
241coro_clone_padlist (pTHX_ CV *cv) 297coro_clone_padlist (pTHX_ CV *cv)
242{ 298{
243 AV *padlist = CvPADLIST (cv); 299 AV *padlist = CvPADLIST (cv);
316 MAGIC *mg; 372 MAGIC *mg;
317 373
318 if (SvROK (coro)) 374 if (SvROK (coro))
319 coro = SvRV (coro); 375 coro = SvRV (coro);
320 376
321 if (SvTYPE (coro) != SVt_PVHV) 377 if (expect_false (SvTYPE (coro) != SVt_PVHV))
322 croak ("Coro::State object required"); 378 croak ("Coro::State object required");
323 379
324 stash = SvSTASH (coro); 380 stash = SvSTASH (coro);
325 if (stash != coro_stash && stash != coro_state_stash) 381 if (expect_false (stash != coro_stash && stash != coro_state_stash))
326 { 382 {
327 /* very slow, but rare, check */ 383 /* very slow, but rare, check */
328 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 384 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
329 croak ("Coro::State object required"); 385 croak ("Coro::State object required");
330 } 386 }
340get_padlist (pTHX_ CV *cv) 396get_padlist (pTHX_ CV *cv)
341{ 397{
342 MAGIC *mg = CORO_MAGIC (cv); 398 MAGIC *mg = CORO_MAGIC (cv);
343 AV *av; 399 AV *av;
344 400
345 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 401 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
346 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 402 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
347 else 403 else
348 { 404 {
349#if CORO_PREFER_PERL_FUNCTIONS 405#if CORO_PREFER_PERL_FUNCTIONS
350 /* this is probably cleaner, but also slower? */ 406 /* this is probably cleaner, but also slower? */
362put_padlist (pTHX_ CV *cv) 418put_padlist (pTHX_ CV *cv)
363{ 419{
364 MAGIC *mg = CORO_MAGIC (cv); 420 MAGIC *mg = CORO_MAGIC (cv);
365 AV *av; 421 AV *av;
366 422
367 if (!mg) 423 if (expect_false (!mg))
368 { 424 {
369 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 425 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
370 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 426 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
371 mg->mg_virtual = &vtbl_coro; 427 mg->mg_virtual = &vtbl_coro;
372 mg->mg_obj = (SV *)newAV (); 428 mg->mg_obj = (SV *)newAV ();
373 } 429 }
374 430
375 av = (AV *)mg->mg_obj; 431 av = (AV *)mg->mg_obj;
376 432
377 if (AvFILLp (av) >= AvMAX (av)) 433 if (expect_false (AvFILLp (av) >= AvMAX (av)))
378 av_extend (av, AvMAX (av) + 1); 434 av_extend (av, AvMAX (av) + 1);
379 435
380 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 436 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
381} 437}
382 438
383/** load & save, init *******************************************************/ 439/** load & save, init *******************************************************/
384 440
385static void 441static void
386load_perl (pTHX_ Coro__State c) 442load_perl (pTHX_ Coro__State c)
387{ 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
388#define VAR(name,type) PL_ ## name = c->name; 454 #define VAR(name,type) PL_ ## name = slot->name;
389# include "state.h" 455 # include "state.h"
390#undef VAR 456 #undef VAR
391
392 GvSV (PL_defgv) = c->defsv;
393 GvAV (PL_defgv) = c->defav;
394 GvSV (PL_errgv) = c->errsv;
395 GvSV (irsgv) = c->irssv_sv;
396 457
397 { 458 {
398 dSP; 459 dSP;
460
399 CV *cv; 461 CV *cv;
400 462
401 /* now do the ugly restore mess */ 463 /* now do the ugly restore mess */
402 while ((cv = (CV *)POPs)) 464 while (expect_true (cv = (CV *)POPs))
403 { 465 {
404 put_padlist (aTHX_ cv); /* mark this padlist as available */ 466 put_padlist (aTHX_ cv); /* mark this padlist as available */
405 CvDEPTH (cv) = PTR2IV (POPs); 467 CvDEPTH (cv) = PTR2IV (POPs);
406 CvPADLIST (cv) = (AV *)POPs; 468 CvPADLIST (cv) = (AV *)POPs;
407 } 469 }
426 488
427 XPUSHs (Nullsv); 489 XPUSHs (Nullsv);
428 /* this loop was inspired by pp_caller */ 490 /* this loop was inspired by pp_caller */
429 for (;;) 491 for (;;)
430 { 492 {
431 while (cxix >= 0) 493 while (expect_true (cxix >= 0))
432 { 494 {
433 PERL_CONTEXT *cx = &ccstk[cxix--]; 495 PERL_CONTEXT *cx = &ccstk[cxix--];
434 496
435 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 497 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
436 { 498 {
437 CV *cv = cx->blk_sub.cv; 499 CV *cv = cx->blk_sub.cv;
438 500
439 if (CvDEPTH (cv)) 501 if (expect_true (CvDEPTH (cv)))
440 { 502 {
441 EXTEND (SP, 3); 503 EXTEND (SP, 3);
442 PUSHs ((SV *)CvPADLIST (cv)); 504 PUSHs ((SV *)CvPADLIST (cv));
443 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 505 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
444 PUSHs ((SV *)cv); 506 PUSHs ((SV *)cv);
447 get_padlist (aTHX_ cv); 509 get_padlist (aTHX_ cv);
448 } 510 }
449 } 511 }
450 } 512 }
451 513
452 if (top_si->si_type == PERLSI_MAIN) 514 if (expect_true (top_si->si_type == PERLSI_MAIN))
453 break; 515 break;
454 516
455 top_si = top_si->si_prev; 517 top_si = top_si->si_prev;
456 ccstk = top_si->si_cxstack; 518 ccstk = top_si->si_cxstack;
457 cxix = top_si->si_cxix; 519 cxix = top_si->si_cxix;
458 } 520 }
459 521
460 PUTBACK; 522 PUTBACK;
461 } 523 }
462 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
463 c->defav = GvAV (PL_defgv); 543 slot->defav = GvAV (PL_defgv);
464 c->defsv = DEFSV; 544 slot->defsv = DEFSV;
465 c->errsv = ERRSV; 545 slot->errsv = ERRSV;
466 c->irssv_sv = GvSV (irsgv); 546 slot->irsgv = GvSV (irsgv);
467 547
468#define VAR(name,type)c->name = PL_ ## name; 548 #define VAR(name,type) slot->name = PL_ ## name;
469# include "state.h" 549 # include "state.h"
470#undef VAR 550 #undef VAR
551 }
471} 552}
472 553
473/* 554/*
474 * allocate various perl stacks. This is an exact copy 555 * allocate various perl stacks. This is an exact copy
475 * of perl.c:init_stacks, except that it uses less memory 556 * of perl.c:init_stacks, except that it uses less memory
480# define coro_init_stacks init_stacks 561# define coro_init_stacks init_stacks
481#else 562#else
482static void 563static void
483coro_init_stacks (pTHX) 564coro_init_stacks (pTHX)
484{ 565{
485 PL_curstackinfo = new_stackinfo(64, 6); 566 PL_curstackinfo = new_stackinfo(32, 8);
486 PL_curstackinfo->si_type = PERLSI_MAIN; 567 PL_curstackinfo->si_type = PERLSI_MAIN;
487 PL_curstack = PL_curstackinfo->si_stack; 568 PL_curstack = PL_curstackinfo->si_stack;
488 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 569 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
489 570
490 PL_stack_base = AvARRAY(PL_curstack); 571 PL_stack_base = AvARRAY(PL_curstack);
491 PL_stack_sp = PL_stack_base; 572 PL_stack_sp = PL_stack_base;
492 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 573 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
493 574
494 New(50,PL_tmps_stack,64,SV*); 575 New(50,PL_tmps_stack,32,SV*);
495 PL_tmps_floor = -1; 576 PL_tmps_floor = -1;
496 PL_tmps_ix = -1; 577 PL_tmps_ix = -1;
497 PL_tmps_max = 64; 578 PL_tmps_max = 32;
498 579
499 New(54,PL_markstack,16,I32); 580 New(54,PL_markstack,16,I32);
500 PL_markstack_ptr = PL_markstack; 581 PL_markstack_ptr = PL_markstack;
501 PL_markstack_max = PL_markstack + 16; 582 PL_markstack_max = PL_markstack + 16;
502 583
503#ifdef SET_MARK_OFFSET 584#ifdef SET_MARK_OFFSET
504 SET_MARK_OFFSET; 585 SET_MARK_OFFSET;
505#endif 586#endif
506 587
507 New(54,PL_scopestack,16,I32); 588 New(54,PL_scopestack,8,I32);
508 PL_scopestack_ix = 0; 589 PL_scopestack_ix = 0;
509 PL_scopestack_max = 16; 590 PL_scopestack_max = 8;
510 591
511 New(54,PL_savestack,64,ANY); 592 New(54,PL_savestack,24,ANY);
512 PL_savestack_ix = 0; 593 PL_savestack_ix = 0;
513 PL_savestack_max = 64; 594 PL_savestack_max = 24;
514 595
515#if !PERL_VERSION_ATLEAST (5,9,0) 596#if !PERL_VERSION_ATLEAST (5,9,0)
516 New(54,PL_retstack,4,OP*); 597 New(54,PL_retstack,4,OP*);
517 PL_retstack_ix = 0; 598 PL_retstack_ix = 0;
518 PL_retstack_max = 4; 599 PL_retstack_max = 4;
555{ 636{
556 size_t rss = sizeof (*coro); 637 size_t rss = sizeof (*coro);
557 638
558 if (coro->mainstack) 639 if (coro->mainstack)
559 { 640 {
641 perl_slots tmp_slot;
642 perl_slots *slot;
643
560 if (coro->flags & CF_RUNNING) 644 if (coro->flags & CF_RUNNING)
561 { 645 {
646 slot = &tmp_slot;
647
562 #define VAR(name,type)coro->name = PL_ ## name; 648 #define VAR(name,type) slot->name = PL_ ## name;
563 # include "state.h" 649 # include "state.h"
564 #undef VAR 650 #undef VAR
565 } 651 }
652 else
653 slot = coro->slot;
566 654
567 rss += sizeof (coro->curstackinfo); 655 rss += sizeof (slot->curstackinfo);
568 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
569 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 656 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
570 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 *);
571 rss += coro->tmps_max * sizeof (SV *); 658 rss += slot->tmps_max * sizeof (SV *);
572 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 659 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
573 rss += coro->scopestack_max * sizeof (I32); 660 rss += slot->scopestack_max * sizeof (I32);
574 rss += coro->savestack_max * sizeof (ANY); 661 rss += slot->savestack_max * sizeof (ANY);
575 662
576#if !PERL_VERSION_ATLEAST (5,9,0) 663#if !PERL_VERSION_ATLEAST (5,9,0)
577 rss += coro->retstack_max * sizeof (OP *); 664 rss += slot->retstack_max * sizeof (OP *);
578#endif 665#endif
579 } 666 }
580 667
581 return rss; 668 return rss;
582} 669}
594 PL_runops = RUNOPS_DEFAULT; 681 PL_runops = RUNOPS_DEFAULT;
595 PL_curcop = &PL_compiling; 682 PL_curcop = &PL_compiling;
596 PL_in_eval = EVAL_NULL; 683 PL_in_eval = EVAL_NULL;
597 PL_comppad = 0; 684 PL_comppad = 0;
598 PL_curpm = 0; 685 PL_curpm = 0;
686 PL_curpad = 0;
599 PL_localizing = 0; 687 PL_localizing = 0;
600 PL_dirty = 0; 688 PL_dirty = 0;
601 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);
602 692
603 GvSV (PL_defgv) = NEWSV (0, 0); 693 GvSV (PL_defgv) = newSV (0);
604 GvAV (PL_defgv) = coro->args; coro->args = 0; 694 GvAV (PL_defgv) = coro->args; coro->args = 0;
605 GvSV (PL_errgv) = NEWSV (0, 0); 695 GvSV (PL_errgv) = newSV (0);
606 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);
607 PL_rs = newSVsv (GvSV (irsgv)); 697 PL_rs = newSVsv (GvSV (irsgv));
608 698 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
609 {
610 IO *io = newIO ();
611 PL_defoutgv = newGVgen ("Coro");
612 GvIOp(PL_defoutgv) = io;
613 IoTYPE (io) = IoTYPE_WRONLY;
614 IoOFP (io) = IoIFP (io) = PerlIO_stdout ();
615 IoFLAGS (io) |= IOf_FLUSH;
616 }
617 699
618 { 700 {
619 dSP; 701 dSP;
620 LOGOP myop; 702 LOGOP myop;
621 703
622 Zero (&myop, 1, LOGOP); 704 Zero (&myop, 1, LOGOP);
623 myop.op_next = Nullop; 705 myop.op_next = Nullop;
624 myop.op_flags = OPf_WANT_VOID; 706 myop.op_flags = OPf_WANT_VOID;
625 707
626 PUSHMARK (SP); 708 PUSHMARK (SP);
627 XPUSHs (av_shift (GvAV (PL_defgv))); 709 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
628 PUTBACK; 710 PUTBACK;
629 PL_op = (OP *)&myop; 711 PL_op = (OP *)&myop;
630 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 712 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
631 SPAGAIN; 713 SPAGAIN;
632 } 714 }
633 715
634 ENTER; /* necessary e.g. for dounwind */ 716 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */
635} 717}
636 718
637static void 719static void
638coro_destroy (pTHX_ struct coro *coro) 720coro_destroy (pTHX_ struct coro *coro)
639{ 721{
659 SvREFCNT_dec (GvSV (PL_errgv)); 741 SvREFCNT_dec (GvSV (PL_errgv));
660 SvREFCNT_dec (PL_defoutgv); 742 SvREFCNT_dec (PL_defoutgv);
661 SvREFCNT_dec (PL_rs); 743 SvREFCNT_dec (PL_rs);
662 SvREFCNT_dec (GvSV (irsgv)); 744 SvREFCNT_dec (GvSV (irsgv));
663 745
746 SvREFCNT_dec (PL_diehook);
747 SvREFCNT_dec (PL_warnhook);
748
664 SvREFCNT_dec (coro->saved_deffh); 749 SvREFCNT_dec (coro->saved_deffh);
665 //SvREFCNT_dec (coro->throw); 750 SvREFCNT_dec (coro->throw);
666 751
667 coro_destroy_stacks (aTHX); 752 coro_destroy_stacks (aTHX);
668} 753}
669 754
670static void 755static void
671free_coro_mortal (pTHX) 756free_coro_mortal (pTHX)
672{ 757{
673 if (coro_mortal) 758 if (expect_true (coro_mortal))
674 { 759 {
675 SvREFCNT_dec (coro_mortal); 760 SvREFCNT_dec (coro_mortal);
676 coro_mortal = 0; 761 coro_mortal = 0;
677 } 762 }
678} 763}
707 bot = PL_stack_base + cx->blk_oldsp + 1; 792 bot = PL_stack_base + cx->blk_oldsp + 1;
708 top = cx->blk_gimme == G_ARRAY ? SP + 1 793 top = cx->blk_gimme == G_ARRAY ? SP + 1
709 : cx->blk_gimme == G_SCALAR ? bot + 1 794 : cx->blk_gimme == G_SCALAR ? bot + 1
710 : bot; 795 : bot;
711 796
797 av_extend (av, top - bot);
712 while (bot < top) 798 while (bot < top)
713 av_push (av, SvREFCNT_inc (*bot++)); 799 av_push (av, SvREFCNT_inc (*bot++));
714 800
715 PL_runops = RUNOPS_DEFAULT; 801 PL_runops = RUNOPS_DEFAULT;
716 ENTER; 802 ENTER;
719 PUSHMARK (SP); 805 PUSHMARK (SP);
720 PUSHs (&PL_sv_no); 806 PUSHs (&PL_sv_no);
721 PUSHs (fullname); 807 PUSHs (fullname);
722 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 808 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
723 PUTBACK; 809 PUTBACK;
724 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);
725 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);
726 SPAGAIN; 812 SPAGAIN;
727 FREETMPS; 813 FREETMPS;
728 LEAVE; 814 LEAVE;
729 PL_runops = runops_trace; 815 PL_runops = runops_trace;
758 PUSHMARK (SP); 844 PUSHMARK (SP);
759 PUSHs (&PL_sv_yes); 845 PUSHs (&PL_sv_yes);
760 PUSHs (fullname); 846 PUSHs (fullname);
761 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);
762 PUTBACK; 848 PUTBACK;
763 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);
764 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);
765 SPAGAIN; 851 SPAGAIN;
766 FREETMPS; 852 FREETMPS;
767 LEAVE; 853 LEAVE;
768 PL_runops = runops_trace; 854 PL_runops = runops_trace;
782 PL_runops = RUNOPS_DEFAULT; 868 PL_runops = RUNOPS_DEFAULT;
783 PUSHMARK (SP); 869 PUSHMARK (SP);
784 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 870 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
785 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 871 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
786 PUTBACK; 872 PUTBACK;
787 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);
788 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);
789 SPAGAIN; 875 SPAGAIN;
790 FREETMPS; 876 FREETMPS;
791 LEAVE; 877 LEAVE;
792 PL_runops = runops_trace; 878 PL_runops = runops_trace;
802 888
803/* inject a fake call to Coro::State::_cctx_init into the execution */ 889/* inject a fake call to Coro::State::_cctx_init into the execution */
804/* _cctx_init should be careful, as it could be called at almost any time */ 890/* _cctx_init should be careful, as it could be called at almost any time */
805/* during execution of a perl program */ 891/* during execution of a perl program */
806static void NOINLINE 892static void NOINLINE
807prepare_cctx (pTHX_ coro_cctx *cctx) 893cctx_prepare (pTHX_ coro_cctx *cctx)
808{ 894{
809 dSP; 895 dSP;
810 LOGOP myop; 896 LOGOP myop;
811 897
812 PL_top_env = &PL_start_env; 898 PL_top_env = &PL_start_env;
830 916
831/* 917/*
832 * this is a _very_ stripped down perl interpreter ;) 918 * this is a _very_ stripped down perl interpreter ;)
833 */ 919 */
834static void 920static void
835coro_run (void *arg) 921cctx_run (void *arg)
836{ 922{
837 dTHX; 923 dTHX;
838 924
839 /* coro_run is the alternative tail of transfer(), so unlock here. */ 925 /* cctx_run is the alternative tail of transfer(), so unlock here. */
840 UNLOCK; 926 UNLOCK;
841 927
842 /* we now skip the entersub that lead to transfer() */ 928 /* we now skip the entersub that lead to transfer() */
843 PL_op = PL_op->op_next; 929 PL_op = PL_op->op_next;
844 930
845 /* inject a fake subroutine call to cctx_init */ 931 /* inject a fake subroutine call to cctx_init */
846 prepare_cctx (aTHX_ (coro_cctx *)arg); 932 cctx_prepare (aTHX_ (coro_cctx *)arg);
847 933
848 /* somebody or something will hit me for both perl_run and PL_restartop */ 934 /* somebody or something will hit me for both perl_run and PL_restartop */
849 PL_restartop = PL_op; 935 PL_restartop = PL_op;
850 perl_run (PL_curinterp); 936 perl_run (PL_curinterp);
851 937
870 ++cctx_count; 956 ++cctx_count;
871 957
872 Newz (0, cctx, 1, coro_cctx); 958 Newz (0, cctx, 1, coro_cctx);
873 959
874#if HAVE_MMAP 960#if HAVE_MMAP
875
876 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 961 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
877 /* mmap supposedly does allocate-on-write for us */ 962 /* mmap supposedly does allocate-on-write for us */
878 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 963 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
879 964
880 if (cctx->sptr != (void *)-1) 965 if (cctx->sptr != (void *)-1)
901 stack_start = cctx->sptr; 986 stack_start = cctx->sptr;
902 stack_size = cctx->ssize; 987 stack_size = cctx->ssize;
903 } 988 }
904 989
905 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 990 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
906 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 991 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
907 992
908 return cctx; 993 return cctx;
909} 994}
910 995
911static void 996static void
928 Safefree (cctx->sptr); 1013 Safefree (cctx->sptr);
929 1014
930 Safefree (cctx); 1015 Safefree (cctx);
931} 1016}
932 1017
1018/* wether this cctx should be destructed */
1019#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1020
933static coro_cctx * 1021static coro_cctx *
934cctx_get (pTHX) 1022cctx_get (pTHX)
935{ 1023{
936 while (cctx_first) 1024 while (expect_true (cctx_first))
937 { 1025 {
938 coro_cctx *cctx = cctx_first; 1026 coro_cctx *cctx = cctx_first;
939 cctx_first = cctx->next; 1027 cctx_first = cctx->next;
940 --cctx_idle; 1028 --cctx_idle;
941 1029
942 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1030 if (expect_true (!CCTX_EXPIRED (cctx)))
943 return cctx; 1031 return cctx;
944 1032
945 cctx_destroy (cctx); 1033 cctx_destroy (cctx);
946 } 1034 }
947 1035
950 1038
951static void 1039static void
952cctx_put (coro_cctx *cctx) 1040cctx_put (coro_cctx *cctx)
953{ 1041{
954 /* free another cctx if overlimit */ 1042 /* free another cctx if overlimit */
955 if (cctx_idle >= MAX_IDLE_CCTX) 1043 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
956 { 1044 {
957 coro_cctx *first = cctx_first; 1045 coro_cctx *first = cctx_first;
958 cctx_first = first->next; 1046 cctx_first = first->next;
959 --cctx_idle; 1047 --cctx_idle;
960 1048
966 cctx_first = cctx; 1054 cctx_first = cctx;
967} 1055}
968 1056
969/** coroutine switching *****************************************************/ 1057/** coroutine switching *****************************************************/
970 1058
971static void NOINLINE 1059static void
972transfer_check (pTHX_ struct coro *prev, struct coro *next) 1060transfer_check (pTHX_ struct coro *prev, struct coro *next)
973{ 1061{
974 if (prev != next) 1062 if (expect_true (prev != next))
975 { 1063 {
976 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1064 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
977 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1065 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
978 1066
979 if (next->flags & CF_RUNNING) 1067 if (expect_false (next->flags & CF_RUNNING))
980 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1068 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
981 1069
982 if (next->flags & CF_DESTROYED) 1070 if (expect_false (next->flags & CF_DESTROYED))
983 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1071 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
984 1072
1073 if (
1074#if PERL_VERSION_ATLEAST (5,9,0)
1075 expect_false (PL_parser)
1076#else
985 if (PL_lex_state != LEX_NOTPARSING) 1077 expect_false (PL_lex_state != LEX_NOTPARSING)
1078#endif
1079 )
986 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1080 croak ("Coro::State::transfer called while parsing, but this is not supported");
987 } 1081 }
988} 1082}
989 1083
990/* always use the TRANSFER macro */ 1084/* always use the TRANSFER macro */
992transfer (pTHX_ struct coro *prev, struct coro *next) 1086transfer (pTHX_ struct coro *prev, struct coro *next)
993{ 1087{
994 dSTACKLEVEL; 1088 dSTACKLEVEL;
995 1089
996 /* sometimes transfer is only called to set idle_sp */ 1090 /* sometimes transfer is only called to set idle_sp */
997 if (!next) 1091 if (expect_false (!next))
998 { 1092 {
999 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1093 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1000 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1094 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1001 } 1095 }
1002 else if (prev != next) 1096 else if (expect_true (prev != next))
1003 { 1097 {
1004 coro_cctx *prev__cctx; 1098 coro_cctx *prev__cctx;
1005 1099
1006 if (prev->flags & CF_NEW) 1100 if (expect_false (prev->flags & CF_NEW))
1007 { 1101 {
1008 /* create a new empty context */ 1102 /* create a new empty context */
1009 Newz (0, prev->cctx, 1, coro_cctx); 1103 Newz (0, prev->cctx, 1, coro_cctx);
1010 prev->flags &= ~CF_NEW; 1104 prev->flags &= ~CF_NEW;
1011 prev->flags |= CF_RUNNING; 1105 prev->flags |= CF_RUNNING;
1014 prev->flags &= ~CF_RUNNING; 1108 prev->flags &= ~CF_RUNNING;
1015 next->flags |= CF_RUNNING; 1109 next->flags |= CF_RUNNING;
1016 1110
1017 LOCK; 1111 LOCK;
1018 1112
1019 if (next->flags & CF_NEW) 1113 if (expect_false (next->flags & CF_NEW))
1020 { 1114 {
1021 /* need to start coroutine */ 1115 /* need to start coroutine */
1022 next->flags &= ~CF_NEW; 1116 next->flags &= ~CF_NEW;
1023 /* first get rid of the old state */ 1117 /* first get rid of the old state */
1024 save_perl (aTHX_ prev); 1118 save_perl (aTHX_ prev);
1033 } 1127 }
1034 1128
1035 prev__cctx = prev->cctx; 1129 prev__cctx = prev->cctx;
1036 1130
1037 /* possibly "free" the cctx */ 1131 /* possibly "free" the cctx */
1038 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1132 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1039 { 1133 {
1040 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1134 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1041 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1135 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1042 1136
1043 prev->cctx = 0; 1137 prev->cctx = 0;
1044 1138
1139 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1140 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1141 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1142 if (!next->cctx)
1143 next->cctx = cctx_get (aTHX);
1144
1045 cctx_put (prev__cctx); 1145 cctx_put (prev__cctx);
1046 } 1146 }
1047 1147
1048 ++next->usecount; 1148 ++next->usecount;
1049 1149
1050 if (!next->cctx) 1150 if (expect_true (!next->cctx))
1051 next->cctx = cctx_get (aTHX); 1151 next->cctx = cctx_get (aTHX);
1052 1152
1053 if (prev__cctx != next->cctx) 1153 if (expect_false (prev__cctx != next->cctx))
1054 { 1154 {
1055 prev__cctx->top_env = PL_top_env; 1155 prev__cctx->top_env = PL_top_env;
1056 PL_top_env = next->cctx->top_env; 1156 PL_top_env = next->cctx->top_env;
1057 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1157 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1058 } 1158 }
1059 1159
1060 free_coro_mortal (aTHX); 1160 free_coro_mortal (aTHX);
1061 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 }
1062 } 1175 }
1063} 1176}
1064 1177
1065struct transfer_args 1178struct transfer_args
1066{ 1179{
1101 save_perl (aTHX_ &temp); 1214 save_perl (aTHX_ &temp);
1102 load_perl (aTHX_ coro); 1215 load_perl (aTHX_ coro);
1103 1216
1104 coro_destroy (aTHX_ coro); 1217 coro_destroy (aTHX_ coro);
1105 1218
1106 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1219 load_perl (aTHX_ &temp);
1107 1220
1108 coro->mainstack = 0; 1221 coro->slot = 0;
1109 } 1222 }
1110 1223
1111 cctx_destroy (coro->cctx); 1224 cctx_destroy (coro->cctx);
1112 SvREFCNT_dec (coro->args); 1225 SvREFCNT_dec (coro->args);
1113 1226
1238 { 1351 {
1239 LOCK; 1352 LOCK;
1240 next_sv = coro_deq (aTHX_ PRIO_MIN); 1353 next_sv = coro_deq (aTHX_ PRIO_MIN);
1241 1354
1242 /* nothing to schedule: call the idle handler */ 1355 /* nothing to schedule: call the idle handler */
1243 if (!next_sv) 1356 if (expect_false (!next_sv))
1244 { 1357 {
1245 dSP; 1358 dSP;
1246 UNLOCK; 1359 UNLOCK;
1247 1360
1248 ENTER; 1361 ENTER;
1258 } 1371 }
1259 1372
1260 ta->next = SvSTATE (next_sv); 1373 ta->next = SvSTATE (next_sv);
1261 1374
1262 /* cannot transfer to destroyed coros, skip and look for next */ 1375 /* cannot transfer to destroyed coros, skip and look for next */
1263 if (ta->next->flags & CF_DESTROYED) 1376 if (expect_false (ta->next->flags & CF_DESTROYED))
1264 { 1377 {
1265 UNLOCK; 1378 UNLOCK;
1266 SvREFCNT_dec (next_sv); 1379 SvREFCNT_dec (next_sv);
1267 /* coro_nready is already taken care of by destroy */ 1380 /* coro_nready is already taken care of by destroy */
1268 continue; 1381 continue;
1324 dTHX; 1437 dTHX;
1325 struct transfer_args ta; 1438 struct transfer_args ta;
1326 1439
1327 prepare_cede (aTHX_ &ta); 1440 prepare_cede (aTHX_ &ta);
1328 1441
1329 if (ta.prev != ta.next) 1442 if (expect_true (ta.prev != ta.next))
1330 { 1443 {
1331 TRANSFER (ta); 1444 TRANSFER (ta);
1332 return 1; 1445 return 1;
1333 } 1446 }
1334 else 1447 else
1370 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1483 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1371 1484
1372 if (coro->flags & CF_RUNNING) 1485 if (coro->flags & CF_RUNNING)
1373 PL_runops = RUNOPS_DEFAULT; 1486 PL_runops = RUNOPS_DEFAULT;
1374 else 1487 else
1375 coro->runops = RUNOPS_DEFAULT; 1488 coro->slot->runops = RUNOPS_DEFAULT;
1376 } 1489 }
1377} 1490}
1378 1491
1379MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1492MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1380 1493
1385#ifdef USE_ITHREADS 1498#ifdef USE_ITHREADS
1386 MUTEX_INIT (&coro_mutex); 1499 MUTEX_INIT (&coro_mutex);
1387#endif 1500#endif
1388 BOOT_PAGESIZE; 1501 BOOT_PAGESIZE;
1389 1502
1390 irsgv = gv_fetchpv ("/", 1, SVt_PV); 1503 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
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);
1391 1512
1392 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1513 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1393 1514
1394 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1515 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1395 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1516 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1426 1547
1427 coro->hv = hv = newHV (); 1548 coro->hv = hv = newHV ();
1428 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;
1429 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1550 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1430 1551
1552 av_extend (coro->args, items - 1);
1431 for (i = 1; i < items; i++) 1553 for (i = 1; i < items; i++)
1432 av_push (coro->args, newSVsv (ST (i))); 1554 av_push (coro->args, newSVsv (ST (i)));
1433} 1555}
1434 OUTPUT: 1556 OUTPUT:
1435 RETVAL 1557 RETVAL
1478 } 1600 }
1479 1601
1480 BARRIER; 1602 BARRIER;
1481 TRANSFER (ta); 1603 TRANSFER (ta);
1482 1604
1483 if (GIMME_V != G_VOID && ta.next != ta.prev) 1605 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev))
1484 XSRETURN_YES; 1606 XSRETURN_YES;
1485} 1607}
1486 1608
1487bool 1609bool
1488_destroy (SV *coro_sv) 1610_destroy (SV *coro_sv)
1538 CODE: 1660 CODE:
1539{ 1661{
1540 if (coro->mainstack) 1662 if (coro->mainstack)
1541 { 1663 {
1542 struct coro temp; 1664 struct coro temp;
1543 Zero (&temp, 1, struct coro);
1544 1665
1545 if (!(coro->flags & CF_RUNNING)) 1666 if (!(coro->flags & CF_RUNNING))
1546 { 1667 {
1547 save_perl (aTHX_ &temp); 1668 save_perl (aTHX_ &temp);
1548 load_perl (aTHX_ coro); 1669 load_perl (aTHX_ coro);
1552 dSP; 1673 dSP;
1553 ENTER; 1674 ENTER;
1554 SAVETMPS; 1675 SAVETMPS;
1555 PUSHMARK (SP); 1676 PUSHMARK (SP);
1556 PUTBACK; 1677 PUTBACK;
1678
1557 if (ix) 1679 if (ix)
1558 eval_sv (coderef, 0); 1680 eval_sv (coderef, 0);
1559 else 1681 else
1560 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1682 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1683
1561 SPAGAIN; 1684 SPAGAIN;
1562 FREETMPS; 1685 FREETMPS;
1563 LEAVE; 1686 LEAVE;
1564 PUTBACK; 1687 PUTBACK;
1565 } 1688 }
1623 1746
1624BOOT: 1747BOOT:
1625{ 1748{
1626 int i; 1749 int i;
1627 1750
1628 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1751 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1629 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1752 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1630 av_async_pool = get_av ("Coro::async_pool", TRUE); 1753 av_async_pool = coro_get_av ("Coro::async_pool", TRUE);
1631 1754
1632 coro_current = get_sv ("Coro::current", FALSE); 1755 coro_current = coro_get_sv ("Coro::current", FALSE);
1633 SvREADONLY_on (coro_current); 1756 SvREADONLY_on (coro_current);
1634 1757
1635 coro_stash = gv_stashpv ("Coro", TRUE); 1758 coro_stash = gv_stashpv ("Coro", TRUE);
1636 1759
1637 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1760 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1638 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1761 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1639 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1762 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1640 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1763 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1643 1766
1644 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1767 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1645 coro_ready[i] = newAV (); 1768 coro_ready[i] = newAV ();
1646 1769
1647 { 1770 {
1648 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 */
1649 1773
1650 coroapi.schedule = api_schedule; 1774 coroapi.schedule = api_schedule;
1651 coroapi.cede = api_cede; 1775 coroapi.cede = api_cede;
1652 coroapi.cede_notself = api_cede_notself; 1776 coroapi.cede_notself = api_cede_notself;
1653 coroapi.ready = api_ready; 1777 coroapi.ready = api_ready;
1704 CODE: 1828 CODE:
1705 RETVAL = coro_nready; 1829 RETVAL = coro_nready;
1706 OUTPUT: 1830 OUTPUT:
1707 RETVAL 1831 RETVAL
1708 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
1709# for async_pool speedup 1840# for async_pool speedup
1710void 1841void
1711_pool_1 (SV *cb) 1842_pool_1 (SV *cb)
1712 CODE: 1843 CODE:
1713{ 1844{
1714 struct coro *coro = SvSTATE (coro_current); 1845 struct coro *coro = SvSTATE (coro_current);
1715 HV *hv = (HV *)SvRV (coro_current); 1846 HV *hv = (HV *)SvRV (coro_current);
1716 AV *defav = GvAV (PL_defgv); 1847 AV *defav = GvAV (PL_defgv);
1717 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1848 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0);
1718 AV *invoke_av; 1849 AV *invoke_av;
1719 int i, len; 1850 int i, len;
1720 1851
1721 if (!invoke) 1852 if (!invoke)
1722 croak ("\3terminate\2\n"); 1853 croak ("\3async_pool terminate\2\n");
1723 1854
1724 SvREFCNT_dec (coro->saved_deffh); 1855 SvREFCNT_dec (coro->saved_deffh);
1725 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1856 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1726 1857
1727 hv_store (hv, "desc", sizeof ("desc") - 1, 1858 hv_store (hv, "desc", sizeof ("desc") - 1,
1728 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1859 newSVpvn (strpair ("[async_pool]")), 0);
1729 1860
1730 invoke_av = (AV *)SvRV (invoke); 1861 invoke_av = (AV *)SvRV (invoke);
1731 len = av_len (invoke_av); 1862 len = av_len (invoke_av);
1732 1863
1733 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1864 sv_setsv (cb, AvARRAY (invoke_av)[0]);
1753 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1884 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1754 coro->saved_deffh = 0; 1885 coro->saved_deffh = 0;
1755 1886
1756 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1887 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1757 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1888 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1758 croak ("\3terminate\2\n"); 1889 croak ("\3async_pool terminate\2\n");
1759 1890
1760 av_clear (GvAV (PL_defgv)); 1891 av_clear (GvAV (PL_defgv));
1761 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1892 hv_store ((HV *)SvRV (coro_current), strpair ("desc"),
1762 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1893 newSVpvn (strpair ("[async_pool idle]")), 0);
1763 1894
1764 coro->prio = 0; 1895 coro->prio = 0;
1765 1896
1766 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1897 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1767 api_trace (coro_current, 0); 1898 api_trace (coro_current, 0);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines