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.245 by root, Mon Sep 22 05:40:21 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); 366 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
311 367
312 return 0; 368 return 0;
313} 369}
314 370
315#define PERL_MAGIC_coro PERL_MAGIC_ext 371#define CORO_MAGIC_type_cv PERL_MAGIC_ext
372#define CORO_MAGIC_type_state PERL_MAGIC_ext
316 373
317static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 374static MGVTBL coro_cv_vtbl = {
375 0, 0, 0, 0,
376 coro_cv_free
377};
318 378
319#define CORO_MAGIC(cv) \ 379#define CORO_MAGIC(sv,type) \
320 SvMAGIC (cv) \ 380 SvMAGIC (sv) \
321 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 381 ? SvMAGIC (sv)->mg_type == type \
322 ? SvMAGIC (cv) \ 382 ? SvMAGIC (sv) \
323 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 383 : mg_find (sv, type) \
324 : 0 384 : 0
385
386#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
387#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
325 388
326static struct coro * 389static struct coro *
327SvSTATE_ (pTHX_ SV *coro) 390SvSTATE_ (pTHX_ SV *coro)
328{ 391{
329 HV *stash; 392 HV *stash;
341 /* very slow, but rare, check */ 404 /* very slow, but rare, check */
342 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 405 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
343 croak ("Coro::State object required"); 406 croak ("Coro::State object required");
344 } 407 }
345 408
346 mg = CORO_MAGIC (coro); 409 mg = CORO_MAGIC_state (coro);
347 return (struct coro *)mg->mg_ptr; 410 return (struct coro *)mg->mg_ptr;
348} 411}
349 412
350#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 413#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
351 414
352/* the next two functions merely cache the padlists */ 415/* the next two functions merely cache the padlists */
353static void 416static void
354get_padlist (pTHX_ CV *cv) 417get_padlist (pTHX_ CV *cv)
355{ 418{
356 MAGIC *mg = CORO_MAGIC (cv); 419 MAGIC *mg = CORO_MAGIC_cv (cv);
357 AV *av; 420 AV *av;
358 421
359 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 422 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
360 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 423 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
361 else 424 else
362 { 425 {
363#if CORO_PREFER_PERL_FUNCTIONS 426#if CORO_PREFER_PERL_FUNCTIONS
364 /* this is probably cleaner, but also slower? */ 427 /* this is probably cleaner? but also slower! */
428 /* in practise, it seems to be less stable */
365 CV *cp = Perl_cv_clone (cv); 429 CV *cp = Perl_cv_clone (cv);
366 CvPADLIST (cv) = CvPADLIST (cp); 430 CvPADLIST (cv) = CvPADLIST (cp);
367 CvPADLIST (cp) = 0; 431 CvPADLIST (cp) = 0;
368 SvREFCNT_dec (cp); 432 SvREFCNT_dec (cp);
369#else 433#else
373} 437}
374 438
375static void 439static void
376put_padlist (pTHX_ CV *cv) 440put_padlist (pTHX_ CV *cv)
377{ 441{
378 MAGIC *mg = CORO_MAGIC (cv); 442 MAGIC *mg = CORO_MAGIC_cv (cv);
379 AV *av; 443 AV *av;
380 444
381 if (expect_false (!mg)) 445 if (expect_false (!mg))
382 { 446 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 447
389 av = (AV *)mg->mg_obj; 448 av = (AV *)mg->mg_obj;
390 449
391 if (expect_false (AvFILLp (av) >= AvMAX (av))) 450 if (expect_false (AvFILLp (av) >= AvMAX (av)))
392 av_extend (av, AvMAX (av) + 1); 451 av_extend (av, AvMAX (av) + 1);
397/** load & save, init *******************************************************/ 456/** load & save, init *******************************************************/
398 457
399static void 458static void
400load_perl (pTHX_ Coro__State c) 459load_perl (pTHX_ Coro__State c)
401{ 460{
461 perl_slots *slot = c->slot;
462 c->slot = 0;
463
464 PL_mainstack = c->mainstack;
465
466 GvSV (PL_defgv) = slot->defsv;
467 GvAV (PL_defgv) = slot->defav;
468 GvSV (PL_errgv) = slot->errsv;
469 GvSV (irsgv) = slot->irsgv;
470
402#define VAR(name,type) PL_ ## name = c->name; 471 #define VAR(name,type) PL_ ## name = slot->name;
403# include "state.h" 472 # include "state.h"
404#undef VAR 473 #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 474
411 { 475 {
412 dSP; 476 dSP;
477
413 CV *cv; 478 CV *cv;
414 479
415 /* now do the ugly restore mess */ 480 /* now do the ugly restore mess */
416 while (expect_true (cv = (CV *)POPs)) 481 while (expect_true (cv = (CV *)POPs))
417 { 482 {
452 517
453 if (expect_true (CvDEPTH (cv))) 518 if (expect_true (CvDEPTH (cv)))
454 { 519 {
455 EXTEND (SP, 3); 520 EXTEND (SP, 3);
456 PUSHs ((SV *)CvPADLIST (cv)); 521 PUSHs ((SV *)CvPADLIST (cv));
457 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 522 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
458 PUSHs ((SV *)cv); 523 PUSHs ((SV *)cv);
459 524
460 CvDEPTH (cv) = 0; 525 CvDEPTH (cv) = 0;
461 get_padlist (aTHX_ cv); 526 get_padlist (aTHX_ cv);
462 } 527 }
472 } 537 }
473 538
474 PUTBACK; 539 PUTBACK;
475 } 540 }
476 541
542 /* allocate some space on the context stack for our purposes */
543 /* we manually unroll here, as usually 2 slots is enough */
544 if (SLOT_COUNT >= 1) CXINC;
545 if (SLOT_COUNT >= 2) CXINC;
546 if (SLOT_COUNT >= 3) CXINC;
547 {
548 int i;
549 for (i = 3; i < SLOT_COUNT; ++i)
550 CXINC;
551 }
552 cxstack_ix -= SLOT_COUNT; /* undo allocation */
553
554 c->mainstack = PL_mainstack;
555
556 {
557 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
558
477 c->defav = GvAV (PL_defgv); 559 slot->defav = GvAV (PL_defgv);
478 c->defsv = DEFSV; 560 slot->defsv = DEFSV;
479 c->errsv = ERRSV; 561 slot->errsv = ERRSV;
480 c->irssv_sv = GvSV (irsgv); 562 slot->irsgv = GvSV (irsgv);
481 563
482#define VAR(name,type)c->name = PL_ ## name; 564 #define VAR(name,type) slot->name = PL_ ## name;
483# include "state.h" 565 # include "state.h"
484#undef VAR 566 #undef VAR
567 }
485} 568}
486 569
487/* 570/*
488 * allocate various perl stacks. This is an exact copy 571 * allocate various perl stacks. This is an exact copy
489 * of perl.c:init_stacks, except that it uses less memory 572 * of perl.c:init_stacks, except that it uses less memory
494# define coro_init_stacks init_stacks 577# define coro_init_stacks init_stacks
495#else 578#else
496static void 579static void
497coro_init_stacks (pTHX) 580coro_init_stacks (pTHX)
498{ 581{
499 PL_curstackinfo = new_stackinfo(64, 6); 582 PL_curstackinfo = new_stackinfo(32, 8);
500 PL_curstackinfo->si_type = PERLSI_MAIN; 583 PL_curstackinfo->si_type = PERLSI_MAIN;
501 PL_curstack = PL_curstackinfo->si_stack; 584 PL_curstack = PL_curstackinfo->si_stack;
502 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 585 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
503 586
504 PL_stack_base = AvARRAY(PL_curstack); 587 PL_stack_base = AvARRAY(PL_curstack);
505 PL_stack_sp = PL_stack_base; 588 PL_stack_sp = PL_stack_base;
506 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 589 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
507 590
508 New(50,PL_tmps_stack,64,SV*); 591 New(50,PL_tmps_stack,32,SV*);
509 PL_tmps_floor = -1; 592 PL_tmps_floor = -1;
510 PL_tmps_ix = -1; 593 PL_tmps_ix = -1;
511 PL_tmps_max = 64; 594 PL_tmps_max = 32;
512 595
513 New(54,PL_markstack,16,I32); 596 New(54,PL_markstack,16,I32);
514 PL_markstack_ptr = PL_markstack; 597 PL_markstack_ptr = PL_markstack;
515 PL_markstack_max = PL_markstack + 16; 598 PL_markstack_max = PL_markstack + 16;
516 599
517#ifdef SET_MARK_OFFSET 600#ifdef SET_MARK_OFFSET
518 SET_MARK_OFFSET; 601 SET_MARK_OFFSET;
519#endif 602#endif
520 603
521 New(54,PL_scopestack,16,I32); 604 New(54,PL_scopestack,8,I32);
522 PL_scopestack_ix = 0; 605 PL_scopestack_ix = 0;
523 PL_scopestack_max = 16; 606 PL_scopestack_max = 8;
524 607
525 New(54,PL_savestack,64,ANY); 608 New(54,PL_savestack,24,ANY);
526 PL_savestack_ix = 0; 609 PL_savestack_ix = 0;
527 PL_savestack_max = 64; 610 PL_savestack_max = 24;
528 611
529#if !PERL_VERSION_ATLEAST (5,9,0) 612#if !PERL_VERSION_ATLEAST (5,10,0)
530 New(54,PL_retstack,4,OP*); 613 New(54,PL_retstack,4,OP*);
531 PL_retstack_ix = 0; 614 PL_retstack_ix = 0;
532 PL_retstack_max = 4; 615 PL_retstack_max = 4;
533#endif 616#endif
534} 617}
557 640
558 Safefree (PL_tmps_stack); 641 Safefree (PL_tmps_stack);
559 Safefree (PL_markstack); 642 Safefree (PL_markstack);
560 Safefree (PL_scopestack); 643 Safefree (PL_scopestack);
561 Safefree (PL_savestack); 644 Safefree (PL_savestack);
562#if !PERL_VERSION_ATLEAST (5,9,0) 645#if !PERL_VERSION_ATLEAST (5,10,0)
563 Safefree (PL_retstack); 646 Safefree (PL_retstack);
564#endif 647#endif
565} 648}
566 649
567static size_t 650static size_t
569{ 652{
570 size_t rss = sizeof (*coro); 653 size_t rss = sizeof (*coro);
571 654
572 if (coro->mainstack) 655 if (coro->mainstack)
573 { 656 {
657 perl_slots tmp_slot;
658 perl_slots *slot;
659
574 if (coro->flags & CF_RUNNING) 660 if (coro->flags & CF_RUNNING)
575 { 661 {
662 slot = &tmp_slot;
663
576 #define VAR(name,type)coro->name = PL_ ## name; 664 #define VAR(name,type) slot->name = PL_ ## name;
577 # include "state.h" 665 # include "state.h"
578 #undef VAR 666 #undef VAR
579 } 667 }
668 else
669 slot = coro->slot;
580 670
671 if (slot)
672 {
581 rss += sizeof (coro->curstackinfo); 673 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); 674 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
584 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 675 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
585 rss += coro->tmps_max * sizeof (SV *); 676 rss += slot->tmps_max * sizeof (SV *);
586 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 677 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
587 rss += coro->scopestack_max * sizeof (I32); 678 rss += slot->scopestack_max * sizeof (I32);
588 rss += coro->savestack_max * sizeof (ANY); 679 rss += slot->savestack_max * sizeof (ANY);
589 680
590#if !PERL_VERSION_ATLEAST (5,9,0) 681#if !PERL_VERSION_ATLEAST (5,10,0)
591 rss += coro->retstack_max * sizeof (OP *); 682 rss += slot->retstack_max * sizeof (OP *);
592#endif 683#endif
684 }
593 } 685 }
594 686
595 return rss; 687 return rss;
596} 688}
597 689
598/** coroutine stack handling ************************************************/ 690/** coroutine stack handling ************************************************/
691
692static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
693static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
694static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
695
696/* apparently < 5.8.8 */
697#ifndef MgPV_nolen_const
698#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
699 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
700 (const char*)(mg)->mg_ptr)
701#endif
702
703/*
704 * This overrides the default magic get method of %SIG elements.
705 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
706 * and instead of tryign to save and restore the hash elements, we just provide
707 * readback here.
708 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
709 * not expecting this to actually change the hook. This is a potential problem
710 * when a schedule happens then, but we ignore this.
711 */
712static int
713coro_sigelem_get (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_setsv (sv, *svp ? *svp : &PL_sv_undef);
727 return 0;
728 }
729 }
730
731 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
732}
733
734static int
735coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
736{
737 const char *s = MgPV_nolen_const (mg);
738
739 if (*s == '_')
740 {
741 SV **svp = 0;
742
743 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
744 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
745
746 if (svp)
747 {
748 SV *old = *svp;
749 *svp = 0;
750 SvREFCNT_dec (old);
751 return 0;
752 }
753 }
754
755 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
756}
757
758static int
759coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
760{
761 const char *s = MgPV_nolen_const (mg);
762
763 if (*s == '_')
764 {
765 SV **svp = 0;
766
767 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
768 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
769
770 if (svp)
771 {
772 SV *old = *svp;
773 *svp = newSVsv (sv);
774 SvREFCNT_dec (old);
775 return 0;
776 }
777 }
778
779 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
780}
599 781
600static void 782static void
601coro_setup (pTHX_ struct coro *coro) 783coro_setup (pTHX_ struct coro *coro)
602{ 784{
603 /* 785 /*
608 PL_runops = RUNOPS_DEFAULT; 790 PL_runops = RUNOPS_DEFAULT;
609 PL_curcop = &PL_compiling; 791 PL_curcop = &PL_compiling;
610 PL_in_eval = EVAL_NULL; 792 PL_in_eval = EVAL_NULL;
611 PL_comppad = 0; 793 PL_comppad = 0;
612 PL_curpm = 0; 794 PL_curpm = 0;
795 PL_curpad = 0;
613 PL_localizing = 0; 796 PL_localizing = 0;
614 PL_dirty = 0; 797 PL_dirty = 0;
615 PL_restartop = 0; 798 PL_restartop = 0;
799#if PERL_VERSION_ATLEAST (5,10,0)
800 PL_parser = 0;
801#endif
802
803 /* recreate the die/warn hooks */
804 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
805 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
616 806
617 GvSV (PL_defgv) = newSV (0); 807 GvSV (PL_defgv) = newSV (0);
618 GvAV (PL_defgv) = coro->args; coro->args = 0; 808 GvAV (PL_defgv) = coro->args; coro->args = 0;
619 GvSV (PL_errgv) = newSV (0); 809 GvSV (PL_errgv) = newSV (0);
620 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 810 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
621 PL_rs = newSVsv (GvSV (irsgv)); 811 PL_rs = newSVsv (GvSV (irsgv));
622 PL_defoutgv = SvREFCNT_inc (stdoutgv); 812 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
623
624 ENTER; /* necessary e.g. for dounwind */
625 813
626 { 814 {
627 dSP; 815 dSP;
628 LOGOP myop; 816 LOGOP myop;
629 817
636 PUTBACK; 824 PUTBACK;
637 PL_op = (OP *)&myop; 825 PL_op = (OP *)&myop;
638 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 826 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
639 SPAGAIN; 827 SPAGAIN;
640 } 828 }
829
830 /* this newly created coroutine might be run on an existing cctx which most
831 * likely was suspended in set_stacklevel, called from entersub.
832 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
833 * so we ENTER here for symmetry
834 */
835 ENTER;
641} 836}
642 837
643static void 838static void
644coro_destroy (pTHX_ struct coro *coro) 839coro_destroy (pTHX_ struct coro *coro)
645{ 840{
665 SvREFCNT_dec (GvSV (PL_errgv)); 860 SvREFCNT_dec (GvSV (PL_errgv));
666 SvREFCNT_dec (PL_defoutgv); 861 SvREFCNT_dec (PL_defoutgv);
667 SvREFCNT_dec (PL_rs); 862 SvREFCNT_dec (PL_rs);
668 SvREFCNT_dec (GvSV (irsgv)); 863 SvREFCNT_dec (GvSV (irsgv));
669 864
865 SvREFCNT_dec (PL_diehook);
866 SvREFCNT_dec (PL_warnhook);
867
670 SvREFCNT_dec (coro->saved_deffh); 868 SvREFCNT_dec (coro->saved_deffh);
671 //SvREFCNT_dec (coro->throw); 869 SvREFCNT_dec (coro->throw);
672 870
673 coro_destroy_stacks (aTHX); 871 coro_destroy_stacks (aTHX);
674} 872}
675 873
676static void 874static void
763 SAVETMPS; 961 SAVETMPS;
764 EXTEND (SP, 3); 962 EXTEND (SP, 3);
765 PUSHMARK (SP); 963 PUSHMARK (SP);
766 PUSHs (&PL_sv_yes); 964 PUSHs (&PL_sv_yes);
767 PUSHs (fullname); 965 PUSHs (fullname);
768 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 966 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
769 PUTBACK; 967 PUTBACK;
770 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 968 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); 969 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
772 SPAGAIN; 970 SPAGAIN;
773 FREETMPS; 971 FREETMPS;
809 1007
810/* inject a fake call to Coro::State::_cctx_init into the execution */ 1008/* 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 */ 1009/* _cctx_init should be careful, as it could be called at almost any time */
812/* during execution of a perl program */ 1010/* during execution of a perl program */
813static void NOINLINE 1011static void NOINLINE
814prepare_cctx (pTHX_ coro_cctx *cctx) 1012cctx_prepare (pTHX_ coro_cctx *cctx)
815{ 1013{
816 dSP; 1014 dSP;
817 LOGOP myop; 1015 LOGOP myop;
818 1016
819 PL_top_env = &PL_start_env; 1017 PL_top_env = &PL_start_env;
837 1035
838/* 1036/*
839 * this is a _very_ stripped down perl interpreter ;) 1037 * this is a _very_ stripped down perl interpreter ;)
840 */ 1038 */
841static void 1039static void
842coro_run (void *arg) 1040cctx_run (void *arg)
843{ 1041{
844 dTHX; 1042 dTHX;
845 1043
846 /* coro_run is the alternative tail of transfer(), so unlock here. */ 1044 /* cctx_run is the alternative tail of transfer(), so unlock here. */
847 UNLOCK; 1045 UNLOCK;
848 1046
849 /* we now skip the entersub that lead to transfer() */ 1047 /* we now skip the entersub that lead to transfer() */
850 PL_op = PL_op->op_next; 1048 PL_op = PL_op->op_next;
851 1049
852 /* inject a fake subroutine call to cctx_init */ 1050 /* inject a fake subroutine call to cctx_init */
853 prepare_cctx (aTHX_ (coro_cctx *)arg); 1051 cctx_prepare (aTHX_ (coro_cctx *)arg);
854 1052
855 /* somebody or something will hit me for both perl_run and PL_restartop */ 1053 /* somebody or something will hit me for both perl_run and PL_restartop */
856 PL_restartop = PL_op; 1054 PL_restartop = PL_op;
857 perl_run (PL_curinterp); 1055 perl_run (PL_curinterp);
858 1056
877 ++cctx_count; 1075 ++cctx_count;
878 1076
879 Newz (0, cctx, 1, coro_cctx); 1077 Newz (0, cctx, 1, coro_cctx);
880 1078
881#if HAVE_MMAP 1079#if HAVE_MMAP
882
883 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1080 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
884 /* mmap supposedly does allocate-on-write for us */ 1081 /* 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); 1082 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
886 1083
887 if (cctx->sptr != (void *)-1) 1084 if (cctx->sptr != (void *)-1)
908 stack_start = cctx->sptr; 1105 stack_start = cctx->sptr;
909 stack_size = cctx->ssize; 1106 stack_size = cctx->ssize;
910 } 1107 }
911 1108
912 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1109 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
913 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1110 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
914 1111
915 return cctx; 1112 return cctx;
916} 1113}
917 1114
918static void 1115static void
990 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1187 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
991 1188
992 if (expect_false (next->flags & CF_DESTROYED)) 1189 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"); 1190 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
994 1191
1192#if !PERL_VERSION_ATLEAST (5,10,0)
995 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1193 if (expect_false (PL_lex_state != LEX_NOTPARSING))
996 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1194 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1195#endif
997 } 1196 }
998} 1197}
999 1198
1000/* always use the TRANSFER macro */ 1199/* always use the TRANSFER macro */
1001static void NOINLINE 1200static void NOINLINE
1002transfer (pTHX_ struct coro *prev, struct coro *next) 1201transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1003{ 1202{
1004 dSTACKLEVEL; 1203 dSTACKLEVEL;
1204 static volatile int has_throw;
1005 1205
1006 /* sometimes transfer is only called to set idle_sp */ 1206 /* sometimes transfer is only called to set idle_sp */
1007 if (expect_false (!next)) 1207 if (expect_false (!next))
1008 { 1208 {
1009 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1209 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1024 prev->flags &= ~CF_RUNNING; 1224 prev->flags &= ~CF_RUNNING;
1025 next->flags |= CF_RUNNING; 1225 next->flags |= CF_RUNNING;
1026 1226
1027 LOCK; 1227 LOCK;
1028 1228
1229 /* first get rid of the old state */
1230 save_perl (aTHX_ prev);
1231
1029 if (expect_false (next->flags & CF_NEW)) 1232 if (expect_false (next->flags & CF_NEW))
1030 { 1233 {
1031 /* need to start coroutine */ 1234 /* need to start coroutine */
1032 next->flags &= ~CF_NEW; 1235 next->flags &= ~CF_NEW;
1033 /* first get rid of the old state */
1034 save_perl (aTHX_ prev);
1035 /* setup coroutine call */ 1236 /* setup coroutine call */
1036 coro_setup (aTHX_ next); 1237 coro_setup (aTHX_ next);
1037 } 1238 }
1038 else 1239 else
1039 {
1040 /* coroutine already started */
1041 save_perl (aTHX_ prev);
1042 load_perl (aTHX_ next); 1240 load_perl (aTHX_ next);
1043 }
1044 1241
1045 prev__cctx = prev->cctx; 1242 prev__cctx = prev->cctx;
1046 1243
1047 /* possibly "free" the cctx */ 1244 /* possibly "free" the cctx */
1048 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1245 if (expect_true (
1246 prev__cctx->idle_sp == STACKLEVEL
1247 && !(prev__cctx->flags & CC_TRACE)
1248 && !force_cctx
1249 ))
1049 { 1250 {
1050 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1251 /* 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)); 1252 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1052 1253
1053 prev->cctx = 0; 1254 prev->cctx = 0;
1054 1255
1055 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1256 /* 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 */ 1257 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1057 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1258 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1259 if (!next->cctx)
1058 next->cctx = cctx_get (aTHX); 1260 next->cctx = cctx_get (aTHX);
1059 1261
1060 cctx_put (prev__cctx); 1262 cctx_put (prev__cctx);
1061 } 1263 }
1062 1264
1063 ++next->usecount; 1265 ++next->usecount;
1064 1266
1065 if (expect_true (!next->cctx)) 1267 if (expect_true (!next->cctx))
1066 next->cctx = cctx_get (aTHX); 1268 next->cctx = cctx_get (aTHX);
1269
1270 has_throw = !!next->throw;
1067 1271
1068 if (expect_false (prev__cctx != next->cctx)) 1272 if (expect_false (prev__cctx != next->cctx))
1069 { 1273 {
1070 prev__cctx->top_env = PL_top_env; 1274 prev__cctx->top_env = PL_top_env;
1071 PL_top_env = next->cctx->top_env; 1275 PL_top_env = next->cctx->top_env;
1072 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1276 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1073 } 1277 }
1074 1278
1075 free_coro_mortal (aTHX); 1279 free_coro_mortal (aTHX);
1076 UNLOCK; 1280 UNLOCK;
1281
1282 if (expect_false (has_throw))
1283 {
1284 struct coro *coro = SvSTATE (coro_current);
1285
1286 if (coro->throw)
1287 {
1288 SV *exception = coro->throw;
1289 coro->throw = 0;
1290 sv_setsv (ERRSV, exception);
1291 croak (0);
1292 }
1293 }
1077 } 1294 }
1078} 1295}
1079 1296
1080struct transfer_args 1297struct transfer_args
1081{ 1298{
1082 struct coro *prev, *next; 1299 struct coro *prev, *next;
1083}; 1300};
1084 1301
1085#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1302#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) 1303#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1087 1304
1088/** high level stuff ********************************************************/ 1305/** high level stuff ********************************************************/
1089 1306
1090static int 1307static int
1116 save_perl (aTHX_ &temp); 1333 save_perl (aTHX_ &temp);
1117 load_perl (aTHX_ coro); 1334 load_perl (aTHX_ coro);
1118 1335
1119 coro_destroy (aTHX_ coro); 1336 coro_destroy (aTHX_ coro);
1120 1337
1121 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1338 load_perl (aTHX_ &temp);
1122 1339
1123 coro->mainstack = 0; 1340 coro->slot = 0;
1124 } 1341 }
1125 1342
1126 cctx_destroy (coro->cctx); 1343 cctx_destroy (coro->cctx);
1127 SvREFCNT_dec (coro->args); 1344 SvREFCNT_dec (coro->args);
1128 1345
1184{ 1401{
1185 dTHX; 1402 dTHX;
1186 struct transfer_args ta; 1403 struct transfer_args ta;
1187 1404
1188 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1405 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1189 TRANSFER (ta); 1406 TRANSFER (ta, 1);
1190} 1407}
1191 1408
1192/** Coro ********************************************************************/ 1409/** Coro ********************************************************************/
1193 1410
1194static void 1411static void
1196{ 1413{
1197 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1414 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1198} 1415}
1199 1416
1200static SV * 1417static SV *
1201coro_deq (pTHX_ int min_prio) 1418coro_deq (pTHX)
1202{ 1419{
1203 int prio = PRIO_MAX - PRIO_MIN; 1420 int prio;
1204 1421
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; ) 1422 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1210 if (AvFILLp (coro_ready [prio]) >= 0) 1423 if (AvFILLp (coro_ready [prio]) >= 0)
1211 return av_shift (coro_ready [prio]); 1424 return av_shift (coro_ready [prio]);
1212 1425
1213 return 0; 1426 return 0;
1214} 1427}
1216static int 1429static int
1217api_ready (SV *coro_sv) 1430api_ready (SV *coro_sv)
1218{ 1431{
1219 dTHX; 1432 dTHX;
1220 struct coro *coro; 1433 struct coro *coro;
1434 SV *sv_hook;
1435 void (*xs_hook)(void);
1221 1436
1222 if (SvROK (coro_sv)) 1437 if (SvROK (coro_sv))
1223 coro_sv = SvRV (coro_sv); 1438 coro_sv = SvRV (coro_sv);
1224 1439
1225 coro = SvSTATE (coro_sv); 1440 coro = SvSTATE (coro_sv);
1228 return 0; 1443 return 0;
1229 1444
1230 coro->flags |= CF_READY; 1445 coro->flags |= CF_READY;
1231 1446
1232 LOCK; 1447 LOCK;
1448
1449 sv_hook = coro_nready ? 0 : coro_readyhook;
1450 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1451
1233 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1452 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1234 ++coro_nready; 1453 ++coro_nready;
1454
1235 UNLOCK; 1455 UNLOCK;
1456
1457 if (sv_hook)
1458 {
1459 dSP;
1460
1461 ENTER;
1462 SAVETMPS;
1463
1464 PUSHMARK (SP);
1465 PUTBACK;
1466 call_sv (sv_hook, G_DISCARD);
1467 SPAGAIN;
1468
1469 FREETMPS;
1470 LEAVE;
1471 }
1472
1473 if (xs_hook)
1474 xs_hook ();
1236 1475
1237 return 1; 1476 return 1;
1238} 1477}
1239 1478
1240static int 1479static int
1250 SV *prev_sv, *next_sv; 1489 SV *prev_sv, *next_sv;
1251 1490
1252 for (;;) 1491 for (;;)
1253 { 1492 {
1254 LOCK; 1493 LOCK;
1255 next_sv = coro_deq (aTHX_ PRIO_MIN); 1494 next_sv = coro_deq (aTHX);
1256 1495
1257 /* nothing to schedule: call the idle handler */ 1496 /* nothing to schedule: call the idle handler */
1258 if (expect_false (!next_sv)) 1497 if (expect_false (!next_sv))
1259 { 1498 {
1260 dSP; 1499 dSP;
1264 SAVETMPS; 1503 SAVETMPS;
1265 1504
1266 PUSHMARK (SP); 1505 PUSHMARK (SP);
1267 PUTBACK; 1506 PUTBACK;
1268 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1507 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1508 SPAGAIN;
1269 1509
1270 FREETMPS; 1510 FREETMPS;
1271 LEAVE; 1511 LEAVE;
1272 continue; 1512 continue;
1273 } 1513 }
1328{ 1568{
1329 dTHX; 1569 dTHX;
1330 struct transfer_args ta; 1570 struct transfer_args ta;
1331 1571
1332 prepare_schedule (aTHX_ &ta); 1572 prepare_schedule (aTHX_ &ta);
1333 TRANSFER (ta); 1573 TRANSFER (ta, 1);
1334} 1574}
1335 1575
1336static int 1576static int
1337api_cede (void) 1577api_cede (void)
1338{ 1578{
1341 1581
1342 prepare_cede (aTHX_ &ta); 1582 prepare_cede (aTHX_ &ta);
1343 1583
1344 if (expect_true (ta.prev != ta.next)) 1584 if (expect_true (ta.prev != ta.next))
1345 { 1585 {
1346 TRANSFER (ta); 1586 TRANSFER (ta, 1);
1347 return 1; 1587 return 1;
1348 } 1588 }
1349 else 1589 else
1350 return 0; 1590 return 0;
1351} 1591}
1356 dTHX; 1596 dTHX;
1357 struct transfer_args ta; 1597 struct transfer_args ta;
1358 1598
1359 if (prepare_cede_notself (aTHX_ &ta)) 1599 if (prepare_cede_notself (aTHX_ &ta))
1360 { 1600 {
1361 TRANSFER (ta); 1601 TRANSFER (ta, 1);
1362 return 1; 1602 return 1;
1363 } 1603 }
1364 else 1604 else
1365 return 0; 1605 return 0;
1366} 1606}
1385 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1625 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1386 1626
1387 if (coro->flags & CF_RUNNING) 1627 if (coro->flags & CF_RUNNING)
1388 PL_runops = RUNOPS_DEFAULT; 1628 PL_runops = RUNOPS_DEFAULT;
1389 else 1629 else
1390 coro->runops = RUNOPS_DEFAULT; 1630 coro->slot->runops = RUNOPS_DEFAULT;
1391 } 1631 }
1392} 1632}
1633
1634static int
1635coro_gensub_free (pTHX_ SV *sv, MAGIC *mg)
1636{
1637 AV *padlist;
1638 AV *av = (AV *)mg->mg_obj;
1639
1640 abort ();
1641
1642 return 0;
1643}
1644
1645static MGVTBL coro_gensub_vtbl = {
1646 0, 0, 0, 0,
1647 coro_gensub_free
1648};
1393 1649
1394MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1650MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1395 1651
1396PROTOTYPES: DISABLE 1652PROTOTYPES: DISABLE
1397 1653
1402#endif 1658#endif
1403 BOOT_PAGESIZE; 1659 BOOT_PAGESIZE;
1404 1660
1405 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1661 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1406 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1662 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1663
1664 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1665 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1666 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1667
1668 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1669 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1670 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1407 1671
1408 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1672 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1409 1673
1410 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1674 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1411 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1675 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1416 main_top_env = PL_top_env; 1680 main_top_env = PL_top_env;
1417 1681
1418 while (main_top_env->je_prev) 1682 while (main_top_env->je_prev)
1419 main_top_env = main_top_env->je_prev; 1683 main_top_env = main_top_env->je_prev;
1420 1684
1421 coroapi.ver = CORO_API_VERSION; 1685 coroapi.ver = CORO_API_VERSION;
1686 coroapi.rev = CORO_API_REVISION;
1422 coroapi.transfer = api_transfer; 1687 coroapi.transfer = api_transfer;
1423 1688
1424 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1689 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1425} 1690}
1426 1691
1427SV * 1692SV *
1428new (char *klass, ...) 1693new (char *klass, ...)
1429 CODE: 1694 CODE:
1430{ 1695{
1431 struct coro *coro; 1696 struct coro *coro;
1697 MAGIC *mg;
1432 HV *hv; 1698 HV *hv;
1433 int i; 1699 int i;
1434 1700
1435 Newz (0, coro, 1, struct coro); 1701 Newz (0, coro, 1, struct coro);
1436 coro->args = newAV (); 1702 coro->args = newAV ();
1439 if (coro_first) coro_first->prev = coro; 1705 if (coro_first) coro_first->prev = coro;
1440 coro->next = coro_first; 1706 coro->next = coro_first;
1441 coro_first = coro; 1707 coro_first = coro;
1442 1708
1443 coro->hv = hv = newHV (); 1709 coro->hv = hv = newHV ();
1444 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1710 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1711 mg->mg_flags |= MGf_DUP;
1445 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1712 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1446 1713
1447 av_extend (coro->args, items - 1); 1714 av_extend (coro->args, items - 1);
1448 for (i = 1; i < items; i++) 1715 for (i = 1; i < items; i++)
1449 av_push (coro->args, newSVsv (ST (i))); 1716 av_push (coro->args, newSVsv (ST (i)));
1463 Coro::cede_notself = 4 1730 Coro::cede_notself = 4
1464 CODE: 1731 CODE:
1465{ 1732{
1466 struct transfer_args ta; 1733 struct transfer_args ta;
1467 1734
1735 PUTBACK;
1468 switch (ix) 1736 switch (ix)
1469 { 1737 {
1470 case 0: 1738 case 0:
1471 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1739 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1472 ta.next = 0; 1740 ta.next = 0;
1491 if (!prepare_cede_notself (aTHX_ &ta)) 1759 if (!prepare_cede_notself (aTHX_ &ta))
1492 XSRETURN_EMPTY; 1760 XSRETURN_EMPTY;
1493 1761
1494 break; 1762 break;
1495 } 1763 }
1764 SPAGAIN;
1496 1765
1497 BARRIER; 1766 BARRIER;
1767 PUTBACK;
1498 TRANSFER (ta); 1768 TRANSFER (ta, 0);
1499 1769 SPAGAIN; /* might be the sp of a different coroutine now */
1500 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev)) 1770 /* be extra careful not to ever do anything after TRANSFER */
1501 XSRETURN_YES;
1502} 1771}
1503 1772
1504bool 1773bool
1505_destroy (SV *coro_sv) 1774_destroy (SV *coro_sv)
1506 CODE: 1775 CODE:
1507 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 1776 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1508 OUTPUT: 1777 OUTPUT:
1509 RETVAL 1778 RETVAL
1510 1779
1511void 1780void
1512_exit (code) 1781_exit (int code)
1513 int code
1514 PROTOTYPE: $ 1782 PROTOTYPE: $
1515 CODE: 1783 CODE:
1516 _exit (code); 1784 _exit (code);
1517 1785
1518int 1786int
1552call (Coro::State coro, SV *coderef) 1820call (Coro::State coro, SV *coderef)
1553 ALIAS: 1821 ALIAS:
1554 eval = 1 1822 eval = 1
1555 CODE: 1823 CODE:
1556{ 1824{
1557 if (coro->mainstack) 1825 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
1558 { 1826 {
1559 struct coro temp; 1827 struct coro temp;
1560 Zero (&temp, 1, struct coro);
1561 1828
1562 if (!(coro->flags & CF_RUNNING)) 1829 if (!(coro->flags & CF_RUNNING))
1563 { 1830 {
1831 PUTBACK;
1564 save_perl (aTHX_ &temp); 1832 save_perl (aTHX_ &temp);
1565 load_perl (aTHX_ coro); 1833 load_perl (aTHX_ coro);
1566 } 1834 }
1567 1835
1568 { 1836 {
1569 dSP; 1837 dSP;
1570 ENTER; 1838 ENTER;
1571 SAVETMPS; 1839 SAVETMPS;
1840 PUTBACK;
1841 PUSHSTACK;
1572 PUSHMARK (SP); 1842 PUSHMARK (SP);
1573 PUTBACK; 1843
1574 if (ix) 1844 if (ix)
1575 eval_sv (coderef, 0); 1845 eval_sv (coderef, 0);
1576 else 1846 else
1577 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1847 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1848
1849 POPSTACK;
1578 SPAGAIN; 1850 SPAGAIN;
1579 FREETMPS; 1851 FREETMPS;
1580 LEAVE; 1852 LEAVE;
1581 PUTBACK; 1853 PUTBACK;
1582 } 1854 }
1583 1855
1584 if (!(coro->flags & CF_RUNNING)) 1856 if (!(coro->flags & CF_RUNNING))
1585 { 1857 {
1586 save_perl (aTHX_ coro); 1858 save_perl (aTHX_ coro);
1587 load_perl (aTHX_ &temp); 1859 load_perl (aTHX_ &temp);
1860 SPAGAIN;
1588 } 1861 }
1589 } 1862 }
1590} 1863}
1591 1864
1592SV * 1865SV *
1604 1877
1605void 1878void
1606api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 1879api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1607 1880
1608SV * 1881SV *
1609has_stack (Coro::State coro) 1882has_cctx (Coro::State coro)
1610 PROTOTYPE: $ 1883 PROTOTYPE: $
1611 CODE: 1884 CODE:
1612 RETVAL = boolSV (!!coro->cctx); 1885 RETVAL = boolSV (!!coro->cctx);
1613 OUTPUT: 1886 OUTPUT:
1614 RETVAL 1887 RETVAL
1633 case 1: RETVAL = coro->usecount; break; 1906 case 1: RETVAL = coro->usecount; break;
1634 } 1907 }
1635 OUTPUT: 1908 OUTPUT:
1636 RETVAL 1909 RETVAL
1637 1910
1911void
1912force_cctx ()
1913 CODE:
1914 struct coro *coro = SvSTATE (coro_current);
1915 coro->cctx->idle_sp = 0;
1916
1917void
1918throw (Coro::State self, SV *throw = &PL_sv_undef)
1919 PROTOTYPE: $;$
1920 CODE:
1921 SvREFCNT_dec (self->throw);
1922 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1923
1924void
1925swap_defsv (Coro::State self)
1926 PROTOTYPE: $
1927 ALIAS:
1928 swap_defav = 1
1929 CODE:
1930 if (!self->slot)
1931 croak ("cannot swap state with coroutine that has no saved state");
1932 else
1933 {
1934 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1935 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1936
1937 SV *tmp = *src; *src = *dst; *dst = tmp;
1938 }
1638 1939
1639MODULE = Coro::State PACKAGE = Coro 1940MODULE = Coro::State PACKAGE = Coro
1640 1941
1641BOOT: 1942BOOT:
1642{ 1943{
1643 int i; 1944 int i;
1644 1945
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); 1946 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1947 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1948 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1648 1949
1649 coro_current = get_sv ("Coro::current", FALSE); 1950 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1650 SvREADONLY_on (coro_current); 1951 SvREADONLY_on (coro_current);
1651 1952
1652 coro_stash = gv_stashpv ("Coro", TRUE); 1953 coro_stash = gv_stashpv ("Coro", TRUE);
1653 1954
1654 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1955 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1655 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1956 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1656 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1957 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1657 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1958 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1660 1961
1661 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1962 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1662 coro_ready[i] = newAV (); 1963 coro_ready[i] = newAV ();
1663 1964
1664 { 1965 {
1665 SV *sv = perl_get_sv("Coro::API", 1); 1966 SV *sv = perl_get_sv ("Coro::API", TRUE);
1967 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1666 1968
1667 coroapi.schedule = api_schedule; 1969 coroapi.schedule = api_schedule;
1668 coroapi.cede = api_cede; 1970 coroapi.cede = api_cede;
1669 coroapi.cede_notself = api_cede_notself; 1971 coroapi.cede_notself = api_cede_notself;
1670 coroapi.ready = api_ready; 1972 coroapi.ready = api_ready;
1683 PROTOTYPE: $ 1985 PROTOTYPE: $
1684 CODE: 1986 CODE:
1685 SvREFCNT_dec (SvRV (coro_current)); 1987 SvREFCNT_dec (SvRV (coro_current));
1686 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 1988 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1687 1989
1990void
1991_set_readyhook (SV *hook)
1992 PROTOTYPE: $
1993 CODE:
1994 LOCK;
1995 SvREFCNT_dec (coro_readyhook);
1996 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
1997 UNLOCK;
1998
1688int 1999int
1689prio (Coro::State coro, int newprio = 0) 2000prio (Coro::State coro, int newprio = 0)
1690 ALIAS: 2001 ALIAS:
1691 nice = 1 2002 nice = 1
1692 CODE: 2003 CODE:
1734 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 2045 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1735 AV *invoke_av; 2046 AV *invoke_av;
1736 int i, len; 2047 int i, len;
1737 2048
1738 if (!invoke) 2049 if (!invoke)
2050 {
2051 SV *old = PL_diehook;
2052 PL_diehook = 0;
2053 SvREFCNT_dec (old);
1739 croak ("\3terminate\2\n"); 2054 croak ("\3async_pool terminate\2\n");
2055 }
1740 2056
1741 SvREFCNT_dec (coro->saved_deffh); 2057 SvREFCNT_dec (coro->saved_deffh);
1742 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2058 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1743 2059
1744 hv_store (hv, "desc", sizeof ("desc") - 1, 2060 hv_store (hv, "desc", sizeof ("desc") - 1,
1770 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2086 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1771 coro->saved_deffh = 0; 2087 coro->saved_deffh = 0;
1772 2088
1773 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2089 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1774 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2090 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2091 {
2092 SV *old = PL_diehook;
2093 PL_diehook = 0;
2094 SvREFCNT_dec (old);
1775 croak ("\3terminate\2\n"); 2095 croak ("\3async_pool terminate\2\n");
2096 }
1776 2097
1777 av_clear (GvAV (PL_defgv)); 2098 av_clear (GvAV (PL_defgv));
1778 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2099 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1779 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2100 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1780 2101
1783 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2104 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1784 api_trace (coro_current, 0); 2105 api_trace (coro_current, 0);
1785 2106
1786 av_push (av_async_pool, newSVsv (coro_current)); 2107 av_push (av_async_pool, newSVsv (coro_current));
1787} 2108}
2109
2110#if 0
2111
2112void
2113_generator_call (...)
2114 PROTOTYPE: @
2115 PPCODE:
2116 fprintf (stderr, "call %p\n", CvXSUBANY(cv).any_ptr);
2117 xxxx
2118 abort ();
2119
2120SV *
2121gensub (SV *sub, ...)
2122 PROTOTYPE: &;@
2123 CODE:
2124{
2125 struct coro *coro;
2126 MAGIC *mg;
2127 CV *xcv;
2128 CV *ncv = (CV *)newSV_type (SVt_PVCV);
2129 int i;
2130
2131 CvGV (ncv) = CvGV (cv);
2132 CvFILE (ncv) = CvFILE (cv);
2133
2134 Newz (0, coro, 1, struct coro);
2135 coro->args = newAV ();
2136 coro->flags = CF_NEW;
2137
2138 av_extend (coro->args, items - 1);
2139 for (i = 1; i < items; i++)
2140 av_push (coro->args, newSVsv (ST (i)));
2141
2142 CvISXSUB_on (ncv);
2143 CvXSUBANY (ncv).any_ptr = (void *)coro;
2144
2145 xcv = GvCV (gv_fetchpv ("Coro::_generator_call", 0, SVt_PVCV));
2146
2147 CvXSUB (ncv) = CvXSUB (xcv);
2148 CvANON_on (ncv);
2149
2150 mg = sv_magicext ((SV *)ncv, 0, CORO_MAGIC_type_state, &coro_gensub_vtbl, (char *)coro, 0);
2151 RETVAL = newRV_noinc ((SV *)ncv);
2152}
2153 OUTPUT:
2154 RETVAL
2155
2156#endif
1788 2157
1789 2158
1790MODULE = Coro::State PACKAGE = Coro::AIO 2159MODULE = Coro::State PACKAGE = Coro::AIO
1791 2160
1792SV * 2161SV *
1819 PL_laststype = data->laststype; 2188 PL_laststype = data->laststype;
1820 PL_laststatval = data->laststatval; 2189 PL_laststatval = data->laststatval;
1821 PL_statcache = data->statcache; 2190 PL_statcache = data->statcache;
1822} 2191}
1823 2192
2193
2194MODULE = Coro::State PACKAGE = Coro::AnyEvent
2195
2196BOOT:
2197 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2198
2199SV *
2200_schedule (...)
2201 PROTOTYPE: @
2202 CODE:
2203{
2204 static int incede;
2205
2206 api_cede_notself ();
2207
2208 ++incede;
2209 while (coro_nready >= incede && api_cede ())
2210 ;
2211
2212 sv_setsv (sv_activity, &PL_sv_undef);
2213 if (coro_nready >= incede)
2214 {
2215 PUSHMARK (SP);
2216 PUTBACK;
2217 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2218 SPAGAIN;
2219 }
2220
2221 --incede;
2222}
2223

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines