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.197 by root, Sat Oct 6 19:25:00 2007 UTC vs.
Revision 1.231 by root, Thu Apr 24 10:31: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
16#ifdef WIN32
17# undef setjmp
18# undef longjmp
19# undef _exit
20#include <setjmp.h>
21#else
22# include <inttypes.h> /* most portable stdint.h */
23#endif
14 24
15#ifdef HAVE_MMAP 25#ifdef HAVE_MMAP
16# include <unistd.h> 26# include <unistd.h>
17# include <sys/mman.h> 27# include <sys/mman.h>
18# ifndef MAP_ANONYMOUS 28# ifndef MAP_ANONYMOUS
70# ifndef IS_PADCONST 80# ifndef IS_PADCONST
71# define IS_PADCONST(v) 0 81# define IS_PADCONST(v) 0
72# endif 82# endif
73#endif 83#endif
74 84
85/* 5.8.8 */
86#ifndef GV_NOTQUAL
87# define GV_NOTQUAL 0
88#endif
89#ifndef newSV
90# define newSV(l) NEWSV(0,l)
91#endif
92
93/* 5.11 */
94#ifndef CxHASARGS
95# define CxHASARGS(cx) (cx)->blk_sub.hasargs
96#endif
97
75/* 5.8.7 */ 98/* 5.8.7 */
76#ifndef SvRV_set 99#ifndef SvRV_set
77# define SvRV_set(s,v) SvRV(s) = (v) 100# 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 101#endif
87 102
88#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 103#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
89# undef CORO_STACKGUARD 104# undef CORO_STACKGUARD
90#endif 105#endif
143static size_t coro_stacksize = CORO_STACKSIZE; 158static size_t coro_stacksize = CORO_STACKSIZE;
144static struct CoroAPI coroapi; 159static struct CoroAPI coroapi;
145static AV *main_mainstack; /* used to differentiate between $main and others */ 160static AV *main_mainstack; /* used to differentiate between $main and others */
146static JMPENV *main_top_env; 161static JMPENV *main_top_env;
147static HV *coro_state_stash, *coro_stash; 162static HV *coro_state_stash, *coro_stash;
148static SV *coro_mortal; /* will be freed after next transfer */ 163static volatile SV *coro_mortal; /* will be freed after next transfer */
149 164
150static GV *irsgv; /* $/ */ 165static GV *irsgv; /* $/ */
151static GV *stdoutgv; /* *STDOUT */ 166static GV *stdoutgv; /* *STDOUT */
167static SV *rv_diehook;
168static SV *rv_warnhook;
169static HV *hv_sig; /* %SIG */
152 170
153/* async_pool helper stuff */ 171/* async_pool helper stuff */
154static SV *sv_pool_rss; 172static SV *sv_pool_rss;
155static SV *sv_pool_size; 173static SV *sv_pool_size;
156static AV *av_async_pool; 174static AV *av_async_pool;
192 CF_READY = 0x0002, /* coroutine is ready */ 210 CF_READY = 0x0002, /* coroutine is ready */
193 CF_NEW = 0x0004, /* has never been switched to */ 211 CF_NEW = 0x0004, /* has never been switched to */
194 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 212 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
195}; 213};
196 214
215/* the structure where most of the perl state is stored, overlaid on the cxstack */
216typedef struct {
217 SV *defsv;
218 AV *defav;
219 SV *errsv;
220 SV *irsgv;
221#define VAR(name,type) type name;
222# include "state.h"
223#undef VAR
224} perl_slots;
225
226#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
227
197/* this is a structure representing a perl-level coroutine */ 228/* this is a structure representing a perl-level coroutine */
198struct coro { 229struct coro {
199 /* the c coroutine allocated to this perl coroutine, if any */ 230 /* the c coroutine allocated to this perl coroutine, if any */
200 coro_cctx *cctx; 231 coro_cctx *cctx;
201 232
233 /* process data */
234 AV *mainstack;
235 perl_slots *slot; /* basically the saved sp */
236
202 /* data associated with this coroutine (initial args) */ 237 AV *args; /* data associated with this coroutine (initial args) */
203 AV *args; 238 int refcnt; /* coroutines are refcounted, yes */
204 int refcnt;
205 int flags; /* CF_ flags */ 239 int flags; /* CF_ flags */
206 240 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 241
219 /* statistics */ 242 /* statistics */
220 int usecount; /* number of transfers to this coro */ 243 int usecount; /* number of transfers to this coro */
221 244
222 /* coro process data */ 245 /* coro process data */
223 int prio; 246 int prio;
224 SV *throw; 247 SV *throw; /* exception to be thrown */
225 248
226 /* async_pool */ 249 /* async_pool */
227 SV *saved_deffh; 250 SV *saved_deffh;
228 251
229 /* linked list */ 252 /* linked list */
230 struct coro *next, *prev; 253 struct coro *next, *prev;
231 HV *hv; /* the perl hash associated with this coro, if any */
232}; 254};
233 255
234typedef struct coro *Coro__State; 256typedef struct coro *Coro__State;
235typedef struct coro *Coro__State_or_hashref; 257typedef struct coro *Coro__State_or_hashref;
236 258
249static int coro_nready; 271static int coro_nready;
250static struct coro *coro_first; 272static struct coro *coro_first;
251 273
252/** lowlevel stuff **********************************************************/ 274/** lowlevel stuff **********************************************************/
253 275
276static SV *
277coro_get_sv (pTHX_ const char *name, int create)
278{
279#if PERL_VERSION_ATLEAST (5,10,0)
280 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
281 get_sv (name, create);
282#endif
283 return get_sv (name, create);
284}
285
286static AV *
287coro_get_av (pTHX_ const char *name, int create)
288{
289#if PERL_VERSION_ATLEAST (5,10,0)
290 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
291 get_av (name, create);
292#endif
293 return get_av (name, create);
294}
295
296static HV *
297coro_get_hv (pTHX_ const char *name, int create)
298{
299#if PERL_VERSION_ATLEAST (5,10,0)
300 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
301 get_hv (name, create);
302#endif
303 return get_hv (name, create);
304}
305
254static AV * 306static AV *
255coro_clone_padlist (pTHX_ CV *cv) 307coro_clone_padlist (pTHX_ CV *cv)
256{ 308{
257 AV *padlist = CvPADLIST (cv); 309 AV *padlist = CvPADLIST (cv);
258 AV *newpadlist, *newpad; 310 AV *newpadlist, *newpad;
259 311
260 newpadlist = newAV (); 312 newpadlist = newAV ();
261 AvREAL_off (newpadlist); 313 AvREAL_off (newpadlist);
262#if PERL_VERSION_ATLEAST (5,9,0) 314#if PERL_VERSION_ATLEAST (5,10,0)
263 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 315 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
264#else 316#else
265 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 317 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
266#endif 318#endif
267 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 319 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
305 357
306 /* casting is fun. */ 358 /* casting is fun. */
307 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 359 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
308 free_padlist (aTHX_ padlist); 360 free_padlist (aTHX_ padlist);
309 361
310 SvREFCNT_dec (av);
311
312 return 0; 362 return 0;
313} 363}
314 364
315#define PERL_MAGIC_coro PERL_MAGIC_ext 365#define CORO_MAGIC_type_cv PERL_MAGIC_ext
366#define CORO_MAGIC_type_state PERL_MAGIC_ext
316 367
317static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 368static MGVTBL coro_cv_vtbl = {
369 0, 0, 0, 0,
370 coro_cv_free
371};
318 372
319#define CORO_MAGIC(cv) \ 373#define CORO_MAGIC(sv,type) \
320 SvMAGIC (cv) \ 374 SvMAGIC (sv) \
321 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 375 ? SvMAGIC (sv)->mg_type == type \
322 ? SvMAGIC (cv) \ 376 ? SvMAGIC (sv) \
323 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 377 : mg_find (sv, type) \
324 : 0 378 : 0
379
380#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
381#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
325 382
326static struct coro * 383static struct coro *
327SvSTATE_ (pTHX_ SV *coro) 384SvSTATE_ (pTHX_ SV *coro)
328{ 385{
329 HV *stash; 386 HV *stash;
341 /* very slow, but rare, check */ 398 /* very slow, but rare, check */
342 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 399 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
343 croak ("Coro::State object required"); 400 croak ("Coro::State object required");
344 } 401 }
345 402
346 mg = CORO_MAGIC (coro); 403 mg = CORO_MAGIC_state (coro);
347 return (struct coro *)mg->mg_ptr; 404 return (struct coro *)mg->mg_ptr;
348} 405}
349 406
350#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 407#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
351 408
352/* the next two functions merely cache the padlists */ 409/* the next two functions merely cache the padlists */
353static void 410static void
354get_padlist (pTHX_ CV *cv) 411get_padlist (pTHX_ CV *cv)
355{ 412{
356 MAGIC *mg = CORO_MAGIC (cv); 413 MAGIC *mg = CORO_MAGIC_cv (cv);
357 AV *av; 414 AV *av;
358 415
359 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 416 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
360 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 417 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
361 else 418 else
373} 430}
374 431
375static void 432static void
376put_padlist (pTHX_ CV *cv) 433put_padlist (pTHX_ CV *cv)
377{ 434{
378 MAGIC *mg = CORO_MAGIC (cv); 435 MAGIC *mg = CORO_MAGIC_cv (cv);
379 AV *av; 436 AV *av;
380 437
381 if (expect_false (!mg)) 438 if (expect_false (!mg))
382 { 439 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 440
389 av = (AV *)mg->mg_obj; 441 av = (AV *)mg->mg_obj;
390 442
391 if (expect_false (AvFILLp (av) >= AvMAX (av))) 443 if (expect_false (AvFILLp (av) >= AvMAX (av)))
392 av_extend (av, AvMAX (av) + 1); 444 av_extend (av, AvMAX (av) + 1);
397/** load & save, init *******************************************************/ 449/** load & save, init *******************************************************/
398 450
399static void 451static void
400load_perl (pTHX_ Coro__State c) 452load_perl (pTHX_ Coro__State c)
401{ 453{
454 perl_slots *slot = c->slot;
455 c->slot = 0;
456
457 PL_mainstack = c->mainstack;
458
459 GvSV (PL_defgv) = slot->defsv;
460 GvAV (PL_defgv) = slot->defav;
461 GvSV (PL_errgv) = slot->errsv;
462 GvSV (irsgv) = slot->irsgv;
463
402#define VAR(name,type) PL_ ## name = c->name; 464 #define VAR(name,type) PL_ ## name = slot->name;
403# include "state.h" 465 # include "state.h"
404#undef VAR 466 #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 467
411 { 468 {
412 dSP; 469 dSP;
470
413 CV *cv; 471 CV *cv;
414 472
415 /* now do the ugly restore mess */ 473 /* now do the ugly restore mess */
416 while (expect_true (cv = (CV *)POPs)) 474 while (expect_true (cv = (CV *)POPs))
417 { 475 {
472 } 530 }
473 531
474 PUTBACK; 532 PUTBACK;
475 } 533 }
476 534
535 /* allocate some space on the context stack for our purposes */
536 /* we manually unroll here, as usually 2 slots is enough */
537 if (SLOT_COUNT >= 1) CXINC;
538 if (SLOT_COUNT >= 2) CXINC;
539 if (SLOT_COUNT >= 3) CXINC;
540 {
541 int i;
542 for (i = 3; i < SLOT_COUNT; ++i)
543 CXINC;
544 }
545 cxstack_ix -= SLOT_COUNT; /* undo allocation */
546
547 c->mainstack = PL_mainstack;
548
549 {
550 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
551
477 c->defav = GvAV (PL_defgv); 552 slot->defav = GvAV (PL_defgv);
478 c->defsv = DEFSV; 553 slot->defsv = DEFSV;
479 c->errsv = ERRSV; 554 slot->errsv = ERRSV;
480 c->irssv_sv = GvSV (irsgv); 555 slot->irsgv = GvSV (irsgv);
481 556
482#define VAR(name,type)c->name = PL_ ## name; 557 #define VAR(name,type) slot->name = PL_ ## name;
483# include "state.h" 558 # include "state.h"
484#undef VAR 559 #undef VAR
560 }
485} 561}
486 562
487/* 563/*
488 * allocate various perl stacks. This is an exact copy 564 * allocate various perl stacks. This is an exact copy
489 * of perl.c:init_stacks, except that it uses less memory 565 * of perl.c:init_stacks, except that it uses less memory
494# define coro_init_stacks init_stacks 570# define coro_init_stacks init_stacks
495#else 571#else
496static void 572static void
497coro_init_stacks (pTHX) 573coro_init_stacks (pTHX)
498{ 574{
499 PL_curstackinfo = new_stackinfo(64, 6); 575 PL_curstackinfo = new_stackinfo(32, 8);
500 PL_curstackinfo->si_type = PERLSI_MAIN; 576 PL_curstackinfo->si_type = PERLSI_MAIN;
501 PL_curstack = PL_curstackinfo->si_stack; 577 PL_curstack = PL_curstackinfo->si_stack;
502 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 578 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
503 579
504 PL_stack_base = AvARRAY(PL_curstack); 580 PL_stack_base = AvARRAY(PL_curstack);
505 PL_stack_sp = PL_stack_base; 581 PL_stack_sp = PL_stack_base;
506 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 582 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
507 583
508 New(50,PL_tmps_stack,64,SV*); 584 New(50,PL_tmps_stack,32,SV*);
509 PL_tmps_floor = -1; 585 PL_tmps_floor = -1;
510 PL_tmps_ix = -1; 586 PL_tmps_ix = -1;
511 PL_tmps_max = 64; 587 PL_tmps_max = 32;
512 588
513 New(54,PL_markstack,16,I32); 589 New(54,PL_markstack,16,I32);
514 PL_markstack_ptr = PL_markstack; 590 PL_markstack_ptr = PL_markstack;
515 PL_markstack_max = PL_markstack + 16; 591 PL_markstack_max = PL_markstack + 16;
516 592
517#ifdef SET_MARK_OFFSET 593#ifdef SET_MARK_OFFSET
518 SET_MARK_OFFSET; 594 SET_MARK_OFFSET;
519#endif 595#endif
520 596
521 New(54,PL_scopestack,16,I32); 597 New(54,PL_scopestack,8,I32);
522 PL_scopestack_ix = 0; 598 PL_scopestack_ix = 0;
523 PL_scopestack_max = 16; 599 PL_scopestack_max = 8;
524 600
525 New(54,PL_savestack,64,ANY); 601 New(54,PL_savestack,24,ANY);
526 PL_savestack_ix = 0; 602 PL_savestack_ix = 0;
527 PL_savestack_max = 64; 603 PL_savestack_max = 24;
528 604
529#if !PERL_VERSION_ATLEAST (5,9,0) 605#if !PERL_VERSION_ATLEAST (5,10,0)
530 New(54,PL_retstack,4,OP*); 606 New(54,PL_retstack,4,OP*);
531 PL_retstack_ix = 0; 607 PL_retstack_ix = 0;
532 PL_retstack_max = 4; 608 PL_retstack_max = 4;
533#endif 609#endif
534} 610}
557 633
558 Safefree (PL_tmps_stack); 634 Safefree (PL_tmps_stack);
559 Safefree (PL_markstack); 635 Safefree (PL_markstack);
560 Safefree (PL_scopestack); 636 Safefree (PL_scopestack);
561 Safefree (PL_savestack); 637 Safefree (PL_savestack);
562#if !PERL_VERSION_ATLEAST (5,9,0) 638#if !PERL_VERSION_ATLEAST (5,10,0)
563 Safefree (PL_retstack); 639 Safefree (PL_retstack);
564#endif 640#endif
565} 641}
566 642
567static size_t 643static size_t
569{ 645{
570 size_t rss = sizeof (*coro); 646 size_t rss = sizeof (*coro);
571 647
572 if (coro->mainstack) 648 if (coro->mainstack)
573 { 649 {
650 perl_slots tmp_slot;
651 perl_slots *slot;
652
574 if (coro->flags & CF_RUNNING) 653 if (coro->flags & CF_RUNNING)
575 { 654 {
655 slot = &tmp_slot;
656
576 #define VAR(name,type)coro->name = PL_ ## name; 657 #define VAR(name,type) slot->name = PL_ ## name;
577 # include "state.h" 658 # include "state.h"
578 #undef VAR 659 #undef VAR
579 } 660 }
661 else
662 slot = coro->slot;
580 663
581 rss += sizeof (coro->curstackinfo); 664 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); 665 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
584 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 666 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
585 rss += coro->tmps_max * sizeof (SV *); 667 rss += slot->tmps_max * sizeof (SV *);
586 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 668 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
587 rss += coro->scopestack_max * sizeof (I32); 669 rss += slot->scopestack_max * sizeof (I32);
588 rss += coro->savestack_max * sizeof (ANY); 670 rss += slot->savestack_max * sizeof (ANY);
589 671
590#if !PERL_VERSION_ATLEAST (5,9,0) 672#if !PERL_VERSION_ATLEAST (5,10,0)
591 rss += coro->retstack_max * sizeof (OP *); 673 rss += slot->retstack_max * sizeof (OP *);
592#endif 674#endif
593 } 675 }
594 676
595 return rss; 677 return rss;
596} 678}
597 679
598/** coroutine stack handling ************************************************/ 680/** coroutine stack handling ************************************************/
681
682static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
683static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
684
685/*
686 * This overrides the default magic get method of %SIG elements.
687 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
688 * and instead of tryign to save and restore the hash elements, we just provide
689 * readback here.
690 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
691 * not expecting this to actually change the hook. This is a potential problem
692 * when a schedule happens then, but we ignore this.
693 */
694static int
695coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
696{
697 const char *s = MgPV_nolen_const (mg);
698
699 if (*s == '_')
700 {
701 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;
702 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
703 }
704
705 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
706}
707
708static int
709coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
710{
711 const char *s = MgPV_nolen_const (mg);
712
713 if (*s == '_')
714 {
715 SV **svp = 0;
716
717 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
718 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
719
720 if (svp)
721 {
722 SV *old = *svp;
723 *svp = newSVsv (sv);
724 SvREFCNT_dec (old);
725 return 0;
726 }
727 }
728
729 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
730}
599 731
600static void 732static void
601coro_setup (pTHX_ struct coro *coro) 733coro_setup (pTHX_ struct coro *coro)
602{ 734{
603 /* 735 /*
612 PL_curpm = 0; 744 PL_curpm = 0;
613 PL_curpad = 0; 745 PL_curpad = 0;
614 PL_localizing = 0; 746 PL_localizing = 0;
615 PL_dirty = 0; 747 PL_dirty = 0;
616 PL_restartop = 0; 748 PL_restartop = 0;
749#if PERL_VERSION_ATLEAST (5,10,0)
750 PL_parser = 0;
751#endif
752
753 /* recreate the die/warn hooks */
754 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
755 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
617 756
618 GvSV (PL_defgv) = newSV (0); 757 GvSV (PL_defgv) = newSV (0);
619 GvAV (PL_defgv) = coro->args; coro->args = 0; 758 GvAV (PL_defgv) = coro->args; coro->args = 0;
620 GvSV (PL_errgv) = newSV (0); 759 GvSV (PL_errgv) = newSV (0);
621 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 760 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
636 PL_op = (OP *)&myop; 775 PL_op = (OP *)&myop;
637 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 776 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
638 SPAGAIN; 777 SPAGAIN;
639 } 778 }
640 779
641 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */ 780 /* this newly created coroutine might be run on an existing cctx which most
781 * likely was suspended in set_stacklevel, called from entersub.
782 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
783 * so we ENTER here for symmetry
784 */
785 ENTER;
642} 786}
643 787
644static void 788static void
645coro_destroy (pTHX_ struct coro *coro) 789coro_destroy (pTHX_ struct coro *coro)
646{ 790{
666 SvREFCNT_dec (GvSV (PL_errgv)); 810 SvREFCNT_dec (GvSV (PL_errgv));
667 SvREFCNT_dec (PL_defoutgv); 811 SvREFCNT_dec (PL_defoutgv);
668 SvREFCNT_dec (PL_rs); 812 SvREFCNT_dec (PL_rs);
669 SvREFCNT_dec (GvSV (irsgv)); 813 SvREFCNT_dec (GvSV (irsgv));
670 814
815 SvREFCNT_dec (PL_diehook);
816 SvREFCNT_dec (PL_warnhook);
817
671 SvREFCNT_dec (coro->saved_deffh); 818 SvREFCNT_dec (coro->saved_deffh);
672 SvREFCNT_dec (coro->throw); 819 SvREFCNT_dec (coro->throw);
673 820
674 coro_destroy_stacks (aTHX); 821 coro_destroy_stacks (aTHX);
675} 822}
764 SAVETMPS; 911 SAVETMPS;
765 EXTEND (SP, 3); 912 EXTEND (SP, 3);
766 PUSHMARK (SP); 913 PUSHMARK (SP);
767 PUSHs (&PL_sv_yes); 914 PUSHs (&PL_sv_yes);
768 PUSHs (fullname); 915 PUSHs (fullname);
769 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 916 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
770 PUTBACK; 917 PUTBACK;
771 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 918 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
772 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 919 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
773 SPAGAIN; 920 SPAGAIN;
774 FREETMPS; 921 FREETMPS;
810 957
811/* inject a fake call to Coro::State::_cctx_init into the execution */ 958/* inject a fake call to Coro::State::_cctx_init into the execution */
812/* _cctx_init should be careful, as it could be called at almost any time */ 959/* _cctx_init should be careful, as it could be called at almost any time */
813/* during execution of a perl program */ 960/* during execution of a perl program */
814static void NOINLINE 961static void NOINLINE
815prepare_cctx (pTHX_ coro_cctx *cctx) 962cctx_prepare (pTHX_ coro_cctx *cctx)
816{ 963{
817 dSP; 964 dSP;
818 LOGOP myop; 965 LOGOP myop;
819 966
820 PL_top_env = &PL_start_env; 967 PL_top_env = &PL_start_env;
838 985
839/* 986/*
840 * this is a _very_ stripped down perl interpreter ;) 987 * this is a _very_ stripped down perl interpreter ;)
841 */ 988 */
842static void 989static void
843coro_run (void *arg) 990cctx_run (void *arg)
844{ 991{
845 dTHX; 992 dTHX;
846 993
847 /* coro_run is the alternative tail of transfer(), so unlock here. */ 994 /* cctx_run is the alternative tail of transfer(), so unlock here. */
848 UNLOCK; 995 UNLOCK;
849 996
850 /* we now skip the entersub that lead to transfer() */ 997 /* we now skip the entersub that lead to transfer() */
851 PL_op = PL_op->op_next; 998 PL_op = PL_op->op_next;
852 999
853 /* inject a fake subroutine call to cctx_init */ 1000 /* inject a fake subroutine call to cctx_init */
854 prepare_cctx (aTHX_ (coro_cctx *)arg); 1001 cctx_prepare (aTHX_ (coro_cctx *)arg);
855 1002
856 /* somebody or something will hit me for both perl_run and PL_restartop */ 1003 /* somebody or something will hit me for both perl_run and PL_restartop */
857 PL_restartop = PL_op; 1004 PL_restartop = PL_op;
858 perl_run (PL_curinterp); 1005 perl_run (PL_curinterp);
859 1006
878 ++cctx_count; 1025 ++cctx_count;
879 1026
880 Newz (0, cctx, 1, coro_cctx); 1027 Newz (0, cctx, 1, coro_cctx);
881 1028
882#if HAVE_MMAP 1029#if HAVE_MMAP
883
884 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1030 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
885 /* mmap supposedly does allocate-on-write for us */ 1031 /* mmap supposedly does allocate-on-write for us */
886 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1032 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
887 1033
888 if (cctx->sptr != (void *)-1) 1034 if (cctx->sptr != (void *)-1)
909 stack_start = cctx->sptr; 1055 stack_start = cctx->sptr;
910 stack_size = cctx->ssize; 1056 stack_size = cctx->ssize;
911 } 1057 }
912 1058
913 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1059 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
914 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1060 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
915 1061
916 return cctx; 1062 return cctx;
917} 1063}
918 1064
919static void 1065static void
991 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1137 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
992 1138
993 if (expect_false (next->flags & CF_DESTROYED)) 1139 if (expect_false (next->flags & CF_DESTROYED))
994 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1140 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
995 1141
1142#if !PERL_VERSION_ATLEAST (5,10,0)
996 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1143 if (expect_false (PL_lex_state != LEX_NOTPARSING))
997 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1144 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1145#endif
998 } 1146 }
999} 1147}
1000 1148
1001/* always use the TRANSFER macro */ 1149/* always use the TRANSFER macro */
1002static void NOINLINE 1150static void NOINLINE
1003transfer (pTHX_ struct coro *prev, struct coro *next) 1151transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1004{ 1152{
1005 dSTACKLEVEL; 1153 dSTACKLEVEL;
1154 static volatile int has_throw;
1006 1155
1007 /* sometimes transfer is only called to set idle_sp */ 1156 /* sometimes transfer is only called to set idle_sp */
1008 if (expect_false (!next)) 1157 if (expect_false (!next))
1009 { 1158 {
1010 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1159 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1025 prev->flags &= ~CF_RUNNING; 1174 prev->flags &= ~CF_RUNNING;
1026 next->flags |= CF_RUNNING; 1175 next->flags |= CF_RUNNING;
1027 1176
1028 LOCK; 1177 LOCK;
1029 1178
1179 /* first get rid of the old state */
1180 save_perl (aTHX_ prev);
1181
1030 if (expect_false (next->flags & CF_NEW)) 1182 if (expect_false (next->flags & CF_NEW))
1031 { 1183 {
1032 /* need to start coroutine */ 1184 /* need to start coroutine */
1033 next->flags &= ~CF_NEW; 1185 next->flags &= ~CF_NEW;
1034 /* first get rid of the old state */
1035 save_perl (aTHX_ prev);
1036 /* setup coroutine call */ 1186 /* setup coroutine call */
1037 coro_setup (aTHX_ next); 1187 coro_setup (aTHX_ next);
1038 } 1188 }
1039 else 1189 else
1040 {
1041 /* coroutine already started */
1042 save_perl (aTHX_ prev);
1043 load_perl (aTHX_ next); 1190 load_perl (aTHX_ next);
1044 }
1045 1191
1046 prev__cctx = prev->cctx; 1192 prev__cctx = prev->cctx;
1047 1193
1048 /* possibly "free" the cctx */ 1194 /* possibly "free" the cctx */
1049 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1195 if (expect_true (
1196 prev__cctx->idle_sp == STACKLEVEL
1197 && !(prev__cctx->flags & CC_TRACE)
1198 && !force_cctx
1199 ))
1050 { 1200 {
1051 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1201 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1052 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1202 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1053 1203
1054 prev->cctx = 0; 1204 prev->cctx = 0;
1055 1205
1056 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1206 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1057 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1207 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1058 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1208 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1209 if (!next->cctx)
1059 next->cctx = cctx_get (aTHX); 1210 next->cctx = cctx_get (aTHX);
1060 1211
1061 cctx_put (prev__cctx); 1212 cctx_put (prev__cctx);
1062 } 1213 }
1063 1214
1064 ++next->usecount; 1215 ++next->usecount;
1065 1216
1066 if (expect_true (!next->cctx)) 1217 if (expect_true (!next->cctx))
1067 next->cctx = cctx_get (aTHX); 1218 next->cctx = cctx_get (aTHX);
1219
1220 has_throw = !!next->throw;
1068 1221
1069 if (expect_false (prev__cctx != next->cctx)) 1222 if (expect_false (prev__cctx != next->cctx))
1070 { 1223 {
1071 prev__cctx->top_env = PL_top_env; 1224 prev__cctx->top_env = PL_top_env;
1072 PL_top_env = next->cctx->top_env; 1225 PL_top_env = next->cctx->top_env;
1074 } 1227 }
1075 1228
1076 free_coro_mortal (aTHX); 1229 free_coro_mortal (aTHX);
1077 UNLOCK; 1230 UNLOCK;
1078 1231
1079 if (expect_false (prev->throw || next->throw)) 1232 if (expect_false (has_throw))
1080 { 1233 {
1081 struct coro *coro = SvSTATE (coro_current); 1234 struct coro *coro = SvSTATE (coro_current);
1082 1235
1083 if (coro->throw) 1236 if (coro->throw)
1084 { 1237 {
1094struct transfer_args 1247struct transfer_args
1095{ 1248{
1096 struct coro *prev, *next; 1249 struct coro *prev, *next;
1097}; 1250};
1098 1251
1099#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1252#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1100#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1253#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1101 1254
1102/** high level stuff ********************************************************/ 1255/** high level stuff ********************************************************/
1103 1256
1104static int 1257static int
1130 save_perl (aTHX_ &temp); 1283 save_perl (aTHX_ &temp);
1131 load_perl (aTHX_ coro); 1284 load_perl (aTHX_ coro);
1132 1285
1133 coro_destroy (aTHX_ coro); 1286 coro_destroy (aTHX_ coro);
1134 1287
1135 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1288 load_perl (aTHX_ &temp);
1136 1289
1137 coro->mainstack = 0; 1290 coro->slot = 0;
1138 } 1291 }
1139 1292
1140 cctx_destroy (coro->cctx); 1293 cctx_destroy (coro->cctx);
1141 SvREFCNT_dec (coro->args); 1294 SvREFCNT_dec (coro->args);
1142 1295
1198{ 1351{
1199 dTHX; 1352 dTHX;
1200 struct transfer_args ta; 1353 struct transfer_args ta;
1201 1354
1202 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1355 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1203 TRANSFER (ta); 1356 TRANSFER (ta, 1);
1204} 1357}
1205 1358
1206/** Coro ********************************************************************/ 1359/** Coro ********************************************************************/
1207 1360
1208static void 1361static void
1210{ 1363{
1211 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1364 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1212} 1365}
1213 1366
1214static SV * 1367static SV *
1215coro_deq (pTHX_ int min_prio) 1368coro_deq (pTHX)
1216{ 1369{
1217 int prio = PRIO_MAX - PRIO_MIN; 1370 int prio;
1218 1371
1219 min_prio -= PRIO_MIN;
1220 if (min_prio < 0)
1221 min_prio = 0;
1222
1223 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1372 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1224 if (AvFILLp (coro_ready [prio]) >= 0) 1373 if (AvFILLp (coro_ready [prio]) >= 0)
1225 return av_shift (coro_ready [prio]); 1374 return av_shift (coro_ready [prio]);
1226 1375
1227 return 0; 1376 return 0;
1228} 1377}
1264 SV *prev_sv, *next_sv; 1413 SV *prev_sv, *next_sv;
1265 1414
1266 for (;;) 1415 for (;;)
1267 { 1416 {
1268 LOCK; 1417 LOCK;
1269 next_sv = coro_deq (aTHX_ PRIO_MIN); 1418 next_sv = coro_deq (aTHX);
1270 1419
1271 /* nothing to schedule: call the idle handler */ 1420 /* nothing to schedule: call the idle handler */
1272 if (expect_false (!next_sv)) 1421 if (expect_false (!next_sv))
1273 { 1422 {
1274 dSP; 1423 dSP;
1278 SAVETMPS; 1427 SAVETMPS;
1279 1428
1280 PUSHMARK (SP); 1429 PUSHMARK (SP);
1281 PUTBACK; 1430 PUTBACK;
1282 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1431 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1432 SPAGAIN;
1283 1433
1284 FREETMPS; 1434 FREETMPS;
1285 LEAVE; 1435 LEAVE;
1286 continue; 1436 continue;
1287 } 1437 }
1342{ 1492{
1343 dTHX; 1493 dTHX;
1344 struct transfer_args ta; 1494 struct transfer_args ta;
1345 1495
1346 prepare_schedule (aTHX_ &ta); 1496 prepare_schedule (aTHX_ &ta);
1347 TRANSFER (ta); 1497 TRANSFER (ta, 1);
1348} 1498}
1349 1499
1350static int 1500static int
1351api_cede (void) 1501api_cede (void)
1352{ 1502{
1355 1505
1356 prepare_cede (aTHX_ &ta); 1506 prepare_cede (aTHX_ &ta);
1357 1507
1358 if (expect_true (ta.prev != ta.next)) 1508 if (expect_true (ta.prev != ta.next))
1359 { 1509 {
1360 TRANSFER (ta); 1510 TRANSFER (ta, 1);
1361 return 1; 1511 return 1;
1362 } 1512 }
1363 else 1513 else
1364 return 0; 1514 return 0;
1365} 1515}
1370 dTHX; 1520 dTHX;
1371 struct transfer_args ta; 1521 struct transfer_args ta;
1372 1522
1373 if (prepare_cede_notself (aTHX_ &ta)) 1523 if (prepare_cede_notself (aTHX_ &ta))
1374 { 1524 {
1375 TRANSFER (ta); 1525 TRANSFER (ta, 1);
1376 return 1; 1526 return 1;
1377 } 1527 }
1378 else 1528 else
1379 return 0; 1529 return 0;
1380} 1530}
1399 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1549 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1400 1550
1401 if (coro->flags & CF_RUNNING) 1551 if (coro->flags & CF_RUNNING)
1402 PL_runops = RUNOPS_DEFAULT; 1552 PL_runops = RUNOPS_DEFAULT;
1403 else 1553 else
1404 coro->runops = RUNOPS_DEFAULT; 1554 coro->slot->runops = RUNOPS_DEFAULT;
1405 } 1555 }
1406} 1556}
1407 1557
1408MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1558MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1409 1559
1416#endif 1566#endif
1417 BOOT_PAGESIZE; 1567 BOOT_PAGESIZE;
1418 1568
1419 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1569 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1420 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1570 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1571
1572 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1573 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1574 orig_sigelem_set = PL_vtbl_sigelem.svt_set;
1575 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1576
1577 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1578 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1579 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1421 1580
1422 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1581 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1423 1582
1424 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1583 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1425 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1584 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1431 1590
1432 while (main_top_env->je_prev) 1591 while (main_top_env->je_prev)
1433 main_top_env = main_top_env->je_prev; 1592 main_top_env = main_top_env->je_prev;
1434 1593
1435 coroapi.ver = CORO_API_VERSION; 1594 coroapi.ver = CORO_API_VERSION;
1595 coroapi.rev = CORO_API_REVISION;
1436 coroapi.transfer = api_transfer; 1596 coroapi.transfer = api_transfer;
1437 1597
1438 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1598 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1439} 1599}
1440 1600
1441SV * 1601SV *
1442new (char *klass, ...) 1602new (char *klass, ...)
1443 CODE: 1603 CODE:
1444{ 1604{
1445 struct coro *coro; 1605 struct coro *coro;
1606 MAGIC *mg;
1446 HV *hv; 1607 HV *hv;
1447 int i; 1608 int i;
1448 1609
1449 Newz (0, coro, 1, struct coro); 1610 Newz (0, coro, 1, struct coro);
1450 coro->args = newAV (); 1611 coro->args = newAV ();
1453 if (coro_first) coro_first->prev = coro; 1614 if (coro_first) coro_first->prev = coro;
1454 coro->next = coro_first; 1615 coro->next = coro_first;
1455 coro_first = coro; 1616 coro_first = coro;
1456 1617
1457 coro->hv = hv = newHV (); 1618 coro->hv = hv = newHV ();
1458 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1619 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1620 mg->mg_flags |= MGf_DUP;
1459 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1621 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1460 1622
1461 av_extend (coro->args, items - 1); 1623 av_extend (coro->args, items - 1);
1462 for (i = 1; i < items; i++) 1624 for (i = 1; i < items; i++)
1463 av_push (coro->args, newSVsv (ST (i))); 1625 av_push (coro->args, newSVsv (ST (i)));
1477 Coro::cede_notself = 4 1639 Coro::cede_notself = 4
1478 CODE: 1640 CODE:
1479{ 1641{
1480 struct transfer_args ta; 1642 struct transfer_args ta;
1481 1643
1644 PUTBACK;
1482 switch (ix) 1645 switch (ix)
1483 { 1646 {
1484 case 0: 1647 case 0:
1485 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1648 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1486 ta.next = 0; 1649 ta.next = 0;
1505 if (!prepare_cede_notself (aTHX_ &ta)) 1668 if (!prepare_cede_notself (aTHX_ &ta))
1506 XSRETURN_EMPTY; 1669 XSRETURN_EMPTY;
1507 1670
1508 break; 1671 break;
1509 } 1672 }
1673 SPAGAIN;
1510 1674
1511 BARRIER; 1675 BARRIER;
1676 PUTBACK;
1512 TRANSFER (ta); 1677 TRANSFER (ta, 0);
1513 1678 SPAGAIN; /* might be the sp of a different coroutine now */
1514 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev)) 1679 /* be extra careful not to ever do anything after TRANSFER */
1515 XSRETURN_YES;
1516} 1680}
1517 1681
1518bool 1682bool
1519_destroy (SV *coro_sv) 1683_destroy (SV *coro_sv)
1520 CODE: 1684 CODE:
1569 CODE: 1733 CODE:
1570{ 1734{
1571 if (coro->mainstack) 1735 if (coro->mainstack)
1572 { 1736 {
1573 struct coro temp; 1737 struct coro temp;
1574 Zero (&temp, 1, struct coro);
1575 1738
1576 if (!(coro->flags & CF_RUNNING)) 1739 if (!(coro->flags & CF_RUNNING))
1577 { 1740 {
1741 PUTBACK;
1578 save_perl (aTHX_ &temp); 1742 save_perl (aTHX_ &temp);
1579 load_perl (aTHX_ coro); 1743 load_perl (aTHX_ coro);
1580 } 1744 }
1581 1745
1582 { 1746 {
1583 dSP; 1747 dSP;
1584 ENTER; 1748 ENTER;
1585 SAVETMPS; 1749 SAVETMPS;
1750 PUTBACK;
1751 PUSHSTACK;
1586 PUSHMARK (SP); 1752 PUSHMARK (SP);
1587 PUTBACK; 1753
1588 if (ix) 1754 if (ix)
1589 eval_sv (coderef, 0); 1755 eval_sv (coderef, 0);
1590 else 1756 else
1591 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1757 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1758
1759 POPSTACK;
1592 SPAGAIN; 1760 SPAGAIN;
1593 FREETMPS; 1761 FREETMPS;
1594 LEAVE; 1762 LEAVE;
1595 PUTBACK; 1763 PUTBACK;
1596 } 1764 }
1597 1765
1598 if (!(coro->flags & CF_RUNNING)) 1766 if (!(coro->flags & CF_RUNNING))
1599 { 1767 {
1600 save_perl (aTHX_ coro); 1768 save_perl (aTHX_ coro);
1601 load_perl (aTHX_ &temp); 1769 load_perl (aTHX_ &temp);
1770 SPAGAIN;
1602 } 1771 }
1603 } 1772 }
1604} 1773}
1605 1774
1606SV * 1775SV *
1647 case 1: RETVAL = coro->usecount; break; 1816 case 1: RETVAL = coro->usecount; break;
1648 } 1817 }
1649 OUTPUT: 1818 OUTPUT:
1650 RETVAL 1819 RETVAL
1651 1820
1821void
1822force_cctx ()
1823 CODE:
1824 struct coro *coro = SvSTATE (coro_current);
1825 coro->cctx->idle_sp = 0;
1652 1826
1653MODULE = Coro::State PACKAGE = Coro 1827MODULE = Coro::State PACKAGE = Coro
1654 1828
1655BOOT: 1829BOOT:
1656{ 1830{
1657 int i; 1831 int i;
1658 1832
1659 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1833 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1660 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1834 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1661 av_async_pool = get_av ("Coro::async_pool", TRUE); 1835 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1662 1836
1663 coro_current = get_sv ("Coro::current", FALSE); 1837 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1664 SvREADONLY_on (coro_current); 1838 SvREADONLY_on (coro_current);
1665 1839
1666 coro_stash = gv_stashpv ("Coro", TRUE); 1840 coro_stash = gv_stashpv ("Coro", TRUE);
1667 1841
1668 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1842 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1669 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1843 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1670 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1844 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1671 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1845 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1674 1848
1675 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1849 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1676 coro_ready[i] = newAV (); 1850 coro_ready[i] = newAV ();
1677 1851
1678 { 1852 {
1679 SV *sv = perl_get_sv("Coro::API", 1); 1853 SV *sv = perl_get_sv ("Coro::API", TRUE);
1854 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1680 1855
1681 coroapi.schedule = api_schedule; 1856 coroapi.schedule = api_schedule;
1682 coroapi.cede = api_cede; 1857 coroapi.cede = api_cede;
1683 coroapi.cede_notself = api_cede_notself; 1858 coroapi.cede_notself = api_cede_notself;
1684 coroapi.ready = api_ready; 1859 coroapi.ready = api_ready;
1742 PROTOTYPE: $;$ 1917 PROTOTYPE: $;$
1743 CODE: 1918 CODE:
1744 SvREFCNT_dec (self->throw); 1919 SvREFCNT_dec (self->throw);
1745 self->throw = SvOK (throw) ? newSVsv (throw) : 0; 1920 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1746 1921
1922void
1923swap_defsv (Coro::State self)
1924 PROTOTYPE: $
1925 ALIAS:
1926 swap_defav = 1
1927 CODE:
1928 if (!self->slot)
1929 croak ("cannot swap state with coroutine that has no saved state");
1930 else
1931 {
1932 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1933 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1934
1935 SV *tmp = *src; *src = *dst; *dst = tmp;
1936 }
1937
1747# for async_pool speedup 1938# for async_pool speedup
1748void 1939void
1749_pool_1 (SV *cb) 1940_pool_1 (SV *cb)
1750 CODE: 1941 CODE:
1751{ 1942{
1755 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1946 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1756 AV *invoke_av; 1947 AV *invoke_av;
1757 int i, len; 1948 int i, len;
1758 1949
1759 if (!invoke) 1950 if (!invoke)
1951 {
1952 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1760 croak ("\3async_pool terminate\2\n"); 1953 croak ("\3async_pool terminate\2\n");
1954 }
1761 1955
1762 SvREFCNT_dec (coro->saved_deffh); 1956 SvREFCNT_dec (coro->saved_deffh);
1763 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1957 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1764 1958
1765 hv_store (hv, "desc", sizeof ("desc") - 1, 1959 hv_store (hv, "desc", sizeof ("desc") - 1,
1791 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1985 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1792 coro->saved_deffh = 0; 1986 coro->saved_deffh = 0;
1793 1987
1794 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1988 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1795 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1989 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1990 {
1991 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1796 croak ("\3async_pool terminate\2\n"); 1992 croak ("\3async_pool terminate\2\n");
1993 }
1797 1994
1798 av_clear (GvAV (PL_defgv)); 1995 av_clear (GvAV (PL_defgv));
1799 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1996 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1800 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1997 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1801 1998

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines