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.240 by root, Sun Jun 29 00:28:17 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);
688static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
689
690/* apparently < 5.8.8 */
691#undef MgPV_nolen_const
692#ifndef MgPV_nolen_const
693#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
694 SvPV_nolen_const((SV*)((mg)->mg_ptr)) : \
695 (const char*)(mg)->mg_ptr)
696#endif
697
698/*
699 * This overrides the default magic get method of %SIG elements.
700 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
701 * and instead of tryign to save and restore the hash elements, we just provide
702 * readback here.
703 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
704 * not expecting this to actually change the hook. This is a potential problem
705 * when a schedule happens then, but we ignore this.
706 */
707static int
708coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
709{
710 const char *s = MgPV_nolen_const (mg);
711
712 if (*s == '_')
713 {
714 SV **svp = 0;
715
716 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
717 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
718
719 if (svp)
720 {
721 sv_setsv (sv, *svp ? *svp : &PL_sv_undef);
722 return 0;
723 }
724 }
725
726 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
727}
728
729static int
730coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
731{
732 const char *s = MgPV_nolen_const (mg);
733
734 if (*s == '_')
735 {
736 SV **svp = 0;
737
738 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
739 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
740
741 if (svp)
742 {
743 SV *old = *svp;
744 *svp = 0;
745 SvREFCNT_dec (old);
746 return 0;
747 }
748 }
749
750 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
751}
752
753static int
754coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
755{
756 const char *s = MgPV_nolen_const (mg);
757
758 if (*s == '_')
759 {
760 SV **svp = 0;
761
762 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
763 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
764
765 if (svp)
766 {
767 SV *old = *svp;
768 *svp = newSVsv (sv);
769 SvREFCNT_dec (old);
770 return 0;
771 }
772 }
773
774 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
775}
585 776
586static void 777static void
587coro_setup (pTHX_ struct coro *coro) 778coro_setup (pTHX_ struct coro *coro)
588{ 779{
589 /* 780 /*
594 PL_runops = RUNOPS_DEFAULT; 785 PL_runops = RUNOPS_DEFAULT;
595 PL_curcop = &PL_compiling; 786 PL_curcop = &PL_compiling;
596 PL_in_eval = EVAL_NULL; 787 PL_in_eval = EVAL_NULL;
597 PL_comppad = 0; 788 PL_comppad = 0;
598 PL_curpm = 0; 789 PL_curpm = 0;
790 PL_curpad = 0;
599 PL_localizing = 0; 791 PL_localizing = 0;
600 PL_dirty = 0; 792 PL_dirty = 0;
601 PL_restartop = 0; 793 PL_restartop = 0;
794#if PERL_VERSION_ATLEAST (5,10,0)
795 PL_parser = 0;
796#endif
797
798 /* recreate the die/warn hooks */
799 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
800 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
602 801
603 GvSV (PL_defgv) = NEWSV (0, 0); 802 GvSV (PL_defgv) = newSV (0);
604 GvAV (PL_defgv) = coro->args; coro->args = 0; 803 GvAV (PL_defgv) = coro->args; coro->args = 0;
605 GvSV (PL_errgv) = NEWSV (0, 0); 804 GvSV (PL_errgv) = newSV (0);
606 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 805 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
607 PL_rs = newSVsv (GvSV (irsgv)); 806 PL_rs = newSVsv (GvSV (irsgv));
608 807 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 808
618 { 809 {
619 dSP; 810 dSP;
620 LOGOP myop; 811 LOGOP myop;
621 812
622 Zero (&myop, 1, LOGOP); 813 Zero (&myop, 1, LOGOP);
623 myop.op_next = Nullop; 814 myop.op_next = Nullop;
624 myop.op_flags = OPf_WANT_VOID; 815 myop.op_flags = OPf_WANT_VOID;
625 816
626 PUSHMARK (SP); 817 PUSHMARK (SP);
627 XPUSHs (av_shift (GvAV (PL_defgv))); 818 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
628 PUTBACK; 819 PUTBACK;
629 PL_op = (OP *)&myop; 820 PL_op = (OP *)&myop;
630 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 821 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
631 SPAGAIN; 822 SPAGAIN;
632 } 823 }
633 824
634 ENTER; /* necessary e.g. for dounwind */ 825 /* this newly created coroutine might be run on an existing cctx which most
826 * likely was suspended in set_stacklevel, called from entersub.
827 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
828 * so we ENTER here for symmetry
829 */
830 ENTER;
635} 831}
636 832
637static void 833static void
638coro_destroy (pTHX_ struct coro *coro) 834coro_destroy (pTHX_ struct coro *coro)
639{ 835{
659 SvREFCNT_dec (GvSV (PL_errgv)); 855 SvREFCNT_dec (GvSV (PL_errgv));
660 SvREFCNT_dec (PL_defoutgv); 856 SvREFCNT_dec (PL_defoutgv);
661 SvREFCNT_dec (PL_rs); 857 SvREFCNT_dec (PL_rs);
662 SvREFCNT_dec (GvSV (irsgv)); 858 SvREFCNT_dec (GvSV (irsgv));
663 859
860 SvREFCNT_dec (PL_diehook);
861 SvREFCNT_dec (PL_warnhook);
862
863 SvREFCNT_dec (coro->saved_deffh);
864 SvREFCNT_dec (coro->throw);
865
664 coro_destroy_stacks (aTHX); 866 coro_destroy_stacks (aTHX);
665} 867}
666 868
667static void 869static void
668free_coro_mortal (pTHX) 870free_coro_mortal (pTHX)
669{ 871{
670 if (coro_mortal) 872 if (expect_true (coro_mortal))
671 { 873 {
672 SvREFCNT_dec (coro_mortal); 874 SvREFCNT_dec (coro_mortal);
673 coro_mortal = 0; 875 coro_mortal = 0;
674 } 876 }
675} 877}
704 bot = PL_stack_base + cx->blk_oldsp + 1; 906 bot = PL_stack_base + cx->blk_oldsp + 1;
705 top = cx->blk_gimme == G_ARRAY ? SP + 1 907 top = cx->blk_gimme == G_ARRAY ? SP + 1
706 : cx->blk_gimme == G_SCALAR ? bot + 1 908 : cx->blk_gimme == G_SCALAR ? bot + 1
707 : bot; 909 : bot;
708 910
911 av_extend (av, top - bot);
709 while (bot < top) 912 while (bot < top)
710 av_push (av, SvREFCNT_inc (*bot++)); 913 av_push (av, SvREFCNT_inc (*bot++));
711 914
712 PL_runops = RUNOPS_DEFAULT; 915 PL_runops = RUNOPS_DEFAULT;
713 ENTER; 916 ENTER;
753 SAVETMPS; 956 SAVETMPS;
754 EXTEND (SP, 3); 957 EXTEND (SP, 3);
755 PUSHMARK (SP); 958 PUSHMARK (SP);
756 PUSHs (&PL_sv_yes); 959 PUSHs (&PL_sv_yes);
757 PUSHs (fullname); 960 PUSHs (fullname);
758 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 961 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
759 PUTBACK; 962 PUTBACK;
760 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 963 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); 964 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
762 SPAGAIN; 965 SPAGAIN;
763 FREETMPS; 966 FREETMPS;
799 1002
800/* inject a fake call to Coro::State::_cctx_init into the execution */ 1003/* 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 */ 1004/* _cctx_init should be careful, as it could be called at almost any time */
802/* during execution of a perl program */ 1005/* during execution of a perl program */
803static void NOINLINE 1006static void NOINLINE
804prepare_cctx (pTHX_ coro_cctx *cctx) 1007cctx_prepare (pTHX_ coro_cctx *cctx)
805{ 1008{
806 dSP; 1009 dSP;
807 LOGOP myop; 1010 LOGOP myop;
808 1011
809 PL_top_env = &PL_start_env; 1012 PL_top_env = &PL_start_env;
827 1030
828/* 1031/*
829 * this is a _very_ stripped down perl interpreter ;) 1032 * this is a _very_ stripped down perl interpreter ;)
830 */ 1033 */
831static void 1034static void
832coro_run (void *arg) 1035cctx_run (void *arg)
833{ 1036{
834 dTHX; 1037 dTHX;
835 1038
836 /* coro_run is the alternative tail of transfer(), so unlock here. */ 1039 /* cctx_run is the alternative tail of transfer(), so unlock here. */
837 UNLOCK; 1040 UNLOCK;
838 1041
839 /* we now skip the entersub that lead to transfer() */ 1042 /* we now skip the entersub that lead to transfer() */
840 PL_op = PL_op->op_next; 1043 PL_op = PL_op->op_next;
841 1044
842 /* inject a fake subroutine call to cctx_init */ 1045 /* inject a fake subroutine call to cctx_init */
843 prepare_cctx (aTHX_ (coro_cctx *)arg); 1046 cctx_prepare (aTHX_ (coro_cctx *)arg);
844 1047
845 /* somebody or something will hit me for both perl_run and PL_restartop */ 1048 /* somebody or something will hit me for both perl_run and PL_restartop */
846 PL_restartop = PL_op; 1049 PL_restartop = PL_op;
847 perl_run (PL_curinterp); 1050 perl_run (PL_curinterp);
848 1051
867 ++cctx_count; 1070 ++cctx_count;
868 1071
869 Newz (0, cctx, 1, coro_cctx); 1072 Newz (0, cctx, 1, coro_cctx);
870 1073
871#if HAVE_MMAP 1074#if HAVE_MMAP
872
873 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1075 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
874 /* mmap supposedly does allocate-on-write for us */ 1076 /* 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); 1077 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
876 1078
877 if (cctx->sptr != (void *)-1) 1079 if (cctx->sptr != (void *)-1)
898 stack_start = cctx->sptr; 1100 stack_start = cctx->sptr;
899 stack_size = cctx->ssize; 1101 stack_size = cctx->ssize;
900 } 1102 }
901 1103
902 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1104 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
903 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1105 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
904 1106
905 return cctx; 1107 return cctx;
906} 1108}
907 1109
908static void 1110static void
925 Safefree (cctx->sptr); 1127 Safefree (cctx->sptr);
926 1128
927 Safefree (cctx); 1129 Safefree (cctx);
928} 1130}
929 1131
1132/* wether this cctx should be destructed */
1133#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1134
930static coro_cctx * 1135static coro_cctx *
931cctx_get (pTHX) 1136cctx_get (pTHX)
932{ 1137{
933 while (cctx_first) 1138 while (expect_true (cctx_first))
934 { 1139 {
935 coro_cctx *cctx = cctx_first; 1140 coro_cctx *cctx = cctx_first;
936 cctx_first = cctx->next; 1141 cctx_first = cctx->next;
937 --cctx_idle; 1142 --cctx_idle;
938 1143
939 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1144 if (expect_true (!CCTX_EXPIRED (cctx)))
940 return cctx; 1145 return cctx;
941 1146
942 cctx_destroy (cctx); 1147 cctx_destroy (cctx);
943 } 1148 }
944 1149
947 1152
948static void 1153static void
949cctx_put (coro_cctx *cctx) 1154cctx_put (coro_cctx *cctx)
950{ 1155{
951 /* free another cctx if overlimit */ 1156 /* free another cctx if overlimit */
952 if (cctx_idle >= MAX_IDLE_CCTX) 1157 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
953 { 1158 {
954 coro_cctx *first = cctx_first; 1159 coro_cctx *first = cctx_first;
955 cctx_first = first->next; 1160 cctx_first = first->next;
956 --cctx_idle; 1161 --cctx_idle;
957 1162
963 cctx_first = cctx; 1168 cctx_first = cctx;
964} 1169}
965 1170
966/** coroutine switching *****************************************************/ 1171/** coroutine switching *****************************************************/
967 1172
968static void NOINLINE 1173static void
969transfer_check (pTHX_ struct coro *prev, struct coro *next) 1174transfer_check (pTHX_ struct coro *prev, struct coro *next)
970{ 1175{
971 if (prev != next) 1176 if (expect_true (prev != next))
972 { 1177 {
973 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1178 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"); 1179 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
975 1180
976 if (next->flags & CF_RUNNING) 1181 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"); 1182 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
978 1183
979 if (next->flags & CF_DESTROYED) 1184 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"); 1185 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
981 1186
1187#if !PERL_VERSION_ATLEAST (5,10,0)
982 if (PL_lex_state != LEX_NOTPARSING) 1188 if (expect_false (PL_lex_state != LEX_NOTPARSING))
983 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1189 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1190#endif
984 } 1191 }
985} 1192}
986 1193
987/* always use the TRANSFER macro */ 1194/* always use the TRANSFER macro */
988static void NOINLINE 1195static void NOINLINE
989transfer (pTHX_ struct coro *prev, struct coro *next) 1196transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
990{ 1197{
991 dSTACKLEVEL; 1198 dSTACKLEVEL;
1199 static volatile int has_throw;
992 1200
993 /* sometimes transfer is only called to set idle_sp */ 1201 /* sometimes transfer is only called to set idle_sp */
994 if (!next) 1202 if (expect_false (!next))
995 { 1203 {
996 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1204 ((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 */ 1205 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
998 } 1206 }
999 else if (prev != next) 1207 else if (expect_true (prev != next))
1000 { 1208 {
1001 coro_cctx *prev__cctx; 1209 coro_cctx *prev__cctx;
1002 1210
1003 if (prev->flags & CF_NEW) 1211 if (expect_false (prev->flags & CF_NEW))
1004 { 1212 {
1005 /* create a new empty context */ 1213 /* create a new empty context */
1006 Newz (0, prev->cctx, 1, coro_cctx); 1214 Newz (0, prev->cctx, 1, coro_cctx);
1007 prev->flags &= ~CF_NEW; 1215 prev->flags &= ~CF_NEW;
1008 prev->flags |= CF_RUNNING; 1216 prev->flags |= CF_RUNNING;
1011 prev->flags &= ~CF_RUNNING; 1219 prev->flags &= ~CF_RUNNING;
1012 next->flags |= CF_RUNNING; 1220 next->flags |= CF_RUNNING;
1013 1221
1014 LOCK; 1222 LOCK;
1015 1223
1224 /* first get rid of the old state */
1225 save_perl (aTHX_ prev);
1226
1016 if (next->flags & CF_NEW) 1227 if (expect_false (next->flags & CF_NEW))
1017 { 1228 {
1018 /* need to start coroutine */ 1229 /* need to start coroutine */
1019 next->flags &= ~CF_NEW; 1230 next->flags &= ~CF_NEW;
1020 /* first get rid of the old state */
1021 save_perl (aTHX_ prev);
1022 /* setup coroutine call */ 1231 /* setup coroutine call */
1023 coro_setup (aTHX_ next); 1232 coro_setup (aTHX_ next);
1024 } 1233 }
1025 else 1234 else
1026 {
1027 /* coroutine already started */
1028 save_perl (aTHX_ prev);
1029 load_perl (aTHX_ next); 1235 load_perl (aTHX_ next);
1030 }
1031 1236
1032 prev__cctx = prev->cctx; 1237 prev__cctx = prev->cctx;
1033 1238
1034 /* possibly "free" the cctx */ 1239 /* possibly "free" the cctx */
1035 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1240 if (expect_true (
1241 prev__cctx->idle_sp == STACKLEVEL
1242 && !(prev__cctx->flags & CC_TRACE)
1243 && !force_cctx
1244 ))
1036 { 1245 {
1037 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1246 /* 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)); 1247 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1039 1248
1040 prev->cctx = 0; 1249 prev->cctx = 0;
1041 1250
1251 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1252 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1253 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1254 if (!next->cctx)
1255 next->cctx = cctx_get (aTHX);
1256
1042 cctx_put (prev__cctx); 1257 cctx_put (prev__cctx);
1043 } 1258 }
1044 1259
1045 ++next->usecount; 1260 ++next->usecount;
1046 1261
1047 if (!next->cctx) 1262 if (expect_true (!next->cctx))
1048 next->cctx = cctx_get (aTHX); 1263 next->cctx = cctx_get (aTHX);
1049 1264
1265 has_throw = !!next->throw;
1266
1050 if (prev__cctx != next->cctx) 1267 if (expect_false (prev__cctx != next->cctx))
1051 { 1268 {
1052 prev__cctx->top_env = PL_top_env; 1269 prev__cctx->top_env = PL_top_env;
1053 PL_top_env = next->cctx->top_env; 1270 PL_top_env = next->cctx->top_env;
1054 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1271 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1055 } 1272 }
1056 1273
1057 free_coro_mortal (aTHX); 1274 free_coro_mortal (aTHX);
1058 UNLOCK; 1275 UNLOCK;
1276
1277 if (expect_false (has_throw))
1278 {
1279 struct coro *coro = SvSTATE (coro_current);
1280
1281 if (coro->throw)
1282 {
1283 SV *exception = coro->throw;
1284 coro->throw = 0;
1285 sv_setsv (ERRSV, exception);
1286 croak (0);
1287 }
1288 }
1059 } 1289 }
1060} 1290}
1061 1291
1062struct transfer_args 1292struct transfer_args
1063{ 1293{
1064 struct coro *prev, *next; 1294 struct coro *prev, *next;
1065}; 1295};
1066 1296
1067#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1297#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) 1298#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1069 1299
1070/** high level stuff ********************************************************/ 1300/** high level stuff ********************************************************/
1071 1301
1072static int 1302static int
1098 save_perl (aTHX_ &temp); 1328 save_perl (aTHX_ &temp);
1099 load_perl (aTHX_ coro); 1329 load_perl (aTHX_ coro);
1100 1330
1101 coro_destroy (aTHX_ coro); 1331 coro_destroy (aTHX_ coro);
1102 1332
1103 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1333 load_perl (aTHX_ &temp);
1104 1334
1105 coro->mainstack = 0; 1335 coro->slot = 0;
1106 } 1336 }
1107 1337
1108 cctx_destroy (coro->cctx); 1338 cctx_destroy (coro->cctx);
1109 SvREFCNT_dec (coro->args); 1339 SvREFCNT_dec (coro->args);
1110 1340
1166{ 1396{
1167 dTHX; 1397 dTHX;
1168 struct transfer_args ta; 1398 struct transfer_args ta;
1169 1399
1170 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1400 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1171 TRANSFER (ta); 1401 TRANSFER (ta, 1);
1172} 1402}
1173 1403
1174/** Coro ********************************************************************/ 1404/** Coro ********************************************************************/
1175 1405
1176static void 1406static void
1178{ 1408{
1179 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1409 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1180} 1410}
1181 1411
1182static SV * 1412static SV *
1183coro_deq (pTHX_ int min_prio) 1413coro_deq (pTHX)
1184{ 1414{
1185 int prio = PRIO_MAX - PRIO_MIN; 1415 int prio;
1186 1416
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; ) 1417 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1192 if (AvFILLp (coro_ready [prio]) >= 0) 1418 if (AvFILLp (coro_ready [prio]) >= 0)
1193 return av_shift (coro_ready [prio]); 1419 return av_shift (coro_ready [prio]);
1194 1420
1195 return 0; 1421 return 0;
1196} 1422}
1198static int 1424static int
1199api_ready (SV *coro_sv) 1425api_ready (SV *coro_sv)
1200{ 1426{
1201 dTHX; 1427 dTHX;
1202 struct coro *coro; 1428 struct coro *coro;
1429 SV *sv_hook;
1430 void (*xs_hook)(void);
1203 1431
1204 if (SvROK (coro_sv)) 1432 if (SvROK (coro_sv))
1205 coro_sv = SvRV (coro_sv); 1433 coro_sv = SvRV (coro_sv);
1206 1434
1207 coro = SvSTATE (coro_sv); 1435 coro = SvSTATE (coro_sv);
1210 return 0; 1438 return 0;
1211 1439
1212 coro->flags |= CF_READY; 1440 coro->flags |= CF_READY;
1213 1441
1214 LOCK; 1442 LOCK;
1443
1444 sv_hook = coro_nready ? 0 : coro_readyhook;
1445 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1446
1215 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1447 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1216 ++coro_nready; 1448 ++coro_nready;
1449
1217 UNLOCK; 1450 UNLOCK;
1451
1452 if (sv_hook)
1453 {
1454 dSP;
1455
1456 ENTER;
1457 SAVETMPS;
1458
1459 PUSHMARK (SP);
1460 PUTBACK;
1461 call_sv (sv_hook, G_DISCARD);
1462 SPAGAIN;
1463
1464 FREETMPS;
1465 LEAVE;
1466 }
1467
1468 if (xs_hook)
1469 xs_hook ();
1218 1470
1219 return 1; 1471 return 1;
1220} 1472}
1221 1473
1222static int 1474static int
1232 SV *prev_sv, *next_sv; 1484 SV *prev_sv, *next_sv;
1233 1485
1234 for (;;) 1486 for (;;)
1235 { 1487 {
1236 LOCK; 1488 LOCK;
1237 next_sv = coro_deq (aTHX_ PRIO_MIN); 1489 next_sv = coro_deq (aTHX);
1238 1490
1239 /* nothing to schedule: call the idle handler */ 1491 /* nothing to schedule: call the idle handler */
1240 if (!next_sv) 1492 if (expect_false (!next_sv))
1241 { 1493 {
1242 dSP; 1494 dSP;
1243 UNLOCK; 1495 UNLOCK;
1244 1496
1245 ENTER; 1497 ENTER;
1246 SAVETMPS; 1498 SAVETMPS;
1247 1499
1248 PUSHMARK (SP); 1500 PUSHMARK (SP);
1249 PUTBACK; 1501 PUTBACK;
1250 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1502 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1503 SPAGAIN;
1251 1504
1252 FREETMPS; 1505 FREETMPS;
1253 LEAVE; 1506 LEAVE;
1254 continue; 1507 continue;
1255 } 1508 }
1256 1509
1257 ta->next = SvSTATE (next_sv); 1510 ta->next = SvSTATE (next_sv);
1258 1511
1259 /* cannot transfer to destroyed coros, skip and look for next */ 1512 /* cannot transfer to destroyed coros, skip and look for next */
1260 if (ta->next->flags & CF_DESTROYED) 1513 if (expect_false (ta->next->flags & CF_DESTROYED))
1261 { 1514 {
1262 UNLOCK; 1515 UNLOCK;
1263 SvREFCNT_dec (next_sv); 1516 SvREFCNT_dec (next_sv);
1264 /* coro_nready is already taken care of by destroy */ 1517 /* coro_nready is already taken care of by destroy */
1265 continue; 1518 continue;
1310{ 1563{
1311 dTHX; 1564 dTHX;
1312 struct transfer_args ta; 1565 struct transfer_args ta;
1313 1566
1314 prepare_schedule (aTHX_ &ta); 1567 prepare_schedule (aTHX_ &ta);
1315 TRANSFER (ta); 1568 TRANSFER (ta, 1);
1316} 1569}
1317 1570
1318static int 1571static int
1319api_cede (void) 1572api_cede (void)
1320{ 1573{
1321 dTHX; 1574 dTHX;
1322 struct transfer_args ta; 1575 struct transfer_args ta;
1323 1576
1324 prepare_cede (aTHX_ &ta); 1577 prepare_cede (aTHX_ &ta);
1325 1578
1326 if (ta.prev != ta.next) 1579 if (expect_true (ta.prev != ta.next))
1327 { 1580 {
1328 TRANSFER (ta); 1581 TRANSFER (ta, 1);
1329 return 1; 1582 return 1;
1330 } 1583 }
1331 else 1584 else
1332 return 0; 1585 return 0;
1333} 1586}
1338 dTHX; 1591 dTHX;
1339 struct transfer_args ta; 1592 struct transfer_args ta;
1340 1593
1341 if (prepare_cede_notself (aTHX_ &ta)) 1594 if (prepare_cede_notself (aTHX_ &ta))
1342 { 1595 {
1343 TRANSFER (ta); 1596 TRANSFER (ta, 1);
1344 return 1; 1597 return 1;
1345 } 1598 }
1346 else 1599 else
1347 return 0; 1600 return 0;
1348} 1601}
1367 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1620 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1368 1621
1369 if (coro->flags & CF_RUNNING) 1622 if (coro->flags & CF_RUNNING)
1370 PL_runops = RUNOPS_DEFAULT; 1623 PL_runops = RUNOPS_DEFAULT;
1371 else 1624 else
1372 coro->runops = RUNOPS_DEFAULT; 1625 coro->slot->runops = RUNOPS_DEFAULT;
1373 } 1626 }
1374} 1627}
1375 1628
1376MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1629MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1377 1630
1382#ifdef USE_ITHREADS 1635#ifdef USE_ITHREADS
1383 MUTEX_INIT (&coro_mutex); 1636 MUTEX_INIT (&coro_mutex);
1384#endif 1637#endif
1385 BOOT_PAGESIZE; 1638 BOOT_PAGESIZE;
1386 1639
1387 irsgv = gv_fetchpv ("/", 1, SVt_PV); 1640 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1641 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1642
1643 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1644 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1645 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1646
1647 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1648 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1649 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1388 1650
1389 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1651 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1390 1652
1391 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1653 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1392 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1654 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1397 main_top_env = PL_top_env; 1659 main_top_env = PL_top_env;
1398 1660
1399 while (main_top_env->je_prev) 1661 while (main_top_env->je_prev)
1400 main_top_env = main_top_env->je_prev; 1662 main_top_env = main_top_env->je_prev;
1401 1663
1402 coroapi.ver = CORO_API_VERSION; 1664 coroapi.ver = CORO_API_VERSION;
1665 coroapi.rev = CORO_API_REVISION;
1403 coroapi.transfer = api_transfer; 1666 coroapi.transfer = api_transfer;
1404 1667
1405 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1668 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1406} 1669}
1407 1670
1408SV * 1671SV *
1409new (char *klass, ...) 1672new (char *klass, ...)
1410 CODE: 1673 CODE:
1411{ 1674{
1412 struct coro *coro; 1675 struct coro *coro;
1676 MAGIC *mg;
1413 HV *hv; 1677 HV *hv;
1414 int i; 1678 int i;
1415 1679
1416 Newz (0, coro, 1, struct coro); 1680 Newz (0, coro, 1, struct coro);
1417 coro->args = newAV (); 1681 coro->args = newAV ();
1420 if (coro_first) coro_first->prev = coro; 1684 if (coro_first) coro_first->prev = coro;
1421 coro->next = coro_first; 1685 coro->next = coro_first;
1422 coro_first = coro; 1686 coro_first = coro;
1423 1687
1424 coro->hv = hv = newHV (); 1688 coro->hv = hv = newHV ();
1425 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1689 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1690 mg->mg_flags |= MGf_DUP;
1426 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1691 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1427 1692
1693 av_extend (coro->args, items - 1);
1428 for (i = 1; i < items; i++) 1694 for (i = 1; i < items; i++)
1429 av_push (coro->args, newSVsv (ST (i))); 1695 av_push (coro->args, newSVsv (ST (i)));
1430} 1696}
1431 OUTPUT: 1697 OUTPUT:
1432 RETVAL 1698 RETVAL
1443 Coro::cede_notself = 4 1709 Coro::cede_notself = 4
1444 CODE: 1710 CODE:
1445{ 1711{
1446 struct transfer_args ta; 1712 struct transfer_args ta;
1447 1713
1714 PUTBACK;
1448 switch (ix) 1715 switch (ix)
1449 { 1716 {
1450 case 0: 1717 case 0:
1451 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1718 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1452 ta.next = 0; 1719 ta.next = 0;
1471 if (!prepare_cede_notself (aTHX_ &ta)) 1738 if (!prepare_cede_notself (aTHX_ &ta))
1472 XSRETURN_EMPTY; 1739 XSRETURN_EMPTY;
1473 1740
1474 break; 1741 break;
1475 } 1742 }
1743 SPAGAIN;
1476 1744
1477 BARRIER; 1745 BARRIER;
1746 PUTBACK;
1478 TRANSFER (ta); 1747 TRANSFER (ta, 0);
1479 1748 SPAGAIN; /* might be the sp of a different coroutine now */
1480 if (GIMME_V != G_VOID && ta.next != ta.prev) 1749 /* be extra careful not to ever do anything after TRANSFER */
1481 XSRETURN_YES;
1482} 1750}
1483 1751
1484bool 1752bool
1485_destroy (SV *coro_sv) 1753_destroy (SV *coro_sv)
1486 CODE: 1754 CODE:
1487 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 1755 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1488 OUTPUT: 1756 OUTPUT:
1489 RETVAL 1757 RETVAL
1490 1758
1491void 1759void
1492_exit (code) 1760_exit (int code)
1493 int code
1494 PROTOTYPE: $ 1761 PROTOTYPE: $
1495 CODE: 1762 CODE:
1496 _exit (code); 1763 _exit (code);
1497 1764
1498int 1765int
1535 CODE: 1802 CODE:
1536{ 1803{
1537 if (coro->mainstack) 1804 if (coro->mainstack)
1538 { 1805 {
1539 struct coro temp; 1806 struct coro temp;
1540 Zero (&temp, 1, struct coro);
1541 1807
1542 if (!(coro->flags & CF_RUNNING)) 1808 if (!(coro->flags & CF_RUNNING))
1543 { 1809 {
1810 PUTBACK;
1544 save_perl (aTHX_ &temp); 1811 save_perl (aTHX_ &temp);
1545 load_perl (aTHX_ coro); 1812 load_perl (aTHX_ coro);
1546 } 1813 }
1547 1814
1548 { 1815 {
1549 dSP; 1816 dSP;
1550 ENTER; 1817 ENTER;
1551 SAVETMPS; 1818 SAVETMPS;
1819 PUTBACK;
1820 PUSHSTACK;
1552 PUSHMARK (SP); 1821 PUSHMARK (SP);
1553 PUTBACK; 1822
1554 if (ix) 1823 if (ix)
1555 eval_sv (coderef, 0); 1824 eval_sv (coderef, 0);
1556 else 1825 else
1557 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1826 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1827
1828 POPSTACK;
1558 SPAGAIN; 1829 SPAGAIN;
1559 FREETMPS; 1830 FREETMPS;
1560 LEAVE; 1831 LEAVE;
1561 PUTBACK; 1832 PUTBACK;
1562 } 1833 }
1563 1834
1564 if (!(coro->flags & CF_RUNNING)) 1835 if (!(coro->flags & CF_RUNNING))
1565 { 1836 {
1566 save_perl (aTHX_ coro); 1837 save_perl (aTHX_ coro);
1567 load_perl (aTHX_ &temp); 1838 load_perl (aTHX_ &temp);
1839 SPAGAIN;
1568 } 1840 }
1569 } 1841 }
1570} 1842}
1571 1843
1572SV * 1844SV *
1584 1856
1585void 1857void
1586api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 1858api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1587 1859
1588SV * 1860SV *
1589has_stack (Coro::State coro) 1861has_cctx (Coro::State coro)
1590 PROTOTYPE: $ 1862 PROTOTYPE: $
1591 CODE: 1863 CODE:
1592 RETVAL = boolSV (!!coro->cctx); 1864 RETVAL = boolSV (!!coro->cctx);
1593 OUTPUT: 1865 OUTPUT:
1594 RETVAL 1866 RETVAL
1613 case 1: RETVAL = coro->usecount; break; 1885 case 1: RETVAL = coro->usecount; break;
1614 } 1886 }
1615 OUTPUT: 1887 OUTPUT:
1616 RETVAL 1888 RETVAL
1617 1889
1890void
1891force_cctx ()
1892 CODE:
1893 struct coro *coro = SvSTATE (coro_current);
1894 coro->cctx->idle_sp = 0;
1618 1895
1619MODULE = Coro::State PACKAGE = Coro 1896MODULE = Coro::State PACKAGE = Coro
1620 1897
1621BOOT: 1898BOOT:
1622{ 1899{
1623 int i; 1900 int i;
1624 1901
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); 1902 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1903 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1904 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1628 1905
1629 coro_current = get_sv ("Coro::current", FALSE); 1906 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1630 SvREADONLY_on (coro_current); 1907 SvREADONLY_on (coro_current);
1631 1908
1632 coro_stash = gv_stashpv ("Coro", TRUE); 1909 coro_stash = gv_stashpv ("Coro", TRUE);
1633 1910
1634 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1911 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1635 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1912 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1636 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1913 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1637 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1914 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1640 1917
1641 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1918 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1642 coro_ready[i] = newAV (); 1919 coro_ready[i] = newAV ();
1643 1920
1644 { 1921 {
1645 SV *sv = perl_get_sv("Coro::API", 1); 1922 SV *sv = perl_get_sv ("Coro::API", TRUE);
1923 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1646 1924
1647 coroapi.schedule = api_schedule; 1925 coroapi.schedule = api_schedule;
1648 coroapi.cede = api_cede; 1926 coroapi.cede = api_cede;
1649 coroapi.cede_notself = api_cede_notself; 1927 coroapi.cede_notself = api_cede_notself;
1650 coroapi.ready = api_ready; 1928 coroapi.ready = api_ready;
1663 PROTOTYPE: $ 1941 PROTOTYPE: $
1664 CODE: 1942 CODE:
1665 SvREFCNT_dec (SvRV (coro_current)); 1943 SvREFCNT_dec (SvRV (coro_current));
1666 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 1944 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1667 1945
1946void
1947_set_readyhook (SV *hook)
1948 PROTOTYPE: $
1949 CODE:
1950 LOCK;
1951 SvREFCNT_dec (coro_readyhook);
1952 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
1953 UNLOCK;
1954
1668int 1955int
1669prio (Coro::State coro, int newprio = 0) 1956prio (Coro::State coro, int newprio = 0)
1670 ALIAS: 1957 ALIAS:
1671 nice = 1 1958 nice = 1
1672 CODE: 1959 CODE:
1701 CODE: 1988 CODE:
1702 RETVAL = coro_nready; 1989 RETVAL = coro_nready;
1703 OUTPUT: 1990 OUTPUT:
1704 RETVAL 1991 RETVAL
1705 1992
1993void
1994throw (Coro::State self, SV *throw = &PL_sv_undef)
1995 PROTOTYPE: $;$
1996 CODE:
1997 SvREFCNT_dec (self->throw);
1998 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1999
2000void
2001swap_defsv (Coro::State self)
2002 PROTOTYPE: $
2003 ALIAS:
2004 swap_defav = 1
2005 CODE:
2006 if (!self->slot)
2007 croak ("cannot swap state with coroutine that has no saved state");
2008 else
2009 {
2010 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
2011 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2012
2013 SV *tmp = *src; *src = *dst; *dst = tmp;
2014 }
2015
1706# for async_pool speedup 2016# for async_pool speedup
1707void 2017void
1708_pool_1 (SV *cb) 2018_pool_1 (SV *cb)
1709 CODE: 2019 CODE:
1710{ 2020{
1711 int i, len; 2021 struct coro *coro = SvSTATE (coro_current);
1712 HV *hv = (HV *)SvRV (coro_current); 2022 HV *hv = (HV *)SvRV (coro_current);
1713 AV *defav = GvAV (PL_defgv); 2023 AV *defav = GvAV (PL_defgv);
1714 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 2024 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1715 AV *invoke_av; 2025 AV *invoke_av;
2026 int i, len;
1716 2027
1717 if (!invoke) 2028 if (!invoke)
2029 {
2030 SV *old = PL_diehook;
2031 PL_diehook = 0;
2032 SvREFCNT_dec (old);
1718 croak ("\3terminate\2\n"); 2033 croak ("\3async_pool terminate\2\n");
2034 }
2035
2036 SvREFCNT_dec (coro->saved_deffh);
2037 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1719 2038
1720 hv_store (hv, "desc", sizeof ("desc") - 1, 2039 hv_store (hv, "desc", sizeof ("desc") - 1,
1721 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 2040 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1722 2041
1723 invoke_av = (AV *)SvRV (invoke); 2042 invoke_av = (AV *)SvRV (invoke);
1741{ 2060{
1742 struct coro *coro = SvSTATE (coro_current); 2061 struct coro *coro = SvSTATE (coro_current);
1743 2062
1744 sv_setsv (cb, &PL_sv_undef); 2063 sv_setsv (cb, &PL_sv_undef);
1745 2064
2065 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2066 coro->saved_deffh = 0;
2067
1746 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2068 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1747 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2069 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2070 {
2071 SV *old = PL_diehook;
2072 PL_diehook = 0;
2073 SvREFCNT_dec (old);
1748 croak ("\3terminate\2\n"); 2074 croak ("\3async_pool terminate\2\n");
2075 }
1749 2076
1750 av_clear (GvAV (PL_defgv)); 2077 av_clear (GvAV (PL_defgv));
1751 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2078 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1752 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2079 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1753 2080
1792 PL_laststype = data->laststype; 2119 PL_laststype = data->laststype;
1793 PL_laststatval = data->laststatval; 2120 PL_laststatval = data->laststatval;
1794 PL_statcache = data->statcache; 2121 PL_statcache = data->statcache;
1795} 2122}
1796 2123
2124
2125MODULE = Coro::State PACKAGE = Coro::AnyEvent
2126
2127BOOT:
2128 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2129
2130SV *
2131_schedule (...)
2132 PROTOTYPE: @
2133 CODE:
2134{
2135 static int incede;
2136
2137 api_cede_notself ();
2138
2139 ++incede;
2140 while (coro_nready >= incede && api_cede ())
2141 ;
2142
2143 sv_setsv (sv_activity, &PL_sv_undef);
2144 if (coro_nready >= incede)
2145 {
2146 PUSHMARK (SP);
2147 PUTBACK;
2148 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2149 SPAGAIN;
2150 }
2151
2152 --incede;
2153}
2154

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines