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.194 by root, Sat Oct 6 00:08:04 2007 UTC vs.
Revision 1.230 by root, Mon Apr 14 11:28:59 2008 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
70# ifndef IS_PADCONST 72# ifndef IS_PADCONST
71# define IS_PADCONST(v) 0 73# define IS_PADCONST(v) 0
72# endif 74# endif
73#endif 75#endif
74 76
77/* 5.8.8 */
78#ifndef GV_NOTQUAL
79# define GV_NOTQUAL 0
80#endif
81#ifndef newSV
82# define newSV(l) NEWSV(0,l)
83#endif
84
85/* 5.11 */
86#ifndef CxHASARGS
87# define CxHASARGS(cx) (cx)->blk_sub.hasargs
88#endif
89
75/* 5.8.7 */ 90/* 5.8.7 */
76#ifndef SvRV_set 91#ifndef SvRV_set
77# define SvRV_set(s,v) SvRV(s) = (v) 92# define SvRV_set(s,v) SvRV(s) = (v)
78#endif
79
80/* 5.8.8 */
81#ifndef GV_NOTQUAL
82# define GV_NOTQUAL 0
83#endif
84#ifndef newSV
85# define newSV(l) NEWSV(0,l)
86#endif 93#endif
87 94
88#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 95#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
89# undef CORO_STACKGUARD 96# undef CORO_STACKGUARD
90#endif 97#endif
143static size_t coro_stacksize = CORO_STACKSIZE; 150static size_t coro_stacksize = CORO_STACKSIZE;
144static struct CoroAPI coroapi; 151static struct CoroAPI coroapi;
145static AV *main_mainstack; /* used to differentiate between $main and others */ 152static AV *main_mainstack; /* used to differentiate between $main and others */
146static JMPENV *main_top_env; 153static JMPENV *main_top_env;
147static HV *coro_state_stash, *coro_stash; 154static HV *coro_state_stash, *coro_stash;
148static SV *coro_mortal; /* will be freed after next transfer */ 155static volatile SV *coro_mortal; /* will be freed after next transfer */
149 156
150static GV *irsgv; /* $/ */ 157static GV *irsgv; /* $/ */
151static GV *stdoutgv; /* *STDOUT */ 158static GV *stdoutgv; /* *STDOUT */
159static SV *rv_diehook;
160static SV *rv_warnhook;
161static HV *hv_sig; /* %SIG */
152 162
153/* async_pool helper stuff */ 163/* async_pool helper stuff */
154static SV *sv_pool_rss; 164static SV *sv_pool_rss;
155static SV *sv_pool_size; 165static SV *sv_pool_size;
156static AV *av_async_pool; 166static AV *av_async_pool;
192 CF_READY = 0x0002, /* coroutine is ready */ 202 CF_READY = 0x0002, /* coroutine is ready */
193 CF_NEW = 0x0004, /* has never been switched to */ 203 CF_NEW = 0x0004, /* has never been switched to */
194 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 204 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
195}; 205};
196 206
207/* the structure where most of the perl state is stored, overlaid on the cxstack */
208typedef struct {
209 SV *defsv;
210 AV *defav;
211 SV *errsv;
212 SV *irsgv;
213#define VAR(name,type) type name;
214# include "state.h"
215#undef VAR
216} perl_slots;
217
218#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
219
197/* this is a structure representing a perl-level coroutine */ 220/* this is a structure representing a perl-level coroutine */
198struct coro { 221struct coro {
199 /* the c coroutine allocated to this perl coroutine, if any */ 222 /* the c coroutine allocated to this perl coroutine, if any */
200 coro_cctx *cctx; 223 coro_cctx *cctx;
201 224
225 /* process data */
226 AV *mainstack;
227 perl_slots *slot; /* basically the saved sp */
228
202 /* data associated with this coroutine (initial args) */ 229 AV *args; /* data associated with this coroutine (initial args) */
203 AV *args; 230 int refcnt; /* coroutines are refcounted, yes */
204 int refcnt;
205 int flags; /* CF_ flags */ 231 int flags; /* CF_ flags */
206 232 HV *hv; /* the perl hash associated with this coro, if any */
207 /* optionally saved, might be zero */
208 AV *defav; /* @_ */
209 SV *defsv; /* $_ */
210 SV *errsv; /* $@ */
211 SV *deffh; /* default filehandle */
212 SV *irssv; /* $/ */
213 SV *irssv_sv; /* real $/ cache */
214
215#define VAR(name,type) type name;
216# include "state.h"
217#undef VAR
218 233
219 /* statistics */ 234 /* statistics */
220 int usecount; /* number of transfers to this coro */ 235 int usecount; /* number of transfers to this coro */
221 236
222 /* coro process data */ 237 /* coro process data */
223 int prio; 238 int prio;
224 //SV *throw; 239 SV *throw; /* exception to be thrown */
225 240
226 /* async_pool */ 241 /* async_pool */
227 SV *saved_deffh; 242 SV *saved_deffh;
228 243
229 /* linked list */ 244 /* linked list */
230 struct coro *next, *prev; 245 struct coro *next, *prev;
231 HV *hv; /* the perl hash associated with this coro, if any */
232}; 246};
233 247
234typedef struct coro *Coro__State; 248typedef struct coro *Coro__State;
235typedef struct coro *Coro__State_or_hashref; 249typedef struct coro *Coro__State_or_hashref;
236 250
249static int coro_nready; 263static int coro_nready;
250static struct coro *coro_first; 264static struct coro *coro_first;
251 265
252/** lowlevel stuff **********************************************************/ 266/** lowlevel stuff **********************************************************/
253 267
268static SV *
269coro_get_sv (pTHX_ const char *name, int create)
270{
271#if PERL_VERSION_ATLEAST (5,10,0)
272 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
273 get_sv (name, create);
274#endif
275 return get_sv (name, create);
276}
277
278static AV *
279coro_get_av (pTHX_ const char *name, int create)
280{
281#if PERL_VERSION_ATLEAST (5,10,0)
282 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
283 get_av (name, create);
284#endif
285 return get_av (name, create);
286}
287
288static HV *
289coro_get_hv (pTHX_ const char *name, int create)
290{
291#if PERL_VERSION_ATLEAST (5,10,0)
292 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
293 get_hv (name, create);
294#endif
295 return get_hv (name, create);
296}
297
254static AV * 298static AV *
255coro_clone_padlist (pTHX_ CV *cv) 299coro_clone_padlist (pTHX_ CV *cv)
256{ 300{
257 AV *padlist = CvPADLIST (cv); 301 AV *padlist = CvPADLIST (cv);
258 AV *newpadlist, *newpad; 302 AV *newpadlist, *newpad;
259 303
260 newpadlist = newAV (); 304 newpadlist = newAV ();
261 AvREAL_off (newpadlist); 305 AvREAL_off (newpadlist);
262#if PERL_VERSION_ATLEAST (5,9,0) 306#if PERL_VERSION_ATLEAST (5,10,0)
263 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 307 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
264#else 308#else
265 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 309 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
266#endif 310#endif
267 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 311 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
305 349
306 /* casting is fun. */ 350 /* casting is fun. */
307 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 351 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
308 free_padlist (aTHX_ padlist); 352 free_padlist (aTHX_ padlist);
309 353
310 SvREFCNT_dec (av);
311
312 return 0; 354 return 0;
313} 355}
314 356
315#define PERL_MAGIC_coro PERL_MAGIC_ext 357#define CORO_MAGIC_type_cv PERL_MAGIC_ext
358#define CORO_MAGIC_type_state PERL_MAGIC_ext
316 359
317static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 360static MGVTBL coro_cv_vtbl = {
361 0, 0, 0, 0,
362 coro_cv_free
363};
318 364
319#define CORO_MAGIC(cv) \ 365#define CORO_MAGIC(sv,type) \
320 SvMAGIC (cv) \ 366 SvMAGIC (sv) \
321 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 367 ? SvMAGIC (sv)->mg_type == type \
322 ? SvMAGIC (cv) \ 368 ? SvMAGIC (sv) \
323 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 369 : mg_find (sv, type) \
324 : 0 370 : 0
371
372#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
373#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
325 374
326static struct coro * 375static struct coro *
327SvSTATE_ (pTHX_ SV *coro) 376SvSTATE_ (pTHX_ SV *coro)
328{ 377{
329 HV *stash; 378 HV *stash;
341 /* very slow, but rare, check */ 390 /* very slow, but rare, check */
342 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 391 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
343 croak ("Coro::State object required"); 392 croak ("Coro::State object required");
344 } 393 }
345 394
346 mg = CORO_MAGIC (coro); 395 mg = CORO_MAGIC_state (coro);
347 return (struct coro *)mg->mg_ptr; 396 return (struct coro *)mg->mg_ptr;
348} 397}
349 398
350#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 399#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
351 400
352/* the next two functions merely cache the padlists */ 401/* the next two functions merely cache the padlists */
353static void 402static void
354get_padlist (pTHX_ CV *cv) 403get_padlist (pTHX_ CV *cv)
355{ 404{
356 MAGIC *mg = CORO_MAGIC (cv); 405 MAGIC *mg = CORO_MAGIC_cv (cv);
357 AV *av; 406 AV *av;
358 407
359 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 408 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
360 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 409 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
361 else 410 else
373} 422}
374 423
375static void 424static void
376put_padlist (pTHX_ CV *cv) 425put_padlist (pTHX_ CV *cv)
377{ 426{
378 MAGIC *mg = CORO_MAGIC (cv); 427 MAGIC *mg = CORO_MAGIC_cv (cv);
379 AV *av; 428 AV *av;
380 429
381 if (expect_false (!mg)) 430 if (expect_false (!mg))
382 { 431 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
383 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
384 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
385 mg->mg_virtual = &vtbl_coro;
386 mg->mg_obj = (SV *)newAV ();
387 }
388 432
389 av = (AV *)mg->mg_obj; 433 av = (AV *)mg->mg_obj;
390 434
391 if (expect_false (AvFILLp (av) >= AvMAX (av))) 435 if (expect_false (AvFILLp (av) >= AvMAX (av)))
392 av_extend (av, AvMAX (av) + 1); 436 av_extend (av, AvMAX (av) + 1);
397/** load & save, init *******************************************************/ 441/** load & save, init *******************************************************/
398 442
399static void 443static void
400load_perl (pTHX_ Coro__State c) 444load_perl (pTHX_ Coro__State c)
401{ 445{
446 perl_slots *slot = c->slot;
447 c->slot = 0;
448
449 PL_mainstack = c->mainstack;
450
451 GvSV (PL_defgv) = slot->defsv;
452 GvAV (PL_defgv) = slot->defav;
453 GvSV (PL_errgv) = slot->errsv;
454 GvSV (irsgv) = slot->irsgv;
455
402#define VAR(name,type) PL_ ## name = c->name; 456 #define VAR(name,type) PL_ ## name = slot->name;
403# include "state.h" 457 # include "state.h"
404#undef VAR 458 #undef VAR
405
406 GvSV (PL_defgv) = c->defsv;
407 GvAV (PL_defgv) = c->defav;
408 GvSV (PL_errgv) = c->errsv;
409 GvSV (irsgv) = c->irssv_sv;
410 459
411 { 460 {
412 dSP; 461 dSP;
462
413 CV *cv; 463 CV *cv;
414 464
415 /* now do the ugly restore mess */ 465 /* now do the ugly restore mess */
416 while (expect_true (cv = (CV *)POPs)) 466 while (expect_true (cv = (CV *)POPs))
417 { 467 {
472 } 522 }
473 523
474 PUTBACK; 524 PUTBACK;
475 } 525 }
476 526
527 /* allocate some space on the context stack for our purposes */
528 /* we manually unroll here, as usually 2 slots is enough */
529 if (SLOT_COUNT >= 1) CXINC;
530 if (SLOT_COUNT >= 2) CXINC;
531 if (SLOT_COUNT >= 3) CXINC;
532 {
533 int i;
534 for (i = 3; i < SLOT_COUNT; ++i)
535 CXINC;
536 }
537 cxstack_ix -= SLOT_COUNT; /* undo allocation */
538
539 c->mainstack = PL_mainstack;
540
541 {
542 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
543
477 c->defav = GvAV (PL_defgv); 544 slot->defav = GvAV (PL_defgv);
478 c->defsv = DEFSV; 545 slot->defsv = DEFSV;
479 c->errsv = ERRSV; 546 slot->errsv = ERRSV;
480 c->irssv_sv = GvSV (irsgv); 547 slot->irsgv = GvSV (irsgv);
481 548
482#define VAR(name,type)c->name = PL_ ## name; 549 #define VAR(name,type) slot->name = PL_ ## name;
483# include "state.h" 550 # include "state.h"
484#undef VAR 551 #undef VAR
552 }
485} 553}
486 554
487/* 555/*
488 * allocate various perl stacks. This is an exact copy 556 * allocate various perl stacks. This is an exact copy
489 * of perl.c:init_stacks, except that it uses less memory 557 * of perl.c:init_stacks, except that it uses less memory
494# define coro_init_stacks init_stacks 562# define coro_init_stacks init_stacks
495#else 563#else
496static void 564static void
497coro_init_stacks (pTHX) 565coro_init_stacks (pTHX)
498{ 566{
499 PL_curstackinfo = new_stackinfo(64, 6); 567 PL_curstackinfo = new_stackinfo(32, 8);
500 PL_curstackinfo->si_type = PERLSI_MAIN; 568 PL_curstackinfo->si_type = PERLSI_MAIN;
501 PL_curstack = PL_curstackinfo->si_stack; 569 PL_curstack = PL_curstackinfo->si_stack;
502 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 570 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
503 571
504 PL_stack_base = AvARRAY(PL_curstack); 572 PL_stack_base = AvARRAY(PL_curstack);
505 PL_stack_sp = PL_stack_base; 573 PL_stack_sp = PL_stack_base;
506 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 574 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
507 575
508 New(50,PL_tmps_stack,64,SV*); 576 New(50,PL_tmps_stack,32,SV*);
509 PL_tmps_floor = -1; 577 PL_tmps_floor = -1;
510 PL_tmps_ix = -1; 578 PL_tmps_ix = -1;
511 PL_tmps_max = 64; 579 PL_tmps_max = 32;
512 580
513 New(54,PL_markstack,16,I32); 581 New(54,PL_markstack,16,I32);
514 PL_markstack_ptr = PL_markstack; 582 PL_markstack_ptr = PL_markstack;
515 PL_markstack_max = PL_markstack + 16; 583 PL_markstack_max = PL_markstack + 16;
516 584
517#ifdef SET_MARK_OFFSET 585#ifdef SET_MARK_OFFSET
518 SET_MARK_OFFSET; 586 SET_MARK_OFFSET;
519#endif 587#endif
520 588
521 New(54,PL_scopestack,16,I32); 589 New(54,PL_scopestack,8,I32);
522 PL_scopestack_ix = 0; 590 PL_scopestack_ix = 0;
523 PL_scopestack_max = 16; 591 PL_scopestack_max = 8;
524 592
525 New(54,PL_savestack,64,ANY); 593 New(54,PL_savestack,24,ANY);
526 PL_savestack_ix = 0; 594 PL_savestack_ix = 0;
527 PL_savestack_max = 64; 595 PL_savestack_max = 24;
528 596
529#if !PERL_VERSION_ATLEAST (5,9,0) 597#if !PERL_VERSION_ATLEAST (5,10,0)
530 New(54,PL_retstack,4,OP*); 598 New(54,PL_retstack,4,OP*);
531 PL_retstack_ix = 0; 599 PL_retstack_ix = 0;
532 PL_retstack_max = 4; 600 PL_retstack_max = 4;
533#endif 601#endif
534} 602}
557 625
558 Safefree (PL_tmps_stack); 626 Safefree (PL_tmps_stack);
559 Safefree (PL_markstack); 627 Safefree (PL_markstack);
560 Safefree (PL_scopestack); 628 Safefree (PL_scopestack);
561 Safefree (PL_savestack); 629 Safefree (PL_savestack);
562#if !PERL_VERSION_ATLEAST (5,9,0) 630#if !PERL_VERSION_ATLEAST (5,10,0)
563 Safefree (PL_retstack); 631 Safefree (PL_retstack);
564#endif 632#endif
565} 633}
566 634
567static size_t 635static size_t
569{ 637{
570 size_t rss = sizeof (*coro); 638 size_t rss = sizeof (*coro);
571 639
572 if (coro->mainstack) 640 if (coro->mainstack)
573 { 641 {
642 perl_slots tmp_slot;
643 perl_slots *slot;
644
574 if (coro->flags & CF_RUNNING) 645 if (coro->flags & CF_RUNNING)
575 { 646 {
647 slot = &tmp_slot;
648
576 #define VAR(name,type)coro->name = PL_ ## name; 649 #define VAR(name,type) slot->name = PL_ ## name;
577 # include "state.h" 650 # include "state.h"
578 #undef VAR 651 #undef VAR
579 } 652 }
653 else
654 slot = coro->slot;
580 655
581 rss += sizeof (coro->curstackinfo); 656 rss += sizeof (slot->curstackinfo);
582 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
583 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 657 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
584 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 658 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
585 rss += coro->tmps_max * sizeof (SV *); 659 rss += slot->tmps_max * sizeof (SV *);
586 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 660 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
587 rss += coro->scopestack_max * sizeof (I32); 661 rss += slot->scopestack_max * sizeof (I32);
588 rss += coro->savestack_max * sizeof (ANY); 662 rss += slot->savestack_max * sizeof (ANY);
589 663
590#if !PERL_VERSION_ATLEAST (5,9,0) 664#if !PERL_VERSION_ATLEAST (5,10,0)
591 rss += coro->retstack_max * sizeof (OP *); 665 rss += slot->retstack_max * sizeof (OP *);
592#endif 666#endif
593 } 667 }
594 668
595 return rss; 669 return rss;
596} 670}
597 671
598/** coroutine stack handling ************************************************/ 672/** coroutine stack handling ************************************************/
673
674static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
675static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
676
677/*
678 * This overrides the default magic get method of %SIG elements.
679 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
680 * and instead of tryign to save and restore the hash elements, we just provide
681 * readback here.
682 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
683 * not expecting this to actually change the hook. This is a potential problem
684 * when a schedule happens then, but we ignore this.
685 */
686static int
687coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
688{
689 const char *s = MgPV_nolen_const (mg);
690
691 if (*s == '_')
692 {
693 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;
694 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
695 }
696
697 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
698}
699
700static int
701coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
702{
703 const char *s = MgPV_nolen_const (mg);
704
705 if (*s == '_')
706 {
707 SV **svp = 0;
708
709 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
710 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
711
712 if (svp)
713 {
714 SV *old = *svp;
715 *svp = newSVsv (sv);
716 SvREFCNT_dec (old);
717 return;
718 }
719 }
720
721 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
722}
599 723
600static void 724static void
601coro_setup (pTHX_ struct coro *coro) 725coro_setup (pTHX_ struct coro *coro)
602{ 726{
603 /* 727 /*
608 PL_runops = RUNOPS_DEFAULT; 732 PL_runops = RUNOPS_DEFAULT;
609 PL_curcop = &PL_compiling; 733 PL_curcop = &PL_compiling;
610 PL_in_eval = EVAL_NULL; 734 PL_in_eval = EVAL_NULL;
611 PL_comppad = 0; 735 PL_comppad = 0;
612 PL_curpm = 0; 736 PL_curpm = 0;
737 PL_curpad = 0;
613 PL_localizing = 0; 738 PL_localizing = 0;
614 PL_dirty = 0; 739 PL_dirty = 0;
615 PL_restartop = 0; 740 PL_restartop = 0;
741#if PERL_VERSION_ATLEAST (5,10,0)
742 PL_parser = 0;
743#endif
744
745 /* recreate the die/warn hooks */
746 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
747 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
616 748
617 GvSV (PL_defgv) = newSV (0); 749 GvSV (PL_defgv) = newSV (0);
618 GvAV (PL_defgv) = coro->args; coro->args = 0; 750 GvAV (PL_defgv) = coro->args; coro->args = 0;
619 GvSV (PL_errgv) = newSV (0); 751 GvSV (PL_errgv) = newSV (0);
620 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 752 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
621 PL_rs = newSVsv (GvSV (irsgv)); 753 PL_rs = newSVsv (GvSV (irsgv));
622 PL_defoutgv = SvREFCNT_inc (stdoutgv); 754 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
623
624 ENTER; /* necessary e.g. for dounwind */
625 755
626 { 756 {
627 dSP; 757 dSP;
628 LOGOP myop; 758 LOGOP myop;
629 759
636 PUTBACK; 766 PUTBACK;
637 PL_op = (OP *)&myop; 767 PL_op = (OP *)&myop;
638 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 768 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
639 SPAGAIN; 769 SPAGAIN;
640 } 770 }
771
772 /* this newly created coroutine might be run on an existing cctx which most
773 * likely was suspended in set_stacklevel, called from entersub.
774 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
775 * so we ENTER here for symmetry
776 */
777 ENTER;
641} 778}
642 779
643static void 780static void
644coro_destroy (pTHX_ struct coro *coro) 781coro_destroy (pTHX_ struct coro *coro)
645{ 782{
665 SvREFCNT_dec (GvSV (PL_errgv)); 802 SvREFCNT_dec (GvSV (PL_errgv));
666 SvREFCNT_dec (PL_defoutgv); 803 SvREFCNT_dec (PL_defoutgv);
667 SvREFCNT_dec (PL_rs); 804 SvREFCNT_dec (PL_rs);
668 SvREFCNT_dec (GvSV (irsgv)); 805 SvREFCNT_dec (GvSV (irsgv));
669 806
807 SvREFCNT_dec (PL_diehook);
808 SvREFCNT_dec (PL_warnhook);
809
670 SvREFCNT_dec (coro->saved_deffh); 810 SvREFCNT_dec (coro->saved_deffh);
671 //SvREFCNT_dec (coro->throw); 811 SvREFCNT_dec (coro->throw);
672 812
673 coro_destroy_stacks (aTHX); 813 coro_destroy_stacks (aTHX);
674} 814}
675 815
676static void 816static void
763 SAVETMPS; 903 SAVETMPS;
764 EXTEND (SP, 3); 904 EXTEND (SP, 3);
765 PUSHMARK (SP); 905 PUSHMARK (SP);
766 PUSHs (&PL_sv_yes); 906 PUSHs (&PL_sv_yes);
767 PUSHs (fullname); 907 PUSHs (fullname);
768 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 908 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
769 PUTBACK; 909 PUTBACK;
770 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 910 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
771 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 911 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
772 SPAGAIN; 912 SPAGAIN;
773 FREETMPS; 913 FREETMPS;
809 949
810/* inject a fake call to Coro::State::_cctx_init into the execution */ 950/* inject a fake call to Coro::State::_cctx_init into the execution */
811/* _cctx_init should be careful, as it could be called at almost any time */ 951/* _cctx_init should be careful, as it could be called at almost any time */
812/* during execution of a perl program */ 952/* during execution of a perl program */
813static void NOINLINE 953static void NOINLINE
814prepare_cctx (pTHX_ coro_cctx *cctx) 954cctx_prepare (pTHX_ coro_cctx *cctx)
815{ 955{
816 dSP; 956 dSP;
817 LOGOP myop; 957 LOGOP myop;
818 958
819 PL_top_env = &PL_start_env; 959 PL_top_env = &PL_start_env;
837 977
838/* 978/*
839 * this is a _very_ stripped down perl interpreter ;) 979 * this is a _very_ stripped down perl interpreter ;)
840 */ 980 */
841static void 981static void
842coro_run (void *arg) 982cctx_run (void *arg)
843{ 983{
844 dTHX; 984 dTHX;
845 985
846 /* coro_run is the alternative tail of transfer(), so unlock here. */ 986 /* cctx_run is the alternative tail of transfer(), so unlock here. */
847 UNLOCK; 987 UNLOCK;
848 988
849 /* we now skip the entersub that lead to transfer() */ 989 /* we now skip the entersub that lead to transfer() */
850 PL_op = PL_op->op_next; 990 PL_op = PL_op->op_next;
851 991
852 /* inject a fake subroutine call to cctx_init */ 992 /* inject a fake subroutine call to cctx_init */
853 prepare_cctx (aTHX_ (coro_cctx *)arg); 993 cctx_prepare (aTHX_ (coro_cctx *)arg);
854 994
855 /* somebody or something will hit me for both perl_run and PL_restartop */ 995 /* somebody or something will hit me for both perl_run and PL_restartop */
856 PL_restartop = PL_op; 996 PL_restartop = PL_op;
857 perl_run (PL_curinterp); 997 perl_run (PL_curinterp);
858 998
877 ++cctx_count; 1017 ++cctx_count;
878 1018
879 Newz (0, cctx, 1, coro_cctx); 1019 Newz (0, cctx, 1, coro_cctx);
880 1020
881#if HAVE_MMAP 1021#if HAVE_MMAP
882
883 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1022 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
884 /* mmap supposedly does allocate-on-write for us */ 1023 /* mmap supposedly does allocate-on-write for us */
885 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1024 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
886 1025
887 if (cctx->sptr != (void *)-1) 1026 if (cctx->sptr != (void *)-1)
908 stack_start = cctx->sptr; 1047 stack_start = cctx->sptr;
909 stack_size = cctx->ssize; 1048 stack_size = cctx->ssize;
910 } 1049 }
911 1050
912 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1051 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
913 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1052 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
914 1053
915 return cctx; 1054 return cctx;
916} 1055}
917 1056
918static void 1057static void
990 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1129 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
991 1130
992 if (expect_false (next->flags & CF_DESTROYED)) 1131 if (expect_false (next->flags & CF_DESTROYED))
993 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1132 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
994 1133
1134#if !PERL_VERSION_ATLEAST (5,10,0)
995 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1135 if (expect_false (PL_lex_state != LEX_NOTPARSING))
996 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1136 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1137#endif
997 } 1138 }
998} 1139}
999 1140
1000/* always use the TRANSFER macro */ 1141/* always use the TRANSFER macro */
1001static void NOINLINE 1142static void NOINLINE
1002transfer (pTHX_ struct coro *prev, struct coro *next) 1143transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1003{ 1144{
1004 dSTACKLEVEL; 1145 dSTACKLEVEL;
1146 static volatile int has_throw;
1005 1147
1006 /* sometimes transfer is only called to set idle_sp */ 1148 /* sometimes transfer is only called to set idle_sp */
1007 if (expect_false (!next)) 1149 if (expect_false (!next))
1008 { 1150 {
1009 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1151 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1024 prev->flags &= ~CF_RUNNING; 1166 prev->flags &= ~CF_RUNNING;
1025 next->flags |= CF_RUNNING; 1167 next->flags |= CF_RUNNING;
1026 1168
1027 LOCK; 1169 LOCK;
1028 1170
1171 /* first get rid of the old state */
1172 save_perl (aTHX_ prev);
1173
1029 if (expect_false (next->flags & CF_NEW)) 1174 if (expect_false (next->flags & CF_NEW))
1030 { 1175 {
1031 /* need to start coroutine */ 1176 /* need to start coroutine */
1032 next->flags &= ~CF_NEW; 1177 next->flags &= ~CF_NEW;
1033 /* first get rid of the old state */
1034 save_perl (aTHX_ prev);
1035 /* setup coroutine call */ 1178 /* setup coroutine call */
1036 coro_setup (aTHX_ next); 1179 coro_setup (aTHX_ next);
1037 } 1180 }
1038 else 1181 else
1039 {
1040 /* coroutine already started */
1041 save_perl (aTHX_ prev);
1042 load_perl (aTHX_ next); 1182 load_perl (aTHX_ next);
1043 }
1044 1183
1045 prev__cctx = prev->cctx; 1184 prev__cctx = prev->cctx;
1046 1185
1047 /* possibly "free" the cctx */ 1186 /* possibly "free" the cctx */
1048 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1187 if (expect_true (
1188 prev__cctx->idle_sp == STACKLEVEL
1189 && !(prev__cctx->flags & CC_TRACE)
1190 && !force_cctx
1191 ))
1049 { 1192 {
1050 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1193 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1051 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1194 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1052 1195
1053 prev->cctx = 0; 1196 prev->cctx = 0;
1054 1197
1055 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1198 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1056 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1199 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1057 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1200 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1201 if (!next->cctx)
1058 next->cctx = cctx_get (aTHX); 1202 next->cctx = cctx_get (aTHX);
1059 1203
1060 cctx_put (prev__cctx); 1204 cctx_put (prev__cctx);
1061 } 1205 }
1062 1206
1063 ++next->usecount; 1207 ++next->usecount;
1064 1208
1065 if (expect_true (!next->cctx)) 1209 if (expect_true (!next->cctx))
1066 next->cctx = cctx_get (aTHX); 1210 next->cctx = cctx_get (aTHX);
1211
1212 has_throw = !!next->throw;
1067 1213
1068 if (expect_false (prev__cctx != next->cctx)) 1214 if (expect_false (prev__cctx != next->cctx))
1069 { 1215 {
1070 prev__cctx->top_env = PL_top_env; 1216 prev__cctx->top_env = PL_top_env;
1071 PL_top_env = next->cctx->top_env; 1217 PL_top_env = next->cctx->top_env;
1072 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1218 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1073 } 1219 }
1074 1220
1075 free_coro_mortal (aTHX); 1221 free_coro_mortal (aTHX);
1076 UNLOCK; 1222 UNLOCK;
1223
1224 if (expect_false (has_throw))
1225 {
1226 struct coro *coro = SvSTATE (coro_current);
1227
1228 if (coro->throw)
1229 {
1230 SV *exception = coro->throw;
1231 coro->throw = 0;
1232 sv_setsv (ERRSV, exception);
1233 croak (0);
1234 }
1235 }
1077 } 1236 }
1078} 1237}
1079 1238
1080struct transfer_args 1239struct transfer_args
1081{ 1240{
1082 struct coro *prev, *next; 1241 struct coro *prev, *next;
1083}; 1242};
1084 1243
1085#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1244#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1086#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1245#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1087 1246
1088/** high level stuff ********************************************************/ 1247/** high level stuff ********************************************************/
1089 1248
1090static int 1249static int
1116 save_perl (aTHX_ &temp); 1275 save_perl (aTHX_ &temp);
1117 load_perl (aTHX_ coro); 1276 load_perl (aTHX_ coro);
1118 1277
1119 coro_destroy (aTHX_ coro); 1278 coro_destroy (aTHX_ coro);
1120 1279
1121 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1280 load_perl (aTHX_ &temp);
1122 1281
1123 coro->mainstack = 0; 1282 coro->slot = 0;
1124 } 1283 }
1125 1284
1126 cctx_destroy (coro->cctx); 1285 cctx_destroy (coro->cctx);
1127 SvREFCNT_dec (coro->args); 1286 SvREFCNT_dec (coro->args);
1128 1287
1184{ 1343{
1185 dTHX; 1344 dTHX;
1186 struct transfer_args ta; 1345 struct transfer_args ta;
1187 1346
1188 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1347 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1189 TRANSFER (ta); 1348 TRANSFER (ta, 1);
1190} 1349}
1191 1350
1192/** Coro ********************************************************************/ 1351/** Coro ********************************************************************/
1193 1352
1194static void 1353static void
1196{ 1355{
1197 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1356 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1198} 1357}
1199 1358
1200static SV * 1359static SV *
1201coro_deq (pTHX_ int min_prio) 1360coro_deq (pTHX)
1202{ 1361{
1203 int prio = PRIO_MAX - PRIO_MIN; 1362 int prio;
1204 1363
1205 min_prio -= PRIO_MIN;
1206 if (min_prio < 0)
1207 min_prio = 0;
1208
1209 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1364 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1210 if (AvFILLp (coro_ready [prio]) >= 0) 1365 if (AvFILLp (coro_ready [prio]) >= 0)
1211 return av_shift (coro_ready [prio]); 1366 return av_shift (coro_ready [prio]);
1212 1367
1213 return 0; 1368 return 0;
1214} 1369}
1250 SV *prev_sv, *next_sv; 1405 SV *prev_sv, *next_sv;
1251 1406
1252 for (;;) 1407 for (;;)
1253 { 1408 {
1254 LOCK; 1409 LOCK;
1255 next_sv = coro_deq (aTHX_ PRIO_MIN); 1410 next_sv = coro_deq (aTHX);
1256 1411
1257 /* nothing to schedule: call the idle handler */ 1412 /* nothing to schedule: call the idle handler */
1258 if (expect_false (!next_sv)) 1413 if (expect_false (!next_sv))
1259 { 1414 {
1260 dSP; 1415 dSP;
1264 SAVETMPS; 1419 SAVETMPS;
1265 1420
1266 PUSHMARK (SP); 1421 PUSHMARK (SP);
1267 PUTBACK; 1422 PUTBACK;
1268 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1423 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1424 SPAGAIN;
1269 1425
1270 FREETMPS; 1426 FREETMPS;
1271 LEAVE; 1427 LEAVE;
1272 continue; 1428 continue;
1273 } 1429 }
1328{ 1484{
1329 dTHX; 1485 dTHX;
1330 struct transfer_args ta; 1486 struct transfer_args ta;
1331 1487
1332 prepare_schedule (aTHX_ &ta); 1488 prepare_schedule (aTHX_ &ta);
1333 TRANSFER (ta); 1489 TRANSFER (ta, 1);
1334} 1490}
1335 1491
1336static int 1492static int
1337api_cede (void) 1493api_cede (void)
1338{ 1494{
1341 1497
1342 prepare_cede (aTHX_ &ta); 1498 prepare_cede (aTHX_ &ta);
1343 1499
1344 if (expect_true (ta.prev != ta.next)) 1500 if (expect_true (ta.prev != ta.next))
1345 { 1501 {
1346 TRANSFER (ta); 1502 TRANSFER (ta, 1);
1347 return 1; 1503 return 1;
1348 } 1504 }
1349 else 1505 else
1350 return 0; 1506 return 0;
1351} 1507}
1356 dTHX; 1512 dTHX;
1357 struct transfer_args ta; 1513 struct transfer_args ta;
1358 1514
1359 if (prepare_cede_notself (aTHX_ &ta)) 1515 if (prepare_cede_notself (aTHX_ &ta))
1360 { 1516 {
1361 TRANSFER (ta); 1517 TRANSFER (ta, 1);
1362 return 1; 1518 return 1;
1363 } 1519 }
1364 else 1520 else
1365 return 0; 1521 return 0;
1366} 1522}
1385 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1541 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1386 1542
1387 if (coro->flags & CF_RUNNING) 1543 if (coro->flags & CF_RUNNING)
1388 PL_runops = RUNOPS_DEFAULT; 1544 PL_runops = RUNOPS_DEFAULT;
1389 else 1545 else
1390 coro->runops = RUNOPS_DEFAULT; 1546 coro->slot->runops = RUNOPS_DEFAULT;
1391 } 1547 }
1392} 1548}
1393 1549
1394MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1550MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1395 1551
1402#endif 1558#endif
1403 BOOT_PAGESIZE; 1559 BOOT_PAGESIZE;
1404 1560
1405 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1561 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1406 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1562 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1563
1564 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1565 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1566 orig_sigelem_set = PL_vtbl_sigelem.svt_set;
1567 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1568
1569 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1570 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1571 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1407 1572
1408 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1573 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1409 1574
1410 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1575 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1411 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1576 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1417 1582
1418 while (main_top_env->je_prev) 1583 while (main_top_env->je_prev)
1419 main_top_env = main_top_env->je_prev; 1584 main_top_env = main_top_env->je_prev;
1420 1585
1421 coroapi.ver = CORO_API_VERSION; 1586 coroapi.ver = CORO_API_VERSION;
1587 coroapi.rev = CORO_API_REVISION;
1422 coroapi.transfer = api_transfer; 1588 coroapi.transfer = api_transfer;
1423 1589
1424 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1590 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1425} 1591}
1426 1592
1427SV * 1593SV *
1428new (char *klass, ...) 1594new (char *klass, ...)
1429 CODE: 1595 CODE:
1430{ 1596{
1431 struct coro *coro; 1597 struct coro *coro;
1598 MAGIC *mg;
1432 HV *hv; 1599 HV *hv;
1433 int i; 1600 int i;
1434 1601
1435 Newz (0, coro, 1, struct coro); 1602 Newz (0, coro, 1, struct coro);
1436 coro->args = newAV (); 1603 coro->args = newAV ();
1439 if (coro_first) coro_first->prev = coro; 1606 if (coro_first) coro_first->prev = coro;
1440 coro->next = coro_first; 1607 coro->next = coro_first;
1441 coro_first = coro; 1608 coro_first = coro;
1442 1609
1443 coro->hv = hv = newHV (); 1610 coro->hv = hv = newHV ();
1444 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1611 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1612 mg->mg_flags |= MGf_DUP;
1445 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1613 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1446 1614
1447 av_extend (coro->args, items - 1); 1615 av_extend (coro->args, items - 1);
1448 for (i = 1; i < items; i++) 1616 for (i = 1; i < items; i++)
1449 av_push (coro->args, newSVsv (ST (i))); 1617 av_push (coro->args, newSVsv (ST (i)));
1463 Coro::cede_notself = 4 1631 Coro::cede_notself = 4
1464 CODE: 1632 CODE:
1465{ 1633{
1466 struct transfer_args ta; 1634 struct transfer_args ta;
1467 1635
1636 PUTBACK;
1468 switch (ix) 1637 switch (ix)
1469 { 1638 {
1470 case 0: 1639 case 0:
1471 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1640 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1472 ta.next = 0; 1641 ta.next = 0;
1491 if (!prepare_cede_notself (aTHX_ &ta)) 1660 if (!prepare_cede_notself (aTHX_ &ta))
1492 XSRETURN_EMPTY; 1661 XSRETURN_EMPTY;
1493 1662
1494 break; 1663 break;
1495 } 1664 }
1665 SPAGAIN;
1496 1666
1497 BARRIER; 1667 BARRIER;
1668 PUTBACK;
1498 TRANSFER (ta); 1669 TRANSFER (ta, 0);
1499 1670 SPAGAIN; /* might be the sp of a different coroutine now */
1500 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev)) 1671 /* be extra careful not to ever do anything after TRANSFER */
1501 XSRETURN_YES;
1502} 1672}
1503 1673
1504bool 1674bool
1505_destroy (SV *coro_sv) 1675_destroy (SV *coro_sv)
1506 CODE: 1676 CODE:
1555 CODE: 1725 CODE:
1556{ 1726{
1557 if (coro->mainstack) 1727 if (coro->mainstack)
1558 { 1728 {
1559 struct coro temp; 1729 struct coro temp;
1560 Zero (&temp, 1, struct coro);
1561 1730
1562 if (!(coro->flags & CF_RUNNING)) 1731 if (!(coro->flags & CF_RUNNING))
1563 { 1732 {
1733 PUTBACK;
1564 save_perl (aTHX_ &temp); 1734 save_perl (aTHX_ &temp);
1565 load_perl (aTHX_ coro); 1735 load_perl (aTHX_ coro);
1566 } 1736 }
1567 1737
1568 { 1738 {
1569 dSP; 1739 dSP;
1570 ENTER; 1740 ENTER;
1571 SAVETMPS; 1741 SAVETMPS;
1742 PUTBACK;
1743 PUSHSTACK;
1572 PUSHMARK (SP); 1744 PUSHMARK (SP);
1573 PUTBACK; 1745
1574 if (ix) 1746 if (ix)
1575 eval_sv (coderef, 0); 1747 eval_sv (coderef, 0);
1576 else 1748 else
1577 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1749 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1750
1751 POPSTACK;
1578 SPAGAIN; 1752 SPAGAIN;
1579 FREETMPS; 1753 FREETMPS;
1580 LEAVE; 1754 LEAVE;
1581 PUTBACK; 1755 PUTBACK;
1582 } 1756 }
1583 1757
1584 if (!(coro->flags & CF_RUNNING)) 1758 if (!(coro->flags & CF_RUNNING))
1585 { 1759 {
1586 save_perl (aTHX_ coro); 1760 save_perl (aTHX_ coro);
1587 load_perl (aTHX_ &temp); 1761 load_perl (aTHX_ &temp);
1762 SPAGAIN;
1588 } 1763 }
1589 } 1764 }
1590} 1765}
1591 1766
1592SV * 1767SV *
1633 case 1: RETVAL = coro->usecount; break; 1808 case 1: RETVAL = coro->usecount; break;
1634 } 1809 }
1635 OUTPUT: 1810 OUTPUT:
1636 RETVAL 1811 RETVAL
1637 1812
1813void
1814force_cctx ()
1815 CODE:
1816 struct coro *coro = SvSTATE (coro_current);
1817 coro->cctx->idle_sp = 0;
1638 1818
1639MODULE = Coro::State PACKAGE = Coro 1819MODULE = Coro::State PACKAGE = Coro
1640 1820
1641BOOT: 1821BOOT:
1642{ 1822{
1643 int i; 1823 int i;
1644 1824
1645 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1825 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1646 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1826 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1647 av_async_pool = get_av ("Coro::async_pool", TRUE); 1827 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1648 1828
1649 coro_current = get_sv ("Coro::current", FALSE); 1829 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1650 SvREADONLY_on (coro_current); 1830 SvREADONLY_on (coro_current);
1651 1831
1652 coro_stash = gv_stashpv ("Coro", TRUE); 1832 coro_stash = gv_stashpv ("Coro", TRUE);
1653 1833
1654 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1834 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1655 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1835 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1656 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1836 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1657 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1837 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1660 1840
1661 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1841 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1662 coro_ready[i] = newAV (); 1842 coro_ready[i] = newAV ();
1663 1843
1664 { 1844 {
1665 SV *sv = perl_get_sv("Coro::API", 1); 1845 SV *sv = perl_get_sv ("Coro::API", TRUE);
1846 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1666 1847
1667 coroapi.schedule = api_schedule; 1848 coroapi.schedule = api_schedule;
1668 coroapi.cede = api_cede; 1849 coroapi.cede = api_cede;
1669 coroapi.cede_notself = api_cede_notself; 1850 coroapi.cede_notself = api_cede_notself;
1670 coroapi.ready = api_ready; 1851 coroapi.ready = api_ready;
1721 CODE: 1902 CODE:
1722 RETVAL = coro_nready; 1903 RETVAL = coro_nready;
1723 OUTPUT: 1904 OUTPUT:
1724 RETVAL 1905 RETVAL
1725 1906
1907void
1908throw (Coro::State self, SV *throw = &PL_sv_undef)
1909 PROTOTYPE: $;$
1910 CODE:
1911 SvREFCNT_dec (self->throw);
1912 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1913
1914void
1915swap_defsv (Coro::State self)
1916 PROTOTYPE: $
1917 ALIAS:
1918 swap_defav = 1
1919 CODE:
1920 if (!self->slot)
1921 croak ("cannot swap state with coroutine that has no saved state");
1922 else
1923 {
1924 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1925 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1926
1927 SV *tmp = *src; *src = *dst; *dst = tmp;
1928 }
1929
1726# for async_pool speedup 1930# for async_pool speedup
1727void 1931void
1728_pool_1 (SV *cb) 1932_pool_1 (SV *cb)
1729 CODE: 1933 CODE:
1730{ 1934{
1734 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1938 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1735 AV *invoke_av; 1939 AV *invoke_av;
1736 int i, len; 1940 int i, len;
1737 1941
1738 if (!invoke) 1942 if (!invoke)
1943 {
1944 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1739 croak ("\3terminate\2\n"); 1945 croak ("\3async_pool terminate\2\n");
1946 }
1740 1947
1741 SvREFCNT_dec (coro->saved_deffh); 1948 SvREFCNT_dec (coro->saved_deffh);
1742 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1949 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1743 1950
1744 hv_store (hv, "desc", sizeof ("desc") - 1, 1951 hv_store (hv, "desc", sizeof ("desc") - 1,
1770 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1977 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1771 coro->saved_deffh = 0; 1978 coro->saved_deffh = 0;
1772 1979
1773 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1980 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1774 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1981 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1982 {
1983 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1775 croak ("\3terminate\2\n"); 1984 croak ("\3async_pool terminate\2\n");
1985 }
1776 1986
1777 av_clear (GvAV (PL_defgv)); 1987 av_clear (GvAV (PL_defgv));
1778 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1988 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1779 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1989 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1780 1990

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines