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.195 by root, Sat Oct 6 00:35:41 2007 UTC vs.
Revision 1.217 by root, Wed Nov 14 11:32:56 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
143static size_t coro_stacksize = CORO_STACKSIZE; 145static size_t coro_stacksize = CORO_STACKSIZE;
144static struct CoroAPI coroapi; 146static struct CoroAPI coroapi;
145static AV *main_mainstack; /* used to differentiate between $main and others */ 147static AV *main_mainstack; /* used to differentiate between $main and others */
146static JMPENV *main_top_env; 148static JMPENV *main_top_env;
147static HV *coro_state_stash, *coro_stash; 149static HV *coro_state_stash, *coro_stash;
148static SV *coro_mortal; /* will be freed after next transfer */ 150static volatile SV *coro_mortal; /* will be freed after next transfer */
149 151
150static GV *irsgv; /* $/ */ 152static GV *irsgv; /* $/ */
151static GV *stdoutgv; /* *STDOUT */ 153static GV *stdoutgv; /* *STDOUT */
154static SV *rv_diehook;
155static SV *rv_warnhook;
156static HV *hv_sig; /* %SIG */
152 157
153/* async_pool helper stuff */ 158/* async_pool helper stuff */
154static SV *sv_pool_rss; 159static SV *sv_pool_rss;
155static SV *sv_pool_size; 160static SV *sv_pool_size;
156static AV *av_async_pool; 161static AV *av_async_pool;
192 CF_READY = 0x0002, /* coroutine is ready */ 197 CF_READY = 0x0002, /* coroutine is ready */
193 CF_NEW = 0x0004, /* has never been switched to */ 198 CF_NEW = 0x0004, /* has never been switched to */
194 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 199 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
195}; 200};
196 201
202/* the structure where most of the perl state is stored, overlaid on the cxstack */
203typedef struct {
204 SV *defsv;
205 AV *defav;
206 SV *errsv;
207 SV *irsgv;
208#define VAR(name,type) type name;
209# include "state.h"
210#undef VAR
211} perl_slots;
212
213#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
214
197/* this is a structure representing a perl-level coroutine */ 215/* this is a structure representing a perl-level coroutine */
198struct coro { 216struct coro {
199 /* the c coroutine allocated to this perl coroutine, if any */ 217 /* the c coroutine allocated to this perl coroutine, if any */
200 coro_cctx *cctx; 218 coro_cctx *cctx;
201 219
220 /* process data */
221 AV *mainstack;
222 perl_slots *slot; /* basically the saved sp */
223
202 /* data associated with this coroutine (initial args) */ 224 AV *args; /* data associated with this coroutine (initial args) */
203 AV *args; 225 int refcnt; /* coroutines are refcounted, yes */
204 int refcnt;
205 int flags; /* CF_ flags */ 226 int flags; /* CF_ flags */
206 227 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 228
219 /* statistics */ 229 /* statistics */
220 int usecount; /* number of transfers to this coro */ 230 int usecount; /* number of transfers to this coro */
221 231
222 /* coro process data */ 232 /* coro process data */
223 int prio; 233 int prio;
224 //SV *throw; 234 SV *throw; /* exception to be thrown */
225 235
226 /* async_pool */ 236 /* async_pool */
227 SV *saved_deffh; 237 SV *saved_deffh;
228 238
229 /* linked list */ 239 /* linked list */
230 struct coro *next, *prev; 240 struct coro *next, *prev;
231 HV *hv; /* the perl hash associated with this coro, if any */
232}; 241};
233 242
234typedef struct coro *Coro__State; 243typedef struct coro *Coro__State;
235typedef struct coro *Coro__State_or_hashref; 244typedef struct coro *Coro__State_or_hashref;
236 245
248static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 257static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
249static int coro_nready; 258static int coro_nready;
250static struct coro *coro_first; 259static struct coro *coro_first;
251 260
252/** lowlevel stuff **********************************************************/ 261/** lowlevel stuff **********************************************************/
262
263static SV *
264coro_get_sv (pTHX_ const char *name, int create)
265{
266#if PERL_VERSION_ATLEAST (5,9,0)
267 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
268 get_sv (name, create);
269#endif
270 return get_sv (name, create);
271}
272
273static AV *
274coro_get_av (pTHX_ const char *name, int create)
275{
276#if PERL_VERSION_ATLEAST (5,9,0)
277 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
278 get_av (name, create);
279#endif
280 return get_av (name, create);
281}
282
283static HV *
284coro_get_hv (pTHX_ const char *name, int create)
285{
286#if PERL_VERSION_ATLEAST (5,9,0)
287 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
288 get_hv (name, create);
289#endif
290 return get_hv (name, create);
291}
253 292
254static AV * 293static AV *
255coro_clone_padlist (pTHX_ CV *cv) 294coro_clone_padlist (pTHX_ CV *cv)
256{ 295{
257 AV *padlist = CvPADLIST (cv); 296 AV *padlist = CvPADLIST (cv);
305 344
306 /* casting is fun. */ 345 /* casting is fun. */
307 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 346 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
308 free_padlist (aTHX_ padlist); 347 free_padlist (aTHX_ padlist);
309 348
310 SvREFCNT_dec (av);
311
312 return 0; 349 return 0;
313} 350}
314 351
315#define PERL_MAGIC_coro PERL_MAGIC_ext 352#define CORO_MAGIC_type_cv PERL_MAGIC_ext
353#define CORO_MAGIC_type_state PERL_MAGIC_ext
316 354
317static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 355static MGVTBL coro_cv_vtbl = {
356 0, 0, 0, 0,
357 coro_cv_free
358};
318 359
319#define CORO_MAGIC(cv) \ 360#define CORO_MAGIC(sv,type) \
320 SvMAGIC (cv) \ 361 SvMAGIC (sv) \
321 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 362 ? SvMAGIC (sv)->mg_type == type \
322 ? SvMAGIC (cv) \ 363 ? SvMAGIC (sv) \
323 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 364 : mg_find (sv, type) \
324 : 0 365 : 0
366
367#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
368#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
325 369
326static struct coro * 370static struct coro *
327SvSTATE_ (pTHX_ SV *coro) 371SvSTATE_ (pTHX_ SV *coro)
328{ 372{
329 HV *stash; 373 HV *stash;
341 /* very slow, but rare, check */ 385 /* very slow, but rare, check */
342 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 386 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
343 croak ("Coro::State object required"); 387 croak ("Coro::State object required");
344 } 388 }
345 389
346 mg = CORO_MAGIC (coro); 390 mg = CORO_MAGIC_state (coro);
347 return (struct coro *)mg->mg_ptr; 391 return (struct coro *)mg->mg_ptr;
348} 392}
349 393
350#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 394#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
351 395
352/* the next two functions merely cache the padlists */ 396/* the next two functions merely cache the padlists */
353static void 397static void
354get_padlist (pTHX_ CV *cv) 398get_padlist (pTHX_ CV *cv)
355{ 399{
356 MAGIC *mg = CORO_MAGIC (cv); 400 MAGIC *mg = CORO_MAGIC_cv (cv);
357 AV *av; 401 AV *av;
358 402
359 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 403 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
360 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 404 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
361 else 405 else
373} 417}
374 418
375static void 419static void
376put_padlist (pTHX_ CV *cv) 420put_padlist (pTHX_ CV *cv)
377{ 421{
378 MAGIC *mg = CORO_MAGIC (cv); 422 MAGIC *mg = CORO_MAGIC_cv (cv);
379 AV *av; 423 AV *av;
380 424
381 if (expect_false (!mg)) 425 if (expect_false (!mg))
382 { 426 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 427
389 av = (AV *)mg->mg_obj; 428 av = (AV *)mg->mg_obj;
390 429
391 if (expect_false (AvFILLp (av) >= AvMAX (av))) 430 if (expect_false (AvFILLp (av) >= AvMAX (av)))
392 av_extend (av, AvMAX (av) + 1); 431 av_extend (av, AvMAX (av) + 1);
397/** load & save, init *******************************************************/ 436/** load & save, init *******************************************************/
398 437
399static void 438static void
400load_perl (pTHX_ Coro__State c) 439load_perl (pTHX_ Coro__State c)
401{ 440{
441 perl_slots *slot = c->slot;
442 c->slot = 0;
443
444 PL_mainstack = c->mainstack;
445
446 GvSV (PL_defgv) = slot->defsv;
447 GvAV (PL_defgv) = slot->defav;
448 GvSV (PL_errgv) = slot->errsv;
449 GvSV (irsgv) = slot->irsgv;
450
402#define VAR(name,type) PL_ ## name = c->name; 451 #define VAR(name,type) PL_ ## name = slot->name;
403# include "state.h" 452 # include "state.h"
404#undef VAR 453 #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 454
411 { 455 {
412 dSP; 456 dSP;
457
413 CV *cv; 458 CV *cv;
414 459
415 /* now do the ugly restore mess */ 460 /* now do the ugly restore mess */
416 while (expect_true (cv = (CV *)POPs)) 461 while (expect_true (cv = (CV *)POPs))
417 { 462 {
472 } 517 }
473 518
474 PUTBACK; 519 PUTBACK;
475 } 520 }
476 521
522 /* allocate some space on the context stack for our purposes */
523 /* we manually unroll here, as usually 2 slots is enough */
524 if (SLOT_COUNT >= 1) CXINC;
525 if (SLOT_COUNT >= 2) CXINC;
526 if (SLOT_COUNT >= 3) CXINC;
527 {
528 int i;
529 for (i = 3; i < SLOT_COUNT; ++i)
530 CXINC;
531 }
532 cxstack_ix -= SLOT_COUNT; /* undo allocation */
533
534 c->mainstack = PL_mainstack;
535
536 {
537 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
538
477 c->defav = GvAV (PL_defgv); 539 slot->defav = GvAV (PL_defgv);
478 c->defsv = DEFSV; 540 slot->defsv = DEFSV;
479 c->errsv = ERRSV; 541 slot->errsv = ERRSV;
480 c->irssv_sv = GvSV (irsgv); 542 slot->irsgv = GvSV (irsgv);
481 543
482#define VAR(name,type)c->name = PL_ ## name; 544 #define VAR(name,type) slot->name = PL_ ## name;
483# include "state.h" 545 # include "state.h"
484#undef VAR 546 #undef VAR
547 }
485} 548}
486 549
487/* 550/*
488 * allocate various perl stacks. This is an exact copy 551 * allocate various perl stacks. This is an exact copy
489 * of perl.c:init_stacks, except that it uses less memory 552 * of perl.c:init_stacks, except that it uses less memory
494# define coro_init_stacks init_stacks 557# define coro_init_stacks init_stacks
495#else 558#else
496static void 559static void
497coro_init_stacks (pTHX) 560coro_init_stacks (pTHX)
498{ 561{
499 PL_curstackinfo = new_stackinfo(64, 6); 562 PL_curstackinfo = new_stackinfo(32, 8);
500 PL_curstackinfo->si_type = PERLSI_MAIN; 563 PL_curstackinfo->si_type = PERLSI_MAIN;
501 PL_curstack = PL_curstackinfo->si_stack; 564 PL_curstack = PL_curstackinfo->si_stack;
502 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 565 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
503 566
504 PL_stack_base = AvARRAY(PL_curstack); 567 PL_stack_base = AvARRAY(PL_curstack);
505 PL_stack_sp = PL_stack_base; 568 PL_stack_sp = PL_stack_base;
506 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 569 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
507 570
508 New(50,PL_tmps_stack,64,SV*); 571 New(50,PL_tmps_stack,32,SV*);
509 PL_tmps_floor = -1; 572 PL_tmps_floor = -1;
510 PL_tmps_ix = -1; 573 PL_tmps_ix = -1;
511 PL_tmps_max = 64; 574 PL_tmps_max = 32;
512 575
513 New(54,PL_markstack,16,I32); 576 New(54,PL_markstack,16,I32);
514 PL_markstack_ptr = PL_markstack; 577 PL_markstack_ptr = PL_markstack;
515 PL_markstack_max = PL_markstack + 16; 578 PL_markstack_max = PL_markstack + 16;
516 579
517#ifdef SET_MARK_OFFSET 580#ifdef SET_MARK_OFFSET
518 SET_MARK_OFFSET; 581 SET_MARK_OFFSET;
519#endif 582#endif
520 583
521 New(54,PL_scopestack,16,I32); 584 New(54,PL_scopestack,8,I32);
522 PL_scopestack_ix = 0; 585 PL_scopestack_ix = 0;
523 PL_scopestack_max = 16; 586 PL_scopestack_max = 8;
524 587
525 New(54,PL_savestack,64,ANY); 588 New(54,PL_savestack,24,ANY);
526 PL_savestack_ix = 0; 589 PL_savestack_ix = 0;
527 PL_savestack_max = 64; 590 PL_savestack_max = 24;
528 591
529#if !PERL_VERSION_ATLEAST (5,9,0) 592#if !PERL_VERSION_ATLEAST (5,9,0)
530 New(54,PL_retstack,4,OP*); 593 New(54,PL_retstack,4,OP*);
531 PL_retstack_ix = 0; 594 PL_retstack_ix = 0;
532 PL_retstack_max = 4; 595 PL_retstack_max = 4;
569{ 632{
570 size_t rss = sizeof (*coro); 633 size_t rss = sizeof (*coro);
571 634
572 if (coro->mainstack) 635 if (coro->mainstack)
573 { 636 {
637 perl_slots tmp_slot;
638 perl_slots *slot;
639
574 if (coro->flags & CF_RUNNING) 640 if (coro->flags & CF_RUNNING)
575 { 641 {
642 slot = &tmp_slot;
643
576 #define VAR(name,type)coro->name = PL_ ## name; 644 #define VAR(name,type) slot->name = PL_ ## name;
577 # include "state.h" 645 # include "state.h"
578 #undef VAR 646 #undef VAR
579 } 647 }
648 else
649 slot = coro->slot;
580 650
581 rss += sizeof (coro->curstackinfo); 651 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); 652 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
584 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 653 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
585 rss += coro->tmps_max * sizeof (SV *); 654 rss += slot->tmps_max * sizeof (SV *);
586 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 655 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
587 rss += coro->scopestack_max * sizeof (I32); 656 rss += slot->scopestack_max * sizeof (I32);
588 rss += coro->savestack_max * sizeof (ANY); 657 rss += slot->savestack_max * sizeof (ANY);
589 658
590#if !PERL_VERSION_ATLEAST (5,9,0) 659#if !PERL_VERSION_ATLEAST (5,9,0)
591 rss += coro->retstack_max * sizeof (OP *); 660 rss += slot->retstack_max * sizeof (OP *);
592#endif 661#endif
593 } 662 }
594 663
595 return rss; 664 return rss;
596} 665}
597 666
598/** coroutine stack handling ************************************************/ 667/** coroutine stack handling ************************************************/
668
669#if 0
670static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
671
672/*
673 * This overrides the default magic get method of %SIG elements.
674 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
675 * and instead of tryign to save and restore the hash elements, we just provide
676 * readback here.
677 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
678 * not expecting this to actually change the hook. This is a potential problem
679 * when a schedule happens then, but we ignore this.
680 */
681static int
682coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
683{
684 return orig_sigelem_get (aTHX_ sv, mg);
685 const char *s = MgPV_nolen_const (mg);
686
687 if (*s == '_')
688 {
689 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;
690 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
691 }
692
693 return orig_sigelem_get (aTHX_ sv, mg);
694}
695#endif
599 696
600static void 697static void
601coro_setup (pTHX_ struct coro *coro) 698coro_setup (pTHX_ struct coro *coro)
602{ 699{
603 /* 700 /*
608 PL_runops = RUNOPS_DEFAULT; 705 PL_runops = RUNOPS_DEFAULT;
609 PL_curcop = &PL_compiling; 706 PL_curcop = &PL_compiling;
610 PL_in_eval = EVAL_NULL; 707 PL_in_eval = EVAL_NULL;
611 PL_comppad = 0; 708 PL_comppad = 0;
612 PL_curpm = 0; 709 PL_curpm = 0;
613 PL_curpad = 1; 710 PL_curpad = 0;
614 PL_localizing = 0; 711 PL_localizing = 0;
615 PL_dirty = 0; 712 PL_dirty = 0;
616 PL_restartop = 0; 713 PL_restartop = 0;
714
715 /* recreate the die/warn hooks */
716 PL_diehook = 0;
717 hv_store (hv_sig, "__DIE__", sizeof ("__DIE__") - 1, newSV (0), 0);
718 PL_diehook = SvREFCNT_inc (rv_diehook);
719
720 PL_warnhook = 0;
721 hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, newSV (0), 0);
722 PL_warnhook = SvREFCNT_inc (rv_warnhook);
617 723
618 GvSV (PL_defgv) = newSV (0); 724 GvSV (PL_defgv) = newSV (0);
619 GvAV (PL_defgv) = coro->args; coro->args = 0; 725 GvAV (PL_defgv) = coro->args; coro->args = 0;
620 GvSV (PL_errgv) = newSV (0); 726 GvSV (PL_errgv) = newSV (0);
621 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 727 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
622 PL_rs = newSVsv (GvSV (irsgv)); 728 PL_rs = newSVsv (GvSV (irsgv));
623 PL_defoutgv = SvREFCNT_inc (stdoutgv); 729 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
624 730
625 { 731 {
626 dSP; 732 dSP;
627 LOGOP myop; 733 LOGOP myop;
628 734
636 PL_op = (OP *)&myop; 742 PL_op = (OP *)&myop;
637 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 743 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
638 SPAGAIN; 744 SPAGAIN;
639 } 745 }
640 746
641 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */ 747 /* this newly created coroutine might be run on an existing cctx which most
748 * likely was suspended in set_stacklevel, called from entersub.
749 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
750 * so we ENTER here for symmetry
751 */
752 ENTER;
642} 753}
643 754
644static void 755static void
645coro_destroy (pTHX_ struct coro *coro) 756coro_destroy (pTHX_ struct coro *coro)
646{ 757{
666 SvREFCNT_dec (GvSV (PL_errgv)); 777 SvREFCNT_dec (GvSV (PL_errgv));
667 SvREFCNT_dec (PL_defoutgv); 778 SvREFCNT_dec (PL_defoutgv);
668 SvREFCNT_dec (PL_rs); 779 SvREFCNT_dec (PL_rs);
669 SvREFCNT_dec (GvSV (irsgv)); 780 SvREFCNT_dec (GvSV (irsgv));
670 781
782 SvREFCNT_dec (PL_diehook);
783 SvREFCNT_dec (PL_warnhook);
784
671 SvREFCNT_dec (coro->saved_deffh); 785 SvREFCNT_dec (coro->saved_deffh);
672 //SvREFCNT_dec (coro->throw); 786 SvREFCNT_dec (coro->throw);
673 787
674 coro_destroy_stacks (aTHX); 788 coro_destroy_stacks (aTHX);
675} 789}
676 790
677static void 791static void
810 924
811/* inject a fake call to Coro::State::_cctx_init into the execution */ 925/* 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 */ 926/* _cctx_init should be careful, as it could be called at almost any time */
813/* during execution of a perl program */ 927/* during execution of a perl program */
814static void NOINLINE 928static void NOINLINE
815prepare_cctx (pTHX_ coro_cctx *cctx) 929cctx_prepare (pTHX_ coro_cctx *cctx)
816{ 930{
817 dSP; 931 dSP;
818 LOGOP myop; 932 LOGOP myop;
819 933
820 PL_top_env = &PL_start_env; 934 PL_top_env = &PL_start_env;
838 952
839/* 953/*
840 * this is a _very_ stripped down perl interpreter ;) 954 * this is a _very_ stripped down perl interpreter ;)
841 */ 955 */
842static void 956static void
843coro_run (void *arg) 957cctx_run (void *arg)
844{ 958{
845 dTHX; 959 dTHX;
846 960
847 /* coro_run is the alternative tail of transfer(), so unlock here. */ 961 /* cctx_run is the alternative tail of transfer(), so unlock here. */
848 UNLOCK; 962 UNLOCK;
849 963
850 /* we now skip the entersub that lead to transfer() */ 964 /* we now skip the entersub that lead to transfer() */
851 PL_op = PL_op->op_next; 965 PL_op = PL_op->op_next;
852 966
853 /* inject a fake subroutine call to cctx_init */ 967 /* inject a fake subroutine call to cctx_init */
854 prepare_cctx (aTHX_ (coro_cctx *)arg); 968 cctx_prepare (aTHX_ (coro_cctx *)arg);
855 969
856 /* somebody or something will hit me for both perl_run and PL_restartop */ 970 /* somebody or something will hit me for both perl_run and PL_restartop */
857 PL_restartop = PL_op; 971 PL_restartop = PL_op;
858 perl_run (PL_curinterp); 972 perl_run (PL_curinterp);
859 973
878 ++cctx_count; 992 ++cctx_count;
879 993
880 Newz (0, cctx, 1, coro_cctx); 994 Newz (0, cctx, 1, coro_cctx);
881 995
882#if HAVE_MMAP 996#if HAVE_MMAP
883
884 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 997 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
885 /* mmap supposedly does allocate-on-write for us */ 998 /* 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); 999 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
887 1000
888 if (cctx->sptr != (void *)-1) 1001 if (cctx->sptr != (void *)-1)
909 stack_start = cctx->sptr; 1022 stack_start = cctx->sptr;
910 stack_size = cctx->ssize; 1023 stack_size = cctx->ssize;
911 } 1024 }
912 1025
913 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1026 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
914 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1027 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
915 1028
916 return cctx; 1029 return cctx;
917} 1030}
918 1031
919static void 1032static void
991 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1104 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
992 1105
993 if (expect_false (next->flags & CF_DESTROYED)) 1106 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"); 1107 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
995 1108
1109 if (
1110#if PERL_VERSION_ATLEAST (5,9,0)
1111 expect_false (PL_parser)
1112#else
996 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1113 expect_false (PL_lex_state != LEX_NOTPARSING)
1114#endif
1115 )
997 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1116 croak ("Coro::State::transfer called while parsing, but this is not supported");
998 } 1117 }
999} 1118}
1000 1119
1001/* always use the TRANSFER macro */ 1120/* always use the TRANSFER macro */
1002static void NOINLINE 1121static void NOINLINE
1003transfer (pTHX_ struct coro *prev, struct coro *next) 1122transfer (pTHX_ struct coro *prev, struct coro *next)
1004{ 1123{
1005 dSTACKLEVEL; 1124 dSTACKLEVEL;
1125 static volatile int has_throw;
1006 1126
1007 /* sometimes transfer is only called to set idle_sp */ 1127 /* sometimes transfer is only called to set idle_sp */
1008 if (expect_false (!next)) 1128 if (expect_false (!next))
1009 { 1129 {
1010 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1130 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1025 prev->flags &= ~CF_RUNNING; 1145 prev->flags &= ~CF_RUNNING;
1026 next->flags |= CF_RUNNING; 1146 next->flags |= CF_RUNNING;
1027 1147
1028 LOCK; 1148 LOCK;
1029 1149
1150 /* first get rid of the old state */
1151 save_perl (aTHX_ prev);
1152
1030 if (expect_false (next->flags & CF_NEW)) 1153 if (expect_false (next->flags & CF_NEW))
1031 { 1154 {
1032 /* need to start coroutine */ 1155 /* need to start coroutine */
1033 next->flags &= ~CF_NEW; 1156 next->flags &= ~CF_NEW;
1034 /* first get rid of the old state */
1035 save_perl (aTHX_ prev);
1036 /* setup coroutine call */ 1157 /* setup coroutine call */
1037 coro_setup (aTHX_ next); 1158 coro_setup (aTHX_ next);
1038 } 1159 }
1039 else 1160 else
1040 {
1041 /* coroutine already started */
1042 save_perl (aTHX_ prev);
1043 load_perl (aTHX_ next); 1161 load_perl (aTHX_ next);
1044 }
1045 1162
1046 prev__cctx = prev->cctx; 1163 prev__cctx = prev->cctx;
1047 1164
1048 /* possibly "free" the cctx */ 1165 /* possibly "free" the cctx */
1049 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1166 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1054 prev->cctx = 0; 1171 prev->cctx = 0;
1055 1172
1056 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1173 /* 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 */ 1174 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1058 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1175 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1176 if (!next->cctx)
1059 next->cctx = cctx_get (aTHX); 1177 next->cctx = cctx_get (aTHX);
1060 1178
1061 cctx_put (prev__cctx); 1179 cctx_put (prev__cctx);
1062 } 1180 }
1063 1181
1064 ++next->usecount; 1182 ++next->usecount;
1065 1183
1066 if (expect_true (!next->cctx)) 1184 if (expect_true (!next->cctx))
1067 next->cctx = cctx_get (aTHX); 1185 next->cctx = cctx_get (aTHX);
1186
1187 has_throw = !!next->throw;
1068 1188
1069 if (expect_false (prev__cctx != next->cctx)) 1189 if (expect_false (prev__cctx != next->cctx))
1070 { 1190 {
1071 prev__cctx->top_env = PL_top_env; 1191 prev__cctx->top_env = PL_top_env;
1072 PL_top_env = next->cctx->top_env; 1192 PL_top_env = next->cctx->top_env;
1073 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1193 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1074 } 1194 }
1075 1195
1076 free_coro_mortal (aTHX); 1196 free_coro_mortal (aTHX);
1077 UNLOCK; 1197 UNLOCK;
1198
1199 if (expect_false (has_throw))
1200 {
1201 struct coro *coro = SvSTATE (coro_current);
1202
1203 if (coro->throw)
1204 {
1205 SV *exception = coro->throw;
1206 coro->throw = 0;
1207 sv_setsv (ERRSV, exception);
1208 croak (0);
1209 }
1210 }
1078 } 1211 }
1079} 1212}
1080 1213
1081struct transfer_args 1214struct transfer_args
1082{ 1215{
1117 save_perl (aTHX_ &temp); 1250 save_perl (aTHX_ &temp);
1118 load_perl (aTHX_ coro); 1251 load_perl (aTHX_ coro);
1119 1252
1120 coro_destroy (aTHX_ coro); 1253 coro_destroy (aTHX_ coro);
1121 1254
1122 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1255 load_perl (aTHX_ &temp);
1123 1256
1124 coro->mainstack = 0; 1257 coro->slot = 0;
1125 } 1258 }
1126 1259
1127 cctx_destroy (coro->cctx); 1260 cctx_destroy (coro->cctx);
1128 SvREFCNT_dec (coro->args); 1261 SvREFCNT_dec (coro->args);
1129 1262
1386 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1519 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1387 1520
1388 if (coro->flags & CF_RUNNING) 1521 if (coro->flags & CF_RUNNING)
1389 PL_runops = RUNOPS_DEFAULT; 1522 PL_runops = RUNOPS_DEFAULT;
1390 else 1523 else
1391 coro->runops = RUNOPS_DEFAULT; 1524 coro->slot->runops = RUNOPS_DEFAULT;
1392 } 1525 }
1393} 1526}
1394 1527
1395MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1528MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1396 1529
1403#endif 1536#endif
1404 BOOT_PAGESIZE; 1537 BOOT_PAGESIZE;
1405 1538
1406 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1539 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1407 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1540 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1541#if 0
1542 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1543 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1544#endif
1545 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1546 rv_diehook = SvREFCNT_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1547 rv_warnhook = SvREFCNT_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1408 1548
1409 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1549 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1410 1550
1411 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1551 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1412 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1552 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1418 1558
1419 while (main_top_env->je_prev) 1559 while (main_top_env->je_prev)
1420 main_top_env = main_top_env->je_prev; 1560 main_top_env = main_top_env->je_prev;
1421 1561
1422 coroapi.ver = CORO_API_VERSION; 1562 coroapi.ver = CORO_API_VERSION;
1563 coroapi.rev = CORO_API_REVISION;
1423 coroapi.transfer = api_transfer; 1564 coroapi.transfer = api_transfer;
1424 1565
1425 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1566 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1426} 1567}
1427 1568
1428SV * 1569SV *
1429new (char *klass, ...) 1570new (char *klass, ...)
1430 CODE: 1571 CODE:
1431{ 1572{
1432 struct coro *coro; 1573 struct coro *coro;
1574 MAGIC *mg;
1433 HV *hv; 1575 HV *hv;
1434 int i; 1576 int i;
1435 1577
1436 Newz (0, coro, 1, struct coro); 1578 Newz (0, coro, 1, struct coro);
1437 coro->args = newAV (); 1579 coro->args = newAV ();
1440 if (coro_first) coro_first->prev = coro; 1582 if (coro_first) coro_first->prev = coro;
1441 coro->next = coro_first; 1583 coro->next = coro_first;
1442 coro_first = coro; 1584 coro_first = coro;
1443 1585
1444 coro->hv = hv = newHV (); 1586 coro->hv = hv = newHV ();
1445 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1587 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1588 mg->mg_flags |= MGf_DUP;
1446 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1589 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1447 1590
1448 av_extend (coro->args, items - 1); 1591 av_extend (coro->args, items - 1);
1449 for (i = 1; i < items; i++) 1592 for (i = 1; i < items; i++)
1450 av_push (coro->args, newSVsv (ST (i))); 1593 av_push (coro->args, newSVsv (ST (i)));
1494 1637
1495 break; 1638 break;
1496 } 1639 }
1497 1640
1498 BARRIER; 1641 BARRIER;
1642 PUTBACK;
1499 TRANSFER (ta); 1643 TRANSFER (ta);
1500 1644 SPAGAIN; /* might be the sp of a different coroutine now */
1501 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev)) 1645 /* be extra careful not to ever do anything after TRANSFER */
1502 XSRETURN_YES;
1503} 1646}
1504 1647
1505bool 1648bool
1506_destroy (SV *coro_sv) 1649_destroy (SV *coro_sv)
1507 CODE: 1650 CODE:
1556 CODE: 1699 CODE:
1557{ 1700{
1558 if (coro->mainstack) 1701 if (coro->mainstack)
1559 { 1702 {
1560 struct coro temp; 1703 struct coro temp;
1561 Zero (&temp, 1, struct coro);
1562 1704
1563 if (!(coro->flags & CF_RUNNING)) 1705 if (!(coro->flags & CF_RUNNING))
1564 { 1706 {
1565 save_perl (aTHX_ &temp); 1707 save_perl (aTHX_ &temp);
1566 load_perl (aTHX_ coro); 1708 load_perl (aTHX_ coro);
1568 1710
1569 { 1711 {
1570 dSP; 1712 dSP;
1571 ENTER; 1713 ENTER;
1572 SAVETMPS; 1714 SAVETMPS;
1715 PUTBACK;
1716 PUSHSTACK;
1573 PUSHMARK (SP); 1717 PUSHMARK (SP);
1574 PUTBACK; 1718
1575 if (ix) 1719 if (ix)
1576 eval_sv (coderef, 0); 1720 eval_sv (coderef, 0);
1577 else 1721 else
1578 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1722 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1723
1724 POPSTACK;
1579 SPAGAIN; 1725 SPAGAIN;
1580 FREETMPS; 1726 FREETMPS;
1581 LEAVE; 1727 LEAVE;
1582 PUTBACK; 1728 PUTBACK;
1583 } 1729 }
1641 1787
1642BOOT: 1788BOOT:
1643{ 1789{
1644 int i; 1790 int i;
1645 1791
1646 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1792 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1647 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1793 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1648 av_async_pool = get_av ("Coro::async_pool", TRUE); 1794 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1649 1795
1650 coro_current = get_sv ("Coro::current", FALSE); 1796 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1651 SvREADONLY_on (coro_current); 1797 SvREADONLY_on (coro_current);
1652 1798
1653 coro_stash = gv_stashpv ("Coro", TRUE); 1799 coro_stash = gv_stashpv ("Coro", TRUE);
1654 1800
1655 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1801 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1656 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1802 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1657 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1803 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1658 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1804 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1661 1807
1662 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1808 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1663 coro_ready[i] = newAV (); 1809 coro_ready[i] = newAV ();
1664 1810
1665 { 1811 {
1666 SV *sv = perl_get_sv("Coro::API", 1); 1812 SV *sv = perl_get_sv ("Coro::API", TRUE);
1813 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1667 1814
1668 coroapi.schedule = api_schedule; 1815 coroapi.schedule = api_schedule;
1669 coroapi.cede = api_cede; 1816 coroapi.cede = api_cede;
1670 coroapi.cede_notself = api_cede_notself; 1817 coroapi.cede_notself = api_cede_notself;
1671 coroapi.ready = api_ready; 1818 coroapi.ready = api_ready;
1722 CODE: 1869 CODE:
1723 RETVAL = coro_nready; 1870 RETVAL = coro_nready;
1724 OUTPUT: 1871 OUTPUT:
1725 RETVAL 1872 RETVAL
1726 1873
1874void
1875throw (Coro::State self, SV *throw = &PL_sv_undef)
1876 PROTOTYPE: $;$
1877 CODE:
1878 SvREFCNT_dec (self->throw);
1879 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1880
1727# for async_pool speedup 1881# for async_pool speedup
1728void 1882void
1729_pool_1 (SV *cb) 1883_pool_1 (SV *cb)
1730 CODE: 1884 CODE:
1731{ 1885{
1735 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1889 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1736 AV *invoke_av; 1890 AV *invoke_av;
1737 int i, len; 1891 int i, len;
1738 1892
1739 if (!invoke) 1893 if (!invoke)
1740 croak ("\3terminate\2\n"); 1894 croak ("\3async_pool terminate\2\n");
1741 1895
1742 SvREFCNT_dec (coro->saved_deffh); 1896 SvREFCNT_dec (coro->saved_deffh);
1743 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1897 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1744 1898
1745 hv_store (hv, "desc", sizeof ("desc") - 1, 1899 hv_store (hv, "desc", sizeof ("desc") - 1,
1771 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1925 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1772 coro->saved_deffh = 0; 1926 coro->saved_deffh = 0;
1773 1927
1774 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1928 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1775 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1929 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1776 croak ("\3terminate\2\n"); 1930 croak ("\3async_pool terminate\2\n");
1777 1931
1778 av_clear (GvAV (PL_defgv)); 1932 av_clear (GvAV (PL_defgv));
1779 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1933 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1780 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1934 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1781 1935

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines