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.190 by root, Fri Oct 5 20:39:39 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 101#endif
84 102
85#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 103#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
86# undef CORO_STACKGUARD 104# undef CORO_STACKGUARD
87#endif 105#endif
103#define IN_DESTRUCT (PL_main_cv == Nullcv) 121#define IN_DESTRUCT (PL_main_cv == Nullcv)
104 122
105#if __GNUC__ >= 3 123#if __GNUC__ >= 3
106# define attribute(x) __attribute__(x) 124# define attribute(x) __attribute__(x)
107# define BARRIER __asm__ __volatile__ ("" : : : "memory") 125# define BARRIER __asm__ __volatile__ ("" : : : "memory")
126# define expect(expr,value) __builtin_expect ((expr),(value))
108#else 127#else
109# define attribute(x) 128# define attribute(x)
110# define BARRIER 129# define BARRIER
130# define expect(expr,value) (expr)
111#endif 131#endif
132
133#define expect_false(expr) expect ((expr) != 0, 0)
134#define expect_true(expr) expect ((expr) != 0, 1)
112 135
113#define NOINLINE attribute ((noinline)) 136#define NOINLINE attribute ((noinline))
114 137
115#include "CoroAPI.h" 138#include "CoroAPI.h"
116 139
135static size_t coro_stacksize = CORO_STACKSIZE; 158static size_t coro_stacksize = CORO_STACKSIZE;
136static struct CoroAPI coroapi; 159static struct CoroAPI coroapi;
137static AV *main_mainstack; /* used to differentiate between $main and others */ 160static AV *main_mainstack; /* used to differentiate between $main and others */
138static JMPENV *main_top_env; 161static JMPENV *main_top_env;
139static HV *coro_state_stash, *coro_stash; 162static HV *coro_state_stash, *coro_stash;
140static SV *coro_mortal; /* will be freed after next transfer */ 163static volatile SV *coro_mortal; /* will be freed after next transfer */
141 164
142static GV *irsgv; /* $/ */ 165static GV *irsgv; /* $/ */
143static GV *stdoutgv; /* *STDOUT */ 166static GV *stdoutgv; /* *STDOUT */
167static SV *rv_diehook;
168static SV *rv_warnhook;
169static HV *hv_sig; /* %SIG */
144 170
145/* async_pool helper stuff */ 171/* async_pool helper stuff */
146static SV *sv_pool_rss; 172static SV *sv_pool_rss;
147static SV *sv_pool_size; 173static SV *sv_pool_size;
148static AV *av_async_pool; 174static AV *av_async_pool;
175
176/* Coro::AnyEvent */
177static SV *sv_activity;
149 178
150static struct coro_cctx *cctx_first; 179static struct coro_cctx *cctx_first;
151static int cctx_count, cctx_idle; 180static int cctx_count, cctx_idle;
152 181
153enum { 182enum {
184 CF_READY = 0x0002, /* coroutine is ready */ 213 CF_READY = 0x0002, /* coroutine is ready */
185 CF_NEW = 0x0004, /* has never been switched to */ 214 CF_NEW = 0x0004, /* has never been switched to */
186 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 215 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
187}; 216};
188 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
189/* this is a structure representing a perl-level coroutine */ 231/* this is a structure representing a perl-level coroutine */
190struct coro { 232struct coro {
191 /* the c coroutine allocated to this perl coroutine, if any */ 233 /* the c coroutine allocated to this perl coroutine, if any */
192 coro_cctx *cctx; 234 coro_cctx *cctx;
193 235
236 /* process data */
237 AV *mainstack;
238 perl_slots *slot; /* basically the saved sp */
239
194 /* data associated with this coroutine (initial args) */ 240 AV *args; /* data associated with this coroutine (initial args) */
195 AV *args; 241 int refcnt; /* coroutines are refcounted, yes */
196 int refcnt;
197 int flags; /* CF_ flags */ 242 int flags; /* CF_ flags */
198 243 HV *hv; /* the perl hash associated with this coro, if any */
199 /* optionally saved, might be zero */
200 AV *defav; /* @_ */
201 SV *defsv; /* $_ */
202 SV *errsv; /* $@ */
203 SV *deffh; /* default filehandle */
204 SV *irssv; /* $/ */
205 SV *irssv_sv; /* real $/ cache */
206
207#define VAR(name,type) type name;
208# include "state.h"
209#undef VAR
210 244
211 /* statistics */ 245 /* statistics */
212 int usecount; /* number of transfers to this coro */ 246 int usecount; /* number of transfers to this coro */
213 247
214 /* coro process data */ 248 /* coro process data */
215 int prio; 249 int prio;
216 //SV *throw; 250 SV *throw; /* exception to be thrown */
217 251
218 /* async_pool */ 252 /* async_pool */
219 SV *saved_deffh; 253 SV *saved_deffh;
220 254
221 /* linked list */ 255 /* linked list */
222 struct coro *next, *prev; 256 struct coro *next, *prev;
223 HV *hv; /* the perl hash associated with this coro, if any */
224}; 257};
225 258
226typedef struct coro *Coro__State; 259typedef struct coro *Coro__State;
227typedef struct coro *Coro__State_or_hashref; 260typedef struct coro *Coro__State_or_hashref;
228 261
235#define PRIO_IDLE -3 268#define PRIO_IDLE -3
236#define PRIO_MIN -4 269#define PRIO_MIN -4
237 270
238/* for Coro.pm */ 271/* for Coro.pm */
239static SV *coro_current; 272static SV *coro_current;
273static SV *coro_readyhook;
240static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 274static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
241static int coro_nready; 275static int coro_nready;
242static struct coro *coro_first; 276static struct coro *coro_first;
243 277
244/** lowlevel stuff **********************************************************/ 278/** lowlevel stuff **********************************************************/
245 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
246static AV * 310static AV *
247coro_clone_padlist (pTHX_ CV *cv) 311coro_clone_padlist (pTHX_ CV *cv)
248{ 312{
249 AV *padlist = CvPADLIST (cv); 313 AV *padlist = CvPADLIST (cv);
250 AV *newpadlist, *newpad; 314 AV *newpadlist, *newpad;
251 315
252 newpadlist = newAV (); 316 newpadlist = newAV ();
253 AvREAL_off (newpadlist); 317 AvREAL_off (newpadlist);
254#if PERL_VERSION_ATLEAST (5,9,0) 318#if PERL_VERSION_ATLEAST (5,10,0)
255 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 319 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
256#else 320#else
257 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 321 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
258#endif 322#endif
259 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 323 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
297 361
298 /* casting is fun. */ 362 /* casting is fun. */
299 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 363 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
300 free_padlist (aTHX_ padlist); 364 free_padlist (aTHX_ padlist);
301 365
302 SvREFCNT_dec (av);
303
304 return 0; 366 return 0;
305} 367}
306 368
307#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
308 371
309static 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};
310 376
311#define CORO_MAGIC(cv) \ 377#define CORO_MAGIC(sv,type) \
312 SvMAGIC (cv) \ 378 SvMAGIC (sv) \
313 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 379 ? SvMAGIC (sv)->mg_type == type \
314 ? SvMAGIC (cv) \ 380 ? SvMAGIC (sv) \
315 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 381 : mg_find (sv, type) \
316 : 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)
317 386
318static struct coro * 387static struct coro *
319SvSTATE_ (pTHX_ SV *coro) 388SvSTATE_ (pTHX_ SV *coro)
320{ 389{
321 HV *stash; 390 HV *stash;
322 MAGIC *mg; 391 MAGIC *mg;
323 392
324 if (SvROK (coro)) 393 if (SvROK (coro))
325 coro = SvRV (coro); 394 coro = SvRV (coro);
326 395
327 if (SvTYPE (coro) != SVt_PVHV) 396 if (expect_false (SvTYPE (coro) != SVt_PVHV))
328 croak ("Coro::State object required"); 397 croak ("Coro::State object required");
329 398
330 stash = SvSTASH (coro); 399 stash = SvSTASH (coro);
331 if (stash != coro_stash && stash != coro_state_stash) 400 if (expect_false (stash != coro_stash && stash != coro_state_stash))
332 { 401 {
333 /* very slow, but rare, check */ 402 /* very slow, but rare, check */
334 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 403 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
335 croak ("Coro::State object required"); 404 croak ("Coro::State object required");
336 } 405 }
337 406
338 mg = CORO_MAGIC (coro); 407 mg = CORO_MAGIC_state (coro);
339 return (struct coro *)mg->mg_ptr; 408 return (struct coro *)mg->mg_ptr;
340} 409}
341 410
342#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 411#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
343 412
344/* the next two functions merely cache the padlists */ 413/* the next two functions merely cache the padlists */
345static void 414static void
346get_padlist (pTHX_ CV *cv) 415get_padlist (pTHX_ CV *cv)
347{ 416{
348 MAGIC *mg = CORO_MAGIC (cv); 417 MAGIC *mg = CORO_MAGIC_cv (cv);
349 AV *av; 418 AV *av;
350 419
351 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 420 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
352 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 421 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
353 else 422 else
354 { 423 {
355#if CORO_PREFER_PERL_FUNCTIONS 424#if CORO_PREFER_PERL_FUNCTIONS
356 /* this is probably cleaner, but also slower? */ 425 /* this is probably cleaner, but also slower? */
365} 434}
366 435
367static void 436static void
368put_padlist (pTHX_ CV *cv) 437put_padlist (pTHX_ CV *cv)
369{ 438{
370 MAGIC *mg = CORO_MAGIC (cv); 439 MAGIC *mg = CORO_MAGIC_cv (cv);
371 AV *av; 440 AV *av;
372 441
373 if (!mg) 442 if (expect_false (!mg))
374 { 443 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
375 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
376 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
377 mg->mg_virtual = &vtbl_coro;
378 mg->mg_obj = (SV *)newAV ();
379 }
380 444
381 av = (AV *)mg->mg_obj; 445 av = (AV *)mg->mg_obj;
382 446
383 if (AvFILLp (av) >= AvMAX (av)) 447 if (expect_false (AvFILLp (av) >= AvMAX (av)))
384 av_extend (av, AvMAX (av) + 1); 448 av_extend (av, AvMAX (av) + 1);
385 449
386 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 450 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
387} 451}
388 452
389/** load & save, init *******************************************************/ 453/** load & save, init *******************************************************/
390 454
391static void 455static void
392load_perl (pTHX_ Coro__State c) 456load_perl (pTHX_ Coro__State c)
393{ 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
394#define VAR(name,type) PL_ ## name = c->name; 468 #define VAR(name,type) PL_ ## name = slot->name;
395# include "state.h" 469 # include "state.h"
396#undef VAR 470 #undef VAR
397
398 GvSV (PL_defgv) = c->defsv;
399 GvAV (PL_defgv) = c->defav;
400 GvSV (PL_errgv) = c->errsv;
401 GvSV (irsgv) = c->irssv_sv;
402 471
403 { 472 {
404 dSP; 473 dSP;
474
405 CV *cv; 475 CV *cv;
406 476
407 /* now do the ugly restore mess */ 477 /* now do the ugly restore mess */
408 while ((cv = (CV *)POPs)) 478 while (expect_true (cv = (CV *)POPs))
409 { 479 {
410 put_padlist (aTHX_ cv); /* mark this padlist as available */ 480 put_padlist (aTHX_ cv); /* mark this padlist as available */
411 CvDEPTH (cv) = PTR2IV (POPs); 481 CvDEPTH (cv) = PTR2IV (POPs);
412 CvPADLIST (cv) = (AV *)POPs; 482 CvPADLIST (cv) = (AV *)POPs;
413 } 483 }
432 502
433 XPUSHs (Nullsv); 503 XPUSHs (Nullsv);
434 /* this loop was inspired by pp_caller */ 504 /* this loop was inspired by pp_caller */
435 for (;;) 505 for (;;)
436 { 506 {
437 while (cxix >= 0) 507 while (expect_true (cxix >= 0))
438 { 508 {
439 PERL_CONTEXT *cx = &ccstk[cxix--]; 509 PERL_CONTEXT *cx = &ccstk[cxix--];
440 510
441 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 511 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
442 { 512 {
443 CV *cv = cx->blk_sub.cv; 513 CV *cv = cx->blk_sub.cv;
444 514
445 if (CvDEPTH (cv)) 515 if (expect_true (CvDEPTH (cv)))
446 { 516 {
447 EXTEND (SP, 3); 517 EXTEND (SP, 3);
448 PUSHs ((SV *)CvPADLIST (cv)); 518 PUSHs ((SV *)CvPADLIST (cv));
449 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 519 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
450 PUSHs ((SV *)cv); 520 PUSHs ((SV *)cv);
451 521
452 CvDEPTH (cv) = 0; 522 CvDEPTH (cv) = 0;
453 get_padlist (aTHX_ cv); 523 get_padlist (aTHX_ cv);
454 } 524 }
455 } 525 }
456 } 526 }
457 527
458 if (top_si->si_type == PERLSI_MAIN) 528 if (expect_true (top_si->si_type == PERLSI_MAIN))
459 break; 529 break;
460 530
461 top_si = top_si->si_prev; 531 top_si = top_si->si_prev;
462 ccstk = top_si->si_cxstack; 532 ccstk = top_si->si_cxstack;
463 cxix = top_si->si_cxix; 533 cxix = top_si->si_cxix;
464 } 534 }
465 535
466 PUTBACK; 536 PUTBACK;
467 } 537 }
468 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
469 c->defav = GvAV (PL_defgv); 556 slot->defav = GvAV (PL_defgv);
470 c->defsv = DEFSV; 557 slot->defsv = DEFSV;
471 c->errsv = ERRSV; 558 slot->errsv = ERRSV;
472 c->irssv_sv = GvSV (irsgv); 559 slot->irsgv = GvSV (irsgv);
473 560
474#define VAR(name,type)c->name = PL_ ## name; 561 #define VAR(name,type) slot->name = PL_ ## name;
475# include "state.h" 562 # include "state.h"
476#undef VAR 563 #undef VAR
564 }
477} 565}
478 566
479/* 567/*
480 * allocate various perl stacks. This is an exact copy 568 * allocate various perl stacks. This is an exact copy
481 * of perl.c:init_stacks, except that it uses less memory 569 * of perl.c:init_stacks, except that it uses less memory
486# define coro_init_stacks init_stacks 574# define coro_init_stacks init_stacks
487#else 575#else
488static void 576static void
489coro_init_stacks (pTHX) 577coro_init_stacks (pTHX)
490{ 578{
491 PL_curstackinfo = new_stackinfo(64, 6); 579 PL_curstackinfo = new_stackinfo(32, 8);
492 PL_curstackinfo->si_type = PERLSI_MAIN; 580 PL_curstackinfo->si_type = PERLSI_MAIN;
493 PL_curstack = PL_curstackinfo->si_stack; 581 PL_curstack = PL_curstackinfo->si_stack;
494 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 582 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
495 583
496 PL_stack_base = AvARRAY(PL_curstack); 584 PL_stack_base = AvARRAY(PL_curstack);
497 PL_stack_sp = PL_stack_base; 585 PL_stack_sp = PL_stack_base;
498 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 586 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
499 587
500 New(50,PL_tmps_stack,64,SV*); 588 New(50,PL_tmps_stack,32,SV*);
501 PL_tmps_floor = -1; 589 PL_tmps_floor = -1;
502 PL_tmps_ix = -1; 590 PL_tmps_ix = -1;
503 PL_tmps_max = 64; 591 PL_tmps_max = 32;
504 592
505 New(54,PL_markstack,16,I32); 593 New(54,PL_markstack,16,I32);
506 PL_markstack_ptr = PL_markstack; 594 PL_markstack_ptr = PL_markstack;
507 PL_markstack_max = PL_markstack + 16; 595 PL_markstack_max = PL_markstack + 16;
508 596
509#ifdef SET_MARK_OFFSET 597#ifdef SET_MARK_OFFSET
510 SET_MARK_OFFSET; 598 SET_MARK_OFFSET;
511#endif 599#endif
512 600
513 New(54,PL_scopestack,16,I32); 601 New(54,PL_scopestack,8,I32);
514 PL_scopestack_ix = 0; 602 PL_scopestack_ix = 0;
515 PL_scopestack_max = 16; 603 PL_scopestack_max = 8;
516 604
517 New(54,PL_savestack,64,ANY); 605 New(54,PL_savestack,24,ANY);
518 PL_savestack_ix = 0; 606 PL_savestack_ix = 0;
519 PL_savestack_max = 64; 607 PL_savestack_max = 24;
520 608
521#if !PERL_VERSION_ATLEAST (5,9,0) 609#if !PERL_VERSION_ATLEAST (5,10,0)
522 New(54,PL_retstack,4,OP*); 610 New(54,PL_retstack,4,OP*);
523 PL_retstack_ix = 0; 611 PL_retstack_ix = 0;
524 PL_retstack_max = 4; 612 PL_retstack_max = 4;
525#endif 613#endif
526} 614}
549 637
550 Safefree (PL_tmps_stack); 638 Safefree (PL_tmps_stack);
551 Safefree (PL_markstack); 639 Safefree (PL_markstack);
552 Safefree (PL_scopestack); 640 Safefree (PL_scopestack);
553 Safefree (PL_savestack); 641 Safefree (PL_savestack);
554#if !PERL_VERSION_ATLEAST (5,9,0) 642#if !PERL_VERSION_ATLEAST (5,10,0)
555 Safefree (PL_retstack); 643 Safefree (PL_retstack);
556#endif 644#endif
557} 645}
558 646
559static size_t 647static size_t
561{ 649{
562 size_t rss = sizeof (*coro); 650 size_t rss = sizeof (*coro);
563 651
564 if (coro->mainstack) 652 if (coro->mainstack)
565 { 653 {
654 perl_slots tmp_slot;
655 perl_slots *slot;
656
566 if (coro->flags & CF_RUNNING) 657 if (coro->flags & CF_RUNNING)
567 { 658 {
659 slot = &tmp_slot;
660
568 #define VAR(name,type)coro->name = PL_ ## name; 661 #define VAR(name,type) slot->name = PL_ ## name;
569 # include "state.h" 662 # include "state.h"
570 #undef VAR 663 #undef VAR
571 } 664 }
665 else
666 slot = coro->slot;
572 667
573 rss += sizeof (coro->curstackinfo); 668 rss += sizeof (slot->curstackinfo);
574 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
575 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 669 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
576 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 *);
577 rss += coro->tmps_max * sizeof (SV *); 671 rss += slot->tmps_max * sizeof (SV *);
578 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 672 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
579 rss += coro->scopestack_max * sizeof (I32); 673 rss += slot->scopestack_max * sizeof (I32);
580 rss += coro->savestack_max * sizeof (ANY); 674 rss += slot->savestack_max * sizeof (ANY);
581 675
582#if !PERL_VERSION_ATLEAST (5,9,0) 676#if !PERL_VERSION_ATLEAST (5,10,0)
583 rss += coro->retstack_max * sizeof (OP *); 677 rss += slot->retstack_max * sizeof (OP *);
584#endif 678#endif
585 } 679 }
586 680
587 return rss; 681 return rss;
588} 682}
589 683
590/** 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}
591 735
592static void 736static void
593coro_setup (pTHX_ struct coro *coro) 737coro_setup (pTHX_ struct coro *coro)
594{ 738{
595 /* 739 /*
600 PL_runops = RUNOPS_DEFAULT; 744 PL_runops = RUNOPS_DEFAULT;
601 PL_curcop = &PL_compiling; 745 PL_curcop = &PL_compiling;
602 PL_in_eval = EVAL_NULL; 746 PL_in_eval = EVAL_NULL;
603 PL_comppad = 0; 747 PL_comppad = 0;
604 PL_curpm = 0; 748 PL_curpm = 0;
749 PL_curpad = 0;
605 PL_localizing = 0; 750 PL_localizing = 0;
606 PL_dirty = 0; 751 PL_dirty = 0;
607 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);
608 760
609 GvSV (PL_defgv) = NEWSV (0, 0); 761 GvSV (PL_defgv) = newSV (0);
610 GvAV (PL_defgv) = coro->args; coro->args = 0; 762 GvAV (PL_defgv) = coro->args; coro->args = 0;
611 GvSV (PL_errgv) = NEWSV (0, 0); 763 GvSV (PL_errgv) = newSV (0);
612 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);
613 PL_rs = newSVsv (GvSV (irsgv)); 765 PL_rs = newSVsv (GvSV (irsgv));
614 PL_defoutgv = SvREFCNT_inc (stdoutgv); 766 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
615 767
616 { 768 {
617 dSP; 769 dSP;
618 LOGOP myop; 770 LOGOP myop;
619 771
620 Zero (&myop, 1, LOGOP); 772 Zero (&myop, 1, LOGOP);
621 myop.op_next = Nullop; 773 myop.op_next = Nullop;
622 myop.op_flags = OPf_WANT_VOID; 774 myop.op_flags = OPf_WANT_VOID;
623 775
624 PUSHMARK (SP); 776 PUSHMARK (SP);
625 XPUSHs (av_shift (GvAV (PL_defgv))); 777 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
626 PUTBACK; 778 PUTBACK;
627 PL_op = (OP *)&myop; 779 PL_op = (OP *)&myop;
628 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 780 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
629 SPAGAIN; 781 SPAGAIN;
630 } 782 }
631 783
632 ENTER; /* necessary e.g. for dounwind */ 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;
633} 790}
634 791
635static void 792static void
636coro_destroy (pTHX_ struct coro *coro) 793coro_destroy (pTHX_ struct coro *coro)
637{ 794{
657 SvREFCNT_dec (GvSV (PL_errgv)); 814 SvREFCNT_dec (GvSV (PL_errgv));
658 SvREFCNT_dec (PL_defoutgv); 815 SvREFCNT_dec (PL_defoutgv);
659 SvREFCNT_dec (PL_rs); 816 SvREFCNT_dec (PL_rs);
660 SvREFCNT_dec (GvSV (irsgv)); 817 SvREFCNT_dec (GvSV (irsgv));
661 818
819 SvREFCNT_dec (PL_diehook);
820 SvREFCNT_dec (PL_warnhook);
821
662 SvREFCNT_dec (coro->saved_deffh); 822 SvREFCNT_dec (coro->saved_deffh);
663 //SvREFCNT_dec (coro->throw); 823 SvREFCNT_dec (coro->throw);
664 824
665 coro_destroy_stacks (aTHX); 825 coro_destroy_stacks (aTHX);
666} 826}
667 827
668static void 828static void
669free_coro_mortal (pTHX) 829free_coro_mortal (pTHX)
670{ 830{
671 if (coro_mortal) 831 if (expect_true (coro_mortal))
672 { 832 {
673 SvREFCNT_dec (coro_mortal); 833 SvREFCNT_dec (coro_mortal);
674 coro_mortal = 0; 834 coro_mortal = 0;
675 } 835 }
676} 836}
705 bot = PL_stack_base + cx->blk_oldsp + 1; 865 bot = PL_stack_base + cx->blk_oldsp + 1;
706 top = cx->blk_gimme == G_ARRAY ? SP + 1 866 top = cx->blk_gimme == G_ARRAY ? SP + 1
707 : cx->blk_gimme == G_SCALAR ? bot + 1 867 : cx->blk_gimme == G_SCALAR ? bot + 1
708 : bot; 868 : bot;
709 869
870 av_extend (av, top - bot);
710 while (bot < top) 871 while (bot < top)
711 av_push (av, SvREFCNT_inc (*bot++)); 872 av_push (av, SvREFCNT_inc (*bot++));
712 873
713 PL_runops = RUNOPS_DEFAULT; 874 PL_runops = RUNOPS_DEFAULT;
714 ENTER; 875 ENTER;
754 SAVETMPS; 915 SAVETMPS;
755 EXTEND (SP, 3); 916 EXTEND (SP, 3);
756 PUSHMARK (SP); 917 PUSHMARK (SP);
757 PUSHs (&PL_sv_yes); 918 PUSHs (&PL_sv_yes);
758 PUSHs (fullname); 919 PUSHs (fullname);
759 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);
760 PUTBACK; 921 PUTBACK;
761 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);
762 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);
763 SPAGAIN; 924 SPAGAIN;
764 FREETMPS; 925 FREETMPS;
800 961
801/* 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 */
802/* _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 */
803/* during execution of a perl program */ 964/* during execution of a perl program */
804static void NOINLINE 965static void NOINLINE
805prepare_cctx (pTHX_ coro_cctx *cctx) 966cctx_prepare (pTHX_ coro_cctx *cctx)
806{ 967{
807 dSP; 968 dSP;
808 LOGOP myop; 969 LOGOP myop;
809 970
810 PL_top_env = &PL_start_env; 971 PL_top_env = &PL_start_env;
828 989
829/* 990/*
830 * this is a _very_ stripped down perl interpreter ;) 991 * this is a _very_ stripped down perl interpreter ;)
831 */ 992 */
832static void 993static void
833coro_run (void *arg) 994cctx_run (void *arg)
834{ 995{
835 dTHX; 996 dTHX;
836 997
837 /* coro_run is the alternative tail of transfer(), so unlock here. */ 998 /* cctx_run is the alternative tail of transfer(), so unlock here. */
838 UNLOCK; 999 UNLOCK;
839 1000
840 /* we now skip the entersub that lead to transfer() */ 1001 /* we now skip the entersub that lead to transfer() */
841 PL_op = PL_op->op_next; 1002 PL_op = PL_op->op_next;
842 1003
843 /* inject a fake subroutine call to cctx_init */ 1004 /* inject a fake subroutine call to cctx_init */
844 prepare_cctx (aTHX_ (coro_cctx *)arg); 1005 cctx_prepare (aTHX_ (coro_cctx *)arg);
845 1006
846 /* 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 */
847 PL_restartop = PL_op; 1008 PL_restartop = PL_op;
848 perl_run (PL_curinterp); 1009 perl_run (PL_curinterp);
849 1010
868 ++cctx_count; 1029 ++cctx_count;
869 1030
870 Newz (0, cctx, 1, coro_cctx); 1031 Newz (0, cctx, 1, coro_cctx);
871 1032
872#if HAVE_MMAP 1033#if HAVE_MMAP
873
874 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;
875 /* mmap supposedly does allocate-on-write for us */ 1035 /* mmap supposedly does allocate-on-write for us */
876 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);
877 1037
878 if (cctx->sptr != (void *)-1) 1038 if (cctx->sptr != (void *)-1)
899 stack_start = cctx->sptr; 1059 stack_start = cctx->sptr;
900 stack_size = cctx->ssize; 1060 stack_size = cctx->ssize;
901 } 1061 }
902 1062
903 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1063 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
904 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);
905 1065
906 return cctx; 1066 return cctx;
907} 1067}
908 1068
909static void 1069static void
926 Safefree (cctx->sptr); 1086 Safefree (cctx->sptr);
927 1087
928 Safefree (cctx); 1088 Safefree (cctx);
929} 1089}
930 1090
1091/* wether this cctx should be destructed */
1092#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1093
931static coro_cctx * 1094static coro_cctx *
932cctx_get (pTHX) 1095cctx_get (pTHX)
933{ 1096{
934 while (cctx_first) 1097 while (expect_true (cctx_first))
935 { 1098 {
936 coro_cctx *cctx = cctx_first; 1099 coro_cctx *cctx = cctx_first;
937 cctx_first = cctx->next; 1100 cctx_first = cctx->next;
938 --cctx_idle; 1101 --cctx_idle;
939 1102
940 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1103 if (expect_true (!CCTX_EXPIRED (cctx)))
941 return cctx; 1104 return cctx;
942 1105
943 cctx_destroy (cctx); 1106 cctx_destroy (cctx);
944 } 1107 }
945 1108
948 1111
949static void 1112static void
950cctx_put (coro_cctx *cctx) 1113cctx_put (coro_cctx *cctx)
951{ 1114{
952 /* free another cctx if overlimit */ 1115 /* free another cctx if overlimit */
953 if (cctx_idle >= MAX_IDLE_CCTX) 1116 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
954 { 1117 {
955 coro_cctx *first = cctx_first; 1118 coro_cctx *first = cctx_first;
956 cctx_first = first->next; 1119 cctx_first = first->next;
957 --cctx_idle; 1120 --cctx_idle;
958 1121
964 cctx_first = cctx; 1127 cctx_first = cctx;
965} 1128}
966 1129
967/** coroutine switching *****************************************************/ 1130/** coroutine switching *****************************************************/
968 1131
969static void NOINLINE 1132static void
970transfer_check (pTHX_ struct coro *prev, struct coro *next) 1133transfer_check (pTHX_ struct coro *prev, struct coro *next)
971{ 1134{
972 if (prev != next) 1135 if (expect_true (prev != next))
973 { 1136 {
974 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1137 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
975 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1138 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
976 1139
977 if (next->flags & CF_RUNNING) 1140 if (expect_false (next->flags & CF_RUNNING))
978 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");
979 1142
980 if (next->flags & CF_DESTROYED) 1143 if (expect_false (next->flags & CF_DESTROYED))
981 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");
982 1145
1146#if !PERL_VERSION_ATLEAST (5,10,0)
983 if (PL_lex_state != LEX_NOTPARSING) 1147 if (expect_false (PL_lex_state != LEX_NOTPARSING))
984 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
985 } 1150 }
986} 1151}
987 1152
988/* always use the TRANSFER macro */ 1153/* always use the TRANSFER macro */
989static void NOINLINE 1154static void NOINLINE
990transfer (pTHX_ struct coro *prev, struct coro *next) 1155transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
991{ 1156{
992 dSTACKLEVEL; 1157 dSTACKLEVEL;
1158 static volatile int has_throw;
993 1159
994 /* sometimes transfer is only called to set idle_sp */ 1160 /* sometimes transfer is only called to set idle_sp */
995 if (!next) 1161 if (expect_false (!next))
996 { 1162 {
997 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1163 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
998 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1164 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
999 } 1165 }
1000 else if (prev != next) 1166 else if (expect_true (prev != next))
1001 { 1167 {
1002 coro_cctx *prev__cctx; 1168 coro_cctx *prev__cctx;
1003 1169
1004 if (prev->flags & CF_NEW) 1170 if (expect_false (prev->flags & CF_NEW))
1005 { 1171 {
1006 /* create a new empty context */ 1172 /* create a new empty context */
1007 Newz (0, prev->cctx, 1, coro_cctx); 1173 Newz (0, prev->cctx, 1, coro_cctx);
1008 prev->flags &= ~CF_NEW; 1174 prev->flags &= ~CF_NEW;
1009 prev->flags |= CF_RUNNING; 1175 prev->flags |= CF_RUNNING;
1012 prev->flags &= ~CF_RUNNING; 1178 prev->flags &= ~CF_RUNNING;
1013 next->flags |= CF_RUNNING; 1179 next->flags |= CF_RUNNING;
1014 1180
1015 LOCK; 1181 LOCK;
1016 1182
1183 /* first get rid of the old state */
1184 save_perl (aTHX_ prev);
1185
1017 if (next->flags & CF_NEW) 1186 if (expect_false (next->flags & CF_NEW))
1018 { 1187 {
1019 /* need to start coroutine */ 1188 /* need to start coroutine */
1020 next->flags &= ~CF_NEW; 1189 next->flags &= ~CF_NEW;
1021 /* first get rid of the old state */
1022 save_perl (aTHX_ prev);
1023 /* setup coroutine call */ 1190 /* setup coroutine call */
1024 coro_setup (aTHX_ next); 1191 coro_setup (aTHX_ next);
1025 } 1192 }
1026 else 1193 else
1027 {
1028 /* coroutine already started */
1029 save_perl (aTHX_ prev);
1030 load_perl (aTHX_ next); 1194 load_perl (aTHX_ next);
1031 }
1032 1195
1033 prev__cctx = prev->cctx; 1196 prev__cctx = prev->cctx;
1034 1197
1035 /* possibly "free" the cctx */ 1198 /* possibly "free" the cctx */
1036 if (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 ))
1037 { 1204 {
1038 /* 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 */
1039 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));
1040 1207
1041 prev->cctx = 0; 1208 prev->cctx = 0;
1042 1209
1210 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1211 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1212 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1213 if (!next->cctx)
1214 next->cctx = cctx_get (aTHX);
1215
1043 cctx_put (prev__cctx); 1216 cctx_put (prev__cctx);
1044 } 1217 }
1045 1218
1046 ++next->usecount; 1219 ++next->usecount;
1047 1220
1048 if (!next->cctx) 1221 if (expect_true (!next->cctx))
1049 next->cctx = cctx_get (aTHX); 1222 next->cctx = cctx_get (aTHX);
1050 1223
1224 has_throw = !!next->throw;
1225
1051 if (prev__cctx != next->cctx) 1226 if (expect_false (prev__cctx != next->cctx))
1052 { 1227 {
1053 prev__cctx->top_env = PL_top_env; 1228 prev__cctx->top_env = PL_top_env;
1054 PL_top_env = next->cctx->top_env; 1229 PL_top_env = next->cctx->top_env;
1055 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1230 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1056 } 1231 }
1057 1232
1058 free_coro_mortal (aTHX); 1233 free_coro_mortal (aTHX);
1059 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 }
1060 } 1248 }
1061} 1249}
1062 1250
1063struct transfer_args 1251struct transfer_args
1064{ 1252{
1065 struct coro *prev, *next; 1253 struct coro *prev, *next;
1066}; 1254};
1067 1255
1068#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1256#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1069#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1257#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1070 1258
1071/** high level stuff ********************************************************/ 1259/** high level stuff ********************************************************/
1072 1260
1073static int 1261static int
1099 save_perl (aTHX_ &temp); 1287 save_perl (aTHX_ &temp);
1100 load_perl (aTHX_ coro); 1288 load_perl (aTHX_ coro);
1101 1289
1102 coro_destroy (aTHX_ coro); 1290 coro_destroy (aTHX_ coro);
1103 1291
1104 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1292 load_perl (aTHX_ &temp);
1105 1293
1106 coro->mainstack = 0; 1294 coro->slot = 0;
1107 } 1295 }
1108 1296
1109 cctx_destroy (coro->cctx); 1297 cctx_destroy (coro->cctx);
1110 SvREFCNT_dec (coro->args); 1298 SvREFCNT_dec (coro->args);
1111 1299
1167{ 1355{
1168 dTHX; 1356 dTHX;
1169 struct transfer_args ta; 1357 struct transfer_args ta;
1170 1358
1171 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1359 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1172 TRANSFER (ta); 1360 TRANSFER (ta, 1);
1173} 1361}
1174 1362
1175/** Coro ********************************************************************/ 1363/** Coro ********************************************************************/
1176 1364
1177static void 1365static void
1179{ 1367{
1180 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);
1181} 1369}
1182 1370
1183static SV * 1371static SV *
1184coro_deq (pTHX_ int min_prio) 1372coro_deq (pTHX)
1185{ 1373{
1186 int prio = PRIO_MAX - PRIO_MIN; 1374 int prio;
1187 1375
1188 min_prio -= PRIO_MIN;
1189 if (min_prio < 0)
1190 min_prio = 0;
1191
1192 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1376 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1193 if (AvFILLp (coro_ready [prio]) >= 0) 1377 if (AvFILLp (coro_ready [prio]) >= 0)
1194 return av_shift (coro_ready [prio]); 1378 return av_shift (coro_ready [prio]);
1195 1379
1196 return 0; 1380 return 0;
1197} 1381}
1199static int 1383static int
1200api_ready (SV *coro_sv) 1384api_ready (SV *coro_sv)
1201{ 1385{
1202 dTHX; 1386 dTHX;
1203 struct coro *coro; 1387 struct coro *coro;
1388 SV *hook;
1204 1389
1205 if (SvROK (coro_sv)) 1390 if (SvROK (coro_sv))
1206 coro_sv = SvRV (coro_sv); 1391 coro_sv = SvRV (coro_sv);
1207 1392
1208 coro = SvSTATE (coro_sv); 1393 coro = SvSTATE (coro_sv);
1211 return 0; 1396 return 0;
1212 1397
1213 coro->flags |= CF_READY; 1398 coro->flags |= CF_READY;
1214 1399
1215 LOCK; 1400 LOCK;
1401
1402 hook = coro_nready ? 0 : coro_readyhook;
1403
1216 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1404 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1217 ++coro_nready; 1405 ++coro_nready;
1406
1218 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 }
1219 1424
1220 return 1; 1425 return 1;
1221} 1426}
1222 1427
1223static int 1428static int
1233 SV *prev_sv, *next_sv; 1438 SV *prev_sv, *next_sv;
1234 1439
1235 for (;;) 1440 for (;;)
1236 { 1441 {
1237 LOCK; 1442 LOCK;
1238 next_sv = coro_deq (aTHX_ PRIO_MIN); 1443 next_sv = coro_deq (aTHX);
1239 1444
1240 /* nothing to schedule: call the idle handler */ 1445 /* nothing to schedule: call the idle handler */
1241 if (!next_sv) 1446 if (expect_false (!next_sv))
1242 { 1447 {
1243 dSP; 1448 dSP;
1244 UNLOCK; 1449 UNLOCK;
1245 1450
1246 ENTER; 1451 ENTER;
1247 SAVETMPS; 1452 SAVETMPS;
1248 1453
1249 PUSHMARK (SP); 1454 PUSHMARK (SP);
1250 PUTBACK; 1455 PUTBACK;
1251 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1456 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1457 SPAGAIN;
1252 1458
1253 FREETMPS; 1459 FREETMPS;
1254 LEAVE; 1460 LEAVE;
1255 continue; 1461 continue;
1256 } 1462 }
1257 1463
1258 ta->next = SvSTATE (next_sv); 1464 ta->next = SvSTATE (next_sv);
1259 1465
1260 /* cannot transfer to destroyed coros, skip and look for next */ 1466 /* cannot transfer to destroyed coros, skip and look for next */
1261 if (ta->next->flags & CF_DESTROYED) 1467 if (expect_false (ta->next->flags & CF_DESTROYED))
1262 { 1468 {
1263 UNLOCK; 1469 UNLOCK;
1264 SvREFCNT_dec (next_sv); 1470 SvREFCNT_dec (next_sv);
1265 /* coro_nready is already taken care of by destroy */ 1471 /* coro_nready is already taken care of by destroy */
1266 continue; 1472 continue;
1311{ 1517{
1312 dTHX; 1518 dTHX;
1313 struct transfer_args ta; 1519 struct transfer_args ta;
1314 1520
1315 prepare_schedule (aTHX_ &ta); 1521 prepare_schedule (aTHX_ &ta);
1316 TRANSFER (ta); 1522 TRANSFER (ta, 1);
1317} 1523}
1318 1524
1319static int 1525static int
1320api_cede (void) 1526api_cede (void)
1321{ 1527{
1322 dTHX; 1528 dTHX;
1323 struct transfer_args ta; 1529 struct transfer_args ta;
1324 1530
1325 prepare_cede (aTHX_ &ta); 1531 prepare_cede (aTHX_ &ta);
1326 1532
1327 if (ta.prev != ta.next) 1533 if (expect_true (ta.prev != ta.next))
1328 { 1534 {
1329 TRANSFER (ta); 1535 TRANSFER (ta, 1);
1330 return 1; 1536 return 1;
1331 } 1537 }
1332 else 1538 else
1333 return 0; 1539 return 0;
1334} 1540}
1339 dTHX; 1545 dTHX;
1340 struct transfer_args ta; 1546 struct transfer_args ta;
1341 1547
1342 if (prepare_cede_notself (aTHX_ &ta)) 1548 if (prepare_cede_notself (aTHX_ &ta))
1343 { 1549 {
1344 TRANSFER (ta); 1550 TRANSFER (ta, 1);
1345 return 1; 1551 return 1;
1346 } 1552 }
1347 else 1553 else
1348 return 0; 1554 return 0;
1349} 1555}
1368 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1574 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1369 1575
1370 if (coro->flags & CF_RUNNING) 1576 if (coro->flags & CF_RUNNING)
1371 PL_runops = RUNOPS_DEFAULT; 1577 PL_runops = RUNOPS_DEFAULT;
1372 else 1578 else
1373 coro->runops = RUNOPS_DEFAULT; 1579 coro->slot->runops = RUNOPS_DEFAULT;
1374 } 1580 }
1375} 1581}
1376 1582
1377MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1583MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1378 1584
1385#endif 1591#endif
1386 BOOT_PAGESIZE; 1592 BOOT_PAGESIZE;
1387 1593
1388 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1594 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1389 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));
1390 1605
1391 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1606 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1392 1607
1393 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1608 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1394 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1609 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1400 1615
1401 while (main_top_env->je_prev) 1616 while (main_top_env->je_prev)
1402 main_top_env = main_top_env->je_prev; 1617 main_top_env = main_top_env->je_prev;
1403 1618
1404 coroapi.ver = CORO_API_VERSION; 1619 coroapi.ver = CORO_API_VERSION;
1620 coroapi.rev = CORO_API_REVISION;
1405 coroapi.transfer = api_transfer; 1621 coroapi.transfer = api_transfer;
1406 1622
1407 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1623 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1408} 1624}
1409 1625
1410SV * 1626SV *
1411new (char *klass, ...) 1627new (char *klass, ...)
1412 CODE: 1628 CODE:
1413{ 1629{
1414 struct coro *coro; 1630 struct coro *coro;
1631 MAGIC *mg;
1415 HV *hv; 1632 HV *hv;
1416 int i; 1633 int i;
1417 1634
1418 Newz (0, coro, 1, struct coro); 1635 Newz (0, coro, 1, struct coro);
1419 coro->args = newAV (); 1636 coro->args = newAV ();
1422 if (coro_first) coro_first->prev = coro; 1639 if (coro_first) coro_first->prev = coro;
1423 coro->next = coro_first; 1640 coro->next = coro_first;
1424 coro_first = coro; 1641 coro_first = coro;
1425 1642
1426 coro->hv = hv = newHV (); 1643 coro->hv = hv = newHV ();
1427 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;
1428 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1646 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1429 1647
1648 av_extend (coro->args, items - 1);
1430 for (i = 1; i < items; i++) 1649 for (i = 1; i < items; i++)
1431 av_push (coro->args, newSVsv (ST (i))); 1650 av_push (coro->args, newSVsv (ST (i)));
1432} 1651}
1433 OUTPUT: 1652 OUTPUT:
1434 RETVAL 1653 RETVAL
1445 Coro::cede_notself = 4 1664 Coro::cede_notself = 4
1446 CODE: 1665 CODE:
1447{ 1666{
1448 struct transfer_args ta; 1667 struct transfer_args ta;
1449 1668
1669 PUTBACK;
1450 switch (ix) 1670 switch (ix)
1451 { 1671 {
1452 case 0: 1672 case 0:
1453 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1673 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1454 ta.next = 0; 1674 ta.next = 0;
1473 if (!prepare_cede_notself (aTHX_ &ta)) 1693 if (!prepare_cede_notself (aTHX_ &ta))
1474 XSRETURN_EMPTY; 1694 XSRETURN_EMPTY;
1475 1695
1476 break; 1696 break;
1477 } 1697 }
1698 SPAGAIN;
1478 1699
1479 BARRIER; 1700 BARRIER;
1701 PUTBACK;
1480 TRANSFER (ta); 1702 TRANSFER (ta, 0);
1481 1703 SPAGAIN; /* might be the sp of a different coroutine now */
1482 if (GIMME_V != G_VOID && ta.next != ta.prev) 1704 /* be extra careful not to ever do anything after TRANSFER */
1483 XSRETURN_YES;
1484} 1705}
1485 1706
1486bool 1707bool
1487_destroy (SV *coro_sv) 1708_destroy (SV *coro_sv)
1488 CODE: 1709 CODE:
1489 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 1710 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1490 OUTPUT: 1711 OUTPUT:
1491 RETVAL 1712 RETVAL
1492 1713
1493void 1714void
1494_exit (code) 1715_exit (int code)
1495 int code
1496 PROTOTYPE: $ 1716 PROTOTYPE: $
1497 CODE: 1717 CODE:
1498 _exit (code); 1718 _exit (code);
1499 1719
1500int 1720int
1537 CODE: 1757 CODE:
1538{ 1758{
1539 if (coro->mainstack) 1759 if (coro->mainstack)
1540 { 1760 {
1541 struct coro temp; 1761 struct coro temp;
1542 Zero (&temp, 1, struct coro);
1543 1762
1544 if (!(coro->flags & CF_RUNNING)) 1763 if (!(coro->flags & CF_RUNNING))
1545 { 1764 {
1765 PUTBACK;
1546 save_perl (aTHX_ &temp); 1766 save_perl (aTHX_ &temp);
1547 load_perl (aTHX_ coro); 1767 load_perl (aTHX_ coro);
1548 } 1768 }
1549 1769
1550 { 1770 {
1551 dSP; 1771 dSP;
1552 ENTER; 1772 ENTER;
1553 SAVETMPS; 1773 SAVETMPS;
1774 PUTBACK;
1775 PUSHSTACK;
1554 PUSHMARK (SP); 1776 PUSHMARK (SP);
1555 PUTBACK; 1777
1556 if (ix) 1778 if (ix)
1557 eval_sv (coderef, 0); 1779 eval_sv (coderef, 0);
1558 else 1780 else
1559 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;
1560 SPAGAIN; 1784 SPAGAIN;
1561 FREETMPS; 1785 FREETMPS;
1562 LEAVE; 1786 LEAVE;
1563 PUTBACK; 1787 PUTBACK;
1564 } 1788 }
1565 1789
1566 if (!(coro->flags & CF_RUNNING)) 1790 if (!(coro->flags & CF_RUNNING))
1567 { 1791 {
1568 save_perl (aTHX_ coro); 1792 save_perl (aTHX_ coro);
1569 load_perl (aTHX_ &temp); 1793 load_perl (aTHX_ &temp);
1794 SPAGAIN;
1570 } 1795 }
1571 } 1796 }
1572} 1797}
1573 1798
1574SV * 1799SV *
1586 1811
1587void 1812void
1588api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 1813api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1589 1814
1590SV * 1815SV *
1591has_stack (Coro::State coro) 1816has_cctx (Coro::State coro)
1592 PROTOTYPE: $ 1817 PROTOTYPE: $
1593 CODE: 1818 CODE:
1594 RETVAL = boolSV (!!coro->cctx); 1819 RETVAL = boolSV (!!coro->cctx);
1595 OUTPUT: 1820 OUTPUT:
1596 RETVAL 1821 RETVAL
1615 case 1: RETVAL = coro->usecount; break; 1840 case 1: RETVAL = coro->usecount; break;
1616 } 1841 }
1617 OUTPUT: 1842 OUTPUT:
1618 RETVAL 1843 RETVAL
1619 1844
1845void
1846force_cctx ()
1847 CODE:
1848 struct coro *coro = SvSTATE (coro_current);
1849 coro->cctx->idle_sp = 0;
1620 1850
1621MODULE = Coro::State PACKAGE = Coro 1851MODULE = Coro::State PACKAGE = Coro
1622 1852
1623BOOT: 1853BOOT:
1624{ 1854{
1625 int i; 1855 int i;
1626 1856
1627 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1628 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1629 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);
1630 1860
1631 coro_current = get_sv ("Coro::current", FALSE); 1861 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1632 SvREADONLY_on (coro_current); 1862 SvREADONLY_on (coro_current);
1633 1863
1634 coro_stash = gv_stashpv ("Coro", TRUE); 1864 coro_stash = gv_stashpv ("Coro", TRUE);
1635 1865
1636 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1866 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1637 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1867 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1638 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1868 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1639 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1869 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1642 1872
1643 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1873 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1644 coro_ready[i] = newAV (); 1874 coro_ready[i] = newAV ();
1645 1875
1646 { 1876 {
1647 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 */
1648 1879
1649 coroapi.schedule = api_schedule; 1880 coroapi.schedule = api_schedule;
1650 coroapi.cede = api_cede; 1881 coroapi.cede = api_cede;
1651 coroapi.cede_notself = api_cede_notself; 1882 coroapi.cede_notself = api_cede_notself;
1652 coroapi.ready = api_ready; 1883 coroapi.ready = api_ready;
1665 PROTOTYPE: $ 1896 PROTOTYPE: $
1666 CODE: 1897 CODE:
1667 SvREFCNT_dec (SvRV (coro_current)); 1898 SvREFCNT_dec (SvRV (coro_current));
1668 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 1899 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1669 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
1670int 1911int
1671prio (Coro::State coro, int newprio = 0) 1912prio (Coro::State coro, int newprio = 0)
1672 ALIAS: 1913 ALIAS:
1673 nice = 1 1914 nice = 1
1674 CODE: 1915 CODE:
1703 CODE: 1944 CODE:
1704 RETVAL = coro_nready; 1945 RETVAL = coro_nready;
1705 OUTPUT: 1946 OUTPUT:
1706 RETVAL 1947 RETVAL
1707 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
1708# for async_pool speedup 1972# for async_pool speedup
1709void 1973void
1710_pool_1 (SV *cb) 1974_pool_1 (SV *cb)
1711 CODE: 1975 CODE:
1712{ 1976{
1716 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1980 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1717 AV *invoke_av; 1981 AV *invoke_av;
1718 int i, len; 1982 int i, len;
1719 1983
1720 if (!invoke) 1984 if (!invoke)
1985 {
1986 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1721 croak ("\3terminate\2\n"); 1987 croak ("\3async_pool terminate\2\n");
1988 }
1722 1989
1723 SvREFCNT_dec (coro->saved_deffh); 1990 SvREFCNT_dec (coro->saved_deffh);
1724 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1991 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1725 1992
1726 hv_store (hv, "desc", sizeof ("desc") - 1, 1993 hv_store (hv, "desc", sizeof ("desc") - 1,
1752 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2019 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1753 coro->saved_deffh = 0; 2020 coro->saved_deffh = 0;
1754 2021
1755 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2022 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1756 || 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;
1757 croak ("\3terminate\2\n"); 2026 croak ("\3async_pool terminate\2\n");
2027 }
1758 2028
1759 av_clear (GvAV (PL_defgv)); 2029 av_clear (GvAV (PL_defgv));
1760 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2030 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1761 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2031 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1762 2032
1801 PL_laststype = data->laststype; 2071 PL_laststype = data->laststype;
1802 PL_laststatval = data->laststatval; 2072 PL_laststatval = data->laststatval;
1803 PL_statcache = data->statcache; 2073 PL_statcache = data->statcache;
1804} 2074}
1805 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