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.188 by root, Fri Oct 5 20:36:31 2007 UTC vs.
Revision 1.210 by root, Wed Oct 10 03:24:40 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
116#else 131#else
117# define LOCK (void)0 132# define LOCK (void)0
118# define UNLOCK (void)0 133# define UNLOCK (void)0
119#endif 134#endif
120 135
136#define strpair(const) const, sizeof (const) - 1
137
121/* helper storage struct for Coro::AIO */ 138/* helper storage struct for Coro::AIO */
122struct io_state 139struct io_state
123{ 140{
124 int errorno; 141 int errorno;
125 I32 laststype; 142 I32 laststype;
132static AV *main_mainstack; /* used to differentiate between $main and others */ 149static AV *main_mainstack; /* used to differentiate between $main and others */
133static JMPENV *main_top_env; 150static JMPENV *main_top_env;
134static HV *coro_state_stash, *coro_stash; 151static HV *coro_state_stash, *coro_stash;
135static SV *coro_mortal; /* will be freed after next transfer */ 152static SV *coro_mortal; /* will be freed after next transfer */
136 153
137static GV *irsgv; /* $/ */ 154static GV *irsgv; /* $/ */
138static GV *stdoutgv; /* STDOUT */ 155static GV *stdoutgv; /* *STDOUT */
156
157static HV *hv_sig; /* %SIG */
158static SV *sv_diehook;
159static SV *sv_warnhook;
139 160
140/* async_pool helper stuff */ 161/* async_pool helper stuff */
141static SV *sv_pool_rss; 162static SV *sv_pool_rss;
142static SV *sv_pool_size; 163static SV *sv_pool_size;
143static AV *av_async_pool; 164static AV *av_async_pool;
144 165
145static struct coro_cctx *cctx_first; 166static struct coro_cctx *cctx_first[3]; /* index by GIMME_V type, void, scalar, array */
146static int cctx_count, cctx_idle; 167static int cctx_count, cctx_idle[3];
147 168
148enum { 169enum {
149 CC_MAPPED = 0x01, 170 CC_MAPPED = 0x01,
150 CC_NOREUSE = 0x02, /* throw this away after tracing */ 171 CC_NOREUSE = 0x02, /* throw this away after tracing */
151 CC_TRACE = 0x04, 172 CC_TRACE = 0x04,
179 CF_READY = 0x0002, /* coroutine is ready */ 200 CF_READY = 0x0002, /* coroutine is ready */
180 CF_NEW = 0x0004, /* has never been switched to */ 201 CF_NEW = 0x0004, /* has never been switched to */
181 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 202 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
182}; 203};
183 204
205/* the structure where most of the perl state is stored, overlaid on the cxstack */
206typedef struct {
207 SV *defsv;
208 AV *defav;
209 SV *errsv;
210 SV *irsgv;
211#define VAR(name,type) type name;
212# include "state.h"
213#undef VAR
214} perl_slots;
215
216#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
217
184/* this is a structure representing a perl-level coroutine */ 218/* this is a structure representing a perl-level coroutine */
185struct coro { 219struct coro {
186 /* the c coroutine allocated to this perl coroutine, if any */ 220 /* the c coroutine allocated to this perl coroutine, if any */
187 coro_cctx *cctx; 221 coro_cctx *cctx;
222 int gimme;
188 223
224 /* process data */
225 AV *mainstack;
226 perl_slots *slot; /* basically the saved sp */
227
189 /* data associated with this coroutine (initial args) */ 228 AV *args; /* data associated with this coroutine (initial args) */
190 AV *args; 229 int refcnt; /* coroutines are refcounted, yes */
191 int refcnt;
192 int flags; /* CF_ flags */ 230 int flags; /* CF_ flags */
193 231 HV *hv; /* the perl hash associated with this coro, if any */
194 /* optionally saved, might be zero */
195 AV *defav; /* @_ */
196 SV *defsv; /* $_ */
197 SV *errsv; /* $@ */
198 SV *deffh; /* default filehandle */
199 SV *irssv; /* $/ */
200 SV *irssv_sv; /* real $/ cache */
201
202#define VAR(name,type) type name;
203# include "state.h"
204#undef VAR
205 232
206 /* statistics */ 233 /* statistics */
207 int usecount; /* number of transfers to this coro */ 234 int usecount; /* number of transfers to this coro */
208 235
209 /* coro process data */ 236 /* coro process data */
210 int prio; 237 int prio;
211 //SV *throw; 238 SV *throw; /* exception to be thrown */
212 239
213 /* async_pool */ 240 /* async_pool */
214 SV *saved_deffh; 241 SV *saved_deffh;
215 242
216 /* linked list */ 243 /* linked list */
217 struct coro *next, *prev; 244 struct coro *next, *prev;
218 HV *hv; /* the perl hash associated with this coro, if any */
219}; 245};
220 246
221typedef struct coro *Coro__State; 247typedef struct coro *Coro__State;
222typedef struct coro *Coro__State_or_hashref; 248typedef struct coro *Coro__State_or_hashref;
223 249
235static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 261static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
236static int coro_nready; 262static int coro_nready;
237static struct coro *coro_first; 263static struct coro *coro_first;
238 264
239/** lowlevel stuff **********************************************************/ 265/** lowlevel stuff **********************************************************/
266
267static SV *
268coro_get_sv (const char *name, int create)
269{
270#if PERL_VERSION_ATLEAST (5,9,0)
271 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
272 get_sv (name, create);
273#endif
274 return get_sv (name, create);
275}
276
277static AV *
278coro_get_av (const char *name, int create)
279{
280#if PERL_VERSION_ATLEAST (5,9,0)
281 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
282 get_av (name, create);
283#endif
284 return get_av (name, create);
285}
286
287static HV *
288coro_get_hv (const char *name, int create)
289{
290#if PERL_VERSION_ATLEAST (5,9,0)
291 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
292 get_hv (name, create);
293#endif
294 return get_hv (name, create);
295}
240 296
241static AV * 297static AV *
242coro_clone_padlist (pTHX_ CV *cv) 298coro_clone_padlist (pTHX_ CV *cv)
243{ 299{
244 AV *padlist = CvPADLIST (cv); 300 AV *padlist = CvPADLIST (cv);
317 MAGIC *mg; 373 MAGIC *mg;
318 374
319 if (SvROK (coro)) 375 if (SvROK (coro))
320 coro = SvRV (coro); 376 coro = SvRV (coro);
321 377
322 if (SvTYPE (coro) != SVt_PVHV) 378 if (expect_false (SvTYPE (coro) != SVt_PVHV))
323 croak ("Coro::State object required"); 379 croak ("Coro::State object required");
324 380
325 stash = SvSTASH (coro); 381 stash = SvSTASH (coro);
326 if (stash != coro_stash && stash != coro_state_stash) 382 if (expect_false (stash != coro_stash && stash != coro_state_stash))
327 { 383 {
328 /* very slow, but rare, check */ 384 /* very slow, but rare, check */
329 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 385 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
330 croak ("Coro::State object required"); 386 croak ("Coro::State object required");
331 } 387 }
341get_padlist (pTHX_ CV *cv) 397get_padlist (pTHX_ CV *cv)
342{ 398{
343 MAGIC *mg = CORO_MAGIC (cv); 399 MAGIC *mg = CORO_MAGIC (cv);
344 AV *av; 400 AV *av;
345 401
346 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 402 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
347 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 403 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
348 else 404 else
349 { 405 {
350#if CORO_PREFER_PERL_FUNCTIONS 406#if CORO_PREFER_PERL_FUNCTIONS
351 /* this is probably cleaner, but also slower? */ 407 /* this is probably cleaner, but also slower? */
363put_padlist (pTHX_ CV *cv) 419put_padlist (pTHX_ CV *cv)
364{ 420{
365 MAGIC *mg = CORO_MAGIC (cv); 421 MAGIC *mg = CORO_MAGIC (cv);
366 AV *av; 422 AV *av;
367 423
368 if (!mg) 424 if (expect_false (!mg))
369 { 425 {
370 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 426 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
371 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 427 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
372 mg->mg_virtual = &vtbl_coro; 428 mg->mg_virtual = &vtbl_coro;
373 mg->mg_obj = (SV *)newAV (); 429 mg->mg_obj = (SV *)newAV ();
374 } 430 }
375 431
376 av = (AV *)mg->mg_obj; 432 av = (AV *)mg->mg_obj;
377 433
378 if (AvFILLp (av) >= AvMAX (av)) 434 if (expect_false (AvFILLp (av) >= AvMAX (av)))
379 av_extend (av, AvMAX (av) + 1); 435 av_extend (av, AvMAX (av) + 1);
380 436
381 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 437 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
382} 438}
383 439
384/** load & save, init *******************************************************/ 440/** load & save, init *******************************************************/
385 441
386static void 442static void
387load_perl (pTHX_ Coro__State c) 443load_perl (pTHX_ Coro__State c)
388{ 444{
445 perl_slots *slot = c->slot;
446 c->slot = 0;
447
448 PL_mainstack = c->mainstack;
449
450 GvSV (PL_defgv) = slot->defsv;
451 GvAV (PL_defgv) = slot->defav;
452 GvSV (PL_errgv) = slot->errsv;
453 GvSV (irsgv) = slot->irsgv;
454
389#define VAR(name,type) PL_ ## name = c->name; 455 #define VAR(name,type) PL_ ## name = slot->name;
390# include "state.h" 456 # include "state.h"
391#undef VAR 457 #undef VAR
392 458
393 GvSV (PL_defgv) = c->defsv; 459 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
394 GvAV (PL_defgv) = c->defav; 460 /*hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);*/
395 GvSV (PL_errgv) = c->errsv;
396 GvSV (irsgv) = c->irssv_sv;
397 461
398 { 462 {
399 dSP; 463 dSP;
464
400 CV *cv; 465 CV *cv;
401 466
402 /* now do the ugly restore mess */ 467 /* now do the ugly restore mess */
403 while ((cv = (CV *)POPs)) 468 while (expect_true (cv = (CV *)POPs))
404 { 469 {
405 put_padlist (aTHX_ cv); /* mark this padlist as available */ 470 put_padlist (aTHX_ cv); /* mark this padlist as available */
406 CvDEPTH (cv) = PTR2IV (POPs); 471 CvDEPTH (cv) = PTR2IV (POPs);
407 CvPADLIST (cv) = (AV *)POPs; 472 CvPADLIST (cv) = (AV *)POPs;
408 } 473 }
427 492
428 XPUSHs (Nullsv); 493 XPUSHs (Nullsv);
429 /* this loop was inspired by pp_caller */ 494 /* this loop was inspired by pp_caller */
430 for (;;) 495 for (;;)
431 { 496 {
432 while (cxix >= 0) 497 while (expect_true (cxix >= 0))
433 { 498 {
434 PERL_CONTEXT *cx = &ccstk[cxix--]; 499 PERL_CONTEXT *cx = &ccstk[cxix--];
435 500
436 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 501 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
437 { 502 {
438 CV *cv = cx->blk_sub.cv; 503 CV *cv = cx->blk_sub.cv;
439 504
440 if (CvDEPTH (cv)) 505 if (expect_true (CvDEPTH (cv)))
441 { 506 {
442 EXTEND (SP, 3); 507 EXTEND (SP, 3);
443 PUSHs ((SV *)CvPADLIST (cv)); 508 PUSHs ((SV *)CvPADLIST (cv));
444 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 509 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
445 PUSHs ((SV *)cv); 510 PUSHs ((SV *)cv);
448 get_padlist (aTHX_ cv); 513 get_padlist (aTHX_ cv);
449 } 514 }
450 } 515 }
451 } 516 }
452 517
453 if (top_si->si_type == PERLSI_MAIN) 518 if (expect_true (top_si->si_type == PERLSI_MAIN))
454 break; 519 break;
455 520
456 top_si = top_si->si_prev; 521 top_si = top_si->si_prev;
457 ccstk = top_si->si_cxstack; 522 ccstk = top_si->si_cxstack;
458 cxix = top_si->si_cxix; 523 cxix = top_si->si_cxix;
459 } 524 }
460 525
461 PUTBACK; 526 PUTBACK;
462 } 527 }
463 528
529 /* allocate some space on the context stack for our purposes */
530 /* we manually unroll here, as usually 2 slots is enough */
531 if (SLOT_COUNT >= 1) CXINC;
532 if (SLOT_COUNT >= 2) CXINC;
533 if (SLOT_COUNT >= 3) CXINC;
534 {
535 int i;
536 for (i = 3; i < SLOT_COUNT; ++i)
537 CXINC;
538 }
539 cxstack_ix -= SLOT_COUNT; /* undo allocation */
540
541 c->mainstack = PL_mainstack;
542
543 {
544 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
545
464 c->defav = GvAV (PL_defgv); 546 slot->defav = GvAV (PL_defgv);
465 c->defsv = DEFSV; 547 slot->defsv = DEFSV;
466 c->errsv = ERRSV; 548 slot->errsv = ERRSV;
467 c->irssv_sv = GvSV (irsgv); 549 slot->irsgv = GvSV (irsgv);
468 550
469#define VAR(name,type)c->name = PL_ ## name; 551 #define VAR(name,type) slot->name = PL_ ## name;
470# include "state.h" 552 # include "state.h"
471#undef VAR 553 #undef VAR
554 }
472} 555}
473 556
474/* 557/*
475 * allocate various perl stacks. This is an exact copy 558 * allocate various perl stacks. This is an exact copy
476 * of perl.c:init_stacks, except that it uses less memory 559 * of perl.c:init_stacks, except that it uses less memory
481# define coro_init_stacks init_stacks 564# define coro_init_stacks init_stacks
482#else 565#else
483static void 566static void
484coro_init_stacks (pTHX) 567coro_init_stacks (pTHX)
485{ 568{
486 PL_curstackinfo = new_stackinfo(64, 6); 569 PL_curstackinfo = new_stackinfo(32, 8);
487 PL_curstackinfo->si_type = PERLSI_MAIN; 570 PL_curstackinfo->si_type = PERLSI_MAIN;
488 PL_curstack = PL_curstackinfo->si_stack; 571 PL_curstack = PL_curstackinfo->si_stack;
489 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 572 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
490 573
491 PL_stack_base = AvARRAY(PL_curstack); 574 PL_stack_base = AvARRAY(PL_curstack);
492 PL_stack_sp = PL_stack_base; 575 PL_stack_sp = PL_stack_base;
493 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 576 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
494 577
495 New(50,PL_tmps_stack,64,SV*); 578 New(50,PL_tmps_stack,32,SV*);
496 PL_tmps_floor = -1; 579 PL_tmps_floor = -1;
497 PL_tmps_ix = -1; 580 PL_tmps_ix = -1;
498 PL_tmps_max = 64; 581 PL_tmps_max = 32;
499 582
500 New(54,PL_markstack,16,I32); 583 New(54,PL_markstack,16,I32);
501 PL_markstack_ptr = PL_markstack; 584 PL_markstack_ptr = PL_markstack;
502 PL_markstack_max = PL_markstack + 16; 585 PL_markstack_max = PL_markstack + 16;
503 586
504#ifdef SET_MARK_OFFSET 587#ifdef SET_MARK_OFFSET
505 SET_MARK_OFFSET; 588 SET_MARK_OFFSET;
506#endif 589#endif
507 590
508 New(54,PL_scopestack,16,I32); 591 New(54,PL_scopestack,8,I32);
509 PL_scopestack_ix = 0; 592 PL_scopestack_ix = 0;
510 PL_scopestack_max = 16; 593 PL_scopestack_max = 8;
511 594
512 New(54,PL_savestack,64,ANY); 595 New(54,PL_savestack,24,ANY);
513 PL_savestack_ix = 0; 596 PL_savestack_ix = 0;
514 PL_savestack_max = 64; 597 PL_savestack_max = 24;
515 598
516#if !PERL_VERSION_ATLEAST (5,9,0) 599#if !PERL_VERSION_ATLEAST (5,9,0)
517 New(54,PL_retstack,4,OP*); 600 New(54,PL_retstack,4,OP*);
518 PL_retstack_ix = 0; 601 PL_retstack_ix = 0;
519 PL_retstack_max = 4; 602 PL_retstack_max = 4;
556{ 639{
557 size_t rss = sizeof (*coro); 640 size_t rss = sizeof (*coro);
558 641
559 if (coro->mainstack) 642 if (coro->mainstack)
560 { 643 {
644 perl_slots tmp_slot;
645 perl_slots *slot;
646
561 if (coro->flags & CF_RUNNING) 647 if (coro->flags & CF_RUNNING)
562 { 648 {
649 slot = &tmp_slot;
650
563 #define VAR(name,type)coro->name = PL_ ## name; 651 #define VAR(name,type) slot->name = PL_ ## name;
564 # include "state.h" 652 # include "state.h"
565 #undef VAR 653 #undef VAR
566 } 654 }
655 else
656 slot = coro->slot;
567 657
568 rss += sizeof (coro->curstackinfo); 658 rss += sizeof (slot->curstackinfo);
569 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
570 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 659 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
571 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 660 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
572 rss += coro->tmps_max * sizeof (SV *); 661 rss += slot->tmps_max * sizeof (SV *);
573 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 662 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
574 rss += coro->scopestack_max * sizeof (I32); 663 rss += slot->scopestack_max * sizeof (I32);
575 rss += coro->savestack_max * sizeof (ANY); 664 rss += slot->savestack_max * sizeof (ANY);
576 665
577#if !PERL_VERSION_ATLEAST (5,9,0) 666#if !PERL_VERSION_ATLEAST (5,9,0)
578 rss += coro->retstack_max * sizeof (OP *); 667 rss += slot->retstack_max * sizeof (OP *);
579#endif 668#endif
580 } 669 }
581 670
582 return rss; 671 return rss;
583} 672}
595 PL_runops = RUNOPS_DEFAULT; 684 PL_runops = RUNOPS_DEFAULT;
596 PL_curcop = &PL_compiling; 685 PL_curcop = &PL_compiling;
597 PL_in_eval = EVAL_NULL; 686 PL_in_eval = EVAL_NULL;
598 PL_comppad = 0; 687 PL_comppad = 0;
599 PL_curpm = 0; 688 PL_curpm = 0;
689 PL_curpad = 0;
600 PL_localizing = 0; 690 PL_localizing = 0;
601 PL_dirty = 0; 691 PL_dirty = 0;
602 PL_restartop = 0; 692 PL_restartop = 0;
693 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
694 PL_warnhook = 0; hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
603 695
604 GvSV (PL_defgv) = NEWSV (0, 0); 696 GvSV (PL_defgv) = newSV (0);
605 GvAV (PL_defgv) = coro->args; coro->args = 0; 697 GvAV (PL_defgv) = coro->args; coro->args = 0;
606 GvSV (PL_errgv) = NEWSV (0, 0); 698 GvSV (PL_errgv) = newSV (0);
607 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 699 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
608 PL_rs = newSVsv (GvSV (irsgv)); 700 PL_rs = newSVsv (GvSV (irsgv));
609 PL_defoutgv = SvREFCNT_inc (stdoutgv); 701 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
610 702
611 { 703 {
612 dSP; 704 dSP;
613 LOGOP myop; 705 LOGOP myop;
614 706
615 Zero (&myop, 1, LOGOP); 707 Zero (&myop, 1, LOGOP);
616 myop.op_next = Nullop; 708 myop.op_next = Nullop;
617 myop.op_flags = OPf_WANT_VOID; 709 myop.op_flags = OPf_WANT_VOID;
618 710
619 PUSHMARK (SP); 711 PUSHMARK (SP);
620 XPUSHs (av_shift (GvAV (PL_defgv))); 712 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
621 PUTBACK; 713 PUTBACK;
622 PL_op = (OP *)&myop; 714 PL_op = (OP *)&myop;
623 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 715 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
624 SPAGAIN; 716 SPAGAIN;
717
718 /*
719 * now its very tricky. the "tail" of the next transfer might end up
720 * either in a new cctx, or an existing one.
721 * in case of an existing one we have to take care of whatever
722 * entersub and transfer do to the perl stack.
723 */
724 ENTER;
725 EXTEND (SP, 4);
726 PUSHs ((SV *)0); /* items */
727 PUSHs ((SV *)0); /* ix, set_stacklevel */
728 PUSHs ((SV *)(sp - PL_stack_base + 1)); /* ax */
729 PUSHs ((SV *)0); /* again */
730 PUTBACK;
625 } 731 }
626 732
627 ENTER; /* necessary e.g. for dounwind */ 733 /* this newly created coroutine might be run on an existing cctx which most
734 * likely was suspended in set_stacklevel, called from entersub.
735 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
736 * so we ENTER here for symmetry
737 */
738 ENTER;
628} 739}
629 740
630static void 741static void
631coro_destroy (pTHX_ struct coro *coro) 742coro_destroy (pTHX_ struct coro *coro)
632{ 743{
652 SvREFCNT_dec (GvSV (PL_errgv)); 763 SvREFCNT_dec (GvSV (PL_errgv));
653 SvREFCNT_dec (PL_defoutgv); 764 SvREFCNT_dec (PL_defoutgv);
654 SvREFCNT_dec (PL_rs); 765 SvREFCNT_dec (PL_rs);
655 SvREFCNT_dec (GvSV (irsgv)); 766 SvREFCNT_dec (GvSV (irsgv));
656 767
768 SvREFCNT_dec (PL_diehook);
769 SvREFCNT_dec (PL_warnhook);
770
657 SvREFCNT_dec (coro->saved_deffh); 771 SvREFCNT_dec (coro->saved_deffh);
658 //SvREFCNT_dec (coro->throw); 772 SvREFCNT_dec (coro->throw);
659 773
660 coro_destroy_stacks (aTHX); 774 coro_destroy_stacks (aTHX);
661} 775}
662 776
663static void 777static void
664free_coro_mortal (pTHX) 778free_coro_mortal (pTHX)
665{ 779{
666 if (coro_mortal) 780 if (expect_true (coro_mortal))
667 { 781 {
668 SvREFCNT_dec (coro_mortal); 782 SvREFCNT_dec (coro_mortal);
669 coro_mortal = 0; 783 coro_mortal = 0;
670 } 784 }
671} 785}
700 bot = PL_stack_base + cx->blk_oldsp + 1; 814 bot = PL_stack_base + cx->blk_oldsp + 1;
701 top = cx->blk_gimme == G_ARRAY ? SP + 1 815 top = cx->blk_gimme == G_ARRAY ? SP + 1
702 : cx->blk_gimme == G_SCALAR ? bot + 1 816 : cx->blk_gimme == G_SCALAR ? bot + 1
703 : bot; 817 : bot;
704 818
819 av_extend (av, top - bot);
705 while (bot < top) 820 while (bot < top)
706 av_push (av, SvREFCNT_inc (*bot++)); 821 av_push (av, SvREFCNT_inc (*bot++));
707 822
708 PL_runops = RUNOPS_DEFAULT; 823 PL_runops = RUNOPS_DEFAULT;
709 ENTER; 824 ENTER;
712 PUSHMARK (SP); 827 PUSHMARK (SP);
713 PUSHs (&PL_sv_no); 828 PUSHs (&PL_sv_no);
714 PUSHs (fullname); 829 PUSHs (fullname);
715 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 830 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
716 PUTBACK; 831 PUTBACK;
717 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 832 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0);
718 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 833 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
719 SPAGAIN; 834 SPAGAIN;
720 FREETMPS; 835 FREETMPS;
721 LEAVE; 836 LEAVE;
722 PL_runops = runops_trace; 837 PL_runops = runops_trace;
751 PUSHMARK (SP); 866 PUSHMARK (SP);
752 PUSHs (&PL_sv_yes); 867 PUSHs (&PL_sv_yes);
753 PUSHs (fullname); 868 PUSHs (fullname);
754 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 869 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
755 PUTBACK; 870 PUTBACK;
756 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 871 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0);
757 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 872 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
758 SPAGAIN; 873 SPAGAIN;
759 FREETMPS; 874 FREETMPS;
760 LEAVE; 875 LEAVE;
761 PL_runops = runops_trace; 876 PL_runops = runops_trace;
775 PL_runops = RUNOPS_DEFAULT; 890 PL_runops = RUNOPS_DEFAULT;
776 PUSHMARK (SP); 891 PUSHMARK (SP);
777 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 892 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
778 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 893 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
779 PUTBACK; 894 PUTBACK;
780 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0); 895 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0);
781 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 896 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
782 SPAGAIN; 897 SPAGAIN;
783 FREETMPS; 898 FREETMPS;
784 LEAVE; 899 LEAVE;
785 PL_runops = runops_trace; 900 PL_runops = runops_trace;
795 910
796/* inject a fake call to Coro::State::_cctx_init into the execution */ 911/* inject a fake call to Coro::State::_cctx_init into the execution */
797/* _cctx_init should be careful, as it could be called at almost any time */ 912/* _cctx_init should be careful, as it could be called at almost any time */
798/* during execution of a perl program */ 913/* during execution of a perl program */
799static void NOINLINE 914static void NOINLINE
800prepare_cctx (pTHX_ coro_cctx *cctx) 915cctx_prepare (pTHX_ coro_cctx *cctx)
801{ 916{
802 dSP; 917 dSP;
803 LOGOP myop; 918 LOGOP myop;
804 919
805 PL_top_env = &PL_start_env; 920 PL_top_env = &PL_start_env;
823 938
824/* 939/*
825 * this is a _very_ stripped down perl interpreter ;) 940 * this is a _very_ stripped down perl interpreter ;)
826 */ 941 */
827static void 942static void
828coro_run (void *arg) 943cctx_run (void *arg)
829{ 944{
830 dTHX; 945 dTHX;
831 946
832 /* coro_run is the alternative tail of transfer(), so unlock here. */ 947 /* cctx_run is the alternative tail of transfer(), so unlock here. */
833 UNLOCK; 948 UNLOCK;
834 949
835 /* we now skip the entersub that lead to transfer() */ 950 /* we now skip the entersub that lead to transfer() */
836 PL_op = PL_op->op_next; 951 PL_op = PL_op->op_next;
837 952
838 /* inject a fake subroutine call to cctx_init */ 953 /* inject a fake subroutine call to cctx_init */
839 prepare_cctx (aTHX_ (coro_cctx *)arg); 954 cctx_prepare (aTHX_ (coro_cctx *)arg);
840 955
841 /* somebody or something will hit me for both perl_run and PL_restartop */ 956 /* somebody or something will hit me for both perl_run and PL_restartop */
842 PL_restartop = PL_op; 957 PL_restartop = PL_op;
843 perl_run (PL_curinterp); 958 perl_run (PL_curinterp);
844 959
863 ++cctx_count; 978 ++cctx_count;
864 979
865 Newz (0, cctx, 1, coro_cctx); 980 Newz (0, cctx, 1, coro_cctx);
866 981
867#if HAVE_MMAP 982#if HAVE_MMAP
868
869 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 983 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
870 /* mmap supposedly does allocate-on-write for us */ 984 /* mmap supposedly does allocate-on-write for us */
871 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 985 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
872 986
873 if (cctx->sptr != (void *)-1) 987 if (cctx->sptr != (void *)-1)
894 stack_start = cctx->sptr; 1008 stack_start = cctx->sptr;
895 stack_size = cctx->ssize; 1009 stack_size = cctx->ssize;
896 } 1010 }
897 1011
898 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1012 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
899 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1013 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
900 1014
901 return cctx; 1015 return cctx;
902} 1016}
903 1017
904static void 1018static void
921 Safefree (cctx->sptr); 1035 Safefree (cctx->sptr);
922 1036
923 Safefree (cctx); 1037 Safefree (cctx);
924} 1038}
925 1039
1040/* wether this cctx should be destructed */
1041#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1042
926static coro_cctx * 1043static coro_cctx *
927cctx_get (pTHX) 1044cctx_get (pTHX_ int gimme)
928{ 1045{
929 while (cctx_first) 1046 while (expect_true (cctx_first[gimme]))
930 { 1047 {
931 coro_cctx *cctx = cctx_first; 1048 coro_cctx *cctx = cctx_first[gimme];
932 cctx_first = cctx->next; 1049 cctx_first[gimme] = cctx->next;
933 --cctx_idle; 1050 --cctx_idle[gimme];
934 1051
935 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1052 if (expect_true (!CCTX_EXPIRED (cctx)))
936 return cctx; 1053 return cctx;
937 1054
938 cctx_destroy (cctx); 1055 cctx_destroy (cctx);
939 } 1056 }
940 1057
1058 assert (!gimme);
941 return cctx_new (); 1059 return cctx_new ();
942} 1060}
943 1061
944static void 1062static void
945cctx_put (coro_cctx *cctx) 1063cctx_put (coro_cctx *cctx, int gimme)
946{ 1064{
947 /* free another cctx if overlimit */ 1065 /* free another cctx if overlimit */
948 if (cctx_idle >= MAX_IDLE_CCTX) 1066 if (expect_false (cctx_idle[gimme] >= MAX_IDLE_CCTX))
949 { 1067 {
950 coro_cctx *first = cctx_first; 1068 coro_cctx *first = cctx_first[gimme];
951 cctx_first = first->next; 1069 cctx_first[gimme] = first->next;
952 --cctx_idle; 1070 --cctx_idle[gimme];
953 1071
954 cctx_destroy (first); 1072 cctx_destroy (first);
955 } 1073 }
956 1074
957 ++cctx_idle; 1075 ++cctx_idle[gimme];
958 cctx->next = cctx_first; 1076 cctx->next = cctx_first[gimme];
959 cctx_first = cctx; 1077 cctx_first[gimme] = cctx;
960} 1078}
961 1079
962/** coroutine switching *****************************************************/ 1080/** coroutine switching *****************************************************/
963 1081
964static void NOINLINE 1082static void
965transfer_check (pTHX_ struct coro *prev, struct coro *next) 1083transfer_check (pTHX_ struct coro *prev, struct coro *next)
966{ 1084{
967 if (prev != next) 1085 if (expect_true (prev != next))
968 { 1086 {
969 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1087 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
970 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1088 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
971 1089
972 if (next->flags & CF_RUNNING) 1090 if (expect_false (next->flags & CF_RUNNING))
973 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1091 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
974 1092
975 if (next->flags & CF_DESTROYED) 1093 if (expect_false (next->flags & CF_DESTROYED))
976 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1094 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
977 1095
1096 if (
1097#if PERL_VERSION_ATLEAST (5,9,0)
1098 expect_false (PL_parser)
1099#else
978 if (PL_lex_state != LEX_NOTPARSING) 1100 expect_false (PL_lex_state != LEX_NOTPARSING)
1101#endif
1102 )
979 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1103 croak ("Coro::State::transfer called while parsing, but this is not supported");
980 } 1104 }
981} 1105}
982 1106
983/* always use the TRANSFER macro */ 1107/* always use the TRANSFER macro */
985transfer (pTHX_ struct coro *prev, struct coro *next) 1109transfer (pTHX_ struct coro *prev, struct coro *next)
986{ 1110{
987 dSTACKLEVEL; 1111 dSTACKLEVEL;
988 1112
989 /* sometimes transfer is only called to set idle_sp */ 1113 /* sometimes transfer is only called to set idle_sp */
990 if (!next) 1114 if (expect_false (!next))
991 { 1115 {
992 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1116 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
993 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1117 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
994 } 1118 }
995 else if (prev != next) 1119 else if (expect_true (prev != next))
996 { 1120 {
997 coro_cctx *prev__cctx; 1121 coro_cctx *prev__cctx;
998 1122
999 if (prev->flags & CF_NEW) 1123 if (expect_false (prev->flags & CF_NEW))
1000 { 1124 {
1001 /* create a new empty context */ 1125 /* create a new empty context */
1002 Newz (0, prev->cctx, 1, coro_cctx); 1126 Newz (0, prev->cctx, 1, coro_cctx);
1003 prev->flags &= ~CF_NEW; 1127 prev->flags &= ~CF_NEW;
1004 prev->flags |= CF_RUNNING; 1128 prev->flags |= CF_RUNNING;
1007 prev->flags &= ~CF_RUNNING; 1131 prev->flags &= ~CF_RUNNING;
1008 next->flags |= CF_RUNNING; 1132 next->flags |= CF_RUNNING;
1009 1133
1010 LOCK; 1134 LOCK;
1011 1135
1012 if (next->flags & CF_NEW) 1136 if (expect_false (next->flags & CF_NEW))
1013 { 1137 {
1014 /* need to start coroutine */ 1138 /* need to start coroutine */
1015 next->flags &= ~CF_NEW; 1139 next->flags &= ~CF_NEW;
1016 /* first get rid of the old state */ 1140 /* first get rid of the old state */
1017 save_perl (aTHX_ prev); 1141 save_perl (aTHX_ prev);
1026 } 1150 }
1027 1151
1028 prev__cctx = prev->cctx; 1152 prev__cctx = prev->cctx;
1029 1153
1030 /* possibly "free" the cctx */ 1154 /* possibly "free" the cctx */
1031 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1155 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1032 { 1156 {
1033 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1157 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1034 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1158 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1035 1159
1036 prev->cctx = 0; 1160 prev->cctx = 0;
1037 1161
1162 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1163 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1164 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1165 if (!next->cctx)
1166 next->cctx = cctx_get (aTHX_ next->gimme);
1167
1038 cctx_put (prev__cctx); 1168 cctx_put (prev__cctx, prev->gimme);
1039 } 1169 }
1040 1170
1041 ++next->usecount; 1171 ++next->usecount;
1042 1172
1043 if (!next->cctx) 1173 if (expect_true (!next->cctx))
1044 next->cctx = cctx_get (aTHX); 1174 next->cctx = cctx_get (aTHX_ next->gimme);
1045 1175
1046 if (prev__cctx != next->cctx) 1176 if (expect_false (prev__cctx != next->cctx))
1047 { 1177 {
1048 prev__cctx->top_env = PL_top_env; 1178 prev__cctx->top_env = PL_top_env;
1049 PL_top_env = next->cctx->top_env; 1179 PL_top_env = next->cctx->top_env;
1050 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1180 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1051 } 1181 }
1052 1182
1053 free_coro_mortal (aTHX); 1183 free_coro_mortal (aTHX);
1054 UNLOCK; 1184 UNLOCK;
1185
1186 if (expect_false (prev->throw || next->throw))
1187 {
1188 struct coro *coro = SvSTATE (coro_current);
1189
1190 if (coro->throw)
1191 {
1192 SV *exception = coro->throw;
1193 coro->throw = 0;
1194 sv_setsv (ERRSV, exception);
1195 croak (0);
1196 }
1197 }
1055 } 1198 }
1056} 1199}
1057 1200
1058struct transfer_args 1201struct transfer_args
1059{ 1202{
1094 save_perl (aTHX_ &temp); 1237 save_perl (aTHX_ &temp);
1095 load_perl (aTHX_ coro); 1238 load_perl (aTHX_ coro);
1096 1239
1097 coro_destroy (aTHX_ coro); 1240 coro_destroy (aTHX_ coro);
1098 1241
1099 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1242 load_perl (aTHX_ &temp);
1100 1243
1101 coro->mainstack = 0; 1244 coro->slot = 0;
1102 } 1245 }
1103 1246
1104 cctx_destroy (coro->cctx); 1247 cctx_destroy (coro->cctx);
1105 SvREFCNT_dec (coro->args); 1248 SvREFCNT_dec (coro->args);
1106 1249
1231 { 1374 {
1232 LOCK; 1375 LOCK;
1233 next_sv = coro_deq (aTHX_ PRIO_MIN); 1376 next_sv = coro_deq (aTHX_ PRIO_MIN);
1234 1377
1235 /* nothing to schedule: call the idle handler */ 1378 /* nothing to schedule: call the idle handler */
1236 if (!next_sv) 1379 if (expect_false (!next_sv))
1237 { 1380 {
1238 dSP; 1381 dSP;
1239 UNLOCK; 1382 UNLOCK;
1240 1383
1241 ENTER; 1384 ENTER;
1251 } 1394 }
1252 1395
1253 ta->next = SvSTATE (next_sv); 1396 ta->next = SvSTATE (next_sv);
1254 1397
1255 /* cannot transfer to destroyed coros, skip and look for next */ 1398 /* cannot transfer to destroyed coros, skip and look for next */
1256 if (ta->next->flags & CF_DESTROYED) 1399 if (expect_false (ta->next->flags & CF_DESTROYED))
1257 { 1400 {
1258 UNLOCK; 1401 UNLOCK;
1259 SvREFCNT_dec (next_sv); 1402 SvREFCNT_dec (next_sv);
1260 /* coro_nready is already taken care of by destroy */ 1403 /* coro_nready is already taken care of by destroy */
1261 continue; 1404 continue;
1317 dTHX; 1460 dTHX;
1318 struct transfer_args ta; 1461 struct transfer_args ta;
1319 1462
1320 prepare_cede (aTHX_ &ta); 1463 prepare_cede (aTHX_ &ta);
1321 1464
1322 if (ta.prev != ta.next) 1465 if (expect_true (ta.prev != ta.next))
1323 { 1466 {
1324 TRANSFER (ta); 1467 TRANSFER (ta);
1325 return 1; 1468 return 1;
1326 } 1469 }
1327 else 1470 else
1363 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1506 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1364 1507
1365 if (coro->flags & CF_RUNNING) 1508 if (coro->flags & CF_RUNNING)
1366 PL_runops = RUNOPS_DEFAULT; 1509 PL_runops = RUNOPS_DEFAULT;
1367 else 1510 else
1368 coro->runops = RUNOPS_DEFAULT; 1511 coro->slot->runops = RUNOPS_DEFAULT;
1369 } 1512 }
1370} 1513}
1371 1514
1372MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1515MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1373 1516
1380#endif 1523#endif
1381 BOOT_PAGESIZE; 1524 BOOT_PAGESIZE;
1382 1525
1383 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1526 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1384 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1527 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1528
1529 hv_sig = coro_get_hv ("SIG", TRUE);
1530 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE);
1531 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE);
1532
1533 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1534 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1385 1535
1386 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1536 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1387 1537
1388 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1538 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1389 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1539 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1395 1545
1396 while (main_top_env->je_prev) 1546 while (main_top_env->je_prev)
1397 main_top_env = main_top_env->je_prev; 1547 main_top_env = main_top_env->je_prev;
1398 1548
1399 coroapi.ver = CORO_API_VERSION; 1549 coroapi.ver = CORO_API_VERSION;
1550 coroapi.rev = CORO_API_REVISION;
1400 coroapi.transfer = api_transfer; 1551 coroapi.transfer = api_transfer;
1401 1552
1402 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1553 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1403} 1554}
1404 1555
1420 1571
1421 coro->hv = hv = newHV (); 1572 coro->hv = hv = newHV ();
1422 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1573 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1423 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1574 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1424 1575
1576 av_extend (coro->args, items - 1);
1425 for (i = 1; i < items; i++) 1577 for (i = 1; i < items; i++)
1426 av_push (coro->args, newSVsv (ST (i))); 1578 av_push (coro->args, newSVsv (ST (i)));
1427} 1579}
1428 OUTPUT: 1580 OUTPUT:
1429 RETVAL 1581 RETVAL
1470 1622
1471 break; 1623 break;
1472 } 1624 }
1473 1625
1474 BARRIER; 1626 BARRIER;
1627 PUTBACK;
1475 TRANSFER (ta); 1628 TRANSFER (ta);
1476 1629 SPAGAIN; /* might be the sp of a different coroutine now */
1477 if (GIMME_V != G_VOID && ta.next != ta.prev) 1630 /* be extra careful not to ever do anything after TRANSFER */
1478 XSRETURN_YES;
1479} 1631}
1480 1632
1481bool 1633bool
1482_destroy (SV *coro_sv) 1634_destroy (SV *coro_sv)
1483 CODE: 1635 CODE:
1509 RETVAL 1661 RETVAL
1510 1662
1511int 1663int
1512cctx_idle () 1664cctx_idle ()
1513 CODE: 1665 CODE:
1514 RETVAL = cctx_idle; 1666 RETVAL = cctx_idle[0] + cctx_idle[1] + cctx_idle[2];
1515 OUTPUT: 1667 OUTPUT:
1516 RETVAL 1668 RETVAL
1517 1669
1518void 1670void
1519list () 1671list ()
1532 CODE: 1684 CODE:
1533{ 1685{
1534 if (coro->mainstack) 1686 if (coro->mainstack)
1535 { 1687 {
1536 struct coro temp; 1688 struct coro temp;
1537 Zero (&temp, 1, struct coro);
1538 1689
1539 if (!(coro->flags & CF_RUNNING)) 1690 if (!(coro->flags & CF_RUNNING))
1540 { 1691 {
1541 save_perl (aTHX_ &temp); 1692 save_perl (aTHX_ &temp);
1542 load_perl (aTHX_ coro); 1693 load_perl (aTHX_ coro);
1544 1695
1545 { 1696 {
1546 dSP; 1697 dSP;
1547 ENTER; 1698 ENTER;
1548 SAVETMPS; 1699 SAVETMPS;
1700 PUTBACK;
1701 PUSHSTACK;
1549 PUSHMARK (SP); 1702 PUSHMARK (SP);
1550 PUTBACK; 1703
1551 if (ix) 1704 if (ix)
1552 eval_sv (coderef, 0); 1705 eval_sv (coderef, 0);
1553 else 1706 else
1554 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1707 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1708
1555 SPAGAIN; 1709 POPSTACK;
1556 FREETMPS; 1710 FREETMPS;
1557 LEAVE; 1711 LEAVE;
1558 PUTBACK; 1712 PUTBACK;
1559 } 1713 }
1560 1714
1617 1771
1618BOOT: 1772BOOT:
1619{ 1773{
1620 int i; 1774 int i;
1621 1775
1622 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1776 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1623 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1777 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1624 av_async_pool = get_av ("Coro::async_pool", TRUE); 1778 av_async_pool = coro_get_av ("Coro::async_pool", TRUE);
1625 1779
1626 coro_current = get_sv ("Coro::current", FALSE); 1780 coro_current = coro_get_sv ("Coro::current", FALSE);
1627 SvREADONLY_on (coro_current); 1781 SvREADONLY_on (coro_current);
1628 1782
1629 coro_stash = gv_stashpv ("Coro", TRUE); 1783 coro_stash = gv_stashpv ("Coro", TRUE);
1630 1784
1631 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1785 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1632 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1786 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1633 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1787 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1634 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1788 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1637 1791
1638 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1792 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1639 coro_ready[i] = newAV (); 1793 coro_ready[i] = newAV ();
1640 1794
1641 { 1795 {
1642 SV *sv = perl_get_sv("Coro::API", 1); 1796 SV *sv = perl_get_sv ("Coro::API", TRUE);
1797 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1643 1798
1644 coroapi.schedule = api_schedule; 1799 coroapi.schedule = api_schedule;
1645 coroapi.cede = api_cede; 1800 coroapi.cede = api_cede;
1646 coroapi.cede_notself = api_cede_notself; 1801 coroapi.cede_notself = api_cede_notself;
1647 coroapi.ready = api_ready; 1802 coroapi.ready = api_ready;
1698 CODE: 1853 CODE:
1699 RETVAL = coro_nready; 1854 RETVAL = coro_nready;
1700 OUTPUT: 1855 OUTPUT:
1701 RETVAL 1856 RETVAL
1702 1857
1858void
1859throw (Coro::State self, SV *throw = &PL_sv_undef)
1860 PROTOTYPE: $;$
1861 CODE:
1862 SvREFCNT_dec (self->throw);
1863 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1864
1703# for async_pool speedup 1865# for async_pool speedup
1704void 1866void
1705_pool_1 (SV *cb) 1867_pool_1 (SV *cb)
1706 CODE: 1868 CODE:
1707{ 1869{
1708 struct coro *coro = SvSTATE (coro_current); 1870 struct coro *coro = SvSTATE (coro_current);
1709 HV *hv = (HV *)SvRV (coro_current); 1871 HV *hv = (HV *)SvRV (coro_current);
1710 AV *defav = GvAV (PL_defgv); 1872 AV *defav = GvAV (PL_defgv);
1711 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1873 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0);
1712 AV *invoke_av; 1874 AV *invoke_av;
1713 int i, len; 1875 int i, len;
1714 1876
1715 if (!invoke) 1877 if (!invoke)
1716 croak ("\3terminate\2\n"); 1878 croak ("\3async_pool terminate\2\n");
1717 1879
1718 SvREFCNT_dec (coro->saved_deffh); 1880 SvREFCNT_dec (coro->saved_deffh);
1719 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1881 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1720 1882
1721 hv_store (hv, "desc", sizeof ("desc") - 1, 1883 hv_store (hv, "desc", sizeof ("desc") - 1,
1722 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1884 newSVpvn (strpair ("[async_pool]")), 0);
1723 1885
1724 invoke_av = (AV *)SvRV (invoke); 1886 invoke_av = (AV *)SvRV (invoke);
1725 len = av_len (invoke_av); 1887 len = av_len (invoke_av);
1726 1888
1727 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1889 sv_setsv (cb, AvARRAY (invoke_av)[0]);
1747 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1909 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1748 coro->saved_deffh = 0; 1910 coro->saved_deffh = 0;
1749 1911
1750 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1912 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1751 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1913 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1752 croak ("\3terminate\2\n"); 1914 croak ("\3async_pool terminate\2\n");
1753 1915
1754 av_clear (GvAV (PL_defgv)); 1916 av_clear (GvAV (PL_defgv));
1755 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1917 hv_store ((HV *)SvRV (coro_current), strpair ("desc"),
1756 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1918 newSVpvn (strpair ("[async_pool idle]")), 0);
1757 1919
1758 coro->prio = 0; 1920 coro->prio = 0;
1759 1921
1760 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1922 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1761 api_trace (coro_current, 0); 1923 api_trace (coro_current, 0);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines