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.179 by root, Wed Oct 3 16:03:17 2007 UTC vs.
Revision 1.213 by root, Thu Oct 11 00:40:48 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
9#include "patchlevel.h" 10#include "patchlevel.h"
10 11
11#include <stdio.h> 12#include <stdio.h>
12#include <errno.h> 13#include <errno.h>
13#include <assert.h> 14#include <assert.h>
15#include <inttypes.h> /* portable stdint.h */
14 16
15#ifdef HAVE_MMAP 17#ifdef HAVE_MMAP
16# include <unistd.h> 18# include <unistd.h>
17# include <sys/mman.h> 19# include <sys/mman.h>
18# ifndef MAP_ANONYMOUS 20# ifndef MAP_ANONYMOUS
75/* 5.8.7 */ 77/* 5.8.7 */
76#ifndef SvRV_set 78#ifndef SvRV_set
77# define SvRV_set(s,v) SvRV(s) = (v) 79# define SvRV_set(s,v) SvRV(s) = (v)
78#endif 80#endif
79 81
82/* 5.8.8 */
83#ifndef GV_NOTQUAL
84# define GV_NOTQUAL 0
85#endif
86#ifndef newSV
87# define newSV(l) NEWSV(0,l)
88#endif
89
80#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 90#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
81# undef CORO_STACKGUARD 91# undef CORO_STACKGUARD
82#endif 92#endif
83 93
84#ifndef CORO_STACKGUARD 94#ifndef CORO_STACKGUARD
98#define IN_DESTRUCT (PL_main_cv == Nullcv) 108#define IN_DESTRUCT (PL_main_cv == Nullcv)
99 109
100#if __GNUC__ >= 3 110#if __GNUC__ >= 3
101# define attribute(x) __attribute__(x) 111# define attribute(x) __attribute__(x)
102# define BARRIER __asm__ __volatile__ ("" : : : "memory") 112# define BARRIER __asm__ __volatile__ ("" : : : "memory")
113# define expect(expr,value) __builtin_expect ((expr),(value))
103#else 114#else
104# define attribute(x) 115# define attribute(x)
105# define BARRIER 116# define BARRIER
117# define expect(expr,value) (expr)
106#endif 118#endif
119
120#define expect_false(expr) expect ((expr) != 0, 0)
121#define expect_true(expr) expect ((expr) != 0, 1)
107 122
108#define NOINLINE attribute ((noinline)) 123#define NOINLINE attribute ((noinline))
109 124
110#include "CoroAPI.h" 125#include "CoroAPI.h"
111 126
132static AV *main_mainstack; /* used to differentiate between $main and others */ 147static AV *main_mainstack; /* used to differentiate between $main and others */
133static JMPENV *main_top_env; 148static JMPENV *main_top_env;
134static HV *coro_state_stash, *coro_stash; 149static HV *coro_state_stash, *coro_stash;
135static SV *coro_mortal; /* will be freed after next transfer */ 150static SV *coro_mortal; /* will be freed after next transfer */
136 151
137static GV *irsgv; /* $/ */ 152static GV *irsgv; /* $/ */
153static GV *stdoutgv; /* *STDOUT */
154
155static HV *hv_sig; /* %SIG */
156static SV *sv_diehook;
157static SV *sv_warnhook;
138 158
139/* async_pool helper stuff */ 159/* async_pool helper stuff */
140static SV *sv_pool_rss; 160static SV *sv_pool_rss;
141static SV *sv_pool_size; 161static SV *sv_pool_size;
142static AV *av_async_pool; 162static AV *av_async_pool;
178 CF_READY = 0x0002, /* coroutine is ready */ 198 CF_READY = 0x0002, /* coroutine is ready */
179 CF_NEW = 0x0004, /* has never been switched to */ 199 CF_NEW = 0x0004, /* has never been switched to */
180 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 200 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
181}; 201};
182 202
203/* the structure where most of the perl state is stored, overlaid on the cxstack */
204typedef struct {
205 SV *defsv;
206 AV *defav;
207 SV *errsv;
208 SV *irsgv;
209#define VAR(name,type) type name;
210# include "state.h"
211#undef VAR
212} perl_slots;
213
214#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
215
183/* this is a structure representing a perl-level coroutine */ 216/* this is a structure representing a perl-level coroutine */
184struct coro { 217struct coro {
185 /* the c coroutine allocated to this perl coroutine, if any */ 218 /* the c coroutine allocated to this perl coroutine, if any */
186 coro_cctx *cctx; 219 coro_cctx *cctx;
187 220
221 /* process data */
222 AV *mainstack;
223 perl_slots *slot; /* basically the saved sp */
224
188 /* data associated with this coroutine (initial args) */ 225 AV *args; /* data associated with this coroutine (initial args) */
189 AV *args; 226 int refcnt; /* coroutines are refcounted, yes */
190 int refcnt;
191 int flags; /* CF_ flags */ 227 int flags; /* CF_ flags */
192 228 HV *hv; /* the perl hash associated with this coro, if any */
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 229
205 /* statistics */ 230 /* statistics */
206 int usecount; /* number of switches to this coro */ 231 int usecount; /* number of transfers to this coro */
207 232
208 /* coro process data */ 233 /* coro process data */
209 int prio; 234 int prio;
235 SV *throw; /* exception to be thrown */
236
237 /* async_pool */
238 SV *saved_deffh;
210 239
211 /* linked list */ 240 /* linked list */
212 struct coro *next, *prev; 241 struct coro *next, *prev;
213 HV *hv; /* the perl hash associated with this coro, if any */
214}; 242};
215 243
216typedef struct coro *Coro__State; 244typedef struct coro *Coro__State;
217typedef struct coro *Coro__State_or_hashref; 245typedef struct coro *Coro__State_or_hashref;
218 246
230static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 258static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
231static int coro_nready; 259static int coro_nready;
232static struct coro *coro_first; 260static struct coro *coro_first;
233 261
234/** lowlevel stuff **********************************************************/ 262/** lowlevel stuff **********************************************************/
263
264static SV *
265coro_get_sv (pTHX_ const char *name, int create)
266{
267#if PERL_VERSION_ATLEAST (5,9,0)
268 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
269 get_sv (name, create);
270#endif
271 return get_sv (name, create);
272}
273
274static AV *
275coro_get_av (pTHX_ const char *name, int create)
276{
277#if PERL_VERSION_ATLEAST (5,9,0)
278 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
279 get_av (name, create);
280#endif
281 return get_av (name, create);
282}
283
284static HV *
285coro_get_hv (pTHX_ const char *name, int create)
286{
287#if PERL_VERSION_ATLEAST (5,9,0)
288 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
289 get_hv (name, create);
290#endif
291 return get_hv (name, create);
292}
235 293
236static AV * 294static AV *
237coro_clone_padlist (pTHX_ CV *cv) 295coro_clone_padlist (pTHX_ CV *cv)
238{ 296{
239 AV *padlist = CvPADLIST (cv); 297 AV *padlist = CvPADLIST (cv);
312 MAGIC *mg; 370 MAGIC *mg;
313 371
314 if (SvROK (coro)) 372 if (SvROK (coro))
315 coro = SvRV (coro); 373 coro = SvRV (coro);
316 374
317 if (SvTYPE (coro) != SVt_PVHV) 375 if (expect_false (SvTYPE (coro) != SVt_PVHV))
318 croak ("Coro::State object required"); 376 croak ("Coro::State object required");
319 377
320 stash = SvSTASH (coro); 378 stash = SvSTASH (coro);
321 if (stash != coro_stash && stash != coro_state_stash) 379 if (expect_false (stash != coro_stash && stash != coro_state_stash))
322 { 380 {
323 /* very slow, but rare, check */ 381 /* very slow, but rare, check */
324 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 382 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
325 croak ("Coro::State object required"); 383 croak ("Coro::State object required");
326 } 384 }
336get_padlist (pTHX_ CV *cv) 394get_padlist (pTHX_ CV *cv)
337{ 395{
338 MAGIC *mg = CORO_MAGIC (cv); 396 MAGIC *mg = CORO_MAGIC (cv);
339 AV *av; 397 AV *av;
340 398
341 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 399 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
342 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 400 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
343 else 401 else
344 { 402 {
345#if CORO_PREFER_PERL_FUNCTIONS 403#if CORO_PREFER_PERL_FUNCTIONS
346 /* this is probably cleaner, but also slower? */ 404 /* this is probably cleaner, but also slower? */
358put_padlist (pTHX_ CV *cv) 416put_padlist (pTHX_ CV *cv)
359{ 417{
360 MAGIC *mg = CORO_MAGIC (cv); 418 MAGIC *mg = CORO_MAGIC (cv);
361 AV *av; 419 AV *av;
362 420
363 if (!mg) 421 if (expect_false (!mg))
364 { 422 {
365 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 423 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
366 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 424 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
367 mg->mg_virtual = &vtbl_coro; 425 mg->mg_virtual = &vtbl_coro;
368 mg->mg_obj = (SV *)newAV (); 426 mg->mg_obj = (SV *)newAV ();
369 } 427 }
370 428
371 av = (AV *)mg->mg_obj; 429 av = (AV *)mg->mg_obj;
372 430
373 if (AvFILLp (av) >= AvMAX (av)) 431 if (expect_false (AvFILLp (av) >= AvMAX (av)))
374 av_extend (av, AvMAX (av) + 1); 432 av_extend (av, AvMAX (av) + 1);
375 433
376 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 434 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
377} 435}
378 436
379/** load & save, init *******************************************************/ 437/** load & save, init *******************************************************/
380 438
381static void 439static void
382load_perl (pTHX_ Coro__State c) 440load_perl (pTHX_ Coro__State c)
383{ 441{
442 perl_slots *slot = c->slot;
443 c->slot = 0;
444
445 PL_mainstack = c->mainstack;
446
447 GvSV (PL_defgv) = slot->defsv;
448 GvAV (PL_defgv) = slot->defav;
449 GvSV (PL_errgv) = slot->errsv;
450 GvSV (irsgv) = slot->irsgv;
451
384#define VAR(name,type) PL_ ## name = c->name; 452 #define VAR(name,type) PL_ ## name = slot->name;
385# include "state.h" 453 # include "state.h"
386#undef VAR 454 #undef VAR
387 455
388 GvSV (PL_defgv) = c->defsv; 456 /*hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0);*/
389 GvAV (PL_defgv) = c->defav; 457 /*hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0);*/
390 GvSV (PL_errgv) = c->errsv;
391 GvIOp(PL_defoutgv) = c->deffh;
392 PL_rs = c->irssv;
393 GvSV (irsgv) = c->irssv_sv;
394 458
395 { 459 {
396 dSP; 460 dSP;
461
397 CV *cv; 462 CV *cv;
398 463
399 /* now do the ugly restore mess */ 464 /* now do the ugly restore mess */
400 while ((cv = (CV *)POPs)) 465 while (expect_true (cv = (CV *)POPs))
401 { 466 {
402 put_padlist (aTHX_ cv); /* mark this padlist as available */ 467 put_padlist (aTHX_ cv); /* mark this padlist as available */
403 CvDEPTH (cv) = PTR2IV (POPs); 468 CvDEPTH (cv) = PTR2IV (POPs);
404 CvPADLIST (cv) = (AV *)POPs; 469 CvPADLIST (cv) = (AV *)POPs;
405 } 470 }
424 489
425 XPUSHs (Nullsv); 490 XPUSHs (Nullsv);
426 /* this loop was inspired by pp_caller */ 491 /* this loop was inspired by pp_caller */
427 for (;;) 492 for (;;)
428 { 493 {
429 while (cxix >= 0) 494 while (expect_true (cxix >= 0))
430 { 495 {
431 PERL_CONTEXT *cx = &ccstk[cxix--]; 496 PERL_CONTEXT *cx = &ccstk[cxix--];
432 497
433 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 498 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
434 { 499 {
435 CV *cv = cx->blk_sub.cv; 500 CV *cv = cx->blk_sub.cv;
436 501
437 if (CvDEPTH (cv)) 502 if (expect_true (CvDEPTH (cv)))
438 { 503 {
439 EXTEND (SP, 3); 504 EXTEND (SP, 3);
440 PUSHs ((SV *)CvPADLIST (cv)); 505 PUSHs ((SV *)CvPADLIST (cv));
441 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 506 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
442 PUSHs ((SV *)cv); 507 PUSHs ((SV *)cv);
445 get_padlist (aTHX_ cv); 510 get_padlist (aTHX_ cv);
446 } 511 }
447 } 512 }
448 } 513 }
449 514
450 if (top_si->si_type == PERLSI_MAIN) 515 if (expect_true (top_si->si_type == PERLSI_MAIN))
451 break; 516 break;
452 517
453 top_si = top_si->si_prev; 518 top_si = top_si->si_prev;
454 ccstk = top_si->si_cxstack; 519 ccstk = top_si->si_cxstack;
455 cxix = top_si->si_cxix; 520 cxix = top_si->si_cxix;
456 } 521 }
457 522
458 PUTBACK; 523 PUTBACK;
459 } 524 }
460 525
526 /* allocate some space on the context stack for our purposes */
527 /* we manually unroll here, as usually 2 slots is enough */
528 if (SLOT_COUNT >= 1) CXINC;
529 if (SLOT_COUNT >= 2) CXINC;
530 if (SLOT_COUNT >= 3) CXINC;
531 {
532 int i;
533 for (i = 3; i < SLOT_COUNT; ++i)
534 CXINC;
535 }
536 cxstack_ix -= SLOT_COUNT; /* undo allocation */
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 = GvIOp (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 PL_diehook = 0; hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0);
691 PL_warnhook = 0; hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 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), irsgv, PERL_MAGIC_sv, "/", 1); 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 GvIOp(PL_defoutgv) = io;
612 IoTYPE (io) = IoTYPE_WRONLY;
613 IoOFP (io) = IoIFP (io) = PerlIO_stdout ();
614 IoFLAGS (io) |= IOf_FLUSH;
615 }
616 699
617 { 700 {
618 dSP; 701 dSP;
619 LOGOP myop; 702 LOGOP myop;
620 703
621 Zero (&myop, 1, LOGOP); 704 Zero (&myop, 1, LOGOP);
622 myop.op_next = Nullop; 705 myop.op_next = Nullop;
623 myop.op_flags = OPf_WANT_VOID; 706 myop.op_flags = OPf_WANT_VOID;
624 707
625 PUSHMARK (SP); 708 PUSHMARK (SP);
626 XPUSHs (av_shift (GvAV (PL_defgv))); 709 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
627 PUTBACK; 710 PUTBACK;
628 PL_op = (OP *)&myop; 711 PL_op = (OP *)&myop;
629 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 712 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
630 SPAGAIN; 713 SPAGAIN;
631 } 714 }
632 715
633 ENTER; /* necessary e.g. for dounwind */ 716 /* this newly created coroutine might be run on an existing cctx which most
717 * likely was suspended in set_stacklevel, called from entersub.
718 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
719 * so we ENTER here for symmetry
720 */
721 ENTER;
634} 722}
635 723
636static void 724static void
637coro_destroy (pTHX_ struct coro *coro) 725coro_destroy (pTHX_ struct coro *coro)
638{ 726{
654 } 742 }
655 743
656 SvREFCNT_dec (GvSV (PL_defgv)); 744 SvREFCNT_dec (GvSV (PL_defgv));
657 SvREFCNT_dec (GvAV (PL_defgv)); 745 SvREFCNT_dec (GvAV (PL_defgv));
658 SvREFCNT_dec (GvSV (PL_errgv)); 746 SvREFCNT_dec (GvSV (PL_errgv));
659 SvREFCNT_dec (GvIOp(PL_defoutgv)); 747 SvREFCNT_dec (PL_defoutgv);
660 SvREFCNT_dec (PL_rs); 748 SvREFCNT_dec (PL_rs);
661 SvREFCNT_dec (GvSV (irsgv)); 749 SvREFCNT_dec (GvSV (irsgv));
662 750
751 SvREFCNT_dec (PL_diehook);
752 SvREFCNT_dec (PL_warnhook);
753
754 SvREFCNT_dec (coro->saved_deffh);
755 SvREFCNT_dec (coro->throw);
756
663 coro_destroy_stacks (aTHX); 757 coro_destroy_stacks (aTHX);
664} 758}
665 759
666static void 760static void
667free_coro_mortal (pTHX) 761free_coro_mortal (pTHX)
668{ 762{
669 if (coro_mortal) 763 if (expect_true (coro_mortal))
670 { 764 {
671 SvREFCNT_dec (coro_mortal); 765 SvREFCNT_dec (coro_mortal);
672 coro_mortal = 0; 766 coro_mortal = 0;
673 } 767 }
674} 768}
703 bot = PL_stack_base + cx->blk_oldsp + 1; 797 bot = PL_stack_base + cx->blk_oldsp + 1;
704 top = cx->blk_gimme == G_ARRAY ? SP + 1 798 top = cx->blk_gimme == G_ARRAY ? SP + 1
705 : cx->blk_gimme == G_SCALAR ? bot + 1 799 : cx->blk_gimme == G_SCALAR ? bot + 1
706 : bot; 800 : bot;
707 801
802 av_extend (av, top - bot);
708 while (bot < top) 803 while (bot < top)
709 av_push (av, SvREFCNT_inc (*bot++)); 804 av_push (av, SvREFCNT_inc (*bot++));
710 805
711 PL_runops = RUNOPS_DEFAULT; 806 PL_runops = RUNOPS_DEFAULT;
712 ENTER; 807 ENTER;
798 893
799/* inject a fake call to Coro::State::_cctx_init into the execution */ 894/* inject a fake call to Coro::State::_cctx_init into the execution */
800/* _cctx_init should be careful, as it could be called at almost any time */ 895/* _cctx_init should be careful, as it could be called at almost any time */
801/* during execution of a perl program */ 896/* during execution of a perl program */
802static void NOINLINE 897static void NOINLINE
803prepare_cctx (pTHX_ coro_cctx *cctx) 898cctx_prepare (pTHX_ coro_cctx *cctx)
804{ 899{
805 dSP; 900 dSP;
806 LOGOP myop; 901 LOGOP myop;
807 902
808 PL_top_env = &PL_start_env; 903 PL_top_env = &PL_start_env;
826 921
827/* 922/*
828 * this is a _very_ stripped down perl interpreter ;) 923 * this is a _very_ stripped down perl interpreter ;)
829 */ 924 */
830static void 925static void
831coro_run (void *arg) 926cctx_run (void *arg)
832{ 927{
833 dTHX; 928 dTHX;
834 929
835 /* coro_run is the alternative tail of transfer(), so unlock here. */ 930 /* cctx_run is the alternative tail of transfer(), so unlock here. */
836 UNLOCK; 931 UNLOCK;
837 932
838 /* we now skip the entersub that lead to transfer() */ 933 /* we now skip the entersub that lead to transfer() */
839 PL_op = PL_op->op_next; 934 PL_op = PL_op->op_next;
840 935
841 /* inject a fake subroutine call to cctx_init */ 936 /* inject a fake subroutine call to cctx_init */
842 prepare_cctx (aTHX_ (coro_cctx *)arg); 937 cctx_prepare (aTHX_ (coro_cctx *)arg);
843 938
844 /* somebody or something will hit me for both perl_run and PL_restartop */ 939 /* somebody or something will hit me for both perl_run and PL_restartop */
845 PL_restartop = PL_op; 940 PL_restartop = PL_op;
846 perl_run (PL_curinterp); 941 perl_run (PL_curinterp);
847 942
866 ++cctx_count; 961 ++cctx_count;
867 962
868 Newz (0, cctx, 1, coro_cctx); 963 Newz (0, cctx, 1, coro_cctx);
869 964
870#if HAVE_MMAP 965#if HAVE_MMAP
871
872 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 966 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
873 /* mmap supposedly does allocate-on-write for us */ 967 /* mmap supposedly does allocate-on-write for us */
874 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 968 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
875 969
876 if (cctx->sptr != (void *)-1) 970 if (cctx->sptr != (void *)-1)
897 stack_start = cctx->sptr; 991 stack_start = cctx->sptr;
898 stack_size = cctx->ssize; 992 stack_size = cctx->ssize;
899 } 993 }
900 994
901 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 995 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
902 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 996 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
903 997
904 return cctx; 998 return cctx;
905} 999}
906 1000
907static void 1001static void
924 Safefree (cctx->sptr); 1018 Safefree (cctx->sptr);
925 1019
926 Safefree (cctx); 1020 Safefree (cctx);
927} 1021}
928 1022
1023/* wether this cctx should be destructed */
1024#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1025
929static coro_cctx * 1026static coro_cctx *
930cctx_get (pTHX) 1027cctx_get (pTHX)
931{ 1028{
932 while (cctx_first) 1029 while (expect_true (cctx_first))
933 { 1030 {
934 coro_cctx *cctx = cctx_first; 1031 coro_cctx *cctx = cctx_first;
935 cctx_first = cctx->next; 1032 cctx_first = cctx->next;
936 --cctx_idle; 1033 --cctx_idle;
937 1034
938 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1035 if (expect_true (!CCTX_EXPIRED (cctx)))
939 return cctx; 1036 return cctx;
940 1037
941 cctx_destroy (cctx); 1038 cctx_destroy (cctx);
942 } 1039 }
943 1040
946 1043
947static void 1044static void
948cctx_put (coro_cctx *cctx) 1045cctx_put (coro_cctx *cctx)
949{ 1046{
950 /* free another cctx if overlimit */ 1047 /* free another cctx if overlimit */
951 if (cctx_idle >= MAX_IDLE_CCTX) 1048 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
952 { 1049 {
953 coro_cctx *first = cctx_first; 1050 coro_cctx *first = cctx_first;
954 cctx_first = first->next; 1051 cctx_first = first->next;
955 --cctx_idle; 1052 --cctx_idle;
956 1053
962 cctx_first = cctx; 1059 cctx_first = cctx;
963} 1060}
964 1061
965/** coroutine switching *****************************************************/ 1062/** coroutine switching *****************************************************/
966 1063
967static void NOINLINE 1064static void
968transfer_check (pTHX_ struct coro *prev, struct coro *next) 1065transfer_check (pTHX_ struct coro *prev, struct coro *next)
969{ 1066{
970 if (prev != next) 1067 if (expect_true (prev != next))
971 { 1068 {
972 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1069 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
973 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1070 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
974 1071
975 if (next->flags & CF_RUNNING) 1072 if (expect_false (next->flags & CF_RUNNING))
976 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1073 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
977 1074
978 if (next->flags & CF_DESTROYED) 1075 if (expect_false (next->flags & CF_DESTROYED))
979 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1076 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
980 1077
1078 if (
1079#if PERL_VERSION_ATLEAST (5,9,0)
1080 expect_false (PL_parser)
1081#else
981 if (PL_lex_state != LEX_NOTPARSING) 1082 expect_false (PL_lex_state != LEX_NOTPARSING)
1083#endif
1084 )
982 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1085 croak ("Coro::State::transfer called while parsing, but this is not supported");
983 } 1086 }
984} 1087}
985 1088
986/* always use the TRANSFER macro */ 1089/* always use the TRANSFER macro */
988transfer (pTHX_ struct coro *prev, struct coro *next) 1091transfer (pTHX_ struct coro *prev, struct coro *next)
989{ 1092{
990 dSTACKLEVEL; 1093 dSTACKLEVEL;
991 1094
992 /* sometimes transfer is only called to set idle_sp */ 1095 /* sometimes transfer is only called to set idle_sp */
993 if (!next) 1096 if (expect_false (!next))
994 { 1097 {
995 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1098 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
996 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1099 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
997 } 1100 }
998 else if (prev != next) 1101 else if (expect_true (prev != next))
999 { 1102 {
1000 coro_cctx *prev__cctx; 1103 coro_cctx *prev__cctx;
1001 1104
1002 if (prev->flags & CF_NEW) 1105 if (expect_false (prev->flags & CF_NEW))
1003 { 1106 {
1004 /* create a new empty context */ 1107 /* create a new empty context */
1005 Newz (0, prev->cctx, 1, coro_cctx); 1108 Newz (0, prev->cctx, 1, coro_cctx);
1006 prev->flags &= ~CF_NEW; 1109 prev->flags &= ~CF_NEW;
1007 prev->flags |= CF_RUNNING; 1110 prev->flags |= CF_RUNNING;
1010 prev->flags &= ~CF_RUNNING; 1113 prev->flags &= ~CF_RUNNING;
1011 next->flags |= CF_RUNNING; 1114 next->flags |= CF_RUNNING;
1012 1115
1013 LOCK; 1116 LOCK;
1014 1117
1015 if (next->flags & CF_NEW) 1118 if (expect_false (next->flags & CF_NEW))
1016 { 1119 {
1017 /* need to start coroutine */ 1120 /* need to start coroutine */
1018 next->flags &= ~CF_NEW; 1121 next->flags &= ~CF_NEW;
1019 /* first get rid of the old state */ 1122 /* first get rid of the old state */
1020 save_perl (aTHX_ prev); 1123 save_perl (aTHX_ prev);
1029 } 1132 }
1030 1133
1031 prev__cctx = prev->cctx; 1134 prev__cctx = prev->cctx;
1032 1135
1033 /* possibly "free" the cctx */ 1136 /* possibly "free" the cctx */
1034 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1137 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1035 { 1138 {
1036 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1139 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1037 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1140 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1038 1141
1039 prev->cctx = 0; 1142 prev->cctx = 0;
1040 1143
1144 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1145 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1146 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1147 if (!next->cctx)
1148 next->cctx = cctx_get (aTHX);
1149
1041 cctx_put (prev__cctx); 1150 cctx_put (prev__cctx);
1042 } 1151 }
1043 1152
1044 ++next->usecount; 1153 ++next->usecount;
1045 1154
1046 if (!next->cctx) 1155 if (expect_true (!next->cctx))
1047 next->cctx = cctx_get (aTHX); 1156 next->cctx = cctx_get (aTHX);
1048 1157
1049 if (prev__cctx != next->cctx) 1158 if (expect_false (prev__cctx != next->cctx))
1050 { 1159 {
1051 prev__cctx->top_env = PL_top_env; 1160 prev__cctx->top_env = PL_top_env;
1052 PL_top_env = next->cctx->top_env; 1161 PL_top_env = next->cctx->top_env;
1053 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1162 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1054 } 1163 }
1055 1164
1056 free_coro_mortal (aTHX); 1165 free_coro_mortal (aTHX);
1057 UNLOCK; 1166 UNLOCK;
1167
1168 if (expect_false (prev->throw || next->throw))
1169 {
1170 struct coro *coro = SvSTATE (coro_current);
1171
1172 if (coro->throw)
1173 {
1174 SV *exception = coro->throw;
1175 coro->throw = 0;
1176 sv_setsv (ERRSV, exception);
1177 croak (0);
1178 }
1179 }
1058 } 1180 }
1059} 1181}
1060 1182
1061struct transfer_args 1183struct transfer_args
1062{ 1184{
1097 save_perl (aTHX_ &temp); 1219 save_perl (aTHX_ &temp);
1098 load_perl (aTHX_ coro); 1220 load_perl (aTHX_ coro);
1099 1221
1100 coro_destroy (aTHX_ coro); 1222 coro_destroy (aTHX_ coro);
1101 1223
1102 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1224 load_perl (aTHX_ &temp);
1103 1225
1104 coro->mainstack = 0; 1226 coro->slot = 0;
1105 } 1227 }
1106 1228
1107 cctx_destroy (coro->cctx); 1229 cctx_destroy (coro->cctx);
1108 SvREFCNT_dec (coro->args); 1230 SvREFCNT_dec (coro->args);
1109 1231
1234 { 1356 {
1235 LOCK; 1357 LOCK;
1236 next_sv = coro_deq (aTHX_ PRIO_MIN); 1358 next_sv = coro_deq (aTHX_ PRIO_MIN);
1237 1359
1238 /* nothing to schedule: call the idle handler */ 1360 /* nothing to schedule: call the idle handler */
1239 if (!next_sv) 1361 if (expect_false (!next_sv))
1240 { 1362 {
1241 dSP; 1363 dSP;
1242 UNLOCK; 1364 UNLOCK;
1243 1365
1244 ENTER; 1366 ENTER;
1254 } 1376 }
1255 1377
1256 ta->next = SvSTATE (next_sv); 1378 ta->next = SvSTATE (next_sv);
1257 1379
1258 /* cannot transfer to destroyed coros, skip and look for next */ 1380 /* cannot transfer to destroyed coros, skip and look for next */
1259 if (ta->next->flags & CF_DESTROYED) 1381 if (expect_false (ta->next->flags & CF_DESTROYED))
1260 { 1382 {
1261 UNLOCK; 1383 UNLOCK;
1262 SvREFCNT_dec (next_sv); 1384 SvREFCNT_dec (next_sv);
1263 /* coro_nready is already taken care of by destroy */ 1385 /* coro_nready is already taken care of by destroy */
1264 continue; 1386 continue;
1320 dTHX; 1442 dTHX;
1321 struct transfer_args ta; 1443 struct transfer_args ta;
1322 1444
1323 prepare_cede (aTHX_ &ta); 1445 prepare_cede (aTHX_ &ta);
1324 1446
1325 if (ta.prev != ta.next) 1447 if (expect_true (ta.prev != ta.next))
1326 { 1448 {
1327 TRANSFER (ta); 1449 TRANSFER (ta);
1328 return 1; 1450 return 1;
1329 } 1451 }
1330 else 1452 else
1366 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1488 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1367 1489
1368 if (coro->flags & CF_RUNNING) 1490 if (coro->flags & CF_RUNNING)
1369 PL_runops = RUNOPS_DEFAULT; 1491 PL_runops = RUNOPS_DEFAULT;
1370 else 1492 else
1371 coro->runops = RUNOPS_DEFAULT; 1493 coro->slot->runops = RUNOPS_DEFAULT;
1372 } 1494 }
1373} 1495}
1374 1496
1375MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1497MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1376 1498
1381#ifdef USE_ITHREADS 1503#ifdef USE_ITHREADS
1382 MUTEX_INIT (&coro_mutex); 1504 MUTEX_INIT (&coro_mutex);
1383#endif 1505#endif
1384 BOOT_PAGESIZE; 1506 BOOT_PAGESIZE;
1385 1507
1386 irsgv = gv_fetchpv ("/", 1, SVt_PV); 1508 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1509 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1510
1511 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1512 sv_diehook = coro_get_sv (aTHX_ "Coro::State::DIEHOOK" , TRUE);
1513 sv_warnhook = coro_get_sv (aTHX_ "Coro::State::WARNHOOK", TRUE);
1514
1515 if (!PL_diehook ) hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0);
1516 if (!PL_warnhook) hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0);
1387 1517
1388 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1518 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1389 1519
1390 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1520 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1391 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1521 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1397 1527
1398 while (main_top_env->je_prev) 1528 while (main_top_env->je_prev)
1399 main_top_env = main_top_env->je_prev; 1529 main_top_env = main_top_env->je_prev;
1400 1530
1401 coroapi.ver = CORO_API_VERSION; 1531 coroapi.ver = CORO_API_VERSION;
1532 coroapi.rev = CORO_API_REVISION;
1402 coroapi.transfer = api_transfer; 1533 coroapi.transfer = api_transfer;
1403 1534
1404 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1535 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1405} 1536}
1406 1537
1422 1553
1423 coro->hv = hv = newHV (); 1554 coro->hv = hv = newHV ();
1424 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1555 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1425 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1556 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1426 1557
1558 av_extend (coro->args, items - 1);
1427 for (i = 1; i < items; i++) 1559 for (i = 1; i < items; i++)
1428 av_push (coro->args, newSVsv (ST (i))); 1560 av_push (coro->args, newSVsv (ST (i)));
1429} 1561}
1430 OUTPUT: 1562 OUTPUT:
1431 RETVAL 1563 RETVAL
1472 1604
1473 break; 1605 break;
1474 } 1606 }
1475 1607
1476 BARRIER; 1608 BARRIER;
1609 PUTBACK;
1477 TRANSFER (ta); 1610 TRANSFER (ta);
1478 1611 SPAGAIN; /* might be the sp of a different coroutine now */
1479 if (GIMME_V != G_VOID && ta.next != ta.prev) 1612 /* be extra careful not to ever do anything after TRANSFER */
1480 XSRETURN_YES;
1481} 1613}
1482 1614
1483bool 1615bool
1484_destroy (SV *coro_sv) 1616_destroy (SV *coro_sv)
1485 CODE: 1617 CODE:
1534 CODE: 1666 CODE:
1535{ 1667{
1536 if (coro->mainstack) 1668 if (coro->mainstack)
1537 { 1669 {
1538 struct coro temp; 1670 struct coro temp;
1539 Zero (&temp, 1, struct coro);
1540 1671
1541 if (!(coro->flags & CF_RUNNING)) 1672 if (!(coro->flags & CF_RUNNING))
1542 { 1673 {
1543 save_perl (aTHX_ &temp); 1674 save_perl (aTHX_ &temp);
1544 load_perl (aTHX_ coro); 1675 load_perl (aTHX_ coro);
1546 1677
1547 { 1678 {
1548 dSP; 1679 dSP;
1549 ENTER; 1680 ENTER;
1550 SAVETMPS; 1681 SAVETMPS;
1682 PUTBACK;
1683 PUSHSTACK;
1551 PUSHMARK (SP); 1684 PUSHMARK (SP);
1552 PUTBACK; 1685
1553 if (ix) 1686 if (ix)
1554 eval_sv (coderef, 0); 1687 eval_sv (coderef, 0);
1555 else 1688 else
1556 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1689 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1690
1691 POPSTACK;
1557 SPAGAIN; 1692 SPAGAIN;
1558 FREETMPS; 1693 FREETMPS;
1559 LEAVE; 1694 LEAVE;
1560 PUTBACK; 1695 PUTBACK;
1561 } 1696 }
1619 1754
1620BOOT: 1755BOOT:
1621{ 1756{
1622 int i; 1757 int i;
1623 1758
1624 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1759 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1625 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1760 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1626 av_async_pool = get_av ("Coro::async_pool", TRUE); 1761 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1627 1762
1628 coro_current = get_sv ("Coro::current", FALSE); 1763 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1629 SvREADONLY_on (coro_current); 1764 SvREADONLY_on (coro_current);
1630 1765
1631 coro_stash = gv_stashpv ("Coro", TRUE); 1766 coro_stash = gv_stashpv ("Coro", TRUE);
1632 1767
1633 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1768 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1634 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1769 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1635 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1770 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1636 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1771 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1639 1774
1640 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1775 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1641 coro_ready[i] = newAV (); 1776 coro_ready[i] = newAV ();
1642 1777
1643 { 1778 {
1644 SV *sv = perl_get_sv("Coro::API", 1); 1779 SV *sv = perl_get_sv ("Coro::API", TRUE);
1780 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1645 1781
1646 coroapi.schedule = api_schedule; 1782 coroapi.schedule = api_schedule;
1647 coroapi.cede = api_cede; 1783 coroapi.cede = api_cede;
1648 coroapi.cede_notself = api_cede_notself; 1784 coroapi.cede_notself = api_cede_notself;
1649 coroapi.ready = api_ready; 1785 coroapi.ready = api_ready;
1700 CODE: 1836 CODE:
1701 RETVAL = coro_nready; 1837 RETVAL = coro_nready;
1702 OUTPUT: 1838 OUTPUT:
1703 RETVAL 1839 RETVAL
1704 1840
1841void
1842throw (Coro::State self, SV *throw = &PL_sv_undef)
1843 PROTOTYPE: $;$
1844 CODE:
1845 SvREFCNT_dec (self->throw);
1846 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1847
1705# for async_pool speedup 1848# for async_pool speedup
1706void 1849void
1707_pool_1 (SV *cb) 1850_pool_1 (SV *cb)
1708 CODE: 1851 CODE:
1709{ 1852{
1710 int i, len; 1853 struct coro *coro = SvSTATE (coro_current);
1711 HV *hv = (HV *)SvRV (coro_current); 1854 HV *hv = (HV *)SvRV (coro_current);
1712 AV *defav = GvAV (PL_defgv); 1855 AV *defav = GvAV (PL_defgv);
1713 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1856 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1714 AV *invoke_av; 1857 AV *invoke_av;
1858 int i, len;
1715 1859
1716 if (!invoke) 1860 if (!invoke)
1717 croak ("\3terminate\2\n"); 1861 croak ("\3async_pool terminate\2\n");
1862
1863 SvREFCNT_dec (coro->saved_deffh);
1864 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1718 1865
1719 hv_store (hv, "desc", sizeof ("desc") - 1, 1866 hv_store (hv, "desc", sizeof ("desc") - 1,
1720 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1867 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1721 1868
1722 invoke_av = (AV *)SvRV (invoke); 1869 invoke_av = (AV *)SvRV (invoke);
1740{ 1887{
1741 struct coro *coro = SvSTATE (coro_current); 1888 struct coro *coro = SvSTATE (coro_current);
1742 1889
1743 sv_setsv (cb, &PL_sv_undef); 1890 sv_setsv (cb, &PL_sv_undef);
1744 1891
1892 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1893 coro->saved_deffh = 0;
1894
1745 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1895 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1746 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1896 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1747 croak ("\3terminate\2\n"); 1897 croak ("\3async_pool terminate\2\n");
1748 1898
1749 av_clear (GvAV (PL_defgv)); 1899 av_clear (GvAV (PL_defgv));
1750 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1900 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1751 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1901 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1752 1902

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines