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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines