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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines