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.187 by root, Fri Oct 5 20:31:18 2007 UTC vs.
Revision 1.243 by root, Sat Aug 30 03:07:46 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 SV *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 SV *saved_deffh; 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 GvSV (irsgv) = c->irssv_sv;
396 471
397 { 472 {
398 dSP; 473 dSP;
474
399 CV *cv; 475 CV *cv;
400 476
401 /* now do the ugly restore mess */ 477 /* now do the ugly restore mess */
402 while ((cv = (CV *)POPs)) 478 while (expect_true (cv = (CV *)POPs))
403 { 479 {
404 put_padlist (aTHX_ cv); /* mark this padlist as available */ 480 put_padlist (aTHX_ cv); /* mark this padlist as available */
405 CvDEPTH (cv) = PTR2IV (POPs); 481 CvDEPTH (cv) = PTR2IV (POPs);
406 CvPADLIST (cv) = (AV *)POPs; 482 CvPADLIST (cv) = (AV *)POPs;
407 } 483 }
426 502
427 XPUSHs (Nullsv); 503 XPUSHs (Nullsv);
428 /* this loop was inspired by pp_caller */ 504 /* this loop was inspired by pp_caller */
429 for (;;) 505 for (;;)
430 { 506 {
431 while (cxix >= 0) 507 while (expect_true (cxix >= 0))
432 { 508 {
433 PERL_CONTEXT *cx = &ccstk[cxix--]; 509 PERL_CONTEXT *cx = &ccstk[cxix--];
434 510
435 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 511 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
436 { 512 {
437 CV *cv = cx->blk_sub.cv; 513 CV *cv = cx->blk_sub.cv;
438 514
439 if (CvDEPTH (cv)) 515 if (expect_true (CvDEPTH (cv)))
440 { 516 {
441 EXTEND (SP, 3); 517 EXTEND (SP, 3);
442 PUSHs ((SV *)CvPADLIST (cv)); 518 PUSHs ((SV *)CvPADLIST (cv));
443 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 519 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
444 PUSHs ((SV *)cv); 520 PUSHs ((SV *)cv);
445 521
446 CvDEPTH (cv) = 0; 522 CvDEPTH (cv) = 0;
447 get_padlist (aTHX_ cv); 523 get_padlist (aTHX_ cv);
448 } 524 }
449 } 525 }
450 } 526 }
451 527
452 if (top_si->si_type == PERLSI_MAIN) 528 if (expect_true (top_si->si_type == PERLSI_MAIN))
453 break; 529 break;
454 530
455 top_si = top_si->si_prev; 531 top_si = top_si->si_prev;
456 ccstk = top_si->si_cxstack; 532 ccstk = top_si->si_cxstack;
457 cxix = top_si->si_cxix; 533 cxix = top_si->si_cxix;
458 } 534 }
459 535
460 PUTBACK; 536 PUTBACK;
461 } 537 }
462 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
463 c->defav = GvAV (PL_defgv); 556 slot->defav = GvAV (PL_defgv);
464 c->defsv = DEFSV; 557 slot->defsv = DEFSV;
465 c->errsv = ERRSV; 558 slot->errsv = ERRSV;
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
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 (SV) + 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 (SV) + 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#ifndef MgPV_nolen_const
692#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
693 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
694 (const char*)(mg)->mg_ptr)
695#endif
696
697/*
698 * This overrides the default magic get method of %SIG elements.
699 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
700 * and instead of tryign to save and restore the hash elements, we just provide
701 * readback here.
702 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
703 * not expecting this to actually change the hook. This is a potential problem
704 * when a schedule happens then, but we ignore this.
705 */
706static int
707coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
708{
709 const char *s = MgPV_nolen_const (mg);
710
711 if (*s == '_')
712 {
713 SV **svp = 0;
714
715 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
716 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
717
718 if (svp)
719 {
720 sv_setsv (sv, *svp ? *svp : &PL_sv_undef);
721 return 0;
722 }
723 }
724
725 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
726}
727
728static int
729coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
730{
731 const char *s = MgPV_nolen_const (mg);
732
733 if (*s == '_')
734 {
735 SV **svp = 0;
736
737 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
738 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
739
740 if (svp)
741 {
742 SV *old = *svp;
743 *svp = 0;
744 SvREFCNT_dec (old);
745 return 0;
746 }
747 }
748
749 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
750}
751
752static int
753coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
754{
755 const char *s = MgPV_nolen_const (mg);
756
757 if (*s == '_')
758 {
759 SV **svp = 0;
760
761 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
762 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
763
764 if (svp)
765 {
766 SV *old = *svp;
767 *svp = newSVsv (sv);
768 SvREFCNT_dec (old);
769 return 0;
770 }
771 }
772
773 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
774}
585 775
586static void 776static void
587coro_setup (pTHX_ struct coro *coro) 777coro_setup (pTHX_ struct coro *coro)
588{ 778{
589 /* 779 /*
594 PL_runops = RUNOPS_DEFAULT; 784 PL_runops = RUNOPS_DEFAULT;
595 PL_curcop = &PL_compiling; 785 PL_curcop = &PL_compiling;
596 PL_in_eval = EVAL_NULL; 786 PL_in_eval = EVAL_NULL;
597 PL_comppad = 0; 787 PL_comppad = 0;
598 PL_curpm = 0; 788 PL_curpm = 0;
789 PL_curpad = 0;
599 PL_localizing = 0; 790 PL_localizing = 0;
600 PL_dirty = 0; 791 PL_dirty = 0;
601 PL_restartop = 0; 792 PL_restartop = 0;
793#if PERL_VERSION_ATLEAST (5,10,0)
794 PL_parser = 0;
795#endif
796
797 /* recreate the die/warn hooks */
798 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
799 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
602 800
603 GvSV (PL_defgv) = NEWSV (0, 0); 801 GvSV (PL_defgv) = newSV (0);
604 GvAV (PL_defgv) = coro->args; coro->args = 0; 802 GvAV (PL_defgv) = coro->args; coro->args = 0;
605 GvSV (PL_errgv) = NEWSV (0, 0); 803 GvSV (PL_errgv) = newSV (0);
606 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 804 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
607 PL_rs = newSVsv (GvSV (irsgv)); 805 PL_rs = newSVsv (GvSV (irsgv));
608 806 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
609 SvREFCNT_inc (PL_defoutgv);
610 807
611 { 808 {
612 dSP; 809 dSP;
613 LOGOP myop; 810 LOGOP myop;
614 811
615 Zero (&myop, 1, LOGOP); 812 Zero (&myop, 1, LOGOP);
616 myop.op_next = Nullop; 813 myop.op_next = Nullop;
617 myop.op_flags = OPf_WANT_VOID; 814 myop.op_flags = OPf_WANT_VOID;
618 815
619 PUSHMARK (SP); 816 PUSHMARK (SP);
620 XPUSHs (av_shift (GvAV (PL_defgv))); 817 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
621 PUTBACK; 818 PUTBACK;
622 PL_op = (OP *)&myop; 819 PL_op = (OP *)&myop;
623 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 820 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
624 SPAGAIN; 821 SPAGAIN;
625 } 822 }
626 823
627 ENTER; /* necessary e.g. for dounwind */ 824 /* this newly created coroutine might be run on an existing cctx which most
825 * likely was suspended in set_stacklevel, called from entersub.
826 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
827 * so we ENTER here for symmetry
828 */
829 ENTER;
628} 830}
629 831
630static void 832static void
631coro_destroy (pTHX_ struct coro *coro) 833coro_destroy (pTHX_ struct coro *coro)
632{ 834{
652 SvREFCNT_dec (GvSV (PL_errgv)); 854 SvREFCNT_dec (GvSV (PL_errgv));
653 SvREFCNT_dec (PL_defoutgv); 855 SvREFCNT_dec (PL_defoutgv);
654 SvREFCNT_dec (PL_rs); 856 SvREFCNT_dec (PL_rs);
655 SvREFCNT_dec (GvSV (irsgv)); 857 SvREFCNT_dec (GvSV (irsgv));
656 858
859 SvREFCNT_dec (PL_diehook);
860 SvREFCNT_dec (PL_warnhook);
861
657 SvREFCNT_dec (coro->saved_deffh); 862 SvREFCNT_dec (coro->saved_deffh);
658 //SvREFCNT_dec (coro->throw); 863 SvREFCNT_dec (coro->throw);
659 864
660 coro_destroy_stacks (aTHX); 865 coro_destroy_stacks (aTHX);
661} 866}
662 867
663static void 868static void
664free_coro_mortal (pTHX) 869free_coro_mortal (pTHX)
665{ 870{
666 if (coro_mortal) 871 if (expect_true (coro_mortal))
667 { 872 {
668 SvREFCNT_dec (coro_mortal); 873 SvREFCNT_dec (coro_mortal);
669 coro_mortal = 0; 874 coro_mortal = 0;
670 } 875 }
671} 876}
700 bot = PL_stack_base + cx->blk_oldsp + 1; 905 bot = PL_stack_base + cx->blk_oldsp + 1;
701 top = cx->blk_gimme == G_ARRAY ? SP + 1 906 top = cx->blk_gimme == G_ARRAY ? SP + 1
702 : cx->blk_gimme == G_SCALAR ? bot + 1 907 : cx->blk_gimme == G_SCALAR ? bot + 1
703 : bot; 908 : bot;
704 909
910 av_extend (av, top - bot);
705 while (bot < top) 911 while (bot < top)
706 av_push (av, SvREFCNT_inc (*bot++)); 912 av_push (av, SvREFCNT_inc (*bot++));
707 913
708 PL_runops = RUNOPS_DEFAULT; 914 PL_runops = RUNOPS_DEFAULT;
709 ENTER; 915 ENTER;
749 SAVETMPS; 955 SAVETMPS;
750 EXTEND (SP, 3); 956 EXTEND (SP, 3);
751 PUSHMARK (SP); 957 PUSHMARK (SP);
752 PUSHs (&PL_sv_yes); 958 PUSHs (&PL_sv_yes);
753 PUSHs (fullname); 959 PUSHs (fullname);
754 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 960 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
755 PUTBACK; 961 PUTBACK;
756 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 962 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
757 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 963 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
758 SPAGAIN; 964 SPAGAIN;
759 FREETMPS; 965 FREETMPS;
795 1001
796/* inject a fake call to Coro::State::_cctx_init into the execution */ 1002/* inject a fake call to Coro::State::_cctx_init into the execution */
797/* _cctx_init should be careful, as it could be called at almost any time */ 1003/* _cctx_init should be careful, as it could be called at almost any time */
798/* during execution of a perl program */ 1004/* during execution of a perl program */
799static void NOINLINE 1005static void NOINLINE
800prepare_cctx (pTHX_ coro_cctx *cctx) 1006cctx_prepare (pTHX_ coro_cctx *cctx)
801{ 1007{
802 dSP; 1008 dSP;
803 LOGOP myop; 1009 LOGOP myop;
804 1010
805 PL_top_env = &PL_start_env; 1011 PL_top_env = &PL_start_env;
823 1029
824/* 1030/*
825 * this is a _very_ stripped down perl interpreter ;) 1031 * this is a _very_ stripped down perl interpreter ;)
826 */ 1032 */
827static void 1033static void
828coro_run (void *arg) 1034cctx_run (void *arg)
829{ 1035{
830 dTHX; 1036 dTHX;
831 1037
832 /* coro_run is the alternative tail of transfer(), so unlock here. */ 1038 /* cctx_run is the alternative tail of transfer(), so unlock here. */
833 UNLOCK; 1039 UNLOCK;
834 1040
835 /* we now skip the entersub that lead to transfer() */ 1041 /* we now skip the entersub that lead to transfer() */
836 PL_op = PL_op->op_next; 1042 PL_op = PL_op->op_next;
837 1043
838 /* inject a fake subroutine call to cctx_init */ 1044 /* inject a fake subroutine call to cctx_init */
839 prepare_cctx (aTHX_ (coro_cctx *)arg); 1045 cctx_prepare (aTHX_ (coro_cctx *)arg);
840 1046
841 /* somebody or something will hit me for both perl_run and PL_restartop */ 1047 /* somebody or something will hit me for both perl_run and PL_restartop */
842 PL_restartop = PL_op; 1048 PL_restartop = PL_op;
843 perl_run (PL_curinterp); 1049 perl_run (PL_curinterp);
844 1050
863 ++cctx_count; 1069 ++cctx_count;
864 1070
865 Newz (0, cctx, 1, coro_cctx); 1071 Newz (0, cctx, 1, coro_cctx);
866 1072
867#if HAVE_MMAP 1073#if HAVE_MMAP
868
869 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1074 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
870 /* mmap supposedly does allocate-on-write for us */ 1075 /* mmap supposedly does allocate-on-write for us */
871 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1076 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
872 1077
873 if (cctx->sptr != (void *)-1) 1078 if (cctx->sptr != (void *)-1)
894 stack_start = cctx->sptr; 1099 stack_start = cctx->sptr;
895 stack_size = cctx->ssize; 1100 stack_size = cctx->ssize;
896 } 1101 }
897 1102
898 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1103 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
899 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1104 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
900 1105
901 return cctx; 1106 return cctx;
902} 1107}
903 1108
904static void 1109static void
921 Safefree (cctx->sptr); 1126 Safefree (cctx->sptr);
922 1127
923 Safefree (cctx); 1128 Safefree (cctx);
924} 1129}
925 1130
1131/* wether this cctx should be destructed */
1132#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1133
926static coro_cctx * 1134static coro_cctx *
927cctx_get (pTHX) 1135cctx_get (pTHX)
928{ 1136{
929 while (cctx_first) 1137 while (expect_true (cctx_first))
930 { 1138 {
931 coro_cctx *cctx = cctx_first; 1139 coro_cctx *cctx = cctx_first;
932 cctx_first = cctx->next; 1140 cctx_first = cctx->next;
933 --cctx_idle; 1141 --cctx_idle;
934 1142
935 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1143 if (expect_true (!CCTX_EXPIRED (cctx)))
936 return cctx; 1144 return cctx;
937 1145
938 cctx_destroy (cctx); 1146 cctx_destroy (cctx);
939 } 1147 }
940 1148
943 1151
944static void 1152static void
945cctx_put (coro_cctx *cctx) 1153cctx_put (coro_cctx *cctx)
946{ 1154{
947 /* free another cctx if overlimit */ 1155 /* free another cctx if overlimit */
948 if (cctx_idle >= MAX_IDLE_CCTX) 1156 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
949 { 1157 {
950 coro_cctx *first = cctx_first; 1158 coro_cctx *first = cctx_first;
951 cctx_first = first->next; 1159 cctx_first = first->next;
952 --cctx_idle; 1160 --cctx_idle;
953 1161
959 cctx_first = cctx; 1167 cctx_first = cctx;
960} 1168}
961 1169
962/** coroutine switching *****************************************************/ 1170/** coroutine switching *****************************************************/
963 1171
964static void NOINLINE 1172static void
965transfer_check (pTHX_ struct coro *prev, struct coro *next) 1173transfer_check (pTHX_ struct coro *prev, struct coro *next)
966{ 1174{
967 if (prev != next) 1175 if (expect_true (prev != next))
968 { 1176 {
969 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1177 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
970 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1178 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
971 1179
972 if (next->flags & CF_RUNNING) 1180 if (expect_false (next->flags & CF_RUNNING))
973 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1181 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
974 1182
975 if (next->flags & CF_DESTROYED) 1183 if (expect_false (next->flags & CF_DESTROYED))
976 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1184 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
977 1185
1186#if !PERL_VERSION_ATLEAST (5,10,0)
978 if (PL_lex_state != LEX_NOTPARSING) 1187 if (expect_false (PL_lex_state != LEX_NOTPARSING))
979 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1188 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1189#endif
980 } 1190 }
981} 1191}
982 1192
983/* always use the TRANSFER macro */ 1193/* always use the TRANSFER macro */
984static void NOINLINE 1194static void NOINLINE
985transfer (pTHX_ struct coro *prev, struct coro *next) 1195transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
986{ 1196{
987 dSTACKLEVEL; 1197 dSTACKLEVEL;
1198 static volatile int has_throw;
988 1199
989 /* sometimes transfer is only called to set idle_sp */ 1200 /* sometimes transfer is only called to set idle_sp */
990 if (!next) 1201 if (expect_false (!next))
991 { 1202 {
992 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1203 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
993 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1204 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
994 } 1205 }
995 else if (prev != next) 1206 else if (expect_true (prev != next))
996 { 1207 {
997 coro_cctx *prev__cctx; 1208 coro_cctx *prev__cctx;
998 1209
999 if (prev->flags & CF_NEW) 1210 if (expect_false (prev->flags & CF_NEW))
1000 { 1211 {
1001 /* create a new empty context */ 1212 /* create a new empty context */
1002 Newz (0, prev->cctx, 1, coro_cctx); 1213 Newz (0, prev->cctx, 1, coro_cctx);
1003 prev->flags &= ~CF_NEW; 1214 prev->flags &= ~CF_NEW;
1004 prev->flags |= CF_RUNNING; 1215 prev->flags |= CF_RUNNING;
1007 prev->flags &= ~CF_RUNNING; 1218 prev->flags &= ~CF_RUNNING;
1008 next->flags |= CF_RUNNING; 1219 next->flags |= CF_RUNNING;
1009 1220
1010 LOCK; 1221 LOCK;
1011 1222
1223 /* first get rid of the old state */
1224 save_perl (aTHX_ prev);
1225
1012 if (next->flags & CF_NEW) 1226 if (expect_false (next->flags & CF_NEW))
1013 { 1227 {
1014 /* need to start coroutine */ 1228 /* need to start coroutine */
1015 next->flags &= ~CF_NEW; 1229 next->flags &= ~CF_NEW;
1016 /* first get rid of the old state */
1017 save_perl (aTHX_ prev);
1018 /* setup coroutine call */ 1230 /* setup coroutine call */
1019 coro_setup (aTHX_ next); 1231 coro_setup (aTHX_ next);
1020 } 1232 }
1021 else 1233 else
1022 {
1023 /* coroutine already started */
1024 save_perl (aTHX_ prev);
1025 load_perl (aTHX_ next); 1234 load_perl (aTHX_ next);
1026 }
1027 1235
1028 prev__cctx = prev->cctx; 1236 prev__cctx = prev->cctx;
1029 1237
1030 /* possibly "free" the cctx */ 1238 /* possibly "free" the cctx */
1031 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1239 if (expect_true (
1240 prev__cctx->idle_sp == STACKLEVEL
1241 && !(prev__cctx->flags & CC_TRACE)
1242 && !force_cctx
1243 ))
1032 { 1244 {
1033 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1245 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1034 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1246 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1035 1247
1036 prev->cctx = 0; 1248 prev->cctx = 0;
1037 1249
1250 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1251 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1252 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1253 if (!next->cctx)
1254 next->cctx = cctx_get (aTHX);
1255
1038 cctx_put (prev__cctx); 1256 cctx_put (prev__cctx);
1039 } 1257 }
1040 1258
1041 ++next->usecount; 1259 ++next->usecount;
1042 1260
1043 if (!next->cctx) 1261 if (expect_true (!next->cctx))
1044 next->cctx = cctx_get (aTHX); 1262 next->cctx = cctx_get (aTHX);
1045 1263
1264 has_throw = !!next->throw;
1265
1046 if (prev__cctx != next->cctx) 1266 if (expect_false (prev__cctx != next->cctx))
1047 { 1267 {
1048 prev__cctx->top_env = PL_top_env; 1268 prev__cctx->top_env = PL_top_env;
1049 PL_top_env = next->cctx->top_env; 1269 PL_top_env = next->cctx->top_env;
1050 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1270 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1051 } 1271 }
1052 1272
1053 free_coro_mortal (aTHX); 1273 free_coro_mortal (aTHX);
1054 UNLOCK; 1274 UNLOCK;
1275
1276 if (expect_false (has_throw))
1277 {
1278 struct coro *coro = SvSTATE (coro_current);
1279
1280 if (coro->throw)
1281 {
1282 SV *exception = coro->throw;
1283 coro->throw = 0;
1284 sv_setsv (ERRSV, exception);
1285 croak (0);
1286 }
1287 }
1055 } 1288 }
1056} 1289}
1057 1290
1058struct transfer_args 1291struct transfer_args
1059{ 1292{
1060 struct coro *prev, *next; 1293 struct coro *prev, *next;
1061}; 1294};
1062 1295
1063#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1296#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1064#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1297#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1065 1298
1066/** high level stuff ********************************************************/ 1299/** high level stuff ********************************************************/
1067 1300
1068static int 1301static int
1094 save_perl (aTHX_ &temp); 1327 save_perl (aTHX_ &temp);
1095 load_perl (aTHX_ coro); 1328 load_perl (aTHX_ coro);
1096 1329
1097 coro_destroy (aTHX_ coro); 1330 coro_destroy (aTHX_ coro);
1098 1331
1099 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1332 load_perl (aTHX_ &temp);
1100 1333
1101 coro->mainstack = 0; 1334 coro->slot = 0;
1102 } 1335 }
1103 1336
1104 cctx_destroy (coro->cctx); 1337 cctx_destroy (coro->cctx);
1105 SvREFCNT_dec (coro->args); 1338 SvREFCNT_dec (coro->args);
1106 1339
1162{ 1395{
1163 dTHX; 1396 dTHX;
1164 struct transfer_args ta; 1397 struct transfer_args ta;
1165 1398
1166 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1399 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1167 TRANSFER (ta); 1400 TRANSFER (ta, 1);
1168} 1401}
1169 1402
1170/** Coro ********************************************************************/ 1403/** Coro ********************************************************************/
1171 1404
1172static void 1405static void
1174{ 1407{
1175 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1408 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1176} 1409}
1177 1410
1178static SV * 1411static SV *
1179coro_deq (pTHX_ int min_prio) 1412coro_deq (pTHX)
1180{ 1413{
1181 int prio = PRIO_MAX - PRIO_MIN; 1414 int prio;
1182 1415
1183 min_prio -= PRIO_MIN;
1184 if (min_prio < 0)
1185 min_prio = 0;
1186
1187 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1416 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1188 if (AvFILLp (coro_ready [prio]) >= 0) 1417 if (AvFILLp (coro_ready [prio]) >= 0)
1189 return av_shift (coro_ready [prio]); 1418 return av_shift (coro_ready [prio]);
1190 1419
1191 return 0; 1420 return 0;
1192} 1421}
1194static int 1423static int
1195api_ready (SV *coro_sv) 1424api_ready (SV *coro_sv)
1196{ 1425{
1197 dTHX; 1426 dTHX;
1198 struct coro *coro; 1427 struct coro *coro;
1428 SV *sv_hook;
1429 void (*xs_hook)(void);
1199 1430
1200 if (SvROK (coro_sv)) 1431 if (SvROK (coro_sv))
1201 coro_sv = SvRV (coro_sv); 1432 coro_sv = SvRV (coro_sv);
1202 1433
1203 coro = SvSTATE (coro_sv); 1434 coro = SvSTATE (coro_sv);
1206 return 0; 1437 return 0;
1207 1438
1208 coro->flags |= CF_READY; 1439 coro->flags |= CF_READY;
1209 1440
1210 LOCK; 1441 LOCK;
1442
1443 sv_hook = coro_nready ? 0 : coro_readyhook;
1444 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1445
1211 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1446 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1212 ++coro_nready; 1447 ++coro_nready;
1448
1213 UNLOCK; 1449 UNLOCK;
1450
1451 if (sv_hook)
1452 {
1453 dSP;
1454
1455 ENTER;
1456 SAVETMPS;
1457
1458 PUSHMARK (SP);
1459 PUTBACK;
1460 call_sv (sv_hook, G_DISCARD);
1461 SPAGAIN;
1462
1463 FREETMPS;
1464 LEAVE;
1465 }
1466
1467 if (xs_hook)
1468 xs_hook ();
1214 1469
1215 return 1; 1470 return 1;
1216} 1471}
1217 1472
1218static int 1473static int
1228 SV *prev_sv, *next_sv; 1483 SV *prev_sv, *next_sv;
1229 1484
1230 for (;;) 1485 for (;;)
1231 { 1486 {
1232 LOCK; 1487 LOCK;
1233 next_sv = coro_deq (aTHX_ PRIO_MIN); 1488 next_sv = coro_deq (aTHX);
1234 1489
1235 /* nothing to schedule: call the idle handler */ 1490 /* nothing to schedule: call the idle handler */
1236 if (!next_sv) 1491 if (expect_false (!next_sv))
1237 { 1492 {
1238 dSP; 1493 dSP;
1239 UNLOCK; 1494 UNLOCK;
1240 1495
1241 ENTER; 1496 ENTER;
1242 SAVETMPS; 1497 SAVETMPS;
1243 1498
1244 PUSHMARK (SP); 1499 PUSHMARK (SP);
1245 PUTBACK; 1500 PUTBACK;
1246 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1501 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1502 SPAGAIN;
1247 1503
1248 FREETMPS; 1504 FREETMPS;
1249 LEAVE; 1505 LEAVE;
1250 continue; 1506 continue;
1251 } 1507 }
1252 1508
1253 ta->next = SvSTATE (next_sv); 1509 ta->next = SvSTATE (next_sv);
1254 1510
1255 /* cannot transfer to destroyed coros, skip and look for next */ 1511 /* cannot transfer to destroyed coros, skip and look for next */
1256 if (ta->next->flags & CF_DESTROYED) 1512 if (expect_false (ta->next->flags & CF_DESTROYED))
1257 { 1513 {
1258 UNLOCK; 1514 UNLOCK;
1259 SvREFCNT_dec (next_sv); 1515 SvREFCNT_dec (next_sv);
1260 /* coro_nready is already taken care of by destroy */ 1516 /* coro_nready is already taken care of by destroy */
1261 continue; 1517 continue;
1306{ 1562{
1307 dTHX; 1563 dTHX;
1308 struct transfer_args ta; 1564 struct transfer_args ta;
1309 1565
1310 prepare_schedule (aTHX_ &ta); 1566 prepare_schedule (aTHX_ &ta);
1311 TRANSFER (ta); 1567 TRANSFER (ta, 1);
1312} 1568}
1313 1569
1314static int 1570static int
1315api_cede (void) 1571api_cede (void)
1316{ 1572{
1317 dTHX; 1573 dTHX;
1318 struct transfer_args ta; 1574 struct transfer_args ta;
1319 1575
1320 prepare_cede (aTHX_ &ta); 1576 prepare_cede (aTHX_ &ta);
1321 1577
1322 if (ta.prev != ta.next) 1578 if (expect_true (ta.prev != ta.next))
1323 { 1579 {
1324 TRANSFER (ta); 1580 TRANSFER (ta, 1);
1325 return 1; 1581 return 1;
1326 } 1582 }
1327 else 1583 else
1328 return 0; 1584 return 0;
1329} 1585}
1334 dTHX; 1590 dTHX;
1335 struct transfer_args ta; 1591 struct transfer_args ta;
1336 1592
1337 if (prepare_cede_notself (aTHX_ &ta)) 1593 if (prepare_cede_notself (aTHX_ &ta))
1338 { 1594 {
1339 TRANSFER (ta); 1595 TRANSFER (ta, 1);
1340 return 1; 1596 return 1;
1341 } 1597 }
1342 else 1598 else
1343 return 0; 1599 return 0;
1344} 1600}
1363 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1619 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1364 1620
1365 if (coro->flags & CF_RUNNING) 1621 if (coro->flags & CF_RUNNING)
1366 PL_runops = RUNOPS_DEFAULT; 1622 PL_runops = RUNOPS_DEFAULT;
1367 else 1623 else
1368 coro->runops = RUNOPS_DEFAULT; 1624 coro->slot->runops = RUNOPS_DEFAULT;
1369 } 1625 }
1370} 1626}
1627
1628static int
1629coro_gensub_free (pTHX_ SV *sv, MAGIC *mg)
1630{
1631 AV *padlist;
1632 AV *av = (AV *)mg->mg_obj;
1633
1634 abort ();
1635
1636 return 0;
1637}
1638
1639static MGVTBL coro_gensub_vtbl = {
1640 0, 0, 0, 0,
1641 coro_gensub_free
1642};
1371 1643
1372MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1644MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1373 1645
1374PROTOTYPES: DISABLE 1646PROTOTYPES: DISABLE
1375 1647
1378#ifdef USE_ITHREADS 1650#ifdef USE_ITHREADS
1379 MUTEX_INIT (&coro_mutex); 1651 MUTEX_INIT (&coro_mutex);
1380#endif 1652#endif
1381 BOOT_PAGESIZE; 1653 BOOT_PAGESIZE;
1382 1654
1383 irsgv = gv_fetchpv ("/", 1, SVt_PV); 1655 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1656 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1657
1658 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1659 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1660 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1661
1662 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1663 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1664 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1384 1665
1385 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1666 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1386 1667
1387 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1668 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1388 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1669 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1393 main_top_env = PL_top_env; 1674 main_top_env = PL_top_env;
1394 1675
1395 while (main_top_env->je_prev) 1676 while (main_top_env->je_prev)
1396 main_top_env = main_top_env->je_prev; 1677 main_top_env = main_top_env->je_prev;
1397 1678
1398 coroapi.ver = CORO_API_VERSION; 1679 coroapi.ver = CORO_API_VERSION;
1680 coroapi.rev = CORO_API_REVISION;
1399 coroapi.transfer = api_transfer; 1681 coroapi.transfer = api_transfer;
1400 1682
1401 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1683 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1402} 1684}
1403 1685
1404SV * 1686SV *
1405new (char *klass, ...) 1687new (char *klass, ...)
1406 CODE: 1688 CODE:
1407{ 1689{
1408 struct coro *coro; 1690 struct coro *coro;
1691 MAGIC *mg;
1409 HV *hv; 1692 HV *hv;
1410 int i; 1693 int i;
1411 1694
1412 Newz (0, coro, 1, struct coro); 1695 Newz (0, coro, 1, struct coro);
1413 coro->args = newAV (); 1696 coro->args = newAV ();
1416 if (coro_first) coro_first->prev = coro; 1699 if (coro_first) coro_first->prev = coro;
1417 coro->next = coro_first; 1700 coro->next = coro_first;
1418 coro_first = coro; 1701 coro_first = coro;
1419 1702
1420 coro->hv = hv = newHV (); 1703 coro->hv = hv = newHV ();
1421 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1704 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1705 mg->mg_flags |= MGf_DUP;
1422 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1706 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1423 1707
1708 av_extend (coro->args, items - 1);
1424 for (i = 1; i < items; i++) 1709 for (i = 1; i < items; i++)
1425 av_push (coro->args, newSVsv (ST (i))); 1710 av_push (coro->args, newSVsv (ST (i)));
1426} 1711}
1427 OUTPUT: 1712 OUTPUT:
1428 RETVAL 1713 RETVAL
1439 Coro::cede_notself = 4 1724 Coro::cede_notself = 4
1440 CODE: 1725 CODE:
1441{ 1726{
1442 struct transfer_args ta; 1727 struct transfer_args ta;
1443 1728
1729 PUTBACK;
1444 switch (ix) 1730 switch (ix)
1445 { 1731 {
1446 case 0: 1732 case 0:
1447 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1733 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1448 ta.next = 0; 1734 ta.next = 0;
1467 if (!prepare_cede_notself (aTHX_ &ta)) 1753 if (!prepare_cede_notself (aTHX_ &ta))
1468 XSRETURN_EMPTY; 1754 XSRETURN_EMPTY;
1469 1755
1470 break; 1756 break;
1471 } 1757 }
1758 SPAGAIN;
1472 1759
1473 BARRIER; 1760 BARRIER;
1761 PUTBACK;
1474 TRANSFER (ta); 1762 TRANSFER (ta, 0);
1475 1763 SPAGAIN; /* might be the sp of a different coroutine now */
1476 if (GIMME_V != G_VOID && ta.next != ta.prev) 1764 /* be extra careful not to ever do anything after TRANSFER */
1477 XSRETURN_YES;
1478} 1765}
1479 1766
1480bool 1767bool
1481_destroy (SV *coro_sv) 1768_destroy (SV *coro_sv)
1482 CODE: 1769 CODE:
1483 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 1770 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1484 OUTPUT: 1771 OUTPUT:
1485 RETVAL 1772 RETVAL
1486 1773
1487void 1774void
1488_exit (code) 1775_exit (int code)
1489 int code
1490 PROTOTYPE: $ 1776 PROTOTYPE: $
1491 CODE: 1777 CODE:
1492 _exit (code); 1778 _exit (code);
1493 1779
1494int 1780int
1531 CODE: 1817 CODE:
1532{ 1818{
1533 if (coro->mainstack) 1819 if (coro->mainstack)
1534 { 1820 {
1535 struct coro temp; 1821 struct coro temp;
1536 Zero (&temp, 1, struct coro);
1537 1822
1538 if (!(coro->flags & CF_RUNNING)) 1823 if (!(coro->flags & CF_RUNNING))
1539 { 1824 {
1825 PUTBACK;
1540 save_perl (aTHX_ &temp); 1826 save_perl (aTHX_ &temp);
1541 load_perl (aTHX_ coro); 1827 load_perl (aTHX_ coro);
1542 } 1828 }
1543 1829
1544 { 1830 {
1545 dSP; 1831 dSP;
1546 ENTER; 1832 ENTER;
1547 SAVETMPS; 1833 SAVETMPS;
1834 PUTBACK;
1835 PUSHSTACK;
1548 PUSHMARK (SP); 1836 PUSHMARK (SP);
1549 PUTBACK; 1837
1550 if (ix) 1838 if (ix)
1551 eval_sv (coderef, 0); 1839 eval_sv (coderef, 0);
1552 else 1840 else
1553 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1841 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1842
1843 POPSTACK;
1554 SPAGAIN; 1844 SPAGAIN;
1555 FREETMPS; 1845 FREETMPS;
1556 LEAVE; 1846 LEAVE;
1557 PUTBACK; 1847 PUTBACK;
1558 } 1848 }
1559 1849
1560 if (!(coro->flags & CF_RUNNING)) 1850 if (!(coro->flags & CF_RUNNING))
1561 { 1851 {
1562 save_perl (aTHX_ coro); 1852 save_perl (aTHX_ coro);
1563 load_perl (aTHX_ &temp); 1853 load_perl (aTHX_ &temp);
1854 SPAGAIN;
1564 } 1855 }
1565 } 1856 }
1566} 1857}
1567 1858
1568SV * 1859SV *
1580 1871
1581void 1872void
1582api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 1873api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1583 1874
1584SV * 1875SV *
1585has_stack (Coro::State coro) 1876has_cctx (Coro::State coro)
1586 PROTOTYPE: $ 1877 PROTOTYPE: $
1587 CODE: 1878 CODE:
1588 RETVAL = boolSV (!!coro->cctx); 1879 RETVAL = boolSV (!!coro->cctx);
1589 OUTPUT: 1880 OUTPUT:
1590 RETVAL 1881 RETVAL
1609 case 1: RETVAL = coro->usecount; break; 1900 case 1: RETVAL = coro->usecount; break;
1610 } 1901 }
1611 OUTPUT: 1902 OUTPUT:
1612 RETVAL 1903 RETVAL
1613 1904
1905void
1906force_cctx ()
1907 CODE:
1908 struct coro *coro = SvSTATE (coro_current);
1909 coro->cctx->idle_sp = 0;
1910
1911void
1912throw (Coro::State self, SV *throw = &PL_sv_undef)
1913 PROTOTYPE: $;$
1914 CODE:
1915 SvREFCNT_dec (self->throw);
1916 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1917
1918void
1919swap_defsv (Coro::State self)
1920 PROTOTYPE: $
1921 ALIAS:
1922 swap_defav = 1
1923 CODE:
1924 if (!self->slot)
1925 croak ("cannot swap state with coroutine that has no saved state");
1926 else
1927 {
1928 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1929 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1930
1931 SV *tmp = *src; *src = *dst; *dst = tmp;
1932 }
1614 1933
1615MODULE = Coro::State PACKAGE = Coro 1934MODULE = Coro::State PACKAGE = Coro
1616 1935
1617BOOT: 1936BOOT:
1618{ 1937{
1619 int i; 1938 int i;
1620 1939
1621 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1622 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1623 av_async_pool = get_av ("Coro::async_pool", TRUE); 1940 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1941 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1942 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1624 1943
1625 coro_current = get_sv ("Coro::current", FALSE); 1944 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1626 SvREADONLY_on (coro_current); 1945 SvREADONLY_on (coro_current);
1627 1946
1628 coro_stash = gv_stashpv ("Coro", TRUE); 1947 coro_stash = gv_stashpv ("Coro", TRUE);
1629 1948
1630 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1949 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1631 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1950 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1632 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1951 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1633 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1952 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1636 1955
1637 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1956 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1638 coro_ready[i] = newAV (); 1957 coro_ready[i] = newAV ();
1639 1958
1640 { 1959 {
1641 SV *sv = perl_get_sv("Coro::API", 1); 1960 SV *sv = perl_get_sv ("Coro::API", TRUE);
1961 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1642 1962
1643 coroapi.schedule = api_schedule; 1963 coroapi.schedule = api_schedule;
1644 coroapi.cede = api_cede; 1964 coroapi.cede = api_cede;
1645 coroapi.cede_notself = api_cede_notself; 1965 coroapi.cede_notself = api_cede_notself;
1646 coroapi.ready = api_ready; 1966 coroapi.ready = api_ready;
1659 PROTOTYPE: $ 1979 PROTOTYPE: $
1660 CODE: 1980 CODE:
1661 SvREFCNT_dec (SvRV (coro_current)); 1981 SvREFCNT_dec (SvRV (coro_current));
1662 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 1982 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1663 1983
1984void
1985_set_readyhook (SV *hook)
1986 PROTOTYPE: $
1987 CODE:
1988 LOCK;
1989 SvREFCNT_dec (coro_readyhook);
1990 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
1991 UNLOCK;
1992
1664int 1993int
1665prio (Coro::State coro, int newprio = 0) 1994prio (Coro::State coro, int newprio = 0)
1666 ALIAS: 1995 ALIAS:
1667 nice = 1 1996 nice = 1
1668 CODE: 1997 CODE:
1710 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 2039 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1711 AV *invoke_av; 2040 AV *invoke_av;
1712 int i, len; 2041 int i, len;
1713 2042
1714 if (!invoke) 2043 if (!invoke)
2044 {
2045 SV *old = PL_diehook;
2046 PL_diehook = 0;
2047 SvREFCNT_dec (old);
1715 croak ("\3terminate\2\n"); 2048 croak ("\3async_pool terminate\2\n");
2049 }
1716 2050
1717 SvREFCNT_dec (coro->saved_deffh); 2051 SvREFCNT_dec (coro->saved_deffh);
1718 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2052 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1719 2053
1720 hv_store (hv, "desc", sizeof ("desc") - 1, 2054 hv_store (hv, "desc", sizeof ("desc") - 1,
1746 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2080 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1747 coro->saved_deffh = 0; 2081 coro->saved_deffh = 0;
1748 2082
1749 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2083 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1750 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2084 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2085 {
2086 SV *old = PL_diehook;
2087 PL_diehook = 0;
2088 SvREFCNT_dec (old);
1751 croak ("\3terminate\2\n"); 2089 croak ("\3async_pool terminate\2\n");
2090 }
1752 2091
1753 av_clear (GvAV (PL_defgv)); 2092 av_clear (GvAV (PL_defgv));
1754 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2093 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1755 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2094 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1756 2095
1759 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2098 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1760 api_trace (coro_current, 0); 2099 api_trace (coro_current, 0);
1761 2100
1762 av_push (av_async_pool, newSVsv (coro_current)); 2101 av_push (av_async_pool, newSVsv (coro_current));
1763} 2102}
2103
2104#if 0
2105
2106void
2107_generator_call (...)
2108 PROTOTYPE: @
2109 PPCODE:
2110 fprintf (stderr, "call %p\n", CvXSUBANY(cv).any_ptr);
2111 xxxx
2112 abort ();
2113
2114SV *
2115gensub (SV *sub, ...)
2116 PROTOTYPE: &;@
2117 CODE:
2118{
2119 struct coro *coro;
2120 MAGIC *mg;
2121 CV *xcv;
2122 CV *ncv = (CV *)newSV_type (SVt_PVCV);
2123 int i;
2124
2125 CvGV (ncv) = CvGV (cv);
2126 CvFILE (ncv) = CvFILE (cv);
2127
2128 Newz (0, coro, 1, struct coro);
2129 coro->args = newAV ();
2130 coro->flags = CF_NEW;
2131
2132 av_extend (coro->args, items - 1);
2133 for (i = 1; i < items; i++)
2134 av_push (coro->args, newSVsv (ST (i)));
2135
2136 CvISXSUB_on (ncv);
2137 CvXSUBANY (ncv).any_ptr = (void *)coro;
2138
2139 xcv = GvCV (gv_fetchpv ("Coro::_generator_call", 0, SVt_PVCV));
2140
2141 CvXSUB (ncv) = CvXSUB (xcv);
2142 CvANON_on (ncv);
2143
2144 mg = sv_magicext ((SV *)ncv, 0, CORO_MAGIC_type_state, &coro_gensub_vtbl, (char *)coro, 0);
2145 RETVAL = newRV_noinc ((SV *)ncv);
2146}
2147 OUTPUT:
2148 RETVAL
2149
2150#endif
1764 2151
1765 2152
1766MODULE = Coro::State PACKAGE = Coro::AIO 2153MODULE = Coro::State PACKAGE = Coro::AIO
1767 2154
1768SV * 2155SV *
1795 PL_laststype = data->laststype; 2182 PL_laststype = data->laststype;
1796 PL_laststatval = data->laststatval; 2183 PL_laststatval = data->laststatval;
1797 PL_statcache = data->statcache; 2184 PL_statcache = data->statcache;
1798} 2185}
1799 2186
2187
2188MODULE = Coro::State PACKAGE = Coro::AnyEvent
2189
2190BOOT:
2191 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2192
2193SV *
2194_schedule (...)
2195 PROTOTYPE: @
2196 CODE:
2197{
2198 static int incede;
2199
2200 api_cede_notself ();
2201
2202 ++incede;
2203 while (coro_nready >= incede && api_cede ())
2204 ;
2205
2206 sv_setsv (sv_activity, &PL_sv_undef);
2207 if (coro_nready >= incede)
2208 {
2209 PUSHMARK (SP);
2210 PUTBACK;
2211 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2212 SPAGAIN;
2213 }
2214
2215 --incede;
2216}
2217

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines