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.190 by root, Fri Oct 5 20:39:39 2007 UTC vs.
Revision 1.222 by root, Sun Jan 20 10:22:07 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#include <inttypes.h> /* portable stdint.h */
14 16
15#ifdef HAVE_MMAP 17#ifdef HAVE_MMAP
16# include <unistd.h> 18# include <unistd.h>
17# include <sys/mman.h> 19# include <sys/mman.h>
18# ifndef MAP_ANONYMOUS 20# ifndef MAP_ANONYMOUS
79 81
80/* 5.8.8 */ 82/* 5.8.8 */
81#ifndef GV_NOTQUAL 83#ifndef GV_NOTQUAL
82# define GV_NOTQUAL 0 84# define GV_NOTQUAL 0
83#endif 85#endif
86#ifndef newSV
87# define newSV(l) NEWSV(0,l)
88#endif
84 89
85#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 90#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
86# undef CORO_STACKGUARD 91# undef CORO_STACKGUARD
87#endif 92#endif
88 93
103#define IN_DESTRUCT (PL_main_cv == Nullcv) 108#define IN_DESTRUCT (PL_main_cv == Nullcv)
104 109
105#if __GNUC__ >= 3 110#if __GNUC__ >= 3
106# define attribute(x) __attribute__(x) 111# define attribute(x) __attribute__(x)
107# define BARRIER __asm__ __volatile__ ("" : : : "memory") 112# define BARRIER __asm__ __volatile__ ("" : : : "memory")
113# define expect(expr,value) __builtin_expect ((expr),(value))
108#else 114#else
109# define attribute(x) 115# define attribute(x)
110# define BARRIER 116# define BARRIER
117# define expect(expr,value) (expr)
111#endif 118#endif
119
120#define expect_false(expr) expect ((expr) != 0, 0)
121#define expect_true(expr) expect ((expr) != 0, 1)
112 122
113#define NOINLINE attribute ((noinline)) 123#define NOINLINE attribute ((noinline))
114 124
115#include "CoroAPI.h" 125#include "CoroAPI.h"
116 126
135static size_t coro_stacksize = CORO_STACKSIZE; 145static size_t coro_stacksize = CORO_STACKSIZE;
136static struct CoroAPI coroapi; 146static struct CoroAPI coroapi;
137static AV *main_mainstack; /* used to differentiate between $main and others */ 147static AV *main_mainstack; /* used to differentiate between $main and others */
138static JMPENV *main_top_env; 148static JMPENV *main_top_env;
139static HV *coro_state_stash, *coro_stash; 149static HV *coro_state_stash, *coro_stash;
140static SV *coro_mortal; /* will be freed after next transfer */ 150static volatile SV *coro_mortal; /* will be freed after next transfer */
141 151
142static GV *irsgv; /* $/ */ 152static GV *irsgv; /* $/ */
143static GV *stdoutgv; /* *STDOUT */ 153static GV *stdoutgv; /* *STDOUT */
154static SV *rv_diehook;
155static SV *rv_warnhook;
156static HV *hv_sig; /* %SIG */
144 157
145/* async_pool helper stuff */ 158/* async_pool helper stuff */
146static SV *sv_pool_rss; 159static SV *sv_pool_rss;
147static SV *sv_pool_size; 160static SV *sv_pool_size;
148static AV *av_async_pool; 161static AV *av_async_pool;
184 CF_READY = 0x0002, /* coroutine is ready */ 197 CF_READY = 0x0002, /* coroutine is ready */
185 CF_NEW = 0x0004, /* has never been switched to */ 198 CF_NEW = 0x0004, /* has never been switched to */
186 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 199 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
187}; 200};
188 201
202/* the structure where most of the perl state is stored, overlaid on the cxstack */
203typedef struct {
204 SV *defsv;
205 AV *defav;
206 SV *errsv;
207 SV *irsgv;
208#define VAR(name,type) type name;
209# include "state.h"
210#undef VAR
211} perl_slots;
212
213#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
214
189/* this is a structure representing a perl-level coroutine */ 215/* this is a structure representing a perl-level coroutine */
190struct coro { 216struct coro {
191 /* the c coroutine allocated to this perl coroutine, if any */ 217 /* the c coroutine allocated to this perl coroutine, if any */
192 coro_cctx *cctx; 218 coro_cctx *cctx;
193 219
220 /* process data */
221 AV *mainstack;
222 perl_slots *slot; /* basically the saved sp */
223
194 /* data associated with this coroutine (initial args) */ 224 AV *args; /* data associated with this coroutine (initial args) */
195 AV *args; 225 int refcnt; /* coroutines are refcounted, yes */
196 int refcnt;
197 int flags; /* CF_ flags */ 226 int flags; /* CF_ flags */
198 227 HV *hv; /* the perl hash associated with this coro, if any */
199 /* optionally saved, might be zero */
200 AV *defav; /* @_ */
201 SV *defsv; /* $_ */
202 SV *errsv; /* $@ */
203 SV *deffh; /* default filehandle */
204 SV *irssv; /* $/ */
205 SV *irssv_sv; /* real $/ cache */
206
207#define VAR(name,type) type name;
208# include "state.h"
209#undef VAR
210 228
211 /* statistics */ 229 /* statistics */
212 int usecount; /* number of transfers to this coro */ 230 int usecount; /* number of transfers to this coro */
213 231
214 /* coro process data */ 232 /* coro process data */
215 int prio; 233 int prio;
216 //SV *throw; 234 SV *throw; /* exception to be thrown */
217 235
218 /* async_pool */ 236 /* async_pool */
219 SV *saved_deffh; 237 SV *saved_deffh;
220 238
221 /* linked list */ 239 /* linked list */
222 struct coro *next, *prev; 240 struct coro *next, *prev;
223 HV *hv; /* the perl hash associated with this coro, if any */
224}; 241};
225 242
226typedef struct coro *Coro__State; 243typedef struct coro *Coro__State;
227typedef struct coro *Coro__State_or_hashref; 244typedef struct coro *Coro__State_or_hashref;
228 245
240static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 257static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
241static int coro_nready; 258static int coro_nready;
242static struct coro *coro_first; 259static struct coro *coro_first;
243 260
244/** lowlevel stuff **********************************************************/ 261/** lowlevel stuff **********************************************************/
262
263static SV *
264coro_get_sv (pTHX_ const char *name, int create)
265{
266#if PERL_VERSION_ATLEAST (5,9,0)
267 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
268 get_sv (name, create);
269#endif
270 return get_sv (name, create);
271}
272
273static AV *
274coro_get_av (pTHX_ const char *name, int create)
275{
276#if PERL_VERSION_ATLEAST (5,9,0)
277 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
278 get_av (name, create);
279#endif
280 return get_av (name, create);
281}
282
283static HV *
284coro_get_hv (pTHX_ const char *name, int create)
285{
286#if PERL_VERSION_ATLEAST (5,9,0)
287 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
288 get_hv (name, create);
289#endif
290 return get_hv (name, create);
291}
245 292
246static AV * 293static AV *
247coro_clone_padlist (pTHX_ CV *cv) 294coro_clone_padlist (pTHX_ CV *cv)
248{ 295{
249 AV *padlist = CvPADLIST (cv); 296 AV *padlist = CvPADLIST (cv);
297 344
298 /* casting is fun. */ 345 /* casting is fun. */
299 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 346 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
300 free_padlist (aTHX_ padlist); 347 free_padlist (aTHX_ padlist);
301 348
302 SvREFCNT_dec (av);
303
304 return 0; 349 return 0;
305} 350}
306 351
307#define PERL_MAGIC_coro PERL_MAGIC_ext 352#define CORO_MAGIC_type_cv PERL_MAGIC_ext
353#define CORO_MAGIC_type_state PERL_MAGIC_ext
308 354
309static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 355static MGVTBL coro_cv_vtbl = {
356 0, 0, 0, 0,
357 coro_cv_free
358};
310 359
311#define CORO_MAGIC(cv) \ 360#define CORO_MAGIC(sv,type) \
312 SvMAGIC (cv) \ 361 SvMAGIC (sv) \
313 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 362 ? SvMAGIC (sv)->mg_type == type \
314 ? SvMAGIC (cv) \ 363 ? SvMAGIC (sv) \
315 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 364 : mg_find (sv, type) \
316 : 0 365 : 0
366
367#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
368#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
317 369
318static struct coro * 370static struct coro *
319SvSTATE_ (pTHX_ SV *coro) 371SvSTATE_ (pTHX_ SV *coro)
320{ 372{
321 HV *stash; 373 HV *stash;
322 MAGIC *mg; 374 MAGIC *mg;
323 375
324 if (SvROK (coro)) 376 if (SvROK (coro))
325 coro = SvRV (coro); 377 coro = SvRV (coro);
326 378
327 if (SvTYPE (coro) != SVt_PVHV) 379 if (expect_false (SvTYPE (coro) != SVt_PVHV))
328 croak ("Coro::State object required"); 380 croak ("Coro::State object required");
329 381
330 stash = SvSTASH (coro); 382 stash = SvSTASH (coro);
331 if (stash != coro_stash && stash != coro_state_stash) 383 if (expect_false (stash != coro_stash && stash != coro_state_stash))
332 { 384 {
333 /* very slow, but rare, check */ 385 /* very slow, but rare, check */
334 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 386 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
335 croak ("Coro::State object required"); 387 croak ("Coro::State object required");
336 } 388 }
337 389
338 mg = CORO_MAGIC (coro); 390 mg = CORO_MAGIC_state (coro);
339 return (struct coro *)mg->mg_ptr; 391 return (struct coro *)mg->mg_ptr;
340} 392}
341 393
342#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 394#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
343 395
344/* the next two functions merely cache the padlists */ 396/* the next two functions merely cache the padlists */
345static void 397static void
346get_padlist (pTHX_ CV *cv) 398get_padlist (pTHX_ CV *cv)
347{ 399{
348 MAGIC *mg = CORO_MAGIC (cv); 400 MAGIC *mg = CORO_MAGIC_cv (cv);
349 AV *av; 401 AV *av;
350 402
351 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 403 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
352 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 404 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
353 else 405 else
354 { 406 {
355#if CORO_PREFER_PERL_FUNCTIONS 407#if CORO_PREFER_PERL_FUNCTIONS
356 /* this is probably cleaner, but also slower? */ 408 /* this is probably cleaner, but also slower? */
365} 417}
366 418
367static void 419static void
368put_padlist (pTHX_ CV *cv) 420put_padlist (pTHX_ CV *cv)
369{ 421{
370 MAGIC *mg = CORO_MAGIC (cv); 422 MAGIC *mg = CORO_MAGIC_cv (cv);
371 AV *av; 423 AV *av;
372 424
373 if (!mg) 425 if (expect_false (!mg))
374 { 426 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
375 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
376 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
377 mg->mg_virtual = &vtbl_coro;
378 mg->mg_obj = (SV *)newAV ();
379 }
380 427
381 av = (AV *)mg->mg_obj; 428 av = (AV *)mg->mg_obj;
382 429
383 if (AvFILLp (av) >= AvMAX (av)) 430 if (expect_false (AvFILLp (av) >= AvMAX (av)))
384 av_extend (av, AvMAX (av) + 1); 431 av_extend (av, AvMAX (av) + 1);
385 432
386 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 433 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
387} 434}
388 435
389/** load & save, init *******************************************************/ 436/** load & save, init *******************************************************/
390 437
391static void 438static void
392load_perl (pTHX_ Coro__State c) 439load_perl (pTHX_ Coro__State c)
393{ 440{
441 perl_slots *slot = c->slot;
442 c->slot = 0;
443
444 PL_mainstack = c->mainstack;
445
446 GvSV (PL_defgv) = slot->defsv;
447 GvAV (PL_defgv) = slot->defav;
448 GvSV (PL_errgv) = slot->errsv;
449 GvSV (irsgv) = slot->irsgv;
450
394#define VAR(name,type) PL_ ## name = c->name; 451 #define VAR(name,type) PL_ ## name = slot->name;
395# include "state.h" 452 # include "state.h"
396#undef VAR 453 #undef VAR
397
398 GvSV (PL_defgv) = c->defsv;
399 GvAV (PL_defgv) = c->defav;
400 GvSV (PL_errgv) = c->errsv;
401 GvSV (irsgv) = c->irssv_sv;
402 454
403 { 455 {
404 dSP; 456 dSP;
457
405 CV *cv; 458 CV *cv;
406 459
407 /* now do the ugly restore mess */ 460 /* now do the ugly restore mess */
408 while ((cv = (CV *)POPs)) 461 while (expect_true (cv = (CV *)POPs))
409 { 462 {
410 put_padlist (aTHX_ cv); /* mark this padlist as available */ 463 put_padlist (aTHX_ cv); /* mark this padlist as available */
411 CvDEPTH (cv) = PTR2IV (POPs); 464 CvDEPTH (cv) = PTR2IV (POPs);
412 CvPADLIST (cv) = (AV *)POPs; 465 CvPADLIST (cv) = (AV *)POPs;
413 } 466 }
432 485
433 XPUSHs (Nullsv); 486 XPUSHs (Nullsv);
434 /* this loop was inspired by pp_caller */ 487 /* this loop was inspired by pp_caller */
435 for (;;) 488 for (;;)
436 { 489 {
437 while (cxix >= 0) 490 while (expect_true (cxix >= 0))
438 { 491 {
439 PERL_CONTEXT *cx = &ccstk[cxix--]; 492 PERL_CONTEXT *cx = &ccstk[cxix--];
440 493
441 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 494 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
442 { 495 {
443 CV *cv = cx->blk_sub.cv; 496 CV *cv = cx->blk_sub.cv;
444 497
445 if (CvDEPTH (cv)) 498 if (expect_true (CvDEPTH (cv)))
446 { 499 {
447 EXTEND (SP, 3); 500 EXTEND (SP, 3);
448 PUSHs ((SV *)CvPADLIST (cv)); 501 PUSHs ((SV *)CvPADLIST (cv));
449 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 502 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
450 PUSHs ((SV *)cv); 503 PUSHs ((SV *)cv);
453 get_padlist (aTHX_ cv); 506 get_padlist (aTHX_ cv);
454 } 507 }
455 } 508 }
456 } 509 }
457 510
458 if (top_si->si_type == PERLSI_MAIN) 511 if (expect_true (top_si->si_type == PERLSI_MAIN))
459 break; 512 break;
460 513
461 top_si = top_si->si_prev; 514 top_si = top_si->si_prev;
462 ccstk = top_si->si_cxstack; 515 ccstk = top_si->si_cxstack;
463 cxix = top_si->si_cxix; 516 cxix = top_si->si_cxix;
464 } 517 }
465 518
466 PUTBACK; 519 PUTBACK;
467 } 520 }
468 521
522 /* allocate some space on the context stack for our purposes */
523 /* we manually unroll here, as usually 2 slots is enough */
524 if (SLOT_COUNT >= 1) CXINC;
525 if (SLOT_COUNT >= 2) CXINC;
526 if (SLOT_COUNT >= 3) CXINC;
527 {
528 int i;
529 for (i = 3; i < SLOT_COUNT; ++i)
530 CXINC;
531 }
532 cxstack_ix -= SLOT_COUNT; /* undo allocation */
533
534 c->mainstack = PL_mainstack;
535
536 {
537 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
538
469 c->defav = GvAV (PL_defgv); 539 slot->defav = GvAV (PL_defgv);
470 c->defsv = DEFSV; 540 slot->defsv = DEFSV;
471 c->errsv = ERRSV; 541 slot->errsv = ERRSV;
472 c->irssv_sv = GvSV (irsgv); 542 slot->irsgv = GvSV (irsgv);
473 543
474#define VAR(name,type)c->name = PL_ ## name; 544 #define VAR(name,type) slot->name = PL_ ## name;
475# include "state.h" 545 # include "state.h"
476#undef VAR 546 #undef VAR
547 }
477} 548}
478 549
479/* 550/*
480 * allocate various perl stacks. This is an exact copy 551 * allocate various perl stacks. This is an exact copy
481 * of perl.c:init_stacks, except that it uses less memory 552 * of perl.c:init_stacks, except that it uses less memory
486# define coro_init_stacks init_stacks 557# define coro_init_stacks init_stacks
487#else 558#else
488static void 559static void
489coro_init_stacks (pTHX) 560coro_init_stacks (pTHX)
490{ 561{
491 PL_curstackinfo = new_stackinfo(64, 6); 562 PL_curstackinfo = new_stackinfo(32, 8);
492 PL_curstackinfo->si_type = PERLSI_MAIN; 563 PL_curstackinfo->si_type = PERLSI_MAIN;
493 PL_curstack = PL_curstackinfo->si_stack; 564 PL_curstack = PL_curstackinfo->si_stack;
494 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 565 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
495 566
496 PL_stack_base = AvARRAY(PL_curstack); 567 PL_stack_base = AvARRAY(PL_curstack);
497 PL_stack_sp = PL_stack_base; 568 PL_stack_sp = PL_stack_base;
498 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 569 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
499 570
500 New(50,PL_tmps_stack,64,SV*); 571 New(50,PL_tmps_stack,32,SV*);
501 PL_tmps_floor = -1; 572 PL_tmps_floor = -1;
502 PL_tmps_ix = -1; 573 PL_tmps_ix = -1;
503 PL_tmps_max = 64; 574 PL_tmps_max = 32;
504 575
505 New(54,PL_markstack,16,I32); 576 New(54,PL_markstack,16,I32);
506 PL_markstack_ptr = PL_markstack; 577 PL_markstack_ptr = PL_markstack;
507 PL_markstack_max = PL_markstack + 16; 578 PL_markstack_max = PL_markstack + 16;
508 579
509#ifdef SET_MARK_OFFSET 580#ifdef SET_MARK_OFFSET
510 SET_MARK_OFFSET; 581 SET_MARK_OFFSET;
511#endif 582#endif
512 583
513 New(54,PL_scopestack,16,I32); 584 New(54,PL_scopestack,8,I32);
514 PL_scopestack_ix = 0; 585 PL_scopestack_ix = 0;
515 PL_scopestack_max = 16; 586 PL_scopestack_max = 8;
516 587
517 New(54,PL_savestack,64,ANY); 588 New(54,PL_savestack,24,ANY);
518 PL_savestack_ix = 0; 589 PL_savestack_ix = 0;
519 PL_savestack_max = 64; 590 PL_savestack_max = 24;
520 591
521#if !PERL_VERSION_ATLEAST (5,9,0) 592#if !PERL_VERSION_ATLEAST (5,9,0)
522 New(54,PL_retstack,4,OP*); 593 New(54,PL_retstack,4,OP*);
523 PL_retstack_ix = 0; 594 PL_retstack_ix = 0;
524 PL_retstack_max = 4; 595 PL_retstack_max = 4;
561{ 632{
562 size_t rss = sizeof (*coro); 633 size_t rss = sizeof (*coro);
563 634
564 if (coro->mainstack) 635 if (coro->mainstack)
565 { 636 {
637 perl_slots tmp_slot;
638 perl_slots *slot;
639
566 if (coro->flags & CF_RUNNING) 640 if (coro->flags & CF_RUNNING)
567 { 641 {
642 slot = &tmp_slot;
643
568 #define VAR(name,type)coro->name = PL_ ## name; 644 #define VAR(name,type) slot->name = PL_ ## name;
569 # include "state.h" 645 # include "state.h"
570 #undef VAR 646 #undef VAR
571 } 647 }
648 else
649 slot = coro->slot;
572 650
573 rss += sizeof (coro->curstackinfo); 651 rss += sizeof (slot->curstackinfo);
574 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
575 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 652 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
576 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 653 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
577 rss += coro->tmps_max * sizeof (SV *); 654 rss += slot->tmps_max * sizeof (SV *);
578 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 655 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
579 rss += coro->scopestack_max * sizeof (I32); 656 rss += slot->scopestack_max * sizeof (I32);
580 rss += coro->savestack_max * sizeof (ANY); 657 rss += slot->savestack_max * sizeof (ANY);
581 658
582#if !PERL_VERSION_ATLEAST (5,9,0) 659#if !PERL_VERSION_ATLEAST (5,9,0)
583 rss += coro->retstack_max * sizeof (OP *); 660 rss += slot->retstack_max * sizeof (OP *);
584#endif 661#endif
585 } 662 }
586 663
587 return rss; 664 return rss;
588} 665}
589 666
590/** coroutine stack handling ************************************************/ 667/** coroutine stack handling ************************************************/
668
669static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
670static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
671
672/*
673 * This overrides the default magic get method of %SIG elements.
674 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
675 * and instead of tryign to save and restore the hash elements, we just provide
676 * readback here.
677 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
678 * not expecting this to actually change the hook. This is a potential problem
679 * when a schedule happens then, but we ignore this.
680 */
681static int
682coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
683{
684 const char *s = MgPV_nolen_const (mg);
685
686 if (*s == '_')
687 {
688 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;
689 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
690 }
691
692 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
693}
694
695static int
696coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
697{
698 const char *s = MgPV_nolen_const (mg);
699
700 if (*s == '_')
701 {
702 SV **svp = 0;
703
704 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
705 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
706
707 if (svp)
708 {
709 SV *old = *svp;
710 *svp = newSVsv (sv);
711 SvREFCNT_dec (old);
712 return;
713 }
714 }
715
716 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
717}
591 718
592static void 719static void
593coro_setup (pTHX_ struct coro *coro) 720coro_setup (pTHX_ struct coro *coro)
594{ 721{
595 /* 722 /*
600 PL_runops = RUNOPS_DEFAULT; 727 PL_runops = RUNOPS_DEFAULT;
601 PL_curcop = &PL_compiling; 728 PL_curcop = &PL_compiling;
602 PL_in_eval = EVAL_NULL; 729 PL_in_eval = EVAL_NULL;
603 PL_comppad = 0; 730 PL_comppad = 0;
604 PL_curpm = 0; 731 PL_curpm = 0;
732 PL_curpad = 0;
605 PL_localizing = 0; 733 PL_localizing = 0;
606 PL_dirty = 0; 734 PL_dirty = 0;
607 PL_restartop = 0; 735 PL_restartop = 0;
736
737 /* recreate the die/warn hooks */
738 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
739 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
608 740
609 GvSV (PL_defgv) = NEWSV (0, 0); 741 GvSV (PL_defgv) = newSV (0);
610 GvAV (PL_defgv) = coro->args; coro->args = 0; 742 GvAV (PL_defgv) = coro->args; coro->args = 0;
611 GvSV (PL_errgv) = NEWSV (0, 0); 743 GvSV (PL_errgv) = newSV (0);
612 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 744 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
613 PL_rs = newSVsv (GvSV (irsgv)); 745 PL_rs = newSVsv (GvSV (irsgv));
614 PL_defoutgv = SvREFCNT_inc (stdoutgv); 746 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
615 747
616 { 748 {
617 dSP; 749 dSP;
618 LOGOP myop; 750 LOGOP myop;
619 751
620 Zero (&myop, 1, LOGOP); 752 Zero (&myop, 1, LOGOP);
621 myop.op_next = Nullop; 753 myop.op_next = Nullop;
622 myop.op_flags = OPf_WANT_VOID; 754 myop.op_flags = OPf_WANT_VOID;
623 755
624 PUSHMARK (SP); 756 PUSHMARK (SP);
625 XPUSHs (av_shift (GvAV (PL_defgv))); 757 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
626 PUTBACK; 758 PUTBACK;
627 PL_op = (OP *)&myop; 759 PL_op = (OP *)&myop;
628 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 760 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
629 SPAGAIN; 761 SPAGAIN;
630 } 762 }
631 763
632 ENTER; /* necessary e.g. for dounwind */ 764 /* this newly created coroutine might be run on an existing cctx which most
765 * likely was suspended in set_stacklevel, called from entersub.
766 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
767 * so we ENTER here for symmetry
768 */
769 ENTER;
633} 770}
634 771
635static void 772static void
636coro_destroy (pTHX_ struct coro *coro) 773coro_destroy (pTHX_ struct coro *coro)
637{ 774{
657 SvREFCNT_dec (GvSV (PL_errgv)); 794 SvREFCNT_dec (GvSV (PL_errgv));
658 SvREFCNT_dec (PL_defoutgv); 795 SvREFCNT_dec (PL_defoutgv);
659 SvREFCNT_dec (PL_rs); 796 SvREFCNT_dec (PL_rs);
660 SvREFCNT_dec (GvSV (irsgv)); 797 SvREFCNT_dec (GvSV (irsgv));
661 798
799 SvREFCNT_dec (PL_diehook);
800 SvREFCNT_dec (PL_warnhook);
801
662 SvREFCNT_dec (coro->saved_deffh); 802 SvREFCNT_dec (coro->saved_deffh);
663 //SvREFCNT_dec (coro->throw); 803 SvREFCNT_dec (coro->throw);
664 804
665 coro_destroy_stacks (aTHX); 805 coro_destroy_stacks (aTHX);
666} 806}
667 807
668static void 808static void
669free_coro_mortal (pTHX) 809free_coro_mortal (pTHX)
670{ 810{
671 if (coro_mortal) 811 if (expect_true (coro_mortal))
672 { 812 {
673 SvREFCNT_dec (coro_mortal); 813 SvREFCNT_dec (coro_mortal);
674 coro_mortal = 0; 814 coro_mortal = 0;
675 } 815 }
676} 816}
705 bot = PL_stack_base + cx->blk_oldsp + 1; 845 bot = PL_stack_base + cx->blk_oldsp + 1;
706 top = cx->blk_gimme == G_ARRAY ? SP + 1 846 top = cx->blk_gimme == G_ARRAY ? SP + 1
707 : cx->blk_gimme == G_SCALAR ? bot + 1 847 : cx->blk_gimme == G_SCALAR ? bot + 1
708 : bot; 848 : bot;
709 849
850 av_extend (av, top - bot);
710 while (bot < top) 851 while (bot < top)
711 av_push (av, SvREFCNT_inc (*bot++)); 852 av_push (av, SvREFCNT_inc (*bot++));
712 853
713 PL_runops = RUNOPS_DEFAULT; 854 PL_runops = RUNOPS_DEFAULT;
714 ENTER; 855 ENTER;
800 941
801/* inject a fake call to Coro::State::_cctx_init into the execution */ 942/* inject a fake call to Coro::State::_cctx_init into the execution */
802/* _cctx_init should be careful, as it could be called at almost any time */ 943/* _cctx_init should be careful, as it could be called at almost any time */
803/* during execution of a perl program */ 944/* during execution of a perl program */
804static void NOINLINE 945static void NOINLINE
805prepare_cctx (pTHX_ coro_cctx *cctx) 946cctx_prepare (pTHX_ coro_cctx *cctx)
806{ 947{
807 dSP; 948 dSP;
808 LOGOP myop; 949 LOGOP myop;
809 950
810 PL_top_env = &PL_start_env; 951 PL_top_env = &PL_start_env;
828 969
829/* 970/*
830 * this is a _very_ stripped down perl interpreter ;) 971 * this is a _very_ stripped down perl interpreter ;)
831 */ 972 */
832static void 973static void
833coro_run (void *arg) 974cctx_run (void *arg)
834{ 975{
835 dTHX; 976 dTHX;
836 977
837 /* coro_run is the alternative tail of transfer(), so unlock here. */ 978 /* cctx_run is the alternative tail of transfer(), so unlock here. */
838 UNLOCK; 979 UNLOCK;
839 980
840 /* we now skip the entersub that lead to transfer() */ 981 /* we now skip the entersub that lead to transfer() */
841 PL_op = PL_op->op_next; 982 PL_op = PL_op->op_next;
842 983
843 /* inject a fake subroutine call to cctx_init */ 984 /* inject a fake subroutine call to cctx_init */
844 prepare_cctx (aTHX_ (coro_cctx *)arg); 985 cctx_prepare (aTHX_ (coro_cctx *)arg);
845 986
846 /* somebody or something will hit me for both perl_run and PL_restartop */ 987 /* somebody or something will hit me for both perl_run and PL_restartop */
847 PL_restartop = PL_op; 988 PL_restartop = PL_op;
848 perl_run (PL_curinterp); 989 perl_run (PL_curinterp);
849 990
868 ++cctx_count; 1009 ++cctx_count;
869 1010
870 Newz (0, cctx, 1, coro_cctx); 1011 Newz (0, cctx, 1, coro_cctx);
871 1012
872#if HAVE_MMAP 1013#if HAVE_MMAP
873
874 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1014 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
875 /* mmap supposedly does allocate-on-write for us */ 1015 /* mmap supposedly does allocate-on-write for us */
876 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1016 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
877 1017
878 if (cctx->sptr != (void *)-1) 1018 if (cctx->sptr != (void *)-1)
899 stack_start = cctx->sptr; 1039 stack_start = cctx->sptr;
900 stack_size = cctx->ssize; 1040 stack_size = cctx->ssize;
901 } 1041 }
902 1042
903 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1043 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
904 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1044 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
905 1045
906 return cctx; 1046 return cctx;
907} 1047}
908 1048
909static void 1049static void
926 Safefree (cctx->sptr); 1066 Safefree (cctx->sptr);
927 1067
928 Safefree (cctx); 1068 Safefree (cctx);
929} 1069}
930 1070
1071/* wether this cctx should be destructed */
1072#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1073
931static coro_cctx * 1074static coro_cctx *
932cctx_get (pTHX) 1075cctx_get (pTHX)
933{ 1076{
934 while (cctx_first) 1077 while (expect_true (cctx_first))
935 { 1078 {
936 coro_cctx *cctx = cctx_first; 1079 coro_cctx *cctx = cctx_first;
937 cctx_first = cctx->next; 1080 cctx_first = cctx->next;
938 --cctx_idle; 1081 --cctx_idle;
939 1082
940 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1083 if (expect_true (!CCTX_EXPIRED (cctx)))
941 return cctx; 1084 return cctx;
942 1085
943 cctx_destroy (cctx); 1086 cctx_destroy (cctx);
944 } 1087 }
945 1088
948 1091
949static void 1092static void
950cctx_put (coro_cctx *cctx) 1093cctx_put (coro_cctx *cctx)
951{ 1094{
952 /* free another cctx if overlimit */ 1095 /* free another cctx if overlimit */
953 if (cctx_idle >= MAX_IDLE_CCTX) 1096 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
954 { 1097 {
955 coro_cctx *first = cctx_first; 1098 coro_cctx *first = cctx_first;
956 cctx_first = first->next; 1099 cctx_first = first->next;
957 --cctx_idle; 1100 --cctx_idle;
958 1101
964 cctx_first = cctx; 1107 cctx_first = cctx;
965} 1108}
966 1109
967/** coroutine switching *****************************************************/ 1110/** coroutine switching *****************************************************/
968 1111
969static void NOINLINE 1112static void
970transfer_check (pTHX_ struct coro *prev, struct coro *next) 1113transfer_check (pTHX_ struct coro *prev, struct coro *next)
971{ 1114{
972 if (prev != next) 1115 if (expect_true (prev != next))
973 { 1116 {
974 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1117 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
975 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1118 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
976 1119
977 if (next->flags & CF_RUNNING) 1120 if (expect_false (next->flags & CF_RUNNING))
978 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1121 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
979 1122
980 if (next->flags & CF_DESTROYED) 1123 if (expect_false (next->flags & CF_DESTROYED))
981 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1124 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
982 1125
1126 if (
1127#if PERL_VERSION_ATLEAST (5,9,0)
1128 expect_false (PL_parser && PL_parser->lex_state != LEX_NOTPARSING)
1129#else
983 if (PL_lex_state != LEX_NOTPARSING) 1130 expect_false (PL_lex_state != LEX_NOTPARSING)
1131#endif
1132 )
984 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1133 croak ("Coro::State::transfer called while parsing, but this is not supported");
985 } 1134 }
986} 1135}
987 1136
988/* always use the TRANSFER macro */ 1137/* always use the TRANSFER macro */
989static void NOINLINE 1138static void NOINLINE
990transfer (pTHX_ struct coro *prev, struct coro *next) 1139transfer (pTHX_ struct coro *prev, struct coro *next)
991{ 1140{
992 dSTACKLEVEL; 1141 dSTACKLEVEL;
1142 static volatile int has_throw;
993 1143
994 /* sometimes transfer is only called to set idle_sp */ 1144 /* sometimes transfer is only called to set idle_sp */
995 if (!next) 1145 if (expect_false (!next))
996 { 1146 {
997 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1147 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
998 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1148 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
999 } 1149 }
1000 else if (prev != next) 1150 else if (expect_true (prev != next))
1001 { 1151 {
1002 coro_cctx *prev__cctx; 1152 coro_cctx *prev__cctx;
1003 1153
1004 if (prev->flags & CF_NEW) 1154 if (expect_false (prev->flags & CF_NEW))
1005 { 1155 {
1006 /* create a new empty context */ 1156 /* create a new empty context */
1007 Newz (0, prev->cctx, 1, coro_cctx); 1157 Newz (0, prev->cctx, 1, coro_cctx);
1008 prev->flags &= ~CF_NEW; 1158 prev->flags &= ~CF_NEW;
1009 prev->flags |= CF_RUNNING; 1159 prev->flags |= CF_RUNNING;
1012 prev->flags &= ~CF_RUNNING; 1162 prev->flags &= ~CF_RUNNING;
1013 next->flags |= CF_RUNNING; 1163 next->flags |= CF_RUNNING;
1014 1164
1015 LOCK; 1165 LOCK;
1016 1166
1167 /* first get rid of the old state */
1168 save_perl (aTHX_ prev);
1169
1017 if (next->flags & CF_NEW) 1170 if (expect_false (next->flags & CF_NEW))
1018 { 1171 {
1019 /* need to start coroutine */ 1172 /* need to start coroutine */
1020 next->flags &= ~CF_NEW; 1173 next->flags &= ~CF_NEW;
1021 /* first get rid of the old state */
1022 save_perl (aTHX_ prev);
1023 /* setup coroutine call */ 1174 /* setup coroutine call */
1024 coro_setup (aTHX_ next); 1175 coro_setup (aTHX_ next);
1025 } 1176 }
1026 else 1177 else
1027 {
1028 /* coroutine already started */
1029 save_perl (aTHX_ prev);
1030 load_perl (aTHX_ next); 1178 load_perl (aTHX_ next);
1031 }
1032 1179
1033 prev__cctx = prev->cctx; 1180 prev__cctx = prev->cctx;
1034 1181
1035 /* possibly "free" the cctx */ 1182 /* possibly "free" the cctx */
1036 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1183 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1037 { 1184 {
1038 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1185 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1039 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1186 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1040 1187
1041 prev->cctx = 0; 1188 prev->cctx = 0;
1042 1189
1190 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1191 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1192 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1193 if (!next->cctx)
1194 next->cctx = cctx_get (aTHX);
1195
1043 cctx_put (prev__cctx); 1196 cctx_put (prev__cctx);
1044 } 1197 }
1045 1198
1046 ++next->usecount; 1199 ++next->usecount;
1047 1200
1048 if (!next->cctx) 1201 if (expect_true (!next->cctx))
1049 next->cctx = cctx_get (aTHX); 1202 next->cctx = cctx_get (aTHX);
1050 1203
1204 has_throw = !!next->throw;
1205
1051 if (prev__cctx != next->cctx) 1206 if (expect_false (prev__cctx != next->cctx))
1052 { 1207 {
1053 prev__cctx->top_env = PL_top_env; 1208 prev__cctx->top_env = PL_top_env;
1054 PL_top_env = next->cctx->top_env; 1209 PL_top_env = next->cctx->top_env;
1055 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1210 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1056 } 1211 }
1057 1212
1058 free_coro_mortal (aTHX); 1213 free_coro_mortal (aTHX);
1059 UNLOCK; 1214 UNLOCK;
1215
1216 if (expect_false (has_throw))
1217 {
1218 struct coro *coro = SvSTATE (coro_current);
1219
1220 if (coro->throw)
1221 {
1222 SV *exception = coro->throw;
1223 coro->throw = 0;
1224 sv_setsv (ERRSV, exception);
1225 croak (0);
1226 }
1227 }
1060 } 1228 }
1061} 1229}
1062 1230
1063struct transfer_args 1231struct transfer_args
1064{ 1232{
1099 save_perl (aTHX_ &temp); 1267 save_perl (aTHX_ &temp);
1100 load_perl (aTHX_ coro); 1268 load_perl (aTHX_ coro);
1101 1269
1102 coro_destroy (aTHX_ coro); 1270 coro_destroy (aTHX_ coro);
1103 1271
1104 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1272 load_perl (aTHX_ &temp);
1105 1273
1106 coro->mainstack = 0; 1274 coro->slot = 0;
1107 } 1275 }
1108 1276
1109 cctx_destroy (coro->cctx); 1277 cctx_destroy (coro->cctx);
1110 SvREFCNT_dec (coro->args); 1278 SvREFCNT_dec (coro->args);
1111 1279
1179{ 1347{
1180 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1348 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1181} 1349}
1182 1350
1183static SV * 1351static SV *
1184coro_deq (pTHX_ int min_prio) 1352coro_deq (pTHX)
1185{ 1353{
1186 int prio = PRIO_MAX - PRIO_MIN; 1354 int prio;
1187 1355
1188 min_prio -= PRIO_MIN;
1189 if (min_prio < 0)
1190 min_prio = 0;
1191
1192 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1356 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1193 if (AvFILLp (coro_ready [prio]) >= 0) 1357 if (AvFILLp (coro_ready [prio]) >= 0)
1194 return av_shift (coro_ready [prio]); 1358 return av_shift (coro_ready [prio]);
1195 1359
1196 return 0; 1360 return 0;
1197} 1361}
1233 SV *prev_sv, *next_sv; 1397 SV *prev_sv, *next_sv;
1234 1398
1235 for (;;) 1399 for (;;)
1236 { 1400 {
1237 LOCK; 1401 LOCK;
1238 next_sv = coro_deq (aTHX_ PRIO_MIN); 1402 next_sv = coro_deq (aTHX);
1239 1403
1240 /* nothing to schedule: call the idle handler */ 1404 /* nothing to schedule: call the idle handler */
1241 if (!next_sv) 1405 if (expect_false (!next_sv))
1242 { 1406 {
1243 dSP; 1407 dSP;
1244 UNLOCK; 1408 UNLOCK;
1245 1409
1246 ENTER; 1410 ENTER;
1247 SAVETMPS; 1411 SAVETMPS;
1248 1412
1249 PUSHMARK (SP); 1413 PUSHMARK (SP);
1250 PUTBACK; 1414 PUTBACK;
1251 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1415 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1416 SPAGAIN;
1252 1417
1253 FREETMPS; 1418 FREETMPS;
1254 LEAVE; 1419 LEAVE;
1255 continue; 1420 continue;
1256 } 1421 }
1257 1422
1258 ta->next = SvSTATE (next_sv); 1423 ta->next = SvSTATE (next_sv);
1259 1424
1260 /* cannot transfer to destroyed coros, skip and look for next */ 1425 /* cannot transfer to destroyed coros, skip and look for next */
1261 if (ta->next->flags & CF_DESTROYED) 1426 if (expect_false (ta->next->flags & CF_DESTROYED))
1262 { 1427 {
1263 UNLOCK; 1428 UNLOCK;
1264 SvREFCNT_dec (next_sv); 1429 SvREFCNT_dec (next_sv);
1265 /* coro_nready is already taken care of by destroy */ 1430 /* coro_nready is already taken care of by destroy */
1266 continue; 1431 continue;
1322 dTHX; 1487 dTHX;
1323 struct transfer_args ta; 1488 struct transfer_args ta;
1324 1489
1325 prepare_cede (aTHX_ &ta); 1490 prepare_cede (aTHX_ &ta);
1326 1491
1327 if (ta.prev != ta.next) 1492 if (expect_true (ta.prev != ta.next))
1328 { 1493 {
1329 TRANSFER (ta); 1494 TRANSFER (ta);
1330 return 1; 1495 return 1;
1331 } 1496 }
1332 else 1497 else
1368 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1533 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1369 1534
1370 if (coro->flags & CF_RUNNING) 1535 if (coro->flags & CF_RUNNING)
1371 PL_runops = RUNOPS_DEFAULT; 1536 PL_runops = RUNOPS_DEFAULT;
1372 else 1537 else
1373 coro->runops = RUNOPS_DEFAULT; 1538 coro->slot->runops = RUNOPS_DEFAULT;
1374 } 1539 }
1375} 1540}
1376 1541
1377MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1542MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1378 1543
1385#endif 1550#endif
1386 BOOT_PAGESIZE; 1551 BOOT_PAGESIZE;
1387 1552
1388 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1553 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1389 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1554 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1555
1556 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1557 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1558 orig_sigelem_set = PL_vtbl_sigelem.svt_set;
1559 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1560
1561 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1562 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1563 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1390 1564
1391 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1565 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1392 1566
1393 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1567 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1394 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1568 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1400 1574
1401 while (main_top_env->je_prev) 1575 while (main_top_env->je_prev)
1402 main_top_env = main_top_env->je_prev; 1576 main_top_env = main_top_env->je_prev;
1403 1577
1404 coroapi.ver = CORO_API_VERSION; 1578 coroapi.ver = CORO_API_VERSION;
1579 coroapi.rev = CORO_API_REVISION;
1405 coroapi.transfer = api_transfer; 1580 coroapi.transfer = api_transfer;
1406 1581
1407 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1582 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1408} 1583}
1409 1584
1410SV * 1585SV *
1411new (char *klass, ...) 1586new (char *klass, ...)
1412 CODE: 1587 CODE:
1413{ 1588{
1414 struct coro *coro; 1589 struct coro *coro;
1590 MAGIC *mg;
1415 HV *hv; 1591 HV *hv;
1416 int i; 1592 int i;
1417 1593
1418 Newz (0, coro, 1, struct coro); 1594 Newz (0, coro, 1, struct coro);
1419 coro->args = newAV (); 1595 coro->args = newAV ();
1422 if (coro_first) coro_first->prev = coro; 1598 if (coro_first) coro_first->prev = coro;
1423 coro->next = coro_first; 1599 coro->next = coro_first;
1424 coro_first = coro; 1600 coro_first = coro;
1425 1601
1426 coro->hv = hv = newHV (); 1602 coro->hv = hv = newHV ();
1427 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1603 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1604 mg->mg_flags |= MGf_DUP;
1428 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1605 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1429 1606
1607 av_extend (coro->args, items - 1);
1430 for (i = 1; i < items; i++) 1608 for (i = 1; i < items; i++)
1431 av_push (coro->args, newSVsv (ST (i))); 1609 av_push (coro->args, newSVsv (ST (i)));
1432} 1610}
1433 OUTPUT: 1611 OUTPUT:
1434 RETVAL 1612 RETVAL
1445 Coro::cede_notself = 4 1623 Coro::cede_notself = 4
1446 CODE: 1624 CODE:
1447{ 1625{
1448 struct transfer_args ta; 1626 struct transfer_args ta;
1449 1627
1628 PUTBACK;
1450 switch (ix) 1629 switch (ix)
1451 { 1630 {
1452 case 0: 1631 case 0:
1453 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1632 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1454 ta.next = 0; 1633 ta.next = 0;
1473 if (!prepare_cede_notself (aTHX_ &ta)) 1652 if (!prepare_cede_notself (aTHX_ &ta))
1474 XSRETURN_EMPTY; 1653 XSRETURN_EMPTY;
1475 1654
1476 break; 1655 break;
1477 } 1656 }
1657 SPAGAIN;
1478 1658
1479 BARRIER; 1659 BARRIER;
1660 PUTBACK;
1480 TRANSFER (ta); 1661 TRANSFER (ta);
1481 1662 SPAGAIN; /* might be the sp of a different coroutine now */
1482 if (GIMME_V != G_VOID && ta.next != ta.prev) 1663 /* be extra careful not to ever do anything after TRANSFER */
1483 XSRETURN_YES;
1484} 1664}
1485 1665
1486bool 1666bool
1487_destroy (SV *coro_sv) 1667_destroy (SV *coro_sv)
1488 CODE: 1668 CODE:
1537 CODE: 1717 CODE:
1538{ 1718{
1539 if (coro->mainstack) 1719 if (coro->mainstack)
1540 { 1720 {
1541 struct coro temp; 1721 struct coro temp;
1542 Zero (&temp, 1, struct coro);
1543 1722
1544 if (!(coro->flags & CF_RUNNING)) 1723 if (!(coro->flags & CF_RUNNING))
1545 { 1724 {
1725 PUTBACK;
1546 save_perl (aTHX_ &temp); 1726 save_perl (aTHX_ &temp);
1547 load_perl (aTHX_ coro); 1727 load_perl (aTHX_ coro);
1548 } 1728 }
1549 1729
1550 { 1730 {
1551 dSP; 1731 dSP;
1552 ENTER; 1732 ENTER;
1553 SAVETMPS; 1733 SAVETMPS;
1734 PUTBACK;
1735 PUSHSTACK;
1554 PUSHMARK (SP); 1736 PUSHMARK (SP);
1555 PUTBACK; 1737
1556 if (ix) 1738 if (ix)
1557 eval_sv (coderef, 0); 1739 eval_sv (coderef, 0);
1558 else 1740 else
1559 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1741 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1742
1743 POPSTACK;
1560 SPAGAIN; 1744 SPAGAIN;
1561 FREETMPS; 1745 FREETMPS;
1562 LEAVE; 1746 LEAVE;
1563 PUTBACK; 1747 PUTBACK;
1564 } 1748 }
1565 1749
1566 if (!(coro->flags & CF_RUNNING)) 1750 if (!(coro->flags & CF_RUNNING))
1567 { 1751 {
1568 save_perl (aTHX_ coro); 1752 save_perl (aTHX_ coro);
1569 load_perl (aTHX_ &temp); 1753 load_perl (aTHX_ &temp);
1754 SPAGAIN;
1570 } 1755 }
1571 } 1756 }
1572} 1757}
1573 1758
1574SV * 1759SV *
1622 1807
1623BOOT: 1808BOOT:
1624{ 1809{
1625 int i; 1810 int i;
1626 1811
1627 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1812 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1628 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1813 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1629 av_async_pool = get_av ("Coro::async_pool", TRUE); 1814 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1630 1815
1631 coro_current = get_sv ("Coro::current", FALSE); 1816 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1632 SvREADONLY_on (coro_current); 1817 SvREADONLY_on (coro_current);
1633 1818
1634 coro_stash = gv_stashpv ("Coro", TRUE); 1819 coro_stash = gv_stashpv ("Coro", TRUE);
1635 1820
1636 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1821 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1637 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1822 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1638 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1823 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1639 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1824 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1642 1827
1643 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1828 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1644 coro_ready[i] = newAV (); 1829 coro_ready[i] = newAV ();
1645 1830
1646 { 1831 {
1647 SV *sv = perl_get_sv("Coro::API", 1); 1832 SV *sv = perl_get_sv ("Coro::API", TRUE);
1833 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1648 1834
1649 coroapi.schedule = api_schedule; 1835 coroapi.schedule = api_schedule;
1650 coroapi.cede = api_cede; 1836 coroapi.cede = api_cede;
1651 coroapi.cede_notself = api_cede_notself; 1837 coroapi.cede_notself = api_cede_notself;
1652 coroapi.ready = api_ready; 1838 coroapi.ready = api_ready;
1703 CODE: 1889 CODE:
1704 RETVAL = coro_nready; 1890 RETVAL = coro_nready;
1705 OUTPUT: 1891 OUTPUT:
1706 RETVAL 1892 RETVAL
1707 1893
1894void
1895throw (Coro::State self, SV *throw = &PL_sv_undef)
1896 PROTOTYPE: $;$
1897 CODE:
1898 SvREFCNT_dec (self->throw);
1899 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1900
1708# for async_pool speedup 1901# for async_pool speedup
1709void 1902void
1710_pool_1 (SV *cb) 1903_pool_1 (SV *cb)
1711 CODE: 1904 CODE:
1712{ 1905{
1716 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1909 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1717 AV *invoke_av; 1910 AV *invoke_av;
1718 int i, len; 1911 int i, len;
1719 1912
1720 if (!invoke) 1913 if (!invoke)
1914 {
1915 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1721 croak ("\3terminate\2\n"); 1916 croak ("\3async_pool terminate\2\n");
1917 }
1722 1918
1723 SvREFCNT_dec (coro->saved_deffh); 1919 SvREFCNT_dec (coro->saved_deffh);
1724 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1920 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1725 1921
1726 hv_store (hv, "desc", sizeof ("desc") - 1, 1922 hv_store (hv, "desc", sizeof ("desc") - 1,
1752 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1948 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1753 coro->saved_deffh = 0; 1949 coro->saved_deffh = 0;
1754 1950
1755 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1951 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1756 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1952 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1953 {
1954 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1757 croak ("\3terminate\2\n"); 1955 croak ("\3async_pool terminate\2\n");
1956 }
1758 1957
1759 av_clear (GvAV (PL_defgv)); 1958 av_clear (GvAV (PL_defgv));
1760 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1959 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1761 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1960 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1762 1961

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines