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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines