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.179 by root, Wed Oct 3 16:03:17 2007 UTC vs.
Revision 1.244 by root, Sun Sep 21 18:29:39 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines