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.234 by root, Fri May 9 22:29:05 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# define setjmp _setjmp // deep magic, don't ask
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;
175
176/* Coro::AnyEvent */
177static SV *sv_activity;
157 178
158static struct coro_cctx *cctx_first; 179static struct coro_cctx *cctx_first;
159static int cctx_count, cctx_idle; 180static int cctx_count, cctx_idle;
160 181
161enum { 182enum {
192 CF_READY = 0x0002, /* coroutine is ready */ 213 CF_READY = 0x0002, /* coroutine is ready */
193 CF_NEW = 0x0004, /* has never been switched to */ 214 CF_NEW = 0x0004, /* has never been switched to */
194 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 215 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
195}; 216};
196 217
218/* the structure where most of the perl state is stored, overlaid on the cxstack */
219typedef struct {
220 SV *defsv;
221 AV *defav;
222 SV *errsv;
223 SV *irsgv;
224#define VAR(name,type) type name;
225# include "state.h"
226#undef VAR
227} perl_slots;
228
229#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
230
197/* this is a structure representing a perl-level coroutine */ 231/* this is a structure representing a perl-level coroutine */
198struct coro { 232struct coro {
199 /* the c coroutine allocated to this perl coroutine, if any */ 233 /* the c coroutine allocated to this perl coroutine, if any */
200 coro_cctx *cctx; 234 coro_cctx *cctx;
201 235
236 /* process data */
237 AV *mainstack;
238 perl_slots *slot; /* basically the saved sp */
239
202 /* data associated with this coroutine (initial args) */ 240 AV *args; /* data associated with this coroutine (initial args) */
203 AV *args; 241 int refcnt; /* coroutines are refcounted, yes */
204 int refcnt;
205 int flags; /* CF_ flags */ 242 int flags; /* CF_ flags */
206 243 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 244
219 /* statistics */ 245 /* statistics */
220 int usecount; /* number of transfers to this coro */ 246 int usecount; /* number of transfers to this coro */
221 247
222 /* coro process data */ 248 /* coro process data */
223 int prio; 249 int prio;
224 //SV *throw; 250 SV *throw; /* exception to be thrown */
225 251
226 /* async_pool */ 252 /* async_pool */
227 SV *saved_deffh; 253 SV *saved_deffh;
228 254
229 /* linked list */ 255 /* linked list */
230 struct coro *next, *prev; 256 struct coro *next, *prev;
231 HV *hv; /* the perl hash associated with this coro, if any */
232}; 257};
233 258
234typedef struct coro *Coro__State; 259typedef struct coro *Coro__State;
235typedef struct coro *Coro__State_or_hashref; 260typedef struct coro *Coro__State_or_hashref;
236 261
243#define PRIO_IDLE -3 268#define PRIO_IDLE -3
244#define PRIO_MIN -4 269#define PRIO_MIN -4
245 270
246/* for Coro.pm */ 271/* for Coro.pm */
247static SV *coro_current; 272static SV *coro_current;
273static SV *coro_readyhook;
248static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 274static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
249static int coro_nready; 275static int coro_nready;
250static struct coro *coro_first; 276static struct coro *coro_first;
251 277
252/** lowlevel stuff **********************************************************/ 278/** lowlevel stuff **********************************************************/
253 279
280static SV *
281coro_get_sv (pTHX_ const char *name, int create)
282{
283#if PERL_VERSION_ATLEAST (5,10,0)
284 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
285 get_sv (name, create);
286#endif
287 return get_sv (name, create);
288}
289
290static AV *
291coro_get_av (pTHX_ const char *name, int create)
292{
293#if PERL_VERSION_ATLEAST (5,10,0)
294 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
295 get_av (name, create);
296#endif
297 return get_av (name, create);
298}
299
300static HV *
301coro_get_hv (pTHX_ const char *name, int create)
302{
303#if PERL_VERSION_ATLEAST (5,10,0)
304 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
305 get_hv (name, create);
306#endif
307 return get_hv (name, create);
308}
309
254static AV * 310static AV *
255coro_clone_padlist (pTHX_ CV *cv) 311coro_clone_padlist (pTHX_ CV *cv)
256{ 312{
257 AV *padlist = CvPADLIST (cv); 313 AV *padlist = CvPADLIST (cv);
258 AV *newpadlist, *newpad; 314 AV *newpadlist, *newpad;
259 315
260 newpadlist = newAV (); 316 newpadlist = newAV ();
261 AvREAL_off (newpadlist); 317 AvREAL_off (newpadlist);
262#if PERL_VERSION_ATLEAST (5,9,0) 318#if PERL_VERSION_ATLEAST (5,10,0)
263 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 319 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
264#else 320#else
265 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 321 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
266#endif 322#endif
267 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 323 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
305 361
306 /* casting is fun. */ 362 /* casting is fun. */
307 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 363 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
308 free_padlist (aTHX_ padlist); 364 free_padlist (aTHX_ padlist);
309 365
310 SvREFCNT_dec (av);
311
312 return 0; 366 return 0;
313} 367}
314 368
315#define PERL_MAGIC_coro PERL_MAGIC_ext 369#define CORO_MAGIC_type_cv PERL_MAGIC_ext
370#define CORO_MAGIC_type_state PERL_MAGIC_ext
316 371
317static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 372static MGVTBL coro_cv_vtbl = {
373 0, 0, 0, 0,
374 coro_cv_free
375};
318 376
319#define CORO_MAGIC(cv) \ 377#define CORO_MAGIC(sv,type) \
320 SvMAGIC (cv) \ 378 SvMAGIC (sv) \
321 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 379 ? SvMAGIC (sv)->mg_type == type \
322 ? SvMAGIC (cv) \ 380 ? SvMAGIC (sv) \
323 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 381 : mg_find (sv, type) \
324 : 0 382 : 0
383
384#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
385#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
325 386
326static struct coro * 387static struct coro *
327SvSTATE_ (pTHX_ SV *coro) 388SvSTATE_ (pTHX_ SV *coro)
328{ 389{
329 HV *stash; 390 HV *stash;
341 /* very slow, but rare, check */ 402 /* very slow, but rare, check */
342 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 403 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
343 croak ("Coro::State object required"); 404 croak ("Coro::State object required");
344 } 405 }
345 406
346 mg = CORO_MAGIC (coro); 407 mg = CORO_MAGIC_state (coro);
347 return (struct coro *)mg->mg_ptr; 408 return (struct coro *)mg->mg_ptr;
348} 409}
349 410
350#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 411#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
351 412
352/* the next two functions merely cache the padlists */ 413/* the next two functions merely cache the padlists */
353static void 414static void
354get_padlist (pTHX_ CV *cv) 415get_padlist (pTHX_ CV *cv)
355{ 416{
356 MAGIC *mg = CORO_MAGIC (cv); 417 MAGIC *mg = CORO_MAGIC_cv (cv);
357 AV *av; 418 AV *av;
358 419
359 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 420 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
360 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 421 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
361 else 422 else
373} 434}
374 435
375static void 436static void
376put_padlist (pTHX_ CV *cv) 437put_padlist (pTHX_ CV *cv)
377{ 438{
378 MAGIC *mg = CORO_MAGIC (cv); 439 MAGIC *mg = CORO_MAGIC_cv (cv);
379 AV *av; 440 AV *av;
380 441
381 if (expect_false (!mg)) 442 if (expect_false (!mg))
382 { 443 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 444
389 av = (AV *)mg->mg_obj; 445 av = (AV *)mg->mg_obj;
390 446
391 if (expect_false (AvFILLp (av) >= AvMAX (av))) 447 if (expect_false (AvFILLp (av) >= AvMAX (av)))
392 av_extend (av, AvMAX (av) + 1); 448 av_extend (av, AvMAX (av) + 1);
397/** load & save, init *******************************************************/ 453/** load & save, init *******************************************************/
398 454
399static void 455static void
400load_perl (pTHX_ Coro__State c) 456load_perl (pTHX_ Coro__State c)
401{ 457{
458 perl_slots *slot = c->slot;
459 c->slot = 0;
460
461 PL_mainstack = c->mainstack;
462
463 GvSV (PL_defgv) = slot->defsv;
464 GvAV (PL_defgv) = slot->defav;
465 GvSV (PL_errgv) = slot->errsv;
466 GvSV (irsgv) = slot->irsgv;
467
402#define VAR(name,type) PL_ ## name = c->name; 468 #define VAR(name,type) PL_ ## name = slot->name;
403# include "state.h" 469 # include "state.h"
404#undef VAR 470 #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 471
411 { 472 {
412 dSP; 473 dSP;
474
413 CV *cv; 475 CV *cv;
414 476
415 /* now do the ugly restore mess */ 477 /* now do the ugly restore mess */
416 while (expect_true (cv = (CV *)POPs)) 478 while (expect_true (cv = (CV *)POPs))
417 { 479 {
452 514
453 if (expect_true (CvDEPTH (cv))) 515 if (expect_true (CvDEPTH (cv)))
454 { 516 {
455 EXTEND (SP, 3); 517 EXTEND (SP, 3);
456 PUSHs ((SV *)CvPADLIST (cv)); 518 PUSHs ((SV *)CvPADLIST (cv));
457 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 519 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
458 PUSHs ((SV *)cv); 520 PUSHs ((SV *)cv);
459 521
460 CvDEPTH (cv) = 0; 522 CvDEPTH (cv) = 0;
461 get_padlist (aTHX_ cv); 523 get_padlist (aTHX_ cv);
462 } 524 }
472 } 534 }
473 535
474 PUTBACK; 536 PUTBACK;
475 } 537 }
476 538
539 /* allocate some space on the context stack for our purposes */
540 /* we manually unroll here, as usually 2 slots is enough */
541 if (SLOT_COUNT >= 1) CXINC;
542 if (SLOT_COUNT >= 2) CXINC;
543 if (SLOT_COUNT >= 3) CXINC;
544 {
545 int i;
546 for (i = 3; i < SLOT_COUNT; ++i)
547 CXINC;
548 }
549 cxstack_ix -= SLOT_COUNT; /* undo allocation */
550
551 c->mainstack = PL_mainstack;
552
553 {
554 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
555
477 c->defav = GvAV (PL_defgv); 556 slot->defav = GvAV (PL_defgv);
478 c->defsv = DEFSV; 557 slot->defsv = DEFSV;
479 c->errsv = ERRSV; 558 slot->errsv = ERRSV;
480 c->irssv_sv = GvSV (irsgv); 559 slot->irsgv = GvSV (irsgv);
481 560
482#define VAR(name,type)c->name = PL_ ## name; 561 #define VAR(name,type) slot->name = PL_ ## name;
483# include "state.h" 562 # include "state.h"
484#undef VAR 563 #undef VAR
564 }
485} 565}
486 566
487/* 567/*
488 * allocate various perl stacks. This is an exact copy 568 * allocate various perl stacks. This is an exact copy
489 * of perl.c:init_stacks, except that it uses less memory 569 * of perl.c:init_stacks, except that it uses less memory
494# define coro_init_stacks init_stacks 574# define coro_init_stacks init_stacks
495#else 575#else
496static void 576static void
497coro_init_stacks (pTHX) 577coro_init_stacks (pTHX)
498{ 578{
499 PL_curstackinfo = new_stackinfo(64, 6); 579 PL_curstackinfo = new_stackinfo(32, 8);
500 PL_curstackinfo->si_type = PERLSI_MAIN; 580 PL_curstackinfo->si_type = PERLSI_MAIN;
501 PL_curstack = PL_curstackinfo->si_stack; 581 PL_curstack = PL_curstackinfo->si_stack;
502 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 582 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
503 583
504 PL_stack_base = AvARRAY(PL_curstack); 584 PL_stack_base = AvARRAY(PL_curstack);
505 PL_stack_sp = PL_stack_base; 585 PL_stack_sp = PL_stack_base;
506 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 586 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
507 587
508 New(50,PL_tmps_stack,64,SV*); 588 New(50,PL_tmps_stack,32,SV*);
509 PL_tmps_floor = -1; 589 PL_tmps_floor = -1;
510 PL_tmps_ix = -1; 590 PL_tmps_ix = -1;
511 PL_tmps_max = 64; 591 PL_tmps_max = 32;
512 592
513 New(54,PL_markstack,16,I32); 593 New(54,PL_markstack,16,I32);
514 PL_markstack_ptr = PL_markstack; 594 PL_markstack_ptr = PL_markstack;
515 PL_markstack_max = PL_markstack + 16; 595 PL_markstack_max = PL_markstack + 16;
516 596
517#ifdef SET_MARK_OFFSET 597#ifdef SET_MARK_OFFSET
518 SET_MARK_OFFSET; 598 SET_MARK_OFFSET;
519#endif 599#endif
520 600
521 New(54,PL_scopestack,16,I32); 601 New(54,PL_scopestack,8,I32);
522 PL_scopestack_ix = 0; 602 PL_scopestack_ix = 0;
523 PL_scopestack_max = 16; 603 PL_scopestack_max = 8;
524 604
525 New(54,PL_savestack,64,ANY); 605 New(54,PL_savestack,24,ANY);
526 PL_savestack_ix = 0; 606 PL_savestack_ix = 0;
527 PL_savestack_max = 64; 607 PL_savestack_max = 24;
528 608
529#if !PERL_VERSION_ATLEAST (5,9,0) 609#if !PERL_VERSION_ATLEAST (5,10,0)
530 New(54,PL_retstack,4,OP*); 610 New(54,PL_retstack,4,OP*);
531 PL_retstack_ix = 0; 611 PL_retstack_ix = 0;
532 PL_retstack_max = 4; 612 PL_retstack_max = 4;
533#endif 613#endif
534} 614}
557 637
558 Safefree (PL_tmps_stack); 638 Safefree (PL_tmps_stack);
559 Safefree (PL_markstack); 639 Safefree (PL_markstack);
560 Safefree (PL_scopestack); 640 Safefree (PL_scopestack);
561 Safefree (PL_savestack); 641 Safefree (PL_savestack);
562#if !PERL_VERSION_ATLEAST (5,9,0) 642#if !PERL_VERSION_ATLEAST (5,10,0)
563 Safefree (PL_retstack); 643 Safefree (PL_retstack);
564#endif 644#endif
565} 645}
566 646
567static size_t 647static size_t
569{ 649{
570 size_t rss = sizeof (*coro); 650 size_t rss = sizeof (*coro);
571 651
572 if (coro->mainstack) 652 if (coro->mainstack)
573 { 653 {
654 perl_slots tmp_slot;
655 perl_slots *slot;
656
574 if (coro->flags & CF_RUNNING) 657 if (coro->flags & CF_RUNNING)
575 { 658 {
659 slot = &tmp_slot;
660
576 #define VAR(name,type)coro->name = PL_ ## name; 661 #define VAR(name,type) slot->name = PL_ ## name;
577 # include "state.h" 662 # include "state.h"
578 #undef VAR 663 #undef VAR
579 } 664 }
665 else
666 slot = coro->slot;
580 667
581 rss += sizeof (coro->curstackinfo); 668 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); 669 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
584 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 670 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
585 rss += coro->tmps_max * sizeof (SV *); 671 rss += slot->tmps_max * sizeof (SV *);
586 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 672 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
587 rss += coro->scopestack_max * sizeof (I32); 673 rss += slot->scopestack_max * sizeof (I32);
588 rss += coro->savestack_max * sizeof (ANY); 674 rss += slot->savestack_max * sizeof (ANY);
589 675
590#if !PERL_VERSION_ATLEAST (5,9,0) 676#if !PERL_VERSION_ATLEAST (5,10,0)
591 rss += coro->retstack_max * sizeof (OP *); 677 rss += slot->retstack_max * sizeof (OP *);
592#endif 678#endif
593 } 679 }
594 680
595 return rss; 681 return rss;
596} 682}
597 683
598/** coroutine stack handling ************************************************/ 684/** coroutine stack handling ************************************************/
685
686static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
687static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
688
689/*
690 * This overrides the default magic get method of %SIG elements.
691 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
692 * and instead of tryign to save and restore the hash elements, we just provide
693 * readback here.
694 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
695 * not expecting this to actually change the hook. This is a potential problem
696 * when a schedule happens then, but we ignore this.
697 */
698static int
699coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
700{
701 const char *s = MgPV_nolen_const (mg);
702
703 if (*s == '_')
704 {
705 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;
706 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
707 }
708
709 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
710}
711
712static int
713coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
714{
715 const char *s = MgPV_nolen_const (mg);
716
717 if (*s == '_')
718 {
719 SV **svp = 0;
720
721 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
722 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
723
724 if (svp)
725 {
726 SV *old = *svp;
727 *svp = newSVsv (sv);
728 SvREFCNT_dec (old);
729 return 0;
730 }
731 }
732
733 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
734}
599 735
600static void 736static void
601coro_setup (pTHX_ struct coro *coro) 737coro_setup (pTHX_ struct coro *coro)
602{ 738{
603 /* 739 /*
608 PL_runops = RUNOPS_DEFAULT; 744 PL_runops = RUNOPS_DEFAULT;
609 PL_curcop = &PL_compiling; 745 PL_curcop = &PL_compiling;
610 PL_in_eval = EVAL_NULL; 746 PL_in_eval = EVAL_NULL;
611 PL_comppad = 0; 747 PL_comppad = 0;
612 PL_curpm = 0; 748 PL_curpm = 0;
749 PL_curpad = 0;
613 PL_localizing = 0; 750 PL_localizing = 0;
614 PL_dirty = 0; 751 PL_dirty = 0;
615 PL_restartop = 0; 752 PL_restartop = 0;
753#if PERL_VERSION_ATLEAST (5,10,0)
754 PL_parser = 0;
755#endif
756
757 /* recreate the die/warn hooks */
758 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
759 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
616 760
617 GvSV (PL_defgv) = newSV (0); 761 GvSV (PL_defgv) = newSV (0);
618 GvAV (PL_defgv) = coro->args; coro->args = 0; 762 GvAV (PL_defgv) = coro->args; coro->args = 0;
619 GvSV (PL_errgv) = newSV (0); 763 GvSV (PL_errgv) = newSV (0);
620 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 764 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
621 PL_rs = newSVsv (GvSV (irsgv)); 765 PL_rs = newSVsv (GvSV (irsgv));
622 PL_defoutgv = SvREFCNT_inc (stdoutgv); 766 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
623
624 ENTER; /* necessary e.g. for dounwind */
625 767
626 { 768 {
627 dSP; 769 dSP;
628 LOGOP myop; 770 LOGOP myop;
629 771
636 PUTBACK; 778 PUTBACK;
637 PL_op = (OP *)&myop; 779 PL_op = (OP *)&myop;
638 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 780 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
639 SPAGAIN; 781 SPAGAIN;
640 } 782 }
783
784 /* this newly created coroutine might be run on an existing cctx which most
785 * likely was suspended in set_stacklevel, called from entersub.
786 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
787 * so we ENTER here for symmetry
788 */
789 ENTER;
641} 790}
642 791
643static void 792static void
644coro_destroy (pTHX_ struct coro *coro) 793coro_destroy (pTHX_ struct coro *coro)
645{ 794{
665 SvREFCNT_dec (GvSV (PL_errgv)); 814 SvREFCNT_dec (GvSV (PL_errgv));
666 SvREFCNT_dec (PL_defoutgv); 815 SvREFCNT_dec (PL_defoutgv);
667 SvREFCNT_dec (PL_rs); 816 SvREFCNT_dec (PL_rs);
668 SvREFCNT_dec (GvSV (irsgv)); 817 SvREFCNT_dec (GvSV (irsgv));
669 818
819 SvREFCNT_dec (PL_diehook);
820 SvREFCNT_dec (PL_warnhook);
821
670 SvREFCNT_dec (coro->saved_deffh); 822 SvREFCNT_dec (coro->saved_deffh);
671 //SvREFCNT_dec (coro->throw); 823 SvREFCNT_dec (coro->throw);
672 824
673 coro_destroy_stacks (aTHX); 825 coro_destroy_stacks (aTHX);
674} 826}
675 827
676static void 828static void
763 SAVETMPS; 915 SAVETMPS;
764 EXTEND (SP, 3); 916 EXTEND (SP, 3);
765 PUSHMARK (SP); 917 PUSHMARK (SP);
766 PUSHs (&PL_sv_yes); 918 PUSHs (&PL_sv_yes);
767 PUSHs (fullname); 919 PUSHs (fullname);
768 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 920 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
769 PUTBACK; 921 PUTBACK;
770 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 922 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); 923 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
772 SPAGAIN; 924 SPAGAIN;
773 FREETMPS; 925 FREETMPS;
809 961
810/* inject a fake call to Coro::State::_cctx_init into the execution */ 962/* 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 */ 963/* _cctx_init should be careful, as it could be called at almost any time */
812/* during execution of a perl program */ 964/* during execution of a perl program */
813static void NOINLINE 965static void NOINLINE
814prepare_cctx (pTHX_ coro_cctx *cctx) 966cctx_prepare (pTHX_ coro_cctx *cctx)
815{ 967{
816 dSP; 968 dSP;
817 LOGOP myop; 969 LOGOP myop;
818 970
819 PL_top_env = &PL_start_env; 971 PL_top_env = &PL_start_env;
837 989
838/* 990/*
839 * this is a _very_ stripped down perl interpreter ;) 991 * this is a _very_ stripped down perl interpreter ;)
840 */ 992 */
841static void 993static void
842coro_run (void *arg) 994cctx_run (void *arg)
843{ 995{
844 dTHX; 996 dTHX;
845 997
846 /* coro_run is the alternative tail of transfer(), so unlock here. */ 998 /* cctx_run is the alternative tail of transfer(), so unlock here. */
847 UNLOCK; 999 UNLOCK;
848 1000
849 /* we now skip the entersub that lead to transfer() */ 1001 /* we now skip the entersub that lead to transfer() */
850 PL_op = PL_op->op_next; 1002 PL_op = PL_op->op_next;
851 1003
852 /* inject a fake subroutine call to cctx_init */ 1004 /* inject a fake subroutine call to cctx_init */
853 prepare_cctx (aTHX_ (coro_cctx *)arg); 1005 cctx_prepare (aTHX_ (coro_cctx *)arg);
854 1006
855 /* somebody or something will hit me for both perl_run and PL_restartop */ 1007 /* somebody or something will hit me for both perl_run and PL_restartop */
856 PL_restartop = PL_op; 1008 PL_restartop = PL_op;
857 perl_run (PL_curinterp); 1009 perl_run (PL_curinterp);
858 1010
877 ++cctx_count; 1029 ++cctx_count;
878 1030
879 Newz (0, cctx, 1, coro_cctx); 1031 Newz (0, cctx, 1, coro_cctx);
880 1032
881#if HAVE_MMAP 1033#if HAVE_MMAP
882
883 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1034 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
884 /* mmap supposedly does allocate-on-write for us */ 1035 /* 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); 1036 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
886 1037
887 if (cctx->sptr != (void *)-1) 1038 if (cctx->sptr != (void *)-1)
908 stack_start = cctx->sptr; 1059 stack_start = cctx->sptr;
909 stack_size = cctx->ssize; 1060 stack_size = cctx->ssize;
910 } 1061 }
911 1062
912 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1063 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
913 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1064 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
914 1065
915 return cctx; 1066 return cctx;
916} 1067}
917 1068
918static void 1069static void
990 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1141 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
991 1142
992 if (expect_false (next->flags & CF_DESTROYED)) 1143 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"); 1144 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
994 1145
1146#if !PERL_VERSION_ATLEAST (5,10,0)
995 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1147 if (expect_false (PL_lex_state != LEX_NOTPARSING))
996 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1148 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1149#endif
997 } 1150 }
998} 1151}
999 1152
1000/* always use the TRANSFER macro */ 1153/* always use the TRANSFER macro */
1001static void NOINLINE 1154static void NOINLINE
1002transfer (pTHX_ struct coro *prev, struct coro *next) 1155transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1003{ 1156{
1004 dSTACKLEVEL; 1157 dSTACKLEVEL;
1158 static volatile int has_throw;
1005 1159
1006 /* sometimes transfer is only called to set idle_sp */ 1160 /* sometimes transfer is only called to set idle_sp */
1007 if (expect_false (!next)) 1161 if (expect_false (!next))
1008 { 1162 {
1009 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1163 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1024 prev->flags &= ~CF_RUNNING; 1178 prev->flags &= ~CF_RUNNING;
1025 next->flags |= CF_RUNNING; 1179 next->flags |= CF_RUNNING;
1026 1180
1027 LOCK; 1181 LOCK;
1028 1182
1183 /* first get rid of the old state */
1184 save_perl (aTHX_ prev);
1185
1029 if (expect_false (next->flags & CF_NEW)) 1186 if (expect_false (next->flags & CF_NEW))
1030 { 1187 {
1031 /* need to start coroutine */ 1188 /* need to start coroutine */
1032 next->flags &= ~CF_NEW; 1189 next->flags &= ~CF_NEW;
1033 /* first get rid of the old state */
1034 save_perl (aTHX_ prev);
1035 /* setup coroutine call */ 1190 /* setup coroutine call */
1036 coro_setup (aTHX_ next); 1191 coro_setup (aTHX_ next);
1037 } 1192 }
1038 else 1193 else
1039 {
1040 /* coroutine already started */
1041 save_perl (aTHX_ prev);
1042 load_perl (aTHX_ next); 1194 load_perl (aTHX_ next);
1043 }
1044 1195
1045 prev__cctx = prev->cctx; 1196 prev__cctx = prev->cctx;
1046 1197
1047 /* possibly "free" the cctx */ 1198 /* possibly "free" the cctx */
1048 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1199 if (expect_true (
1200 prev__cctx->idle_sp == STACKLEVEL
1201 && !(prev__cctx->flags & CC_TRACE)
1202 && !force_cctx
1203 ))
1049 { 1204 {
1050 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1205 /* 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)); 1206 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1052 1207
1053 prev->cctx = 0; 1208 prev->cctx = 0;
1054 1209
1055 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1210 /* 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 */ 1211 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1057 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1212 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1213 if (!next->cctx)
1058 next->cctx = cctx_get (aTHX); 1214 next->cctx = cctx_get (aTHX);
1059 1215
1060 cctx_put (prev__cctx); 1216 cctx_put (prev__cctx);
1061 } 1217 }
1062 1218
1063 ++next->usecount; 1219 ++next->usecount;
1064 1220
1065 if (expect_true (!next->cctx)) 1221 if (expect_true (!next->cctx))
1066 next->cctx = cctx_get (aTHX); 1222 next->cctx = cctx_get (aTHX);
1223
1224 has_throw = !!next->throw;
1067 1225
1068 if (expect_false (prev__cctx != next->cctx)) 1226 if (expect_false (prev__cctx != next->cctx))
1069 { 1227 {
1070 prev__cctx->top_env = PL_top_env; 1228 prev__cctx->top_env = PL_top_env;
1071 PL_top_env = next->cctx->top_env; 1229 PL_top_env = next->cctx->top_env;
1072 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1230 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1073 } 1231 }
1074 1232
1075 free_coro_mortal (aTHX); 1233 free_coro_mortal (aTHX);
1076 UNLOCK; 1234 UNLOCK;
1235
1236 if (expect_false (has_throw))
1237 {
1238 struct coro *coro = SvSTATE (coro_current);
1239
1240 if (coro->throw)
1241 {
1242 SV *exception = coro->throw;
1243 coro->throw = 0;
1244 sv_setsv (ERRSV, exception);
1245 croak (0);
1246 }
1247 }
1077 } 1248 }
1078} 1249}
1079 1250
1080struct transfer_args 1251struct transfer_args
1081{ 1252{
1082 struct coro *prev, *next; 1253 struct coro *prev, *next;
1083}; 1254};
1084 1255
1085#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1256#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) 1257#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1087 1258
1088/** high level stuff ********************************************************/ 1259/** high level stuff ********************************************************/
1089 1260
1090static int 1261static int
1116 save_perl (aTHX_ &temp); 1287 save_perl (aTHX_ &temp);
1117 load_perl (aTHX_ coro); 1288 load_perl (aTHX_ coro);
1118 1289
1119 coro_destroy (aTHX_ coro); 1290 coro_destroy (aTHX_ coro);
1120 1291
1121 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1292 load_perl (aTHX_ &temp);
1122 1293
1123 coro->mainstack = 0; 1294 coro->slot = 0;
1124 } 1295 }
1125 1296
1126 cctx_destroy (coro->cctx); 1297 cctx_destroy (coro->cctx);
1127 SvREFCNT_dec (coro->args); 1298 SvREFCNT_dec (coro->args);
1128 1299
1184{ 1355{
1185 dTHX; 1356 dTHX;
1186 struct transfer_args ta; 1357 struct transfer_args ta;
1187 1358
1188 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1359 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1189 TRANSFER (ta); 1360 TRANSFER (ta, 1);
1190} 1361}
1191 1362
1192/** Coro ********************************************************************/ 1363/** Coro ********************************************************************/
1193 1364
1194static void 1365static void
1196{ 1367{
1197 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1368 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1198} 1369}
1199 1370
1200static SV * 1371static SV *
1201coro_deq (pTHX_ int min_prio) 1372coro_deq (pTHX)
1202{ 1373{
1203 int prio = PRIO_MAX - PRIO_MIN; 1374 int prio;
1204 1375
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; ) 1376 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1210 if (AvFILLp (coro_ready [prio]) >= 0) 1377 if (AvFILLp (coro_ready [prio]) >= 0)
1211 return av_shift (coro_ready [prio]); 1378 return av_shift (coro_ready [prio]);
1212 1379
1213 return 0; 1380 return 0;
1214} 1381}
1216static int 1383static int
1217api_ready (SV *coro_sv) 1384api_ready (SV *coro_sv)
1218{ 1385{
1219 dTHX; 1386 dTHX;
1220 struct coro *coro; 1387 struct coro *coro;
1388 SV *hook;
1221 1389
1222 if (SvROK (coro_sv)) 1390 if (SvROK (coro_sv))
1223 coro_sv = SvRV (coro_sv); 1391 coro_sv = SvRV (coro_sv);
1224 1392
1225 coro = SvSTATE (coro_sv); 1393 coro = SvSTATE (coro_sv);
1228 return 0; 1396 return 0;
1229 1397
1230 coro->flags |= CF_READY; 1398 coro->flags |= CF_READY;
1231 1399
1232 LOCK; 1400 LOCK;
1401
1402 hook = coro_nready ? 0 : coro_readyhook;
1403
1233 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1404 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1234 ++coro_nready; 1405 ++coro_nready;
1406
1235 UNLOCK; 1407 UNLOCK;
1408
1409 if (hook)
1410 {
1411 dSP;
1412
1413 ENTER;
1414 SAVETMPS;
1415
1416 PUSHMARK (SP);
1417 PUTBACK;
1418 call_sv (hook, G_DISCARD);
1419 SPAGAIN;
1420
1421 FREETMPS;
1422 LEAVE;
1423 }
1236 1424
1237 return 1; 1425 return 1;
1238} 1426}
1239 1427
1240static int 1428static int
1250 SV *prev_sv, *next_sv; 1438 SV *prev_sv, *next_sv;
1251 1439
1252 for (;;) 1440 for (;;)
1253 { 1441 {
1254 LOCK; 1442 LOCK;
1255 next_sv = coro_deq (aTHX_ PRIO_MIN); 1443 next_sv = coro_deq (aTHX);
1256 1444
1257 /* nothing to schedule: call the idle handler */ 1445 /* nothing to schedule: call the idle handler */
1258 if (expect_false (!next_sv)) 1446 if (expect_false (!next_sv))
1259 { 1447 {
1260 dSP; 1448 dSP;
1264 SAVETMPS; 1452 SAVETMPS;
1265 1453
1266 PUSHMARK (SP); 1454 PUSHMARK (SP);
1267 PUTBACK; 1455 PUTBACK;
1268 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1456 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1457 SPAGAIN;
1269 1458
1270 FREETMPS; 1459 FREETMPS;
1271 LEAVE; 1460 LEAVE;
1272 continue; 1461 continue;
1273 } 1462 }
1328{ 1517{
1329 dTHX; 1518 dTHX;
1330 struct transfer_args ta; 1519 struct transfer_args ta;
1331 1520
1332 prepare_schedule (aTHX_ &ta); 1521 prepare_schedule (aTHX_ &ta);
1333 TRANSFER (ta); 1522 TRANSFER (ta, 1);
1334} 1523}
1335 1524
1336static int 1525static int
1337api_cede (void) 1526api_cede (void)
1338{ 1527{
1341 1530
1342 prepare_cede (aTHX_ &ta); 1531 prepare_cede (aTHX_ &ta);
1343 1532
1344 if (expect_true (ta.prev != ta.next)) 1533 if (expect_true (ta.prev != ta.next))
1345 { 1534 {
1346 TRANSFER (ta); 1535 TRANSFER (ta, 1);
1347 return 1; 1536 return 1;
1348 } 1537 }
1349 else 1538 else
1350 return 0; 1539 return 0;
1351} 1540}
1356 dTHX; 1545 dTHX;
1357 struct transfer_args ta; 1546 struct transfer_args ta;
1358 1547
1359 if (prepare_cede_notself (aTHX_ &ta)) 1548 if (prepare_cede_notself (aTHX_ &ta))
1360 { 1549 {
1361 TRANSFER (ta); 1550 TRANSFER (ta, 1);
1362 return 1; 1551 return 1;
1363 } 1552 }
1364 else 1553 else
1365 return 0; 1554 return 0;
1366} 1555}
1385 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1574 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1386 1575
1387 if (coro->flags & CF_RUNNING) 1576 if (coro->flags & CF_RUNNING)
1388 PL_runops = RUNOPS_DEFAULT; 1577 PL_runops = RUNOPS_DEFAULT;
1389 else 1578 else
1390 coro->runops = RUNOPS_DEFAULT; 1579 coro->slot->runops = RUNOPS_DEFAULT;
1391 } 1580 }
1392} 1581}
1393 1582
1394MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1583MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1395 1584
1402#endif 1591#endif
1403 BOOT_PAGESIZE; 1592 BOOT_PAGESIZE;
1404 1593
1405 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1594 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1406 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1595 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1596
1597 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1598 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1599 orig_sigelem_set = PL_vtbl_sigelem.svt_set;
1600 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1601
1602 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1603 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1604 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1407 1605
1408 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1606 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1409 1607
1410 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1608 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1411 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1609 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1417 1615
1418 while (main_top_env->je_prev) 1616 while (main_top_env->je_prev)
1419 main_top_env = main_top_env->je_prev; 1617 main_top_env = main_top_env->je_prev;
1420 1618
1421 coroapi.ver = CORO_API_VERSION; 1619 coroapi.ver = CORO_API_VERSION;
1620 coroapi.rev = CORO_API_REVISION;
1422 coroapi.transfer = api_transfer; 1621 coroapi.transfer = api_transfer;
1423 1622
1424 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1623 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1425} 1624}
1426 1625
1427SV * 1626SV *
1428new (char *klass, ...) 1627new (char *klass, ...)
1429 CODE: 1628 CODE:
1430{ 1629{
1431 struct coro *coro; 1630 struct coro *coro;
1631 MAGIC *mg;
1432 HV *hv; 1632 HV *hv;
1433 int i; 1633 int i;
1434 1634
1435 Newz (0, coro, 1, struct coro); 1635 Newz (0, coro, 1, struct coro);
1436 coro->args = newAV (); 1636 coro->args = newAV ();
1439 if (coro_first) coro_first->prev = coro; 1639 if (coro_first) coro_first->prev = coro;
1440 coro->next = coro_first; 1640 coro->next = coro_first;
1441 coro_first = coro; 1641 coro_first = coro;
1442 1642
1443 coro->hv = hv = newHV (); 1643 coro->hv = hv = newHV ();
1444 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1644 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1645 mg->mg_flags |= MGf_DUP;
1445 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1646 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1446 1647
1447 av_extend (coro->args, items - 1); 1648 av_extend (coro->args, items - 1);
1448 for (i = 1; i < items; i++) 1649 for (i = 1; i < items; i++)
1449 av_push (coro->args, newSVsv (ST (i))); 1650 av_push (coro->args, newSVsv (ST (i)));
1463 Coro::cede_notself = 4 1664 Coro::cede_notself = 4
1464 CODE: 1665 CODE:
1465{ 1666{
1466 struct transfer_args ta; 1667 struct transfer_args ta;
1467 1668
1669 PUTBACK;
1468 switch (ix) 1670 switch (ix)
1469 { 1671 {
1470 case 0: 1672 case 0:
1471 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1673 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1472 ta.next = 0; 1674 ta.next = 0;
1491 if (!prepare_cede_notself (aTHX_ &ta)) 1693 if (!prepare_cede_notself (aTHX_ &ta))
1492 XSRETURN_EMPTY; 1694 XSRETURN_EMPTY;
1493 1695
1494 break; 1696 break;
1495 } 1697 }
1698 SPAGAIN;
1496 1699
1497 BARRIER; 1700 BARRIER;
1701 PUTBACK;
1498 TRANSFER (ta); 1702 TRANSFER (ta, 0);
1499 1703 SPAGAIN; /* might be the sp of a different coroutine now */
1500 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev)) 1704 /* be extra careful not to ever do anything after TRANSFER */
1501 XSRETURN_YES;
1502} 1705}
1503 1706
1504bool 1707bool
1505_destroy (SV *coro_sv) 1708_destroy (SV *coro_sv)
1506 CODE: 1709 CODE:
1507 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 1710 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1508 OUTPUT: 1711 OUTPUT:
1509 RETVAL 1712 RETVAL
1510 1713
1511void 1714void
1512_exit (code) 1715_exit (int code)
1513 int code
1514 PROTOTYPE: $ 1716 PROTOTYPE: $
1515 CODE: 1717 CODE:
1516 _exit (code); 1718 _exit (code);
1517 1719
1518int 1720int
1555 CODE: 1757 CODE:
1556{ 1758{
1557 if (coro->mainstack) 1759 if (coro->mainstack)
1558 { 1760 {
1559 struct coro temp; 1761 struct coro temp;
1560 Zero (&temp, 1, struct coro);
1561 1762
1562 if (!(coro->flags & CF_RUNNING)) 1763 if (!(coro->flags & CF_RUNNING))
1563 { 1764 {
1765 PUTBACK;
1564 save_perl (aTHX_ &temp); 1766 save_perl (aTHX_ &temp);
1565 load_perl (aTHX_ coro); 1767 load_perl (aTHX_ coro);
1566 } 1768 }
1567 1769
1568 { 1770 {
1569 dSP; 1771 dSP;
1570 ENTER; 1772 ENTER;
1571 SAVETMPS; 1773 SAVETMPS;
1774 PUTBACK;
1775 PUSHSTACK;
1572 PUSHMARK (SP); 1776 PUSHMARK (SP);
1573 PUTBACK; 1777
1574 if (ix) 1778 if (ix)
1575 eval_sv (coderef, 0); 1779 eval_sv (coderef, 0);
1576 else 1780 else
1577 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1781 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1782
1783 POPSTACK;
1578 SPAGAIN; 1784 SPAGAIN;
1579 FREETMPS; 1785 FREETMPS;
1580 LEAVE; 1786 LEAVE;
1581 PUTBACK; 1787 PUTBACK;
1582 } 1788 }
1583 1789
1584 if (!(coro->flags & CF_RUNNING)) 1790 if (!(coro->flags & CF_RUNNING))
1585 { 1791 {
1586 save_perl (aTHX_ coro); 1792 save_perl (aTHX_ coro);
1587 load_perl (aTHX_ &temp); 1793 load_perl (aTHX_ &temp);
1794 SPAGAIN;
1588 } 1795 }
1589 } 1796 }
1590} 1797}
1591 1798
1592SV * 1799SV *
1604 1811
1605void 1812void
1606api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 1813api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1607 1814
1608SV * 1815SV *
1609has_stack (Coro::State coro) 1816has_cctx (Coro::State coro)
1610 PROTOTYPE: $ 1817 PROTOTYPE: $
1611 CODE: 1818 CODE:
1612 RETVAL = boolSV (!!coro->cctx); 1819 RETVAL = boolSV (!!coro->cctx);
1613 OUTPUT: 1820 OUTPUT:
1614 RETVAL 1821 RETVAL
1633 case 1: RETVAL = coro->usecount; break; 1840 case 1: RETVAL = coro->usecount; break;
1634 } 1841 }
1635 OUTPUT: 1842 OUTPUT:
1636 RETVAL 1843 RETVAL
1637 1844
1845void
1846force_cctx ()
1847 CODE:
1848 struct coro *coro = SvSTATE (coro_current);
1849 coro->cctx->idle_sp = 0;
1638 1850
1639MODULE = Coro::State PACKAGE = Coro 1851MODULE = Coro::State PACKAGE = Coro
1640 1852
1641BOOT: 1853BOOT:
1642{ 1854{
1643 int i; 1855 int i;
1644 1856
1645 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1646 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1647 av_async_pool = get_av ("Coro::async_pool", TRUE); 1857 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1858 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1859 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1648 1860
1649 coro_current = get_sv ("Coro::current", FALSE); 1861 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1650 SvREADONLY_on (coro_current); 1862 SvREADONLY_on (coro_current);
1651 1863
1652 coro_stash = gv_stashpv ("Coro", TRUE); 1864 coro_stash = gv_stashpv ("Coro", TRUE);
1653 1865
1654 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1866 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1655 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1867 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1656 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1868 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1657 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1869 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1660 1872
1661 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1873 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1662 coro_ready[i] = newAV (); 1874 coro_ready[i] = newAV ();
1663 1875
1664 { 1876 {
1665 SV *sv = perl_get_sv("Coro::API", 1); 1877 SV *sv = perl_get_sv ("Coro::API", TRUE);
1878 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1666 1879
1667 coroapi.schedule = api_schedule; 1880 coroapi.schedule = api_schedule;
1668 coroapi.cede = api_cede; 1881 coroapi.cede = api_cede;
1669 coroapi.cede_notself = api_cede_notself; 1882 coroapi.cede_notself = api_cede_notself;
1670 coroapi.ready = api_ready; 1883 coroapi.ready = api_ready;
1683 PROTOTYPE: $ 1896 PROTOTYPE: $
1684 CODE: 1897 CODE:
1685 SvREFCNT_dec (SvRV (coro_current)); 1898 SvREFCNT_dec (SvRV (coro_current));
1686 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 1899 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1687 1900
1901void
1902_set_readyhook (SV *hook)
1903 PROTOTYPE: $
1904 CODE:
1905 LOCK;
1906 if (coro_readyhook)
1907 SvREFCNT_dec (coro_readyhook);
1908 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
1909 UNLOCK;
1910
1688int 1911int
1689prio (Coro::State coro, int newprio = 0) 1912prio (Coro::State coro, int newprio = 0)
1690 ALIAS: 1913 ALIAS:
1691 nice = 1 1914 nice = 1
1692 CODE: 1915 CODE:
1721 CODE: 1944 CODE:
1722 RETVAL = coro_nready; 1945 RETVAL = coro_nready;
1723 OUTPUT: 1946 OUTPUT:
1724 RETVAL 1947 RETVAL
1725 1948
1949void
1950throw (Coro::State self, SV *throw = &PL_sv_undef)
1951 PROTOTYPE: $;$
1952 CODE:
1953 SvREFCNT_dec (self->throw);
1954 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1955
1956void
1957swap_defsv (Coro::State self)
1958 PROTOTYPE: $
1959 ALIAS:
1960 swap_defav = 1
1961 CODE:
1962 if (!self->slot)
1963 croak ("cannot swap state with coroutine that has no saved state");
1964 else
1965 {
1966 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1967 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1968
1969 SV *tmp = *src; *src = *dst; *dst = tmp;
1970 }
1971
1726# for async_pool speedup 1972# for async_pool speedup
1727void 1973void
1728_pool_1 (SV *cb) 1974_pool_1 (SV *cb)
1729 CODE: 1975 CODE:
1730{ 1976{
1734 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1980 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1735 AV *invoke_av; 1981 AV *invoke_av;
1736 int i, len; 1982 int i, len;
1737 1983
1738 if (!invoke) 1984 if (!invoke)
1985 {
1986 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1739 croak ("\3terminate\2\n"); 1987 croak ("\3async_pool terminate\2\n");
1988 }
1740 1989
1741 SvREFCNT_dec (coro->saved_deffh); 1990 SvREFCNT_dec (coro->saved_deffh);
1742 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1991 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1743 1992
1744 hv_store (hv, "desc", sizeof ("desc") - 1, 1993 hv_store (hv, "desc", sizeof ("desc") - 1,
1770 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2019 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1771 coro->saved_deffh = 0; 2020 coro->saved_deffh = 0;
1772 2021
1773 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2022 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1774 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2023 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2024 {
2025 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1775 croak ("\3terminate\2\n"); 2026 croak ("\3async_pool terminate\2\n");
2027 }
1776 2028
1777 av_clear (GvAV (PL_defgv)); 2029 av_clear (GvAV (PL_defgv));
1778 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2030 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1779 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2031 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1780 2032
1819 PL_laststype = data->laststype; 2071 PL_laststype = data->laststype;
1820 PL_laststatval = data->laststatval; 2072 PL_laststatval = data->laststatval;
1821 PL_statcache = data->statcache; 2073 PL_statcache = data->statcache;
1822} 2074}
1823 2075
2076
2077MODULE = Coro::State PACKAGE = Coro::AnyEvent
2078
2079BOOT:
2080 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2081
2082SV *
2083_schedule ()
2084 PROTOTYPE: @
2085 CODE:
2086{
2087 static int incede;
2088 fprintf (stderr, "_schedule\n");//D
2089
2090 api_cede_notself ();
2091
2092 ++incede;
2093 while (coro_nready >= incede && api_cede ())
2094 ;
2095
2096 sv_setsv (sv_activity, &PL_sv_undef);
2097 if (coro_nready >= incede)
2098 {
2099 PUSHMARK (SP);
2100 PUTBACK;
2101 fprintf (stderr, "call act %d >= %d\n", coro_nready, incede);//D
2102 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2103 SPAGAIN;
2104 }
2105
2106 --incede;
2107}
2108

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines