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.180 by root, Wed Oct 3 17:12:20 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 IO *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 switches 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;
236 SV *throw;
237
238 /* async_pool */
239 SV *saved_deffh;
210 240
211 /* linked list */ 241 /* linked list */
212 struct coro *next, *prev; 242 struct coro *next, *prev;
213 HV *hv; /* the perl hash associated with this coro, if any */ 243 HV *hv; /* the perl hash associated with this coro, if any */
214}; 244};
230static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 260static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
231static int coro_nready; 261static int coro_nready;
232static struct coro *coro_first; 262static struct coro *coro_first;
233 263
234/** 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}
235 295
236static AV * 296static AV *
237coro_clone_padlist (pTHX_ CV *cv) 297coro_clone_padlist (pTHX_ CV *cv)
238{ 298{
239 AV *padlist = CvPADLIST (cv); 299 AV *padlist = CvPADLIST (cv);
312 MAGIC *mg; 372 MAGIC *mg;
313 373
314 if (SvROK (coro)) 374 if (SvROK (coro))
315 coro = SvRV (coro); 375 coro = SvRV (coro);
316 376
317 if (SvTYPE (coro) != SVt_PVHV) 377 if (expect_false (SvTYPE (coro) != SVt_PVHV))
318 croak ("Coro::State object required"); 378 croak ("Coro::State object required");
319 379
320 stash = SvSTASH (coro); 380 stash = SvSTASH (coro);
321 if (stash != coro_stash && stash != coro_state_stash) 381 if (expect_false (stash != coro_stash && stash != coro_state_stash))
322 { 382 {
323 /* very slow, but rare, check */ 383 /* very slow, but rare, check */
324 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 384 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
325 croak ("Coro::State object required"); 385 croak ("Coro::State object required");
326 } 386 }
336get_padlist (pTHX_ CV *cv) 396get_padlist (pTHX_ CV *cv)
337{ 397{
338 MAGIC *mg = CORO_MAGIC (cv); 398 MAGIC *mg = CORO_MAGIC (cv);
339 AV *av; 399 AV *av;
340 400
341 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 401 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
342 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 402 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
343 else 403 else
344 { 404 {
345#if CORO_PREFER_PERL_FUNCTIONS 405#if CORO_PREFER_PERL_FUNCTIONS
346 /* this is probably cleaner, but also slower? */ 406 /* this is probably cleaner, but also slower? */
358put_padlist (pTHX_ CV *cv) 418put_padlist (pTHX_ CV *cv)
359{ 419{
360 MAGIC *mg = CORO_MAGIC (cv); 420 MAGIC *mg = CORO_MAGIC (cv);
361 AV *av; 421 AV *av;
362 422
363 if (!mg) 423 if (expect_false (!mg))
364 { 424 {
365 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 425 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
366 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 426 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
367 mg->mg_virtual = &vtbl_coro; 427 mg->mg_virtual = &vtbl_coro;
368 mg->mg_obj = (SV *)newAV (); 428 mg->mg_obj = (SV *)newAV ();
369 } 429 }
370 430
371 av = (AV *)mg->mg_obj; 431 av = (AV *)mg->mg_obj;
372 432
373 if (AvFILLp (av) >= AvMAX (av)) 433 if (expect_false (AvFILLp (av) >= AvMAX (av)))
374 av_extend (av, AvMAX (av) + 1); 434 av_extend (av, AvMAX (av) + 1);
375 435
376 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 436 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
377} 437}
378 438
379/** load & save, init *******************************************************/ 439/** load & save, init *******************************************************/
380 440
381static void 441static void
382load_perl (pTHX_ Coro__State c) 442load_perl (pTHX_ Coro__State c)
383{ 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
384#define VAR(name,type) PL_ ## name = c->name; 454 #define VAR(name,type) PL_ ## name = slot->name;
385# include "state.h" 455 # include "state.h"
386#undef VAR 456 #undef VAR
387
388 GvSV (PL_defgv) = c->defsv;
389 GvAV (PL_defgv) = c->defav;
390 GvSV (PL_errgv) = c->errsv;
391 PL_defoutgv = c->deffh;
392 PL_rs = c->irssv;
393 GvSV (irsgv) = c->irssv_sv;
394 457
395 { 458 {
396 dSP; 459 dSP;
460
397 CV *cv; 461 CV *cv;
398 462
399 /* now do the ugly restore mess */ 463 /* now do the ugly restore mess */
400 while ((cv = (CV *)POPs)) 464 while (expect_true (cv = (CV *)POPs))
401 { 465 {
402 put_padlist (aTHX_ cv); /* mark this padlist as available */ 466 put_padlist (aTHX_ cv); /* mark this padlist as available */
403 CvDEPTH (cv) = PTR2IV (POPs); 467 CvDEPTH (cv) = PTR2IV (POPs);
404 CvPADLIST (cv) = (AV *)POPs; 468 CvPADLIST (cv) = (AV *)POPs;
405 } 469 }
424 488
425 XPUSHs (Nullsv); 489 XPUSHs (Nullsv);
426 /* this loop was inspired by pp_caller */ 490 /* this loop was inspired by pp_caller */
427 for (;;) 491 for (;;)
428 { 492 {
429 while (cxix >= 0) 493 while (expect_true (cxix >= 0))
430 { 494 {
431 PERL_CONTEXT *cx = &ccstk[cxix--]; 495 PERL_CONTEXT *cx = &ccstk[cxix--];
432 496
433 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 497 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
434 { 498 {
435 CV *cv = cx->blk_sub.cv; 499 CV *cv = cx->blk_sub.cv;
436 500
437 if (CvDEPTH (cv)) 501 if (expect_true (CvDEPTH (cv)))
438 { 502 {
439 EXTEND (SP, 3); 503 EXTEND (SP, 3);
440 PUSHs ((SV *)CvPADLIST (cv)); 504 PUSHs ((SV *)CvPADLIST (cv));
441 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 505 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
442 PUSHs ((SV *)cv); 506 PUSHs ((SV *)cv);
445 get_padlist (aTHX_ cv); 509 get_padlist (aTHX_ cv);
446 } 510 }
447 } 511 }
448 } 512 }
449 513
450 if (top_si->si_type == PERLSI_MAIN) 514 if (expect_true (top_si->si_type == PERLSI_MAIN))
451 break; 515 break;
452 516
453 top_si = top_si->si_prev; 517 top_si = top_si->si_prev;
454 ccstk = top_si->si_cxstack; 518 ccstk = top_si->si_cxstack;
455 cxix = top_si->si_cxix; 519 cxix = top_si->si_cxix;
456 } 520 }
457 521
458 PUTBACK; 522 PUTBACK;
459 } 523 }
460 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
461 c->defav = GvAV (PL_defgv); 543 slot->defav = GvAV (PL_defgv);
462 c->defsv = DEFSV; 544 slot->defsv = DEFSV;
463 c->errsv = ERRSV; 545 slot->errsv = ERRSV;
464 c->deffh = PL_defoutgv;
465 c->irssv = PL_rs;
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;
551} 632}
552 633
553static size_t 634static size_t
554coro_rss (pTHX_ struct coro *coro) 635coro_rss (pTHX_ struct coro *coro)
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 (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 (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
749 SvREFCNT_dec (coro->saved_deffh);
750 SvREFCNT_dec (coro->throw);
751
664 coro_destroy_stacks (aTHX); 752 coro_destroy_stacks (aTHX);
665} 753}
666 754
667static void 755static void
668free_coro_mortal (pTHX) 756free_coro_mortal (pTHX)
669{ 757{
670 if (coro_mortal) 758 if (expect_true (coro_mortal))
671 { 759 {
672 SvREFCNT_dec (coro_mortal); 760 SvREFCNT_dec (coro_mortal);
673 coro_mortal = 0; 761 coro_mortal = 0;
674 } 762 }
675} 763}
704 bot = PL_stack_base + cx->blk_oldsp + 1; 792 bot = PL_stack_base + cx->blk_oldsp + 1;
705 top = cx->blk_gimme == G_ARRAY ? SP + 1 793 top = cx->blk_gimme == G_ARRAY ? SP + 1
706 : cx->blk_gimme == G_SCALAR ? bot + 1 794 : cx->blk_gimme == G_SCALAR ? bot + 1
707 : bot; 795 : bot;
708 796
797 av_extend (av, top - bot);
709 while (bot < top) 798 while (bot < top)
710 av_push (av, SvREFCNT_inc (*bot++)); 799 av_push (av, SvREFCNT_inc (*bot++));
711 800
712 PL_runops = RUNOPS_DEFAULT; 801 PL_runops = RUNOPS_DEFAULT;
713 ENTER; 802 ENTER;
716 PUSHMARK (SP); 805 PUSHMARK (SP);
717 PUSHs (&PL_sv_no); 806 PUSHs (&PL_sv_no);
718 PUSHs (fullname); 807 PUSHs (fullname);
719 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 808 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
720 PUTBACK; 809 PUTBACK;
721 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);
722 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);
723 SPAGAIN; 812 SPAGAIN;
724 FREETMPS; 813 FREETMPS;
725 LEAVE; 814 LEAVE;
726 PL_runops = runops_trace; 815 PL_runops = runops_trace;
755 PUSHMARK (SP); 844 PUSHMARK (SP);
756 PUSHs (&PL_sv_yes); 845 PUSHs (&PL_sv_yes);
757 PUSHs (fullname); 846 PUSHs (fullname);
758 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);
759 PUTBACK; 848 PUTBACK;
760 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);
761 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);
762 SPAGAIN; 851 SPAGAIN;
763 FREETMPS; 852 FREETMPS;
764 LEAVE; 853 LEAVE;
765 PL_runops = runops_trace; 854 PL_runops = runops_trace;
779 PL_runops = RUNOPS_DEFAULT; 868 PL_runops = RUNOPS_DEFAULT;
780 PUSHMARK (SP); 869 PUSHMARK (SP);
781 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 870 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
782 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 871 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
783 PUTBACK; 872 PUTBACK;
784 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);
785 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);
786 SPAGAIN; 875 SPAGAIN;
787 FREETMPS; 876 FREETMPS;
788 LEAVE; 877 LEAVE;
789 PL_runops = runops_trace; 878 PL_runops = runops_trace;
799 888
800/* 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 */
801/* _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 */
802/* during execution of a perl program */ 891/* during execution of a perl program */
803static void NOINLINE 892static void NOINLINE
804prepare_cctx (pTHX_ coro_cctx *cctx) 893cctx_prepare (pTHX_ coro_cctx *cctx)
805{ 894{
806 dSP; 895 dSP;
807 LOGOP myop; 896 LOGOP myop;
808 897
809 PL_top_env = &PL_start_env; 898 PL_top_env = &PL_start_env;
827 916
828/* 917/*
829 * this is a _very_ stripped down perl interpreter ;) 918 * this is a _very_ stripped down perl interpreter ;)
830 */ 919 */
831static void 920static void
832coro_run (void *arg) 921cctx_run (void *arg)
833{ 922{
834 dTHX; 923 dTHX;
835 924
836 /* coro_run is the alternative tail of transfer(), so unlock here. */ 925 /* cctx_run is the alternative tail of transfer(), so unlock here. */
837 UNLOCK; 926 UNLOCK;
838 927
839 /* we now skip the entersub that lead to transfer() */ 928 /* we now skip the entersub that lead to transfer() */
840 PL_op = PL_op->op_next; 929 PL_op = PL_op->op_next;
841 930
842 /* inject a fake subroutine call to cctx_init */ 931 /* inject a fake subroutine call to cctx_init */
843 prepare_cctx (aTHX_ (coro_cctx *)arg); 932 cctx_prepare (aTHX_ (coro_cctx *)arg);
844 933
845 /* 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 */
846 PL_restartop = PL_op; 935 PL_restartop = PL_op;
847 perl_run (PL_curinterp); 936 perl_run (PL_curinterp);
848 937
867 ++cctx_count; 956 ++cctx_count;
868 957
869 Newz (0, cctx, 1, coro_cctx); 958 Newz (0, cctx, 1, coro_cctx);
870 959
871#if HAVE_MMAP 960#if HAVE_MMAP
872
873 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;
874 /* mmap supposedly does allocate-on-write for us */ 962 /* mmap supposedly does allocate-on-write for us */
875 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);
876 964
877 if (cctx->sptr != (void *)-1) 965 if (cctx->sptr != (void *)-1)
898 stack_start = cctx->sptr; 986 stack_start = cctx->sptr;
899 stack_size = cctx->ssize; 987 stack_size = cctx->ssize;
900 } 988 }
901 989
902 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 990 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
903 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);
904 992
905 return cctx; 993 return cctx;
906} 994}
907 995
908static void 996static void
925 Safefree (cctx->sptr); 1013 Safefree (cctx->sptr);
926 1014
927 Safefree (cctx); 1015 Safefree (cctx);
928} 1016}
929 1017
1018/* wether this cctx should be destructed */
1019#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1020
930static coro_cctx * 1021static coro_cctx *
931cctx_get (pTHX) 1022cctx_get (pTHX)
932{ 1023{
933 while (cctx_first) 1024 while (expect_true (cctx_first))
934 { 1025 {
935 coro_cctx *cctx = cctx_first; 1026 coro_cctx *cctx = cctx_first;
936 cctx_first = cctx->next; 1027 cctx_first = cctx->next;
937 --cctx_idle; 1028 --cctx_idle;
938 1029
939 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1030 if (expect_true (!CCTX_EXPIRED (cctx)))
940 return cctx; 1031 return cctx;
941 1032
942 cctx_destroy (cctx); 1033 cctx_destroy (cctx);
943 } 1034 }
944 1035
947 1038
948static void 1039static void
949cctx_put (coro_cctx *cctx) 1040cctx_put (coro_cctx *cctx)
950{ 1041{
951 /* free another cctx if overlimit */ 1042 /* free another cctx if overlimit */
952 if (cctx_idle >= MAX_IDLE_CCTX) 1043 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
953 { 1044 {
954 coro_cctx *first = cctx_first; 1045 coro_cctx *first = cctx_first;
955 cctx_first = first->next; 1046 cctx_first = first->next;
956 --cctx_idle; 1047 --cctx_idle;
957 1048
963 cctx_first = cctx; 1054 cctx_first = cctx;
964} 1055}
965 1056
966/** coroutine switching *****************************************************/ 1057/** coroutine switching *****************************************************/
967 1058
968static void NOINLINE 1059static void
969transfer_check (pTHX_ struct coro *prev, struct coro *next) 1060transfer_check (pTHX_ struct coro *prev, struct coro *next)
970{ 1061{
971 if (prev != next) 1062 if (expect_true (prev != next))
972 { 1063 {
973 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1064 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
974 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");
975 1066
976 if (next->flags & CF_RUNNING) 1067 if (expect_false (next->flags & CF_RUNNING))
977 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");
978 1069
979 if (next->flags & CF_DESTROYED) 1070 if (expect_false (next->flags & CF_DESTROYED))
980 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");
981 1072
1073 if (
1074#if PERL_VERSION_ATLEAST (5,9,0)
1075 expect_false (PL_parser)
1076#else
982 if (PL_lex_state != LEX_NOTPARSING) 1077 expect_false (PL_lex_state != LEX_NOTPARSING)
1078#endif
1079 )
983 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");
984 } 1081 }
985} 1082}
986 1083
987/* always use the TRANSFER macro */ 1084/* always use the TRANSFER macro */
989transfer (pTHX_ struct coro *prev, struct coro *next) 1086transfer (pTHX_ struct coro *prev, struct coro *next)
990{ 1087{
991 dSTACKLEVEL; 1088 dSTACKLEVEL;
992 1089
993 /* sometimes transfer is only called to set idle_sp */ 1090 /* sometimes transfer is only called to set idle_sp */
994 if (!next) 1091 if (expect_false (!next))
995 { 1092 {
996 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1093 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
997 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 */
998 } 1095 }
999 else if (prev != next) 1096 else if (expect_true (prev != next))
1000 { 1097 {
1001 coro_cctx *prev__cctx; 1098 coro_cctx *prev__cctx;
1002 1099
1003 if (prev->flags & CF_NEW) 1100 if (expect_false (prev->flags & CF_NEW))
1004 { 1101 {
1005 /* create a new empty context */ 1102 /* create a new empty context */
1006 Newz (0, prev->cctx, 1, coro_cctx); 1103 Newz (0, prev->cctx, 1, coro_cctx);
1007 prev->flags &= ~CF_NEW; 1104 prev->flags &= ~CF_NEW;
1008 prev->flags |= CF_RUNNING; 1105 prev->flags |= CF_RUNNING;
1011 prev->flags &= ~CF_RUNNING; 1108 prev->flags &= ~CF_RUNNING;
1012 next->flags |= CF_RUNNING; 1109 next->flags |= CF_RUNNING;
1013 1110
1014 LOCK; 1111 LOCK;
1015 1112
1016 if (next->flags & CF_NEW) 1113 if (expect_false (next->flags & CF_NEW))
1017 { 1114 {
1018 /* need to start coroutine */ 1115 /* need to start coroutine */
1019 next->flags &= ~CF_NEW; 1116 next->flags &= ~CF_NEW;
1020 /* first get rid of the old state */ 1117 /* first get rid of the old state */
1021 save_perl (aTHX_ prev); 1118 save_perl (aTHX_ prev);
1030 } 1127 }
1031 1128
1032 prev__cctx = prev->cctx; 1129 prev__cctx = prev->cctx;
1033 1130
1034 /* possibly "free" the cctx */ 1131 /* possibly "free" the cctx */
1035 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)))
1036 { 1133 {
1037 /* 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 */
1038 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));
1039 1136
1040 prev->cctx = 0; 1137 prev->cctx = 0;
1041 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
1042 cctx_put (prev__cctx); 1145 cctx_put (prev__cctx);
1043 } 1146 }
1044 1147
1045 ++next->usecount; 1148 ++next->usecount;
1046 1149
1047 if (!next->cctx) 1150 if (expect_true (!next->cctx))
1048 next->cctx = cctx_get (aTHX); 1151 next->cctx = cctx_get (aTHX);
1049 1152
1050 if (prev__cctx != next->cctx) 1153 if (expect_false (prev__cctx != next->cctx))
1051 { 1154 {
1052 prev__cctx->top_env = PL_top_env; 1155 prev__cctx->top_env = PL_top_env;
1053 PL_top_env = next->cctx->top_env; 1156 PL_top_env = next->cctx->top_env;
1054 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1157 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1055 } 1158 }
1056 1159
1057 free_coro_mortal (aTHX); 1160 free_coro_mortal (aTHX);
1058 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 }
1059 } 1175 }
1060} 1176}
1061 1177
1062struct transfer_args 1178struct transfer_args
1063{ 1179{
1098 save_perl (aTHX_ &temp); 1214 save_perl (aTHX_ &temp);
1099 load_perl (aTHX_ coro); 1215 load_perl (aTHX_ coro);
1100 1216
1101 coro_destroy (aTHX_ coro); 1217 coro_destroy (aTHX_ coro);
1102 1218
1103 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1219 load_perl (aTHX_ &temp);
1104 1220
1105 coro->mainstack = 0; 1221 coro->slot = 0;
1106 } 1222 }
1107 1223
1108 cctx_destroy (coro->cctx); 1224 cctx_destroy (coro->cctx);
1109 SvREFCNT_dec (coro->args); 1225 SvREFCNT_dec (coro->args);
1110 1226
1235 { 1351 {
1236 LOCK; 1352 LOCK;
1237 next_sv = coro_deq (aTHX_ PRIO_MIN); 1353 next_sv = coro_deq (aTHX_ PRIO_MIN);
1238 1354
1239 /* nothing to schedule: call the idle handler */ 1355 /* nothing to schedule: call the idle handler */
1240 if (!next_sv) 1356 if (expect_false (!next_sv))
1241 { 1357 {
1242 dSP; 1358 dSP;
1243 UNLOCK; 1359 UNLOCK;
1244 1360
1245 ENTER; 1361 ENTER;
1255 } 1371 }
1256 1372
1257 ta->next = SvSTATE (next_sv); 1373 ta->next = SvSTATE (next_sv);
1258 1374
1259 /* cannot transfer to destroyed coros, skip and look for next */ 1375 /* cannot transfer to destroyed coros, skip and look for next */
1260 if (ta->next->flags & CF_DESTROYED) 1376 if (expect_false (ta->next->flags & CF_DESTROYED))
1261 { 1377 {
1262 UNLOCK; 1378 UNLOCK;
1263 SvREFCNT_dec (next_sv); 1379 SvREFCNT_dec (next_sv);
1264 /* coro_nready is already taken care of by destroy */ 1380 /* coro_nready is already taken care of by destroy */
1265 continue; 1381 continue;
1321 dTHX; 1437 dTHX;
1322 struct transfer_args ta; 1438 struct transfer_args ta;
1323 1439
1324 prepare_cede (aTHX_ &ta); 1440 prepare_cede (aTHX_ &ta);
1325 1441
1326 if (ta.prev != ta.next) 1442 if (expect_true (ta.prev != ta.next))
1327 { 1443 {
1328 TRANSFER (ta); 1444 TRANSFER (ta);
1329 return 1; 1445 return 1;
1330 } 1446 }
1331 else 1447 else
1367 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1483 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1368 1484
1369 if (coro->flags & CF_RUNNING) 1485 if (coro->flags & CF_RUNNING)
1370 PL_runops = RUNOPS_DEFAULT; 1486 PL_runops = RUNOPS_DEFAULT;
1371 else 1487 else
1372 coro->runops = RUNOPS_DEFAULT; 1488 coro->slot->runops = RUNOPS_DEFAULT;
1373 } 1489 }
1374} 1490}
1375 1491
1376MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1492MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1377 1493
1382#ifdef USE_ITHREADS 1498#ifdef USE_ITHREADS
1383 MUTEX_INIT (&coro_mutex); 1499 MUTEX_INIT (&coro_mutex);
1384#endif 1500#endif
1385 BOOT_PAGESIZE; 1501 BOOT_PAGESIZE;
1386 1502
1387 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);
1388 1512
1389 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1513 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1390 1514
1391 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1515 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1392 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1516 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1423 1547
1424 coro->hv = hv = newHV (); 1548 coro->hv = hv = newHV ();
1425 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;
1426 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1550 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1427 1551
1552 av_extend (coro->args, items - 1);
1428 for (i = 1; i < items; i++) 1553 for (i = 1; i < items; i++)
1429 av_push (coro->args, newSVsv (ST (i))); 1554 av_push (coro->args, newSVsv (ST (i)));
1430} 1555}
1431 OUTPUT: 1556 OUTPUT:
1432 RETVAL 1557 RETVAL
1475 } 1600 }
1476 1601
1477 BARRIER; 1602 BARRIER;
1478 TRANSFER (ta); 1603 TRANSFER (ta);
1479 1604
1480 if (GIMME_V != G_VOID && ta.next != ta.prev) 1605 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev))
1481 XSRETURN_YES; 1606 XSRETURN_YES;
1482} 1607}
1483 1608
1484bool 1609bool
1485_destroy (SV *coro_sv) 1610_destroy (SV *coro_sv)
1535 CODE: 1660 CODE:
1536{ 1661{
1537 if (coro->mainstack) 1662 if (coro->mainstack)
1538 { 1663 {
1539 struct coro temp; 1664 struct coro temp;
1540 Zero (&temp, 1, struct coro);
1541 1665
1542 if (!(coro->flags & CF_RUNNING)) 1666 if (!(coro->flags & CF_RUNNING))
1543 { 1667 {
1544 save_perl (aTHX_ &temp); 1668 save_perl (aTHX_ &temp);
1545 load_perl (aTHX_ coro); 1669 load_perl (aTHX_ coro);
1549 dSP; 1673 dSP;
1550 ENTER; 1674 ENTER;
1551 SAVETMPS; 1675 SAVETMPS;
1552 PUSHMARK (SP); 1676 PUSHMARK (SP);
1553 PUTBACK; 1677 PUTBACK;
1678
1554 if (ix) 1679 if (ix)
1555 eval_sv (coderef, 0); 1680 eval_sv (coderef, 0);
1556 else 1681 else
1557 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1682 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1683
1558 SPAGAIN; 1684 SPAGAIN;
1559 FREETMPS; 1685 FREETMPS;
1560 LEAVE; 1686 LEAVE;
1561 PUTBACK; 1687 PUTBACK;
1562 } 1688 }
1620 1746
1621BOOT: 1747BOOT:
1622{ 1748{
1623 int i; 1749 int i;
1624 1750
1625 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1751 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1626 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1752 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1627 av_async_pool = get_av ("Coro::async_pool", TRUE); 1753 av_async_pool = coro_get_av ("Coro::async_pool", TRUE);
1628 1754
1629 coro_current = get_sv ("Coro::current", FALSE); 1755 coro_current = coro_get_sv ("Coro::current", FALSE);
1630 SvREADONLY_on (coro_current); 1756 SvREADONLY_on (coro_current);
1631 1757
1632 coro_stash = gv_stashpv ("Coro", TRUE); 1758 coro_stash = gv_stashpv ("Coro", TRUE);
1633 1759
1634 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1760 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1635 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1761 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1636 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1762 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1637 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1763 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1640 1766
1641 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1767 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1642 coro_ready[i] = newAV (); 1768 coro_ready[i] = newAV ();
1643 1769
1644 { 1770 {
1645 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 */
1646 1773
1647 coroapi.schedule = api_schedule; 1774 coroapi.schedule = api_schedule;
1648 coroapi.cede = api_cede; 1775 coroapi.cede = api_cede;
1649 coroapi.cede_notself = api_cede_notself; 1776 coroapi.cede_notself = api_cede_notself;
1650 coroapi.ready = api_ready; 1777 coroapi.ready = api_ready;
1701 CODE: 1828 CODE:
1702 RETVAL = coro_nready; 1829 RETVAL = coro_nready;
1703 OUTPUT: 1830 OUTPUT:
1704 RETVAL 1831 RETVAL
1705 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
1706# for async_pool speedup 1840# for async_pool speedup
1707void 1841void
1708_pool_1 (SV *cb) 1842_pool_1 (SV *cb)
1709 CODE: 1843 CODE:
1710{ 1844{
1711 int i, len; 1845 struct coro *coro = SvSTATE (coro_current);
1712 HV *hv = (HV *)SvRV (coro_current); 1846 HV *hv = (HV *)SvRV (coro_current);
1713 AV *defav = GvAV (PL_defgv); 1847 AV *defav = GvAV (PL_defgv);
1714 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1848 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0);
1715 AV *invoke_av; 1849 AV *invoke_av;
1850 int i, len;
1716 1851
1717 if (!invoke) 1852 if (!invoke)
1718 croak ("\3terminate\2\n"); 1853 croak ("\3async_pool terminate\2\n");
1854
1855 SvREFCNT_dec (coro->saved_deffh);
1856 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1719 1857
1720 hv_store (hv, "desc", sizeof ("desc") - 1, 1858 hv_store (hv, "desc", sizeof ("desc") - 1,
1721 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1859 newSVpvn (strpair ("[async_pool]")), 0);
1722 1860
1723 invoke_av = (AV *)SvRV (invoke); 1861 invoke_av = (AV *)SvRV (invoke);
1724 len = av_len (invoke_av); 1862 len = av_len (invoke_av);
1725 1863
1726 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1864 sv_setsv (cb, AvARRAY (invoke_av)[0]);
1741{ 1879{
1742 struct coro *coro = SvSTATE (coro_current); 1880 struct coro *coro = SvSTATE (coro_current);
1743 1881
1744 sv_setsv (cb, &PL_sv_undef); 1882 sv_setsv (cb, &PL_sv_undef);
1745 1883
1884 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1885 coro->saved_deffh = 0;
1886
1746 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1887 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1747 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1888 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1748 croak ("\3terminate\2\n"); 1889 croak ("\3async_pool terminate\2\n");
1749 1890
1750 av_clear (GvAV (PL_defgv)); 1891 av_clear (GvAV (PL_defgv));
1751 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1892 hv_store ((HV *)SvRV (coro_current), strpair ("desc"),
1752 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1893 newSVpvn (strpair ("[async_pool idle]")), 0);
1753 1894
1754 coro->prio = 0; 1895 coro->prio = 0;
1755 1896
1756 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1897 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1757 api_trace (coro_current, 0); 1898 api_trace (coro_current, 0);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines