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.183 by root, Wed Oct 3 19:19:06 2007 UTC vs.
Revision 1.212 by root, Wed Oct 10 04:21:33 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 GV *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 transfers 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;
210 //SV *throw; 235 SV *throw; /* exception to be thrown */
211 236
212 /* async_pool */ 237 /* async_pool */
213 GV *asp_deffh; 238 SV *saved_deffh;
214 239
215 /* linked list */ 240 /* linked list */
216 struct coro *next, *prev; 241 struct coro *next, *prev;
217 HV *hv; /* the perl hash associated with this coro, if any */
218}; 242};
219 243
220typedef struct coro *Coro__State; 244typedef struct coro *Coro__State;
221typedef struct coro *Coro__State_or_hashref; 245typedef struct coro *Coro__State_or_hashref;
222 246
234static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 258static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
235static int coro_nready; 259static int coro_nready;
236static struct coro *coro_first; 260static struct coro *coro_first;
237 261
238/** lowlevel stuff **********************************************************/ 262/** lowlevel stuff **********************************************************/
263
264static SV *
265coro_get_sv (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 (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 (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}
239 293
240static AV * 294static AV *
241coro_clone_padlist (pTHX_ CV *cv) 295coro_clone_padlist (pTHX_ CV *cv)
242{ 296{
243 AV *padlist = CvPADLIST (cv); 297 AV *padlist = CvPADLIST (cv);
316 MAGIC *mg; 370 MAGIC *mg;
317 371
318 if (SvROK (coro)) 372 if (SvROK (coro))
319 coro = SvRV (coro); 373 coro = SvRV (coro);
320 374
321 if (SvTYPE (coro) != SVt_PVHV) 375 if (expect_false (SvTYPE (coro) != SVt_PVHV))
322 croak ("Coro::State object required"); 376 croak ("Coro::State object required");
323 377
324 stash = SvSTASH (coro); 378 stash = SvSTASH (coro);
325 if (stash != coro_stash && stash != coro_state_stash) 379 if (expect_false (stash != coro_stash && stash != coro_state_stash))
326 { 380 {
327 /* very slow, but rare, check */ 381 /* very slow, but rare, check */
328 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 382 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
329 croak ("Coro::State object required"); 383 croak ("Coro::State object required");
330 } 384 }
340get_padlist (pTHX_ CV *cv) 394get_padlist (pTHX_ CV *cv)
341{ 395{
342 MAGIC *mg = CORO_MAGIC (cv); 396 MAGIC *mg = CORO_MAGIC (cv);
343 AV *av; 397 AV *av;
344 398
345 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 399 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
346 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 400 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
347 else 401 else
348 { 402 {
349#if CORO_PREFER_PERL_FUNCTIONS 403#if CORO_PREFER_PERL_FUNCTIONS
350 /* this is probably cleaner, but also slower? */ 404 /* this is probably cleaner, but also slower? */
362put_padlist (pTHX_ CV *cv) 416put_padlist (pTHX_ CV *cv)
363{ 417{
364 MAGIC *mg = CORO_MAGIC (cv); 418 MAGIC *mg = CORO_MAGIC (cv);
365 AV *av; 419 AV *av;
366 420
367 if (!mg) 421 if (expect_false (!mg))
368 { 422 {
369 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 423 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
370 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 424 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
371 mg->mg_virtual = &vtbl_coro; 425 mg->mg_virtual = &vtbl_coro;
372 mg->mg_obj = (SV *)newAV (); 426 mg->mg_obj = (SV *)newAV ();
373 } 427 }
374 428
375 av = (AV *)mg->mg_obj; 429 av = (AV *)mg->mg_obj;
376 430
377 if (AvFILLp (av) >= AvMAX (av)) 431 if (expect_false (AvFILLp (av) >= AvMAX (av)))
378 av_extend (av, AvMAX (av) + 1); 432 av_extend (av, AvMAX (av) + 1);
379 433
380 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 434 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
381} 435}
382 436
383/** load & save, init *******************************************************/ 437/** load & save, init *******************************************************/
384 438
385static void 439static void
386load_perl (pTHX_ Coro__State c) 440load_perl (pTHX_ Coro__State c)
387{ 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
388#define VAR(name,type) PL_ ## name = c->name; 452 #define VAR(name,type) PL_ ## name = slot->name;
389# include "state.h" 453 # include "state.h"
390#undef VAR 454 #undef VAR
391 455
392 GvSV (PL_defgv) = c->defsv; 456 /*hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0);*/
393 GvAV (PL_defgv) = c->defav; 457 /*hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0);*/
394 GvSV (PL_errgv) = c->errsv;
395 PL_defoutgv = c->deffh;
396 PL_rs = c->irssv;
397 GvSV (irsgv) = c->irssv_sv;
398 458
399 { 459 {
400 dSP; 460 dSP;
461
401 CV *cv; 462 CV *cv;
402 463
403 /* now do the ugly restore mess */ 464 /* now do the ugly restore mess */
404 while ((cv = (CV *)POPs)) 465 while (expect_true (cv = (CV *)POPs))
405 { 466 {
406 put_padlist (aTHX_ cv); /* mark this padlist as available */ 467 put_padlist (aTHX_ cv); /* mark this padlist as available */
407 CvDEPTH (cv) = PTR2IV (POPs); 468 CvDEPTH (cv) = PTR2IV (POPs);
408 CvPADLIST (cv) = (AV *)POPs; 469 CvPADLIST (cv) = (AV *)POPs;
409 } 470 }
428 489
429 XPUSHs (Nullsv); 490 XPUSHs (Nullsv);
430 /* this loop was inspired by pp_caller */ 491 /* this loop was inspired by pp_caller */
431 for (;;) 492 for (;;)
432 { 493 {
433 while (cxix >= 0) 494 while (expect_true (cxix >= 0))
434 { 495 {
435 PERL_CONTEXT *cx = &ccstk[cxix--]; 496 PERL_CONTEXT *cx = &ccstk[cxix--];
436 497
437 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 498 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
438 { 499 {
439 CV *cv = cx->blk_sub.cv; 500 CV *cv = cx->blk_sub.cv;
440 501
441 if (CvDEPTH (cv)) 502 if (expect_true (CvDEPTH (cv)))
442 { 503 {
443 EXTEND (SP, 3); 504 EXTEND (SP, 3);
444 PUSHs ((SV *)CvPADLIST (cv)); 505 PUSHs ((SV *)CvPADLIST (cv));
445 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 506 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
446 PUSHs ((SV *)cv); 507 PUSHs ((SV *)cv);
449 get_padlist (aTHX_ cv); 510 get_padlist (aTHX_ cv);
450 } 511 }
451 } 512 }
452 } 513 }
453 514
454 if (top_si->si_type == PERLSI_MAIN) 515 if (expect_true (top_si->si_type == PERLSI_MAIN))
455 break; 516 break;
456 517
457 top_si = top_si->si_prev; 518 top_si = top_si->si_prev;
458 ccstk = top_si->si_cxstack; 519 ccstk = top_si->si_cxstack;
459 cxix = top_si->si_cxix; 520 cxix = top_si->si_cxix;
460 } 521 }
461 522
462 PUTBACK; 523 PUTBACK;
463 } 524 }
464 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
465 c->defav = GvAV (PL_defgv); 543 slot->defav = GvAV (PL_defgv);
466 c->defsv = DEFSV; 544 slot->defsv = DEFSV;
467 c->errsv = ERRSV; 545 slot->errsv = ERRSV;
468 c->deffh = PL_defoutgv;
469 c->irssv = PL_rs;
470 c->irssv_sv = GvSV (irsgv); 546 slot->irsgv = GvSV (irsgv);
471 547
472#define VAR(name,type)c->name = PL_ ## name; 548 #define VAR(name,type) slot->name = PL_ ## name;
473# include "state.h" 549 # include "state.h"
474#undef VAR 550 #undef VAR
551 }
475} 552}
476 553
477/* 554/*
478 * allocate various perl stacks. This is an exact copy 555 * allocate various perl stacks. This is an exact copy
479 * of perl.c:init_stacks, except that it uses less memory 556 * of perl.c:init_stacks, except that it uses less memory
484# define coro_init_stacks init_stacks 561# define coro_init_stacks init_stacks
485#else 562#else
486static void 563static void
487coro_init_stacks (pTHX) 564coro_init_stacks (pTHX)
488{ 565{
489 PL_curstackinfo = new_stackinfo(64, 6); 566 PL_curstackinfo = new_stackinfo(32, 8);
490 PL_curstackinfo->si_type = PERLSI_MAIN; 567 PL_curstackinfo->si_type = PERLSI_MAIN;
491 PL_curstack = PL_curstackinfo->si_stack; 568 PL_curstack = PL_curstackinfo->si_stack;
492 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 569 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
493 570
494 PL_stack_base = AvARRAY(PL_curstack); 571 PL_stack_base = AvARRAY(PL_curstack);
495 PL_stack_sp = PL_stack_base; 572 PL_stack_sp = PL_stack_base;
496 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 573 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
497 574
498 New(50,PL_tmps_stack,64,SV*); 575 New(50,PL_tmps_stack,32,SV*);
499 PL_tmps_floor = -1; 576 PL_tmps_floor = -1;
500 PL_tmps_ix = -1; 577 PL_tmps_ix = -1;
501 PL_tmps_max = 64; 578 PL_tmps_max = 32;
502 579
503 New(54,PL_markstack,16,I32); 580 New(54,PL_markstack,16,I32);
504 PL_markstack_ptr = PL_markstack; 581 PL_markstack_ptr = PL_markstack;
505 PL_markstack_max = PL_markstack + 16; 582 PL_markstack_max = PL_markstack + 16;
506 583
507#ifdef SET_MARK_OFFSET 584#ifdef SET_MARK_OFFSET
508 SET_MARK_OFFSET; 585 SET_MARK_OFFSET;
509#endif 586#endif
510 587
511 New(54,PL_scopestack,16,I32); 588 New(54,PL_scopestack,8,I32);
512 PL_scopestack_ix = 0; 589 PL_scopestack_ix = 0;
513 PL_scopestack_max = 16; 590 PL_scopestack_max = 8;
514 591
515 New(54,PL_savestack,64,ANY); 592 New(54,PL_savestack,24,ANY);
516 PL_savestack_ix = 0; 593 PL_savestack_ix = 0;
517 PL_savestack_max = 64; 594 PL_savestack_max = 24;
518 595
519#if !PERL_VERSION_ATLEAST (5,9,0) 596#if !PERL_VERSION_ATLEAST (5,9,0)
520 New(54,PL_retstack,4,OP*); 597 New(54,PL_retstack,4,OP*);
521 PL_retstack_ix = 0; 598 PL_retstack_ix = 0;
522 PL_retstack_max = 4; 599 PL_retstack_max = 4;
559{ 636{
560 size_t rss = sizeof (*coro); 637 size_t rss = sizeof (*coro);
561 638
562 if (coro->mainstack) 639 if (coro->mainstack)
563 { 640 {
641 perl_slots tmp_slot;
642 perl_slots *slot;
643
564 if (coro->flags & CF_RUNNING) 644 if (coro->flags & CF_RUNNING)
565 { 645 {
646 slot = &tmp_slot;
647
566 #define VAR(name,type)coro->name = PL_ ## name; 648 #define VAR(name,type) slot->name = PL_ ## name;
567 # include "state.h" 649 # include "state.h"
568 #undef VAR 650 #undef VAR
569 } 651 }
652 else
653 slot = coro->slot;
570 654
571 rss += sizeof (coro->curstackinfo); 655 rss += sizeof (slot->curstackinfo);
572 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
573 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 656 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
574 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 657 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
575 rss += coro->tmps_max * sizeof (SV *); 658 rss += slot->tmps_max * sizeof (SV *);
576 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 659 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
577 rss += coro->scopestack_max * sizeof (I32); 660 rss += slot->scopestack_max * sizeof (I32);
578 rss += coro->savestack_max * sizeof (ANY); 661 rss += slot->savestack_max * sizeof (ANY);
579 662
580#if !PERL_VERSION_ATLEAST (5,9,0) 663#if !PERL_VERSION_ATLEAST (5,9,0)
581 rss += coro->retstack_max * sizeof (OP *); 664 rss += slot->retstack_max * sizeof (OP *);
582#endif 665#endif
583 } 666 }
584 667
585 return rss; 668 return rss;
586} 669}
598 PL_runops = RUNOPS_DEFAULT; 681 PL_runops = RUNOPS_DEFAULT;
599 PL_curcop = &PL_compiling; 682 PL_curcop = &PL_compiling;
600 PL_in_eval = EVAL_NULL; 683 PL_in_eval = EVAL_NULL;
601 PL_comppad = 0; 684 PL_comppad = 0;
602 PL_curpm = 0; 685 PL_curpm = 0;
686 PL_curpad = 0;
603 PL_localizing = 0; 687 PL_localizing = 0;
604 PL_dirty = 0; 688 PL_dirty = 0;
605 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);
606 692
607 GvSV (PL_defgv) = NEWSV (0, 0); 693 GvSV (PL_defgv) = newSV (0);
608 GvAV (PL_defgv) = coro->args; coro->args = 0; 694 GvAV (PL_defgv) = coro->args; coro->args = 0;
609 GvSV (PL_errgv) = NEWSV (0, 0); 695 GvSV (PL_errgv) = newSV (0);
610 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);
611 PL_rs = newSVsv (GvSV (irsgv)); 697 PL_rs = newSVsv (GvSV (irsgv));
612 698 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
613 {
614 IO *io = newIO ();
615 PL_defoutgv = newGVgen ("Coro");
616 GvIOp(PL_defoutgv) = io;
617 IoTYPE (io) = IoTYPE_WRONLY;
618 IoOFP (io) = IoIFP (io) = PerlIO_stdout ();
619 IoFLAGS (io) |= IOf_FLUSH;
620 }
621 699
622 { 700 {
623 dSP; 701 dSP;
624 LOGOP myop; 702 LOGOP myop;
625 703
626 Zero (&myop, 1, LOGOP); 704 Zero (&myop, 1, LOGOP);
627 myop.op_next = Nullop; 705 myop.op_next = Nullop;
628 myop.op_flags = OPf_WANT_VOID; 706 myop.op_flags = OPf_WANT_VOID;
629 707
630 PUSHMARK (SP); 708 PUSHMARK (SP);
631 XPUSHs (av_shift (GvAV (PL_defgv))); 709 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
632 PUTBACK; 710 PUTBACK;
633 PL_op = (OP *)&myop; 711 PL_op = (OP *)&myop;
634 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 712 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
635 SPAGAIN; 713 SPAGAIN;
636 } 714 }
637 715
638 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;
639} 722}
640 723
641static void 724static void
642coro_destroy (pTHX_ struct coro *coro) 725coro_destroy (pTHX_ struct coro *coro)
643{ 726{
663 SvREFCNT_dec (GvSV (PL_errgv)); 746 SvREFCNT_dec (GvSV (PL_errgv));
664 SvREFCNT_dec (PL_defoutgv); 747 SvREFCNT_dec (PL_defoutgv);
665 SvREFCNT_dec (PL_rs); 748 SvREFCNT_dec (PL_rs);
666 SvREFCNT_dec (GvSV (irsgv)); 749 SvREFCNT_dec (GvSV (irsgv));
667 750
751 SvREFCNT_dec (PL_diehook);
752 SvREFCNT_dec (PL_warnhook);
753
668 SvREFCNT_dec (coro->asp_deffh); 754 SvREFCNT_dec (coro->saved_deffh);
669 //SvREFCNT_dec (coro->throw); 755 SvREFCNT_dec (coro->throw);
670 756
671 coro_destroy_stacks (aTHX); 757 coro_destroy_stacks (aTHX);
672} 758}
673 759
674static void 760static void
675free_coro_mortal (pTHX) 761free_coro_mortal (pTHX)
676{ 762{
677 if (coro_mortal) 763 if (expect_true (coro_mortal))
678 { 764 {
679 SvREFCNT_dec (coro_mortal); 765 SvREFCNT_dec (coro_mortal);
680 coro_mortal = 0; 766 coro_mortal = 0;
681 } 767 }
682} 768}
711 bot = PL_stack_base + cx->blk_oldsp + 1; 797 bot = PL_stack_base + cx->blk_oldsp + 1;
712 top = cx->blk_gimme == G_ARRAY ? SP + 1 798 top = cx->blk_gimme == G_ARRAY ? SP + 1
713 : cx->blk_gimme == G_SCALAR ? bot + 1 799 : cx->blk_gimme == G_SCALAR ? bot + 1
714 : bot; 800 : bot;
715 801
802 av_extend (av, top - bot);
716 while (bot < top) 803 while (bot < top)
717 av_push (av, SvREFCNT_inc (*bot++)); 804 av_push (av, SvREFCNT_inc (*bot++));
718 805
719 PL_runops = RUNOPS_DEFAULT; 806 PL_runops = RUNOPS_DEFAULT;
720 ENTER; 807 ENTER;
806 893
807/* 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 */
808/* _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 */
809/* during execution of a perl program */ 896/* during execution of a perl program */
810static void NOINLINE 897static void NOINLINE
811prepare_cctx (pTHX_ coro_cctx *cctx) 898cctx_prepare (pTHX_ coro_cctx *cctx)
812{ 899{
813 dSP; 900 dSP;
814 LOGOP myop; 901 LOGOP myop;
815 902
816 PL_top_env = &PL_start_env; 903 PL_top_env = &PL_start_env;
834 921
835/* 922/*
836 * this is a _very_ stripped down perl interpreter ;) 923 * this is a _very_ stripped down perl interpreter ;)
837 */ 924 */
838static void 925static void
839coro_run (void *arg) 926cctx_run (void *arg)
840{ 927{
841 dTHX; 928 dTHX;
842 929
843 /* coro_run is the alternative tail of transfer(), so unlock here. */ 930 /* cctx_run is the alternative tail of transfer(), so unlock here. */
844 UNLOCK; 931 UNLOCK;
845 932
846 /* we now skip the entersub that lead to transfer() */ 933 /* we now skip the entersub that lead to transfer() */
847 PL_op = PL_op->op_next; 934 PL_op = PL_op->op_next;
848 935
849 /* inject a fake subroutine call to cctx_init */ 936 /* inject a fake subroutine call to cctx_init */
850 prepare_cctx (aTHX_ (coro_cctx *)arg); 937 cctx_prepare (aTHX_ (coro_cctx *)arg);
851 938
852 /* 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 */
853 PL_restartop = PL_op; 940 PL_restartop = PL_op;
854 perl_run (PL_curinterp); 941 perl_run (PL_curinterp);
855 942
874 ++cctx_count; 961 ++cctx_count;
875 962
876 Newz (0, cctx, 1, coro_cctx); 963 Newz (0, cctx, 1, coro_cctx);
877 964
878#if HAVE_MMAP 965#if HAVE_MMAP
879
880 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;
881 /* mmap supposedly does allocate-on-write for us */ 967 /* mmap supposedly does allocate-on-write for us */
882 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);
883 969
884 if (cctx->sptr != (void *)-1) 970 if (cctx->sptr != (void *)-1)
905 stack_start = cctx->sptr; 991 stack_start = cctx->sptr;
906 stack_size = cctx->ssize; 992 stack_size = cctx->ssize;
907 } 993 }
908 994
909 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 995 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
910 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);
911 997
912 return cctx; 998 return cctx;
913} 999}
914 1000
915static void 1001static void
932 Safefree (cctx->sptr); 1018 Safefree (cctx->sptr);
933 1019
934 Safefree (cctx); 1020 Safefree (cctx);
935} 1021}
936 1022
1023/* wether this cctx should be destructed */
1024#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1025
937static coro_cctx * 1026static coro_cctx *
938cctx_get (pTHX) 1027cctx_get (pTHX)
939{ 1028{
940 while (cctx_first) 1029 while (expect_true (cctx_first))
941 { 1030 {
942 coro_cctx *cctx = cctx_first; 1031 coro_cctx *cctx = cctx_first;
943 cctx_first = cctx->next; 1032 cctx_first = cctx->next;
944 --cctx_idle; 1033 --cctx_idle;
945 1034
946 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1035 if (expect_true (!CCTX_EXPIRED (cctx)))
947 return cctx; 1036 return cctx;
948 1037
949 cctx_destroy (cctx); 1038 cctx_destroy (cctx);
950 } 1039 }
951 1040
954 1043
955static void 1044static void
956cctx_put (coro_cctx *cctx) 1045cctx_put (coro_cctx *cctx)
957{ 1046{
958 /* free another cctx if overlimit */ 1047 /* free another cctx if overlimit */
959 if (cctx_idle >= MAX_IDLE_CCTX) 1048 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
960 { 1049 {
961 coro_cctx *first = cctx_first; 1050 coro_cctx *first = cctx_first;
962 cctx_first = first->next; 1051 cctx_first = first->next;
963 --cctx_idle; 1052 --cctx_idle;
964 1053
970 cctx_first = cctx; 1059 cctx_first = cctx;
971} 1060}
972 1061
973/** coroutine switching *****************************************************/ 1062/** coroutine switching *****************************************************/
974 1063
975static void NOINLINE 1064static void
976transfer_check (pTHX_ struct coro *prev, struct coro *next) 1065transfer_check (pTHX_ struct coro *prev, struct coro *next)
977{ 1066{
978 if (prev != next) 1067 if (expect_true (prev != next))
979 { 1068 {
980 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1069 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
981 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");
982 1071
983 if (next->flags & CF_RUNNING) 1072 if (expect_false (next->flags & CF_RUNNING))
984 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");
985 1074
986 if (next->flags & CF_DESTROYED) 1075 if (expect_false (next->flags & CF_DESTROYED))
987 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");
988 1077
1078 if (
1079#if PERL_VERSION_ATLEAST (5,9,0)
1080 expect_false (PL_parser)
1081#else
989 if (PL_lex_state != LEX_NOTPARSING) 1082 expect_false (PL_lex_state != LEX_NOTPARSING)
1083#endif
1084 )
990 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");
991 } 1086 }
992} 1087}
993 1088
994/* always use the TRANSFER macro */ 1089/* always use the TRANSFER macro */
996transfer (pTHX_ struct coro *prev, struct coro *next) 1091transfer (pTHX_ struct coro *prev, struct coro *next)
997{ 1092{
998 dSTACKLEVEL; 1093 dSTACKLEVEL;
999 1094
1000 /* sometimes transfer is only called to set idle_sp */ 1095 /* sometimes transfer is only called to set idle_sp */
1001 if (!next) 1096 if (expect_false (!next))
1002 { 1097 {
1003 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1098 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1004 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 */
1005 } 1100 }
1006 else if (prev != next) 1101 else if (expect_true (prev != next))
1007 { 1102 {
1008 coro_cctx *prev__cctx; 1103 coro_cctx *prev__cctx;
1009 1104
1010 if (prev->flags & CF_NEW) 1105 if (expect_false (prev->flags & CF_NEW))
1011 { 1106 {
1012 /* create a new empty context */ 1107 /* create a new empty context */
1013 Newz (0, prev->cctx, 1, coro_cctx); 1108 Newz (0, prev->cctx, 1, coro_cctx);
1014 prev->flags &= ~CF_NEW; 1109 prev->flags &= ~CF_NEW;
1015 prev->flags |= CF_RUNNING; 1110 prev->flags |= CF_RUNNING;
1018 prev->flags &= ~CF_RUNNING; 1113 prev->flags &= ~CF_RUNNING;
1019 next->flags |= CF_RUNNING; 1114 next->flags |= CF_RUNNING;
1020 1115
1021 LOCK; 1116 LOCK;
1022 1117
1023 if (next->flags & CF_NEW) 1118 if (expect_false (next->flags & CF_NEW))
1024 { 1119 {
1025 /* need to start coroutine */ 1120 /* need to start coroutine */
1026 next->flags &= ~CF_NEW; 1121 next->flags &= ~CF_NEW;
1027 /* first get rid of the old state */ 1122 /* first get rid of the old state */
1028 save_perl (aTHX_ prev); 1123 save_perl (aTHX_ prev);
1037 } 1132 }
1038 1133
1039 prev__cctx = prev->cctx; 1134 prev__cctx = prev->cctx;
1040 1135
1041 /* possibly "free" the cctx */ 1136 /* possibly "free" the cctx */
1042 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)))
1043 { 1138 {
1044 /* 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 */
1045 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));
1046 1141
1047 prev->cctx = 0; 1142 prev->cctx = 0;
1048 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
1049 cctx_put (prev__cctx); 1150 cctx_put (prev__cctx);
1050 } 1151 }
1051 1152
1052 ++next->usecount; 1153 ++next->usecount;
1053 1154
1054 if (!next->cctx) 1155 if (expect_true (!next->cctx))
1055 next->cctx = cctx_get (aTHX); 1156 next->cctx = cctx_get (aTHX);
1056 1157
1057 if (prev__cctx != next->cctx) 1158 if (expect_false (prev__cctx != next->cctx))
1058 { 1159 {
1059 prev__cctx->top_env = PL_top_env; 1160 prev__cctx->top_env = PL_top_env;
1060 PL_top_env = next->cctx->top_env; 1161 PL_top_env = next->cctx->top_env;
1061 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1162 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1062 } 1163 }
1063 1164
1064 free_coro_mortal (aTHX); 1165 free_coro_mortal (aTHX);
1065 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 }
1066 } 1180 }
1067} 1181}
1068 1182
1069struct transfer_args 1183struct transfer_args
1070{ 1184{
1105 save_perl (aTHX_ &temp); 1219 save_perl (aTHX_ &temp);
1106 load_perl (aTHX_ coro); 1220 load_perl (aTHX_ coro);
1107 1221
1108 coro_destroy (aTHX_ coro); 1222 coro_destroy (aTHX_ coro);
1109 1223
1110 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1224 load_perl (aTHX_ &temp);
1111 1225
1112 coro->mainstack = 0; 1226 coro->slot = 0;
1113 } 1227 }
1114 1228
1115 cctx_destroy (coro->cctx); 1229 cctx_destroy (coro->cctx);
1116 SvREFCNT_dec (coro->args); 1230 SvREFCNT_dec (coro->args);
1117 1231
1242 { 1356 {
1243 LOCK; 1357 LOCK;
1244 next_sv = coro_deq (aTHX_ PRIO_MIN); 1358 next_sv = coro_deq (aTHX_ PRIO_MIN);
1245 1359
1246 /* nothing to schedule: call the idle handler */ 1360 /* nothing to schedule: call the idle handler */
1247 if (!next_sv) 1361 if (expect_false (!next_sv))
1248 { 1362 {
1249 dSP; 1363 dSP;
1250 UNLOCK; 1364 UNLOCK;
1251 1365
1252 ENTER; 1366 ENTER;
1262 } 1376 }
1263 1377
1264 ta->next = SvSTATE (next_sv); 1378 ta->next = SvSTATE (next_sv);
1265 1379
1266 /* cannot transfer to destroyed coros, skip and look for next */ 1380 /* cannot transfer to destroyed coros, skip and look for next */
1267 if (ta->next->flags & CF_DESTROYED) 1381 if (expect_false (ta->next->flags & CF_DESTROYED))
1268 { 1382 {
1269 UNLOCK; 1383 UNLOCK;
1270 SvREFCNT_dec (next_sv); 1384 SvREFCNT_dec (next_sv);
1271 /* coro_nready is already taken care of by destroy */ 1385 /* coro_nready is already taken care of by destroy */
1272 continue; 1386 continue;
1328 dTHX; 1442 dTHX;
1329 struct transfer_args ta; 1443 struct transfer_args ta;
1330 1444
1331 prepare_cede (aTHX_ &ta); 1445 prepare_cede (aTHX_ &ta);
1332 1446
1333 if (ta.prev != ta.next) 1447 if (expect_true (ta.prev != ta.next))
1334 { 1448 {
1335 TRANSFER (ta); 1449 TRANSFER (ta);
1336 return 1; 1450 return 1;
1337 } 1451 }
1338 else 1452 else
1374 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1488 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1375 1489
1376 if (coro->flags & CF_RUNNING) 1490 if (coro->flags & CF_RUNNING)
1377 PL_runops = RUNOPS_DEFAULT; 1491 PL_runops = RUNOPS_DEFAULT;
1378 else 1492 else
1379 coro->runops = RUNOPS_DEFAULT; 1493 coro->slot->runops = RUNOPS_DEFAULT;
1380 } 1494 }
1381} 1495}
1382 1496
1383MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1497MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1384 1498
1389#ifdef USE_ITHREADS 1503#ifdef USE_ITHREADS
1390 MUTEX_INIT (&coro_mutex); 1504 MUTEX_INIT (&coro_mutex);
1391#endif 1505#endif
1392 BOOT_PAGESIZE; 1506 BOOT_PAGESIZE;
1393 1507
1394 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 ("SIG", TRUE);
1512 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE);
1513 sv_warnhook = coro_get_sv ("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);
1395 1517
1396 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1518 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1397 1519
1398 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1520 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1399 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1521 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1405 1527
1406 while (main_top_env->je_prev) 1528 while (main_top_env->je_prev)
1407 main_top_env = main_top_env->je_prev; 1529 main_top_env = main_top_env->je_prev;
1408 1530
1409 coroapi.ver = CORO_API_VERSION; 1531 coroapi.ver = CORO_API_VERSION;
1532 coroapi.rev = CORO_API_REVISION;
1410 coroapi.transfer = api_transfer; 1533 coroapi.transfer = api_transfer;
1411 1534
1412 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1535 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1413} 1536}
1414 1537
1430 1553
1431 coro->hv = hv = newHV (); 1554 coro->hv = hv = newHV ();
1432 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;
1433 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1556 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1434 1557
1558 av_extend (coro->args, items - 1);
1435 for (i = 1; i < items; i++) 1559 for (i = 1; i < items; i++)
1436 av_push (coro->args, newSVsv (ST (i))); 1560 av_push (coro->args, newSVsv (ST (i)));
1437} 1561}
1438 OUTPUT: 1562 OUTPUT:
1439 RETVAL 1563 RETVAL
1480 1604
1481 break; 1605 break;
1482 } 1606 }
1483 1607
1484 BARRIER; 1608 BARRIER;
1609 PUTBACK;
1485 TRANSFER (ta); 1610 TRANSFER (ta);
1486 1611 SPAGAIN; /* might be the sp of a different coroutine now */
1487 if (GIMME_V != G_VOID && ta.next != ta.prev) 1612 /* be extra careful not to ever do anything after TRANSFER */
1488 XSRETURN_YES;
1489} 1613}
1490 1614
1491bool 1615bool
1492_destroy (SV *coro_sv) 1616_destroy (SV *coro_sv)
1493 CODE: 1617 CODE:
1542 CODE: 1666 CODE:
1543{ 1667{
1544 if (coro->mainstack) 1668 if (coro->mainstack)
1545 { 1669 {
1546 struct coro temp; 1670 struct coro temp;
1547 Zero (&temp, 1, struct coro);
1548 1671
1549 if (!(coro->flags & CF_RUNNING)) 1672 if (!(coro->flags & CF_RUNNING))
1550 { 1673 {
1551 save_perl (aTHX_ &temp); 1674 save_perl (aTHX_ &temp);
1552 load_perl (aTHX_ coro); 1675 load_perl (aTHX_ coro);
1554 1677
1555 { 1678 {
1556 dSP; 1679 dSP;
1557 ENTER; 1680 ENTER;
1558 SAVETMPS; 1681 SAVETMPS;
1682 PUTBACK;
1683 PUSHSTACK;
1559 PUSHMARK (SP); 1684 PUSHMARK (SP);
1560 PUTBACK; 1685
1561 if (ix) 1686 if (ix)
1562 eval_sv (coderef, 0); 1687 eval_sv (coderef, 0);
1563 else 1688 else
1564 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;
1565 SPAGAIN; 1692 SPAGAIN;
1566 FREETMPS; 1693 FREETMPS;
1567 LEAVE; 1694 LEAVE;
1568 PUTBACK; 1695 PUTBACK;
1569 } 1696 }
1627 1754
1628BOOT: 1755BOOT:
1629{ 1756{
1630 int i; 1757 int i;
1631 1758
1632 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1759 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1633 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1760 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1634 av_async_pool = get_av ("Coro::async_pool", TRUE); 1761 av_async_pool = coro_get_av ("Coro::async_pool", TRUE);
1635 1762
1636 coro_current = get_sv ("Coro::current", FALSE); 1763 coro_current = coro_get_sv ("Coro::current", FALSE);
1637 SvREADONLY_on (coro_current); 1764 SvREADONLY_on (coro_current);
1638 1765
1639 coro_stash = gv_stashpv ("Coro", TRUE); 1766 coro_stash = gv_stashpv ("Coro", TRUE);
1640 1767
1641 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1768 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1642 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1769 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1643 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1770 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1644 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1771 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1647 1774
1648 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1775 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1649 coro_ready[i] = newAV (); 1776 coro_ready[i] = newAV ();
1650 1777
1651 { 1778 {
1652 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 */
1653 1781
1654 coroapi.schedule = api_schedule; 1782 coroapi.schedule = api_schedule;
1655 coroapi.cede = api_cede; 1783 coroapi.cede = api_cede;
1656 coroapi.cede_notself = api_cede_notself; 1784 coroapi.cede_notself = api_cede_notself;
1657 coroapi.ready = api_ready; 1785 coroapi.ready = api_ready;
1708 CODE: 1836 CODE:
1709 RETVAL = coro_nready; 1837 RETVAL = coro_nready;
1710 OUTPUT: 1838 OUTPUT:
1711 RETVAL 1839 RETVAL
1712 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
1713# for async_pool speedup 1848# for async_pool speedup
1714void 1849void
1715_pool_1 (SV *cb) 1850_pool_1 (SV *cb)
1716 CODE: 1851 CODE:
1717{ 1852{
1721 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1856 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1722 AV *invoke_av; 1857 AV *invoke_av;
1723 int i, len; 1858 int i, len;
1724 1859
1725 if (!invoke) 1860 if (!invoke)
1726 croak ("\3terminate\2\n"); 1861 croak ("\3async_pool terminate\2\n");
1727 1862
1728 SvREFCNT_dec (coro->asp_deffh); 1863 SvREFCNT_dec (coro->saved_deffh);
1729 coro->asp_deffh = SvREFCNT_inc (PL_defoutgv); 1864 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1730 1865
1731 hv_store (hv, "desc", sizeof ("desc") - 1, 1866 hv_store (hv, "desc", sizeof ("desc") - 1,
1732 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1867 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1733 1868
1734 invoke_av = (AV *)SvRV (invoke); 1869 invoke_av = (AV *)SvRV (invoke);
1752{ 1887{
1753 struct coro *coro = SvSTATE (coro_current); 1888 struct coro *coro = SvSTATE (coro_current);
1754 1889
1755 sv_setsv (cb, &PL_sv_undef); 1890 sv_setsv (cb, &PL_sv_undef);
1756 1891
1757 SvREFCNT_dec (PL_defoutgv); PL_defoutgv = coro->asp_deffh; 1892 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1758 coro->asp_deffh = 0; 1893 coro->saved_deffh = 0;
1759 1894
1760 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1895 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1761 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1896 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1762 croak ("\3terminate\2\n"); 1897 croak ("\3async_pool terminate\2\n");
1763 1898
1764 av_clear (GvAV (PL_defgv)); 1899 av_clear (GvAV (PL_defgv));
1765 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1900 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1766 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1901 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1767 1902

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines