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.244 by root, Sun Sep 21 18:29:39 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)];
302 SvREFCNT_dec (av); 366 SvREFCNT_dec (av);
303 367
304 return 0; 368 return 0;
305} 369}
306 370
307#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
308 373
309static 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};
310 378
311#define CORO_MAGIC(cv) \ 379#define CORO_MAGIC(sv,type) \
312 SvMAGIC (cv) \ 380 SvMAGIC (sv) \
313 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 381 ? SvMAGIC (sv)->mg_type == type \
314 ? SvMAGIC (cv) \ 382 ? SvMAGIC (sv) \
315 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 383 : mg_find (sv, type) \
316 : 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)
317 388
318static struct coro * 389static struct coro *
319SvSTATE_ (pTHX_ SV *coro) 390SvSTATE_ (pTHX_ SV *coro)
320{ 391{
321 HV *stash; 392 HV *stash;
322 MAGIC *mg; 393 MAGIC *mg;
323 394
324 if (SvROK (coro)) 395 if (SvROK (coro))
325 coro = SvRV (coro); 396 coro = SvRV (coro);
326 397
327 if (SvTYPE (coro) != SVt_PVHV) 398 if (expect_false (SvTYPE (coro) != SVt_PVHV))
328 croak ("Coro::State object required"); 399 croak ("Coro::State object required");
329 400
330 stash = SvSTASH (coro); 401 stash = SvSTASH (coro);
331 if (stash != coro_stash && stash != coro_state_stash) 402 if (expect_false (stash != coro_stash && stash != coro_state_stash))
332 { 403 {
333 /* very slow, but rare, check */ 404 /* very slow, but rare, check */
334 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 405 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
335 croak ("Coro::State object required"); 406 croak ("Coro::State object required");
336 } 407 }
337 408
338 mg = CORO_MAGIC (coro); 409 mg = CORO_MAGIC_state (coro);
339 return (struct coro *)mg->mg_ptr; 410 return (struct coro *)mg->mg_ptr;
340} 411}
341 412
342#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 413#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
343 414
344/* the next two functions merely cache the padlists */ 415/* the next two functions merely cache the padlists */
345static void 416static void
346get_padlist (pTHX_ CV *cv) 417get_padlist (pTHX_ CV *cv)
347{ 418{
348 MAGIC *mg = CORO_MAGIC (cv); 419 MAGIC *mg = CORO_MAGIC_cv (cv);
349 AV *av; 420 AV *av;
350 421
351 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 422 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
352 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 423 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
353 else 424 else
354 { 425 {
355#if CORO_PREFER_PERL_FUNCTIONS 426#if CORO_PREFER_PERL_FUNCTIONS
356 /* this is probably cleaner, but also slower? */ 427 /* this is probably cleaner? but also slower! */
428 /* in practise, it seems to be less stable */
357 CV *cp = Perl_cv_clone (cv); 429 CV *cp = Perl_cv_clone (cv);
358 CvPADLIST (cv) = CvPADLIST (cp); 430 CvPADLIST (cv) = CvPADLIST (cp);
359 CvPADLIST (cp) = 0; 431 CvPADLIST (cp) = 0;
360 SvREFCNT_dec (cp); 432 SvREFCNT_dec (cp);
361#else 433#else
365} 437}
366 438
367static void 439static void
368put_padlist (pTHX_ CV *cv) 440put_padlist (pTHX_ CV *cv)
369{ 441{
370 MAGIC *mg = CORO_MAGIC (cv); 442 MAGIC *mg = CORO_MAGIC_cv (cv);
371 AV *av; 443 AV *av;
372 444
373 if (!mg) 445 if (expect_false (!mg))
374 { 446 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 447
381 av = (AV *)mg->mg_obj; 448 av = (AV *)mg->mg_obj;
382 449
383 if (AvFILLp (av) >= AvMAX (av)) 450 if (expect_false (AvFILLp (av) >= AvMAX (av)))
384 av_extend (av, AvMAX (av) + 1); 451 av_extend (av, AvMAX (av) + 1);
385 452
386 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 453 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
387} 454}
388 455
389/** load & save, init *******************************************************/ 456/** load & save, init *******************************************************/
390 457
391static void 458static void
392load_perl (pTHX_ Coro__State c) 459load_perl (pTHX_ Coro__State c)
393{ 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
394#define VAR(name,type) PL_ ## name = c->name; 471 #define VAR(name,type) PL_ ## name = slot->name;
395# include "state.h" 472 # include "state.h"
396#undef VAR 473 #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 474
403 { 475 {
404 dSP; 476 dSP;
477
405 CV *cv; 478 CV *cv;
406 479
407 /* now do the ugly restore mess */ 480 /* now do the ugly restore mess */
408 while ((cv = (CV *)POPs)) 481 while (expect_true (cv = (CV *)POPs))
409 { 482 {
410 put_padlist (aTHX_ cv); /* mark this padlist as available */ 483 put_padlist (aTHX_ cv); /* mark this padlist as available */
411 CvDEPTH (cv) = PTR2IV (POPs); 484 CvDEPTH (cv) = PTR2IV (POPs);
412 CvPADLIST (cv) = (AV *)POPs; 485 CvPADLIST (cv) = (AV *)POPs;
413 } 486 }
432 505
433 XPUSHs (Nullsv); 506 XPUSHs (Nullsv);
434 /* this loop was inspired by pp_caller */ 507 /* this loop was inspired by pp_caller */
435 for (;;) 508 for (;;)
436 { 509 {
437 while (cxix >= 0) 510 while (expect_true (cxix >= 0))
438 { 511 {
439 PERL_CONTEXT *cx = &ccstk[cxix--]; 512 PERL_CONTEXT *cx = &ccstk[cxix--];
440 513
441 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 514 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
442 { 515 {
443 CV *cv = cx->blk_sub.cv; 516 CV *cv = cx->blk_sub.cv;
444 517
445 if (CvDEPTH (cv)) 518 if (expect_true (CvDEPTH (cv)))
446 { 519 {
447 EXTEND (SP, 3); 520 EXTEND (SP, 3);
448 PUSHs ((SV *)CvPADLIST (cv)); 521 PUSHs ((SV *)CvPADLIST (cv));
449 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 522 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
450 PUSHs ((SV *)cv); 523 PUSHs ((SV *)cv);
451 524
452 CvDEPTH (cv) = 0; 525 CvDEPTH (cv) = 0;
453 get_padlist (aTHX_ cv); 526 get_padlist (aTHX_ cv);
454 } 527 }
455 } 528 }
456 } 529 }
457 530
458 if (top_si->si_type == PERLSI_MAIN) 531 if (expect_true (top_si->si_type == PERLSI_MAIN))
459 break; 532 break;
460 533
461 top_si = top_si->si_prev; 534 top_si = top_si->si_prev;
462 ccstk = top_si->si_cxstack; 535 ccstk = top_si->si_cxstack;
463 cxix = top_si->si_cxix; 536 cxix = top_si->si_cxix;
464 } 537 }
465 538
466 PUTBACK; 539 PUTBACK;
467 } 540 }
468 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
469 c->defav = GvAV (PL_defgv); 559 slot->defav = GvAV (PL_defgv);
470 c->defsv = DEFSV; 560 slot->defsv = DEFSV;
471 c->errsv = ERRSV; 561 slot->errsv = ERRSV;
472 c->irssv_sv = GvSV (irsgv); 562 slot->irsgv = GvSV (irsgv);
473 563
474#define VAR(name,type)c->name = PL_ ## name; 564 #define VAR(name,type) slot->name = PL_ ## name;
475# include "state.h" 565 # include "state.h"
476#undef VAR 566 #undef VAR
567 }
477} 568}
478 569
479/* 570/*
480 * allocate various perl stacks. This is an exact copy 571 * allocate various perl stacks. This is an exact copy
481 * of perl.c:init_stacks, except that it uses less memory 572 * of perl.c:init_stacks, except that it uses less memory
486# define coro_init_stacks init_stacks 577# define coro_init_stacks init_stacks
487#else 578#else
488static void 579static void
489coro_init_stacks (pTHX) 580coro_init_stacks (pTHX)
490{ 581{
491 PL_curstackinfo = new_stackinfo(64, 6); 582 PL_curstackinfo = new_stackinfo(32, 8);
492 PL_curstackinfo->si_type = PERLSI_MAIN; 583 PL_curstackinfo->si_type = PERLSI_MAIN;
493 PL_curstack = PL_curstackinfo->si_stack; 584 PL_curstack = PL_curstackinfo->si_stack;
494 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 585 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
495 586
496 PL_stack_base = AvARRAY(PL_curstack); 587 PL_stack_base = AvARRAY(PL_curstack);
497 PL_stack_sp = PL_stack_base; 588 PL_stack_sp = PL_stack_base;
498 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 589 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
499 590
500 New(50,PL_tmps_stack,64,SV*); 591 New(50,PL_tmps_stack,32,SV*);
501 PL_tmps_floor = -1; 592 PL_tmps_floor = -1;
502 PL_tmps_ix = -1; 593 PL_tmps_ix = -1;
503 PL_tmps_max = 64; 594 PL_tmps_max = 32;
504 595
505 New(54,PL_markstack,16,I32); 596 New(54,PL_markstack,16,I32);
506 PL_markstack_ptr = PL_markstack; 597 PL_markstack_ptr = PL_markstack;
507 PL_markstack_max = PL_markstack + 16; 598 PL_markstack_max = PL_markstack + 16;
508 599
509#ifdef SET_MARK_OFFSET 600#ifdef SET_MARK_OFFSET
510 SET_MARK_OFFSET; 601 SET_MARK_OFFSET;
511#endif 602#endif
512 603
513 New(54,PL_scopestack,16,I32); 604 New(54,PL_scopestack,8,I32);
514 PL_scopestack_ix = 0; 605 PL_scopestack_ix = 0;
515 PL_scopestack_max = 16; 606 PL_scopestack_max = 8;
516 607
517 New(54,PL_savestack,64,ANY); 608 New(54,PL_savestack,24,ANY);
518 PL_savestack_ix = 0; 609 PL_savestack_ix = 0;
519 PL_savestack_max = 64; 610 PL_savestack_max = 24;
520 611
521#if !PERL_VERSION_ATLEAST (5,9,0) 612#if !PERL_VERSION_ATLEAST (5,10,0)
522 New(54,PL_retstack,4,OP*); 613 New(54,PL_retstack,4,OP*);
523 PL_retstack_ix = 0; 614 PL_retstack_ix = 0;
524 PL_retstack_max = 4; 615 PL_retstack_max = 4;
525#endif 616#endif
526} 617}
549 640
550 Safefree (PL_tmps_stack); 641 Safefree (PL_tmps_stack);
551 Safefree (PL_markstack); 642 Safefree (PL_markstack);
552 Safefree (PL_scopestack); 643 Safefree (PL_scopestack);
553 Safefree (PL_savestack); 644 Safefree (PL_savestack);
554#if !PERL_VERSION_ATLEAST (5,9,0) 645#if !PERL_VERSION_ATLEAST (5,10,0)
555 Safefree (PL_retstack); 646 Safefree (PL_retstack);
556#endif 647#endif
557} 648}
558 649
559static size_t 650static size_t
561{ 652{
562 size_t rss = sizeof (*coro); 653 size_t rss = sizeof (*coro);
563 654
564 if (coro->mainstack) 655 if (coro->mainstack)
565 { 656 {
657 perl_slots tmp_slot;
658 perl_slots *slot;
659
566 if (coro->flags & CF_RUNNING) 660 if (coro->flags & CF_RUNNING)
567 { 661 {
662 slot = &tmp_slot;
663
568 #define VAR(name,type)coro->name = PL_ ## name; 664 #define VAR(name,type) slot->name = PL_ ## name;
569 # include "state.h" 665 # include "state.h"
570 #undef VAR 666 #undef VAR
571 } 667 }
668 else
669 slot = coro->slot;
572 670
573 rss += sizeof (coro->curstackinfo); 671 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); 672 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
576 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 673 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
577 rss += coro->tmps_max * sizeof (SV *); 674 rss += slot->tmps_max * sizeof (SV *);
578 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 675 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
579 rss += coro->scopestack_max * sizeof (I32); 676 rss += slot->scopestack_max * sizeof (I32);
580 rss += coro->savestack_max * sizeof (ANY); 677 rss += slot->savestack_max * sizeof (ANY);
581 678
582#if !PERL_VERSION_ATLEAST (5,9,0) 679#if !PERL_VERSION_ATLEAST (5,10,0)
583 rss += coro->retstack_max * sizeof (OP *); 680 rss += slot->retstack_max * sizeof (OP *);
584#endif 681#endif
585 } 682 }
586 683
587 return rss; 684 return rss;
588} 685}
589 686
590/** coroutine stack handling ************************************************/ 687/** coroutine stack handling ************************************************/
688
689static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
690static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
691static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
692
693/* apparently < 5.8.8 */
694#ifndef MgPV_nolen_const
695#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
696 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
697 (const char*)(mg)->mg_ptr)
698#endif
699
700/*
701 * This overrides the default magic get method of %SIG elements.
702 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
703 * and instead of tryign to save and restore the hash elements, we just provide
704 * readback here.
705 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
706 * not expecting this to actually change the hook. This is a potential problem
707 * when a schedule happens then, but we ignore this.
708 */
709static int
710coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
711{
712 const char *s = MgPV_nolen_const (mg);
713
714 if (*s == '_')
715 {
716 SV **svp = 0;
717
718 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
719 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
720
721 if (svp)
722 {
723 sv_setsv (sv, *svp ? *svp : &PL_sv_undef);
724 return 0;
725 }
726 }
727
728 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
729}
730
731static int
732coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
733{
734 const char *s = MgPV_nolen_const (mg);
735
736 if (*s == '_')
737 {
738 SV **svp = 0;
739
740 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
741 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
742
743 if (svp)
744 {
745 SV *old = *svp;
746 *svp = 0;
747 SvREFCNT_dec (old);
748 return 0;
749 }
750 }
751
752 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
753}
754
755static int
756coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
757{
758 const char *s = MgPV_nolen_const (mg);
759
760 if (*s == '_')
761 {
762 SV **svp = 0;
763
764 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
765 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
766
767 if (svp)
768 {
769 SV *old = *svp;
770 *svp = newSVsv (sv);
771 SvREFCNT_dec (old);
772 return 0;
773 }
774 }
775
776 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
777}
591 778
592static void 779static void
593coro_setup (pTHX_ struct coro *coro) 780coro_setup (pTHX_ struct coro *coro)
594{ 781{
595 /* 782 /*
600 PL_runops = RUNOPS_DEFAULT; 787 PL_runops = RUNOPS_DEFAULT;
601 PL_curcop = &PL_compiling; 788 PL_curcop = &PL_compiling;
602 PL_in_eval = EVAL_NULL; 789 PL_in_eval = EVAL_NULL;
603 PL_comppad = 0; 790 PL_comppad = 0;
604 PL_curpm = 0; 791 PL_curpm = 0;
792 PL_curpad = 0;
605 PL_localizing = 0; 793 PL_localizing = 0;
606 PL_dirty = 0; 794 PL_dirty = 0;
607 PL_restartop = 0; 795 PL_restartop = 0;
796#if PERL_VERSION_ATLEAST (5,10,0)
797 PL_parser = 0;
798#endif
799
800 /* recreate the die/warn hooks */
801 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
802 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
608 803
609 GvSV (PL_defgv) = NEWSV (0, 0); 804 GvSV (PL_defgv) = newSV (0);
610 GvAV (PL_defgv) = coro->args; coro->args = 0; 805 GvAV (PL_defgv) = coro->args; coro->args = 0;
611 GvSV (PL_errgv) = NEWSV (0, 0); 806 GvSV (PL_errgv) = newSV (0);
612 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 807 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
613 PL_rs = newSVsv (GvSV (irsgv)); 808 PL_rs = newSVsv (GvSV (irsgv));
614 PL_defoutgv = SvREFCNT_inc (stdoutgv); 809 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
615 810
616 { 811 {
617 dSP; 812 dSP;
618 LOGOP myop; 813 LOGOP myop;
619 814
620 Zero (&myop, 1, LOGOP); 815 Zero (&myop, 1, LOGOP);
621 myop.op_next = Nullop; 816 myop.op_next = Nullop;
622 myop.op_flags = OPf_WANT_VOID; 817 myop.op_flags = OPf_WANT_VOID;
623 818
624 PUSHMARK (SP); 819 PUSHMARK (SP);
625 XPUSHs (av_shift (GvAV (PL_defgv))); 820 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
626 PUTBACK; 821 PUTBACK;
627 PL_op = (OP *)&myop; 822 PL_op = (OP *)&myop;
628 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 823 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
629 SPAGAIN; 824 SPAGAIN;
630 } 825 }
631 826
632 ENTER; /* necessary e.g. for dounwind */ 827 /* this newly created coroutine might be run on an existing cctx which most
828 * likely was suspended in set_stacklevel, called from entersub.
829 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
830 * so we ENTER here for symmetry
831 */
832 ENTER;
633} 833}
634 834
635static void 835static void
636coro_destroy (pTHX_ struct coro *coro) 836coro_destroy (pTHX_ struct coro *coro)
637{ 837{
657 SvREFCNT_dec (GvSV (PL_errgv)); 857 SvREFCNT_dec (GvSV (PL_errgv));
658 SvREFCNT_dec (PL_defoutgv); 858 SvREFCNT_dec (PL_defoutgv);
659 SvREFCNT_dec (PL_rs); 859 SvREFCNT_dec (PL_rs);
660 SvREFCNT_dec (GvSV (irsgv)); 860 SvREFCNT_dec (GvSV (irsgv));
661 861
862 SvREFCNT_dec (PL_diehook);
863 SvREFCNT_dec (PL_warnhook);
864
662 SvREFCNT_dec (coro->saved_deffh); 865 SvREFCNT_dec (coro->saved_deffh);
663 //SvREFCNT_dec (coro->throw); 866 SvREFCNT_dec (coro->throw);
664 867
665 coro_destroy_stacks (aTHX); 868 coro_destroy_stacks (aTHX);
666} 869}
667 870
668static void 871static void
669free_coro_mortal (pTHX) 872free_coro_mortal (pTHX)
670{ 873{
671 if (coro_mortal) 874 if (expect_true (coro_mortal))
672 { 875 {
673 SvREFCNT_dec (coro_mortal); 876 SvREFCNT_dec (coro_mortal);
674 coro_mortal = 0; 877 coro_mortal = 0;
675 } 878 }
676} 879}
705 bot = PL_stack_base + cx->blk_oldsp + 1; 908 bot = PL_stack_base + cx->blk_oldsp + 1;
706 top = cx->blk_gimme == G_ARRAY ? SP + 1 909 top = cx->blk_gimme == G_ARRAY ? SP + 1
707 : cx->blk_gimme == G_SCALAR ? bot + 1 910 : cx->blk_gimme == G_SCALAR ? bot + 1
708 : bot; 911 : bot;
709 912
913 av_extend (av, top - bot);
710 while (bot < top) 914 while (bot < top)
711 av_push (av, SvREFCNT_inc (*bot++)); 915 av_push (av, SvREFCNT_inc (*bot++));
712 916
713 PL_runops = RUNOPS_DEFAULT; 917 PL_runops = RUNOPS_DEFAULT;
714 ENTER; 918 ENTER;
754 SAVETMPS; 958 SAVETMPS;
755 EXTEND (SP, 3); 959 EXTEND (SP, 3);
756 PUSHMARK (SP); 960 PUSHMARK (SP);
757 PUSHs (&PL_sv_yes); 961 PUSHs (&PL_sv_yes);
758 PUSHs (fullname); 962 PUSHs (fullname);
759 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 963 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
760 PUTBACK; 964 PUTBACK;
761 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 965 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); 966 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
763 SPAGAIN; 967 SPAGAIN;
764 FREETMPS; 968 FREETMPS;
800 1004
801/* inject a fake call to Coro::State::_cctx_init into the execution */ 1005/* 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 */ 1006/* _cctx_init should be careful, as it could be called at almost any time */
803/* during execution of a perl program */ 1007/* during execution of a perl program */
804static void NOINLINE 1008static void NOINLINE
805prepare_cctx (pTHX_ coro_cctx *cctx) 1009cctx_prepare (pTHX_ coro_cctx *cctx)
806{ 1010{
807 dSP; 1011 dSP;
808 LOGOP myop; 1012 LOGOP myop;
809 1013
810 PL_top_env = &PL_start_env; 1014 PL_top_env = &PL_start_env;
828 1032
829/* 1033/*
830 * this is a _very_ stripped down perl interpreter ;) 1034 * this is a _very_ stripped down perl interpreter ;)
831 */ 1035 */
832static void 1036static void
833coro_run (void *arg) 1037cctx_run (void *arg)
834{ 1038{
835 dTHX; 1039 dTHX;
836 1040
837 /* coro_run is the alternative tail of transfer(), so unlock here. */ 1041 /* cctx_run is the alternative tail of transfer(), so unlock here. */
838 UNLOCK; 1042 UNLOCK;
839 1043
840 /* we now skip the entersub that lead to transfer() */ 1044 /* we now skip the entersub that lead to transfer() */
841 PL_op = PL_op->op_next; 1045 PL_op = PL_op->op_next;
842 1046
843 /* inject a fake subroutine call to cctx_init */ 1047 /* inject a fake subroutine call to cctx_init */
844 prepare_cctx (aTHX_ (coro_cctx *)arg); 1048 cctx_prepare (aTHX_ (coro_cctx *)arg);
845 1049
846 /* somebody or something will hit me for both perl_run and PL_restartop */ 1050 /* somebody or something will hit me for both perl_run and PL_restartop */
847 PL_restartop = PL_op; 1051 PL_restartop = PL_op;
848 perl_run (PL_curinterp); 1052 perl_run (PL_curinterp);
849 1053
868 ++cctx_count; 1072 ++cctx_count;
869 1073
870 Newz (0, cctx, 1, coro_cctx); 1074 Newz (0, cctx, 1, coro_cctx);
871 1075
872#if HAVE_MMAP 1076#if HAVE_MMAP
873
874 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1077 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
875 /* mmap supposedly does allocate-on-write for us */ 1078 /* 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); 1079 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
877 1080
878 if (cctx->sptr != (void *)-1) 1081 if (cctx->sptr != (void *)-1)
899 stack_start = cctx->sptr; 1102 stack_start = cctx->sptr;
900 stack_size = cctx->ssize; 1103 stack_size = cctx->ssize;
901 } 1104 }
902 1105
903 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1106 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
904 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1107 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
905 1108
906 return cctx; 1109 return cctx;
907} 1110}
908 1111
909static void 1112static void
926 Safefree (cctx->sptr); 1129 Safefree (cctx->sptr);
927 1130
928 Safefree (cctx); 1131 Safefree (cctx);
929} 1132}
930 1133
1134/* wether this cctx should be destructed */
1135#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1136
931static coro_cctx * 1137static coro_cctx *
932cctx_get (pTHX) 1138cctx_get (pTHX)
933{ 1139{
934 while (cctx_first) 1140 while (expect_true (cctx_first))
935 { 1141 {
936 coro_cctx *cctx = cctx_first; 1142 coro_cctx *cctx = cctx_first;
937 cctx_first = cctx->next; 1143 cctx_first = cctx->next;
938 --cctx_idle; 1144 --cctx_idle;
939 1145
940 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1146 if (expect_true (!CCTX_EXPIRED (cctx)))
941 return cctx; 1147 return cctx;
942 1148
943 cctx_destroy (cctx); 1149 cctx_destroy (cctx);
944 } 1150 }
945 1151
948 1154
949static void 1155static void
950cctx_put (coro_cctx *cctx) 1156cctx_put (coro_cctx *cctx)
951{ 1157{
952 /* free another cctx if overlimit */ 1158 /* free another cctx if overlimit */
953 if (cctx_idle >= MAX_IDLE_CCTX) 1159 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
954 { 1160 {
955 coro_cctx *first = cctx_first; 1161 coro_cctx *first = cctx_first;
956 cctx_first = first->next; 1162 cctx_first = first->next;
957 --cctx_idle; 1163 --cctx_idle;
958 1164
964 cctx_first = cctx; 1170 cctx_first = cctx;
965} 1171}
966 1172
967/** coroutine switching *****************************************************/ 1173/** coroutine switching *****************************************************/
968 1174
969static void NOINLINE 1175static void
970transfer_check (pTHX_ struct coro *prev, struct coro *next) 1176transfer_check (pTHX_ struct coro *prev, struct coro *next)
971{ 1177{
972 if (prev != next) 1178 if (expect_true (prev != next))
973 { 1179 {
974 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1180 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"); 1181 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
976 1182
977 if (next->flags & CF_RUNNING) 1183 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"); 1184 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
979 1185
980 if (next->flags & CF_DESTROYED) 1186 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"); 1187 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
982 1188
1189#if !PERL_VERSION_ATLEAST (5,10,0)
983 if (PL_lex_state != LEX_NOTPARSING) 1190 if (expect_false (PL_lex_state != LEX_NOTPARSING))
984 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1191 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1192#endif
985 } 1193 }
986} 1194}
987 1195
988/* always use the TRANSFER macro */ 1196/* always use the TRANSFER macro */
989static void NOINLINE 1197static void NOINLINE
990transfer (pTHX_ struct coro *prev, struct coro *next) 1198transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
991{ 1199{
992 dSTACKLEVEL; 1200 dSTACKLEVEL;
1201 static volatile int has_throw;
993 1202
994 /* sometimes transfer is only called to set idle_sp */ 1203 /* sometimes transfer is only called to set idle_sp */
995 if (!next) 1204 if (expect_false (!next))
996 { 1205 {
997 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1206 ((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 */ 1207 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
999 } 1208 }
1000 else if (prev != next) 1209 else if (expect_true (prev != next))
1001 { 1210 {
1002 coro_cctx *prev__cctx; 1211 coro_cctx *prev__cctx;
1003 1212
1004 if (prev->flags & CF_NEW) 1213 if (expect_false (prev->flags & CF_NEW))
1005 { 1214 {
1006 /* create a new empty context */ 1215 /* create a new empty context */
1007 Newz (0, prev->cctx, 1, coro_cctx); 1216 Newz (0, prev->cctx, 1, coro_cctx);
1008 prev->flags &= ~CF_NEW; 1217 prev->flags &= ~CF_NEW;
1009 prev->flags |= CF_RUNNING; 1218 prev->flags |= CF_RUNNING;
1012 prev->flags &= ~CF_RUNNING; 1221 prev->flags &= ~CF_RUNNING;
1013 next->flags |= CF_RUNNING; 1222 next->flags |= CF_RUNNING;
1014 1223
1015 LOCK; 1224 LOCK;
1016 1225
1226 /* first get rid of the old state */
1227 save_perl (aTHX_ prev);
1228
1017 if (next->flags & CF_NEW) 1229 if (expect_false (next->flags & CF_NEW))
1018 { 1230 {
1019 /* need to start coroutine */ 1231 /* need to start coroutine */
1020 next->flags &= ~CF_NEW; 1232 next->flags &= ~CF_NEW;
1021 /* first get rid of the old state */
1022 save_perl (aTHX_ prev);
1023 /* setup coroutine call */ 1233 /* setup coroutine call */
1024 coro_setup (aTHX_ next); 1234 coro_setup (aTHX_ next);
1025 } 1235 }
1026 else 1236 else
1027 {
1028 /* coroutine already started */
1029 save_perl (aTHX_ prev);
1030 load_perl (aTHX_ next); 1237 load_perl (aTHX_ next);
1031 }
1032 1238
1033 prev__cctx = prev->cctx; 1239 prev__cctx = prev->cctx;
1034 1240
1035 /* possibly "free" the cctx */ 1241 /* possibly "free" the cctx */
1036 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1242 if (expect_true (
1243 prev__cctx->idle_sp == STACKLEVEL
1244 && !(prev__cctx->flags & CC_TRACE)
1245 && !force_cctx
1246 ))
1037 { 1247 {
1038 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1248 /* 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)); 1249 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1040 1250
1041 prev->cctx = 0; 1251 prev->cctx = 0;
1042 1252
1253 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1254 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1255 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1256 if (!next->cctx)
1257 next->cctx = cctx_get (aTHX);
1258
1043 cctx_put (prev__cctx); 1259 cctx_put (prev__cctx);
1044 } 1260 }
1045 1261
1046 ++next->usecount; 1262 ++next->usecount;
1047 1263
1048 if (!next->cctx) 1264 if (expect_true (!next->cctx))
1049 next->cctx = cctx_get (aTHX); 1265 next->cctx = cctx_get (aTHX);
1050 1266
1267 has_throw = !!next->throw;
1268
1051 if (prev__cctx != next->cctx) 1269 if (expect_false (prev__cctx != next->cctx))
1052 { 1270 {
1053 prev__cctx->top_env = PL_top_env; 1271 prev__cctx->top_env = PL_top_env;
1054 PL_top_env = next->cctx->top_env; 1272 PL_top_env = next->cctx->top_env;
1055 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1273 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1056 } 1274 }
1057 1275
1058 free_coro_mortal (aTHX); 1276 free_coro_mortal (aTHX);
1059 UNLOCK; 1277 UNLOCK;
1278
1279 if (expect_false (has_throw))
1280 {
1281 struct coro *coro = SvSTATE (coro_current);
1282
1283 if (coro->throw)
1284 {
1285 SV *exception = coro->throw;
1286 coro->throw = 0;
1287 sv_setsv (ERRSV, exception);
1288 croak (0);
1289 }
1290 }
1060 } 1291 }
1061} 1292}
1062 1293
1063struct transfer_args 1294struct transfer_args
1064{ 1295{
1065 struct coro *prev, *next; 1296 struct coro *prev, *next;
1066}; 1297};
1067 1298
1068#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1299#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) 1300#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1070 1301
1071/** high level stuff ********************************************************/ 1302/** high level stuff ********************************************************/
1072 1303
1073static int 1304static int
1099 save_perl (aTHX_ &temp); 1330 save_perl (aTHX_ &temp);
1100 load_perl (aTHX_ coro); 1331 load_perl (aTHX_ coro);
1101 1332
1102 coro_destroy (aTHX_ coro); 1333 coro_destroy (aTHX_ coro);
1103 1334
1104 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1335 load_perl (aTHX_ &temp);
1105 1336
1106 coro->mainstack = 0; 1337 coro->slot = 0;
1107 } 1338 }
1108 1339
1109 cctx_destroy (coro->cctx); 1340 cctx_destroy (coro->cctx);
1110 SvREFCNT_dec (coro->args); 1341 SvREFCNT_dec (coro->args);
1111 1342
1167{ 1398{
1168 dTHX; 1399 dTHX;
1169 struct transfer_args ta; 1400 struct transfer_args ta;
1170 1401
1171 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1402 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1172 TRANSFER (ta); 1403 TRANSFER (ta, 1);
1173} 1404}
1174 1405
1175/** Coro ********************************************************************/ 1406/** Coro ********************************************************************/
1176 1407
1177static void 1408static void
1179{ 1410{
1180 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1411 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1181} 1412}
1182 1413
1183static SV * 1414static SV *
1184coro_deq (pTHX_ int min_prio) 1415coro_deq (pTHX)
1185{ 1416{
1186 int prio = PRIO_MAX - PRIO_MIN; 1417 int prio;
1187 1418
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; ) 1419 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1193 if (AvFILLp (coro_ready [prio]) >= 0) 1420 if (AvFILLp (coro_ready [prio]) >= 0)
1194 return av_shift (coro_ready [prio]); 1421 return av_shift (coro_ready [prio]);
1195 1422
1196 return 0; 1423 return 0;
1197} 1424}
1199static int 1426static int
1200api_ready (SV *coro_sv) 1427api_ready (SV *coro_sv)
1201{ 1428{
1202 dTHX; 1429 dTHX;
1203 struct coro *coro; 1430 struct coro *coro;
1431 SV *sv_hook;
1432 void (*xs_hook)(void);
1204 1433
1205 if (SvROK (coro_sv)) 1434 if (SvROK (coro_sv))
1206 coro_sv = SvRV (coro_sv); 1435 coro_sv = SvRV (coro_sv);
1207 1436
1208 coro = SvSTATE (coro_sv); 1437 coro = SvSTATE (coro_sv);
1211 return 0; 1440 return 0;
1212 1441
1213 coro->flags |= CF_READY; 1442 coro->flags |= CF_READY;
1214 1443
1215 LOCK; 1444 LOCK;
1445
1446 sv_hook = coro_nready ? 0 : coro_readyhook;
1447 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1448
1216 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1449 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1217 ++coro_nready; 1450 ++coro_nready;
1451
1218 UNLOCK; 1452 UNLOCK;
1453
1454 if (sv_hook)
1455 {
1456 dSP;
1457
1458 ENTER;
1459 SAVETMPS;
1460
1461 PUSHMARK (SP);
1462 PUTBACK;
1463 call_sv (sv_hook, G_DISCARD);
1464 SPAGAIN;
1465
1466 FREETMPS;
1467 LEAVE;
1468 }
1469
1470 if (xs_hook)
1471 xs_hook ();
1219 1472
1220 return 1; 1473 return 1;
1221} 1474}
1222 1475
1223static int 1476static int
1233 SV *prev_sv, *next_sv; 1486 SV *prev_sv, *next_sv;
1234 1487
1235 for (;;) 1488 for (;;)
1236 { 1489 {
1237 LOCK; 1490 LOCK;
1238 next_sv = coro_deq (aTHX_ PRIO_MIN); 1491 next_sv = coro_deq (aTHX);
1239 1492
1240 /* nothing to schedule: call the idle handler */ 1493 /* nothing to schedule: call the idle handler */
1241 if (!next_sv) 1494 if (expect_false (!next_sv))
1242 { 1495 {
1243 dSP; 1496 dSP;
1244 UNLOCK; 1497 UNLOCK;
1245 1498
1246 ENTER; 1499 ENTER;
1247 SAVETMPS; 1500 SAVETMPS;
1248 1501
1249 PUSHMARK (SP); 1502 PUSHMARK (SP);
1250 PUTBACK; 1503 PUTBACK;
1251 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1504 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1505 SPAGAIN;
1252 1506
1253 FREETMPS; 1507 FREETMPS;
1254 LEAVE; 1508 LEAVE;
1255 continue; 1509 continue;
1256 } 1510 }
1257 1511
1258 ta->next = SvSTATE (next_sv); 1512 ta->next = SvSTATE (next_sv);
1259 1513
1260 /* cannot transfer to destroyed coros, skip and look for next */ 1514 /* cannot transfer to destroyed coros, skip and look for next */
1261 if (ta->next->flags & CF_DESTROYED) 1515 if (expect_false (ta->next->flags & CF_DESTROYED))
1262 { 1516 {
1263 UNLOCK; 1517 UNLOCK;
1264 SvREFCNT_dec (next_sv); 1518 SvREFCNT_dec (next_sv);
1265 /* coro_nready is already taken care of by destroy */ 1519 /* coro_nready is already taken care of by destroy */
1266 continue; 1520 continue;
1311{ 1565{
1312 dTHX; 1566 dTHX;
1313 struct transfer_args ta; 1567 struct transfer_args ta;
1314 1568
1315 prepare_schedule (aTHX_ &ta); 1569 prepare_schedule (aTHX_ &ta);
1316 TRANSFER (ta); 1570 TRANSFER (ta, 1);
1317} 1571}
1318 1572
1319static int 1573static int
1320api_cede (void) 1574api_cede (void)
1321{ 1575{
1322 dTHX; 1576 dTHX;
1323 struct transfer_args ta; 1577 struct transfer_args ta;
1324 1578
1325 prepare_cede (aTHX_ &ta); 1579 prepare_cede (aTHX_ &ta);
1326 1580
1327 if (ta.prev != ta.next) 1581 if (expect_true (ta.prev != ta.next))
1328 { 1582 {
1329 TRANSFER (ta); 1583 TRANSFER (ta, 1);
1330 return 1; 1584 return 1;
1331 } 1585 }
1332 else 1586 else
1333 return 0; 1587 return 0;
1334} 1588}
1339 dTHX; 1593 dTHX;
1340 struct transfer_args ta; 1594 struct transfer_args ta;
1341 1595
1342 if (prepare_cede_notself (aTHX_ &ta)) 1596 if (prepare_cede_notself (aTHX_ &ta))
1343 { 1597 {
1344 TRANSFER (ta); 1598 TRANSFER (ta, 1);
1345 return 1; 1599 return 1;
1346 } 1600 }
1347 else 1601 else
1348 return 0; 1602 return 0;
1349} 1603}
1368 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1622 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1369 1623
1370 if (coro->flags & CF_RUNNING) 1624 if (coro->flags & CF_RUNNING)
1371 PL_runops = RUNOPS_DEFAULT; 1625 PL_runops = RUNOPS_DEFAULT;
1372 else 1626 else
1373 coro->runops = RUNOPS_DEFAULT; 1627 coro->slot->runops = RUNOPS_DEFAULT;
1374 } 1628 }
1375} 1629}
1630
1631static int
1632coro_gensub_free (pTHX_ SV *sv, MAGIC *mg)
1633{
1634 AV *padlist;
1635 AV *av = (AV *)mg->mg_obj;
1636
1637 abort ();
1638
1639 return 0;
1640}
1641
1642static MGVTBL coro_gensub_vtbl = {
1643 0, 0, 0, 0,
1644 coro_gensub_free
1645};
1376 1646
1377MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1647MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1378 1648
1379PROTOTYPES: DISABLE 1649PROTOTYPES: DISABLE
1380 1650
1385#endif 1655#endif
1386 BOOT_PAGESIZE; 1656 BOOT_PAGESIZE;
1387 1657
1388 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1658 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1389 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1659 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1660
1661 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1662 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1663 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1664
1665 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1666 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1667 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1390 1668
1391 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1669 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1392 1670
1393 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1671 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1394 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1672 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1399 main_top_env = PL_top_env; 1677 main_top_env = PL_top_env;
1400 1678
1401 while (main_top_env->je_prev) 1679 while (main_top_env->je_prev)
1402 main_top_env = main_top_env->je_prev; 1680 main_top_env = main_top_env->je_prev;
1403 1681
1404 coroapi.ver = CORO_API_VERSION; 1682 coroapi.ver = CORO_API_VERSION;
1683 coroapi.rev = CORO_API_REVISION;
1405 coroapi.transfer = api_transfer; 1684 coroapi.transfer = api_transfer;
1406 1685
1407 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1686 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1408} 1687}
1409 1688
1410SV * 1689SV *
1411new (char *klass, ...) 1690new (char *klass, ...)
1412 CODE: 1691 CODE:
1413{ 1692{
1414 struct coro *coro; 1693 struct coro *coro;
1694 MAGIC *mg;
1415 HV *hv; 1695 HV *hv;
1416 int i; 1696 int i;
1417 1697
1418 Newz (0, coro, 1, struct coro); 1698 Newz (0, coro, 1, struct coro);
1419 coro->args = newAV (); 1699 coro->args = newAV ();
1422 if (coro_first) coro_first->prev = coro; 1702 if (coro_first) coro_first->prev = coro;
1423 coro->next = coro_first; 1703 coro->next = coro_first;
1424 coro_first = coro; 1704 coro_first = coro;
1425 1705
1426 coro->hv = hv = newHV (); 1706 coro->hv = hv = newHV ();
1427 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1707 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1708 mg->mg_flags |= MGf_DUP;
1428 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1709 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1429 1710
1711 av_extend (coro->args, items - 1);
1430 for (i = 1; i < items; i++) 1712 for (i = 1; i < items; i++)
1431 av_push (coro->args, newSVsv (ST (i))); 1713 av_push (coro->args, newSVsv (ST (i)));
1432} 1714}
1433 OUTPUT: 1715 OUTPUT:
1434 RETVAL 1716 RETVAL
1445 Coro::cede_notself = 4 1727 Coro::cede_notself = 4
1446 CODE: 1728 CODE:
1447{ 1729{
1448 struct transfer_args ta; 1730 struct transfer_args ta;
1449 1731
1732 PUTBACK;
1450 switch (ix) 1733 switch (ix)
1451 { 1734 {
1452 case 0: 1735 case 0:
1453 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1736 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1454 ta.next = 0; 1737 ta.next = 0;
1473 if (!prepare_cede_notself (aTHX_ &ta)) 1756 if (!prepare_cede_notself (aTHX_ &ta))
1474 XSRETURN_EMPTY; 1757 XSRETURN_EMPTY;
1475 1758
1476 break; 1759 break;
1477 } 1760 }
1761 SPAGAIN;
1478 1762
1479 BARRIER; 1763 BARRIER;
1764 PUTBACK;
1480 TRANSFER (ta); 1765 TRANSFER (ta, 0);
1481 1766 SPAGAIN; /* might be the sp of a different coroutine now */
1482 if (GIMME_V != G_VOID && ta.next != ta.prev) 1767 /* be extra careful not to ever do anything after TRANSFER */
1483 XSRETURN_YES;
1484} 1768}
1485 1769
1486bool 1770bool
1487_destroy (SV *coro_sv) 1771_destroy (SV *coro_sv)
1488 CODE: 1772 CODE:
1489 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 1773 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1490 OUTPUT: 1774 OUTPUT:
1491 RETVAL 1775 RETVAL
1492 1776
1493void 1777void
1494_exit (code) 1778_exit (int code)
1495 int code
1496 PROTOTYPE: $ 1779 PROTOTYPE: $
1497 CODE: 1780 CODE:
1498 _exit (code); 1781 _exit (code);
1499 1782
1500int 1783int
1537 CODE: 1820 CODE:
1538{ 1821{
1539 if (coro->mainstack) 1822 if (coro->mainstack)
1540 { 1823 {
1541 struct coro temp; 1824 struct coro temp;
1542 Zero (&temp, 1, struct coro);
1543 1825
1544 if (!(coro->flags & CF_RUNNING)) 1826 if (!(coro->flags & CF_RUNNING))
1545 { 1827 {
1828 PUTBACK;
1546 save_perl (aTHX_ &temp); 1829 save_perl (aTHX_ &temp);
1547 load_perl (aTHX_ coro); 1830 load_perl (aTHX_ coro);
1548 } 1831 }
1549 1832
1550 { 1833 {
1551 dSP; 1834 dSP;
1552 ENTER; 1835 ENTER;
1553 SAVETMPS; 1836 SAVETMPS;
1837 PUTBACK;
1838 PUSHSTACK;
1554 PUSHMARK (SP); 1839 PUSHMARK (SP);
1555 PUTBACK; 1840
1556 if (ix) 1841 if (ix)
1557 eval_sv (coderef, 0); 1842 eval_sv (coderef, 0);
1558 else 1843 else
1559 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1844 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1845
1846 POPSTACK;
1560 SPAGAIN; 1847 SPAGAIN;
1561 FREETMPS; 1848 FREETMPS;
1562 LEAVE; 1849 LEAVE;
1563 PUTBACK; 1850 PUTBACK;
1564 } 1851 }
1565 1852
1566 if (!(coro->flags & CF_RUNNING)) 1853 if (!(coro->flags & CF_RUNNING))
1567 { 1854 {
1568 save_perl (aTHX_ coro); 1855 save_perl (aTHX_ coro);
1569 load_perl (aTHX_ &temp); 1856 load_perl (aTHX_ &temp);
1857 SPAGAIN;
1570 } 1858 }
1571 } 1859 }
1572} 1860}
1573 1861
1574SV * 1862SV *
1586 1874
1587void 1875void
1588api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 1876api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1589 1877
1590SV * 1878SV *
1591has_stack (Coro::State coro) 1879has_cctx (Coro::State coro)
1592 PROTOTYPE: $ 1880 PROTOTYPE: $
1593 CODE: 1881 CODE:
1594 RETVAL = boolSV (!!coro->cctx); 1882 RETVAL = boolSV (!!coro->cctx);
1595 OUTPUT: 1883 OUTPUT:
1596 RETVAL 1884 RETVAL
1615 case 1: RETVAL = coro->usecount; break; 1903 case 1: RETVAL = coro->usecount; break;
1616 } 1904 }
1617 OUTPUT: 1905 OUTPUT:
1618 RETVAL 1906 RETVAL
1619 1907
1908void
1909force_cctx ()
1910 CODE:
1911 struct coro *coro = SvSTATE (coro_current);
1912 coro->cctx->idle_sp = 0;
1913
1914void
1915throw (Coro::State self, SV *throw = &PL_sv_undef)
1916 PROTOTYPE: $;$
1917 CODE:
1918 SvREFCNT_dec (self->throw);
1919 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1920
1921void
1922swap_defsv (Coro::State self)
1923 PROTOTYPE: $
1924 ALIAS:
1925 swap_defav = 1
1926 CODE:
1927 if (!self->slot)
1928 croak ("cannot swap state with coroutine that has no saved state");
1929 else
1930 {
1931 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1932 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1933
1934 SV *tmp = *src; *src = *dst; *dst = tmp;
1935 }
1620 1936
1621MODULE = Coro::State PACKAGE = Coro 1937MODULE = Coro::State PACKAGE = Coro
1622 1938
1623BOOT: 1939BOOT:
1624{ 1940{
1625 int i; 1941 int i;
1626 1942
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); 1943 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1944 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1945 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1630 1946
1631 coro_current = get_sv ("Coro::current", FALSE); 1947 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1632 SvREADONLY_on (coro_current); 1948 SvREADONLY_on (coro_current);
1633 1949
1634 coro_stash = gv_stashpv ("Coro", TRUE); 1950 coro_stash = gv_stashpv ("Coro", TRUE);
1635 1951
1636 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1952 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1637 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1953 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1638 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1954 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1639 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1955 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1642 1958
1643 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1959 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1644 coro_ready[i] = newAV (); 1960 coro_ready[i] = newAV ();
1645 1961
1646 { 1962 {
1647 SV *sv = perl_get_sv("Coro::API", 1); 1963 SV *sv = perl_get_sv ("Coro::API", TRUE);
1964 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1648 1965
1649 coroapi.schedule = api_schedule; 1966 coroapi.schedule = api_schedule;
1650 coroapi.cede = api_cede; 1967 coroapi.cede = api_cede;
1651 coroapi.cede_notself = api_cede_notself; 1968 coroapi.cede_notself = api_cede_notself;
1652 coroapi.ready = api_ready; 1969 coroapi.ready = api_ready;
1665 PROTOTYPE: $ 1982 PROTOTYPE: $
1666 CODE: 1983 CODE:
1667 SvREFCNT_dec (SvRV (coro_current)); 1984 SvREFCNT_dec (SvRV (coro_current));
1668 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 1985 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1669 1986
1987void
1988_set_readyhook (SV *hook)
1989 PROTOTYPE: $
1990 CODE:
1991 LOCK;
1992 SvREFCNT_dec (coro_readyhook);
1993 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
1994 UNLOCK;
1995
1670int 1996int
1671prio (Coro::State coro, int newprio = 0) 1997prio (Coro::State coro, int newprio = 0)
1672 ALIAS: 1998 ALIAS:
1673 nice = 1 1999 nice = 1
1674 CODE: 2000 CODE:
1716 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 2042 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1717 AV *invoke_av; 2043 AV *invoke_av;
1718 int i, len; 2044 int i, len;
1719 2045
1720 if (!invoke) 2046 if (!invoke)
2047 {
2048 SV *old = PL_diehook;
2049 PL_diehook = 0;
2050 SvREFCNT_dec (old);
1721 croak ("\3terminate\2\n"); 2051 croak ("\3async_pool terminate\2\n");
2052 }
1722 2053
1723 SvREFCNT_dec (coro->saved_deffh); 2054 SvREFCNT_dec (coro->saved_deffh);
1724 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2055 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1725 2056
1726 hv_store (hv, "desc", sizeof ("desc") - 1, 2057 hv_store (hv, "desc", sizeof ("desc") - 1,
1752 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2083 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1753 coro->saved_deffh = 0; 2084 coro->saved_deffh = 0;
1754 2085
1755 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2086 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1756 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2087 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2088 {
2089 SV *old = PL_diehook;
2090 PL_diehook = 0;
2091 SvREFCNT_dec (old);
1757 croak ("\3terminate\2\n"); 2092 croak ("\3async_pool terminate\2\n");
2093 }
1758 2094
1759 av_clear (GvAV (PL_defgv)); 2095 av_clear (GvAV (PL_defgv));
1760 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2096 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1761 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2097 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1762 2098
1765 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2101 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1766 api_trace (coro_current, 0); 2102 api_trace (coro_current, 0);
1767 2103
1768 av_push (av_async_pool, newSVsv (coro_current)); 2104 av_push (av_async_pool, newSVsv (coro_current));
1769} 2105}
2106
2107#if 0
2108
2109void
2110_generator_call (...)
2111 PROTOTYPE: @
2112 PPCODE:
2113 fprintf (stderr, "call %p\n", CvXSUBANY(cv).any_ptr);
2114 xxxx
2115 abort ();
2116
2117SV *
2118gensub (SV *sub, ...)
2119 PROTOTYPE: &;@
2120 CODE:
2121{
2122 struct coro *coro;
2123 MAGIC *mg;
2124 CV *xcv;
2125 CV *ncv = (CV *)newSV_type (SVt_PVCV);
2126 int i;
2127
2128 CvGV (ncv) = CvGV (cv);
2129 CvFILE (ncv) = CvFILE (cv);
2130
2131 Newz (0, coro, 1, struct coro);
2132 coro->args = newAV ();
2133 coro->flags = CF_NEW;
2134
2135 av_extend (coro->args, items - 1);
2136 for (i = 1; i < items; i++)
2137 av_push (coro->args, newSVsv (ST (i)));
2138
2139 CvISXSUB_on (ncv);
2140 CvXSUBANY (ncv).any_ptr = (void *)coro;
2141
2142 xcv = GvCV (gv_fetchpv ("Coro::_generator_call", 0, SVt_PVCV));
2143
2144 CvXSUB (ncv) = CvXSUB (xcv);
2145 CvANON_on (ncv);
2146
2147 mg = sv_magicext ((SV *)ncv, 0, CORO_MAGIC_type_state, &coro_gensub_vtbl, (char *)coro, 0);
2148 RETVAL = newRV_noinc ((SV *)ncv);
2149}
2150 OUTPUT:
2151 RETVAL
2152
2153#endif
1770 2154
1771 2155
1772MODULE = Coro::State PACKAGE = Coro::AIO 2156MODULE = Coro::State PACKAGE = Coro::AIO
1773 2157
1774SV * 2158SV *
1801 PL_laststype = data->laststype; 2185 PL_laststype = data->laststype;
1802 PL_laststatval = data->laststatval; 2186 PL_laststatval = data->laststatval;
1803 PL_statcache = data->statcache; 2187 PL_statcache = data->statcache;
1804} 2188}
1805 2189
2190
2191MODULE = Coro::State PACKAGE = Coro::AnyEvent
2192
2193BOOT:
2194 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2195
2196SV *
2197_schedule (...)
2198 PROTOTYPE: @
2199 CODE:
2200{
2201 static int incede;
2202
2203 api_cede_notself ();
2204
2205 ++incede;
2206 while (coro_nready >= incede && api_cede ())
2207 ;
2208
2209 sv_setsv (sv_activity, &PL_sv_undef);
2210 if (coro_nready >= incede)
2211 {
2212 PUSHMARK (SP);
2213 PUTBACK;
2214 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2215 SPAGAIN;
2216 }
2217
2218 --incede;
2219}
2220

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines