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.206 by root, Tue Oct 9 15:45:26 2007 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
75/* 5.8.7 */ 76/* 5.8.7 */
76#ifndef SvRV_set 77#ifndef SvRV_set
77# define SvRV_set(s,v) SvRV(s) = (v) 78# define SvRV_set(s,v) SvRV(s) = (v)
78#endif 79#endif
79 80
81/* 5.8.8 */
82#ifndef GV_NOTQUAL
83# define GV_NOTQUAL 0
84#endif
85#ifndef newSV
86# define newSV(l) NEWSV(0,l)
87#endif
88
80#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 89#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
81# undef CORO_STACKGUARD 90# undef CORO_STACKGUARD
82#endif 91#endif
83 92
84#ifndef CORO_STACKGUARD 93#ifndef CORO_STACKGUARD
98#define IN_DESTRUCT (PL_main_cv == Nullcv) 107#define IN_DESTRUCT (PL_main_cv == Nullcv)
99 108
100#if __GNUC__ >= 3 109#if __GNUC__ >= 3
101# define attribute(x) __attribute__(x) 110# define attribute(x) __attribute__(x)
102# define BARRIER __asm__ __volatile__ ("" : : : "memory") 111# define BARRIER __asm__ __volatile__ ("" : : : "memory")
112# define expect(expr,value) __builtin_expect ((expr),(value))
103#else 113#else
104# define attribute(x) 114# define attribute(x)
105# define BARRIER 115# define BARRIER
116# define expect(expr,value) (expr)
106#endif 117#endif
118
119#define expect_false(expr) expect ((expr) != 0, 0)
120#define expect_true(expr) expect ((expr) != 0, 1)
107 121
108#define NOINLINE attribute ((noinline)) 122#define NOINLINE attribute ((noinline))
109 123
110#include "CoroAPI.h" 124#include "CoroAPI.h"
111 125
116#else 130#else
117# define LOCK (void)0 131# define LOCK (void)0
118# define UNLOCK (void)0 132# define UNLOCK (void)0
119#endif 133#endif
120 134
135#define strpair(const) const, sizeof (const) - 1
136
121/* helper storage struct for Coro::AIO */ 137/* helper storage struct for Coro::AIO */
122struct io_state 138struct io_state
123{ 139{
124 int errorno; 140 int errorno;
125 I32 laststype; 141 I32 laststype;
132static AV *main_mainstack; /* used to differentiate between $main and others */ 148static AV *main_mainstack; /* used to differentiate between $main and others */
133static JMPENV *main_top_env; 149static JMPENV *main_top_env;
134static HV *coro_state_stash, *coro_stash; 150static HV *coro_state_stash, *coro_stash;
135static SV *coro_mortal; /* will be freed after next transfer */ 151static SV *coro_mortal; /* will be freed after next transfer */
136 152
137static GV *irsgv; /* $/ */ 153static GV *irsgv; /* $/ */
138static GV *stdoutgv; /* STDOUT */ 154static GV *stdoutgv; /* *STDOUT */
155
156static HV *hv_sig; /* %SIG */
157static SV *sv_diehook;
158static SV *sv_warnhook;
139 159
140/* async_pool helper stuff */ 160/* async_pool helper stuff */
141static SV *sv_pool_rss; 161static SV *sv_pool_rss;
142static SV *sv_pool_size; 162static SV *sv_pool_size;
143static AV *av_async_pool; 163static AV *av_async_pool;
179 CF_READY = 0x0002, /* coroutine is ready */ 199 CF_READY = 0x0002, /* coroutine is ready */
180 CF_NEW = 0x0004, /* has never been switched to */ 200 CF_NEW = 0x0004, /* has never been switched to */
181 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 201 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
182}; 202};
183 203
204/* the structure where most of the perl state is stored, overlaid on the cxstack */
205typedef struct {
206 SV *defsv;
207 AV *defav;
208 SV *errsv;
209 SV *irsgv;
210#define VAR(name,type) type name;
211# include "state.h"
212#undef VAR
213} perl_slots;
214
215#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
216
184/* this is a structure representing a perl-level coroutine */ 217/* this is a structure representing a perl-level coroutine */
185struct coro { 218struct coro {
186 /* the c coroutine allocated to this perl coroutine, if any */ 219 /* the c coroutine allocated to this perl coroutine, if any */
187 coro_cctx *cctx; 220 coro_cctx *cctx;
188 221
222 /* process data */
223 AV *mainstack;
224 perl_slots *slot; /* basically the saved sp */
225
189 /* data associated with this coroutine (initial args) */ 226 AV *args; /* data associated with this coroutine (initial args) */
190 AV *args; 227 int refcnt; /* coroutines are refcounted, yes */
191 int refcnt;
192 int flags; /* CF_ flags */ 228 int flags; /* CF_ flags */
193 229 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 230
206 /* statistics */ 231 /* statistics */
207 int usecount; /* number of transfers to this coro */ 232 int usecount; /* number of transfers to this coro */
208 233
209 /* coro process data */ 234 /* coro process data */
210 int prio; 235 int prio;
211 //SV *throw; 236 SV *throw; /* exception to be thrown */
212 237
213 /* async_pool */ 238 /* async_pool */
214 SV *saved_deffh; 239 SV *saved_deffh;
215 240
216 /* linked list */ 241 /* linked list */
217 struct coro *next, *prev; 242 struct coro *next, *prev;
218 HV *hv; /* the perl hash associated with this coro, if any */
219}; 243};
220 244
221typedef struct coro *Coro__State; 245typedef struct coro *Coro__State;
222typedef struct coro *Coro__State_or_hashref; 246typedef struct coro *Coro__State_or_hashref;
223 247
235static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 259static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
236static int coro_nready; 260static int coro_nready;
237static struct coro *coro_first; 261static struct coro *coro_first;
238 262
239/** lowlevel stuff **********************************************************/ 263/** lowlevel stuff **********************************************************/
264
265static SV *
266coro_get_sv (const char *name, int create)
267{
268#if PERL_VERSION_ATLEAST (5,9,0)
269 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
270 get_sv (name, create);
271#endif
272 return get_sv (name, create);
273}
274
275static AV *
276coro_get_av (const char *name, int create)
277{
278#if PERL_VERSION_ATLEAST (5,9,0)
279 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
280 get_av (name, create);
281#endif
282 return get_av (name, create);
283}
284
285static HV *
286coro_get_hv (const char *name, int create)
287{
288#if PERL_VERSION_ATLEAST (5,9,0)
289 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
290 get_hv (name, create);
291#endif
292 return get_hv (name, create);
293}
240 294
241static AV * 295static AV *
242coro_clone_padlist (pTHX_ CV *cv) 296coro_clone_padlist (pTHX_ CV *cv)
243{ 297{
244 AV *padlist = CvPADLIST (cv); 298 AV *padlist = CvPADLIST (cv);
317 MAGIC *mg; 371 MAGIC *mg;
318 372
319 if (SvROK (coro)) 373 if (SvROK (coro))
320 coro = SvRV (coro); 374 coro = SvRV (coro);
321 375
322 if (SvTYPE (coro) != SVt_PVHV) 376 if (expect_false (SvTYPE (coro) != SVt_PVHV))
323 croak ("Coro::State object required"); 377 croak ("Coro::State object required");
324 378
325 stash = SvSTASH (coro); 379 stash = SvSTASH (coro);
326 if (stash != coro_stash && stash != coro_state_stash) 380 if (expect_false (stash != coro_stash && stash != coro_state_stash))
327 { 381 {
328 /* very slow, but rare, check */ 382 /* very slow, but rare, check */
329 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 383 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
330 croak ("Coro::State object required"); 384 croak ("Coro::State object required");
331 } 385 }
341get_padlist (pTHX_ CV *cv) 395get_padlist (pTHX_ CV *cv)
342{ 396{
343 MAGIC *mg = CORO_MAGIC (cv); 397 MAGIC *mg = CORO_MAGIC (cv);
344 AV *av; 398 AV *av;
345 399
346 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 400 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
347 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 401 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
348 else 402 else
349 { 403 {
350#if CORO_PREFER_PERL_FUNCTIONS 404#if CORO_PREFER_PERL_FUNCTIONS
351 /* this is probably cleaner, but also slower? */ 405 /* this is probably cleaner, but also slower? */
363put_padlist (pTHX_ CV *cv) 417put_padlist (pTHX_ CV *cv)
364{ 418{
365 MAGIC *mg = CORO_MAGIC (cv); 419 MAGIC *mg = CORO_MAGIC (cv);
366 AV *av; 420 AV *av;
367 421
368 if (!mg) 422 if (expect_false (!mg))
369 { 423 {
370 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 424 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
371 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 425 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
372 mg->mg_virtual = &vtbl_coro; 426 mg->mg_virtual = &vtbl_coro;
373 mg->mg_obj = (SV *)newAV (); 427 mg->mg_obj = (SV *)newAV ();
374 } 428 }
375 429
376 av = (AV *)mg->mg_obj; 430 av = (AV *)mg->mg_obj;
377 431
378 if (AvFILLp (av) >= AvMAX (av)) 432 if (expect_false (AvFILLp (av) >= AvMAX (av)))
379 av_extend (av, AvMAX (av) + 1); 433 av_extend (av, AvMAX (av) + 1);
380 434
381 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 435 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
382} 436}
383 437
384/** load & save, init *******************************************************/ 438/** load & save, init *******************************************************/
385 439
386static void 440static void
387load_perl (pTHX_ Coro__State c) 441load_perl (pTHX_ Coro__State c)
388{ 442{
443 perl_slots *slot = c->slot;
444 c->slot = 0;
445
446 PL_mainstack = c->mainstack;
447
448 GvSV (PL_defgv) = slot->defsv;
449 GvAV (PL_defgv) = slot->defav;
450 GvSV (PL_errgv) = slot->errsv;
451 GvSV (irsgv) = slot->irsgv;
452
389#define VAR(name,type) PL_ ## name = c->name; 453 #define VAR(name,type) PL_ ## name = slot->name;
390# include "state.h" 454 # include "state.h"
391#undef VAR 455 #undef VAR
392 456
393 GvSV (PL_defgv) = c->defsv; 457 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
394 GvAV (PL_defgv) = c->defav; 458 /*hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);*/
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}
595 PL_runops = RUNOPS_DEFAULT; 682 PL_runops = RUNOPS_DEFAULT;
596 PL_curcop = &PL_compiling; 683 PL_curcop = &PL_compiling;
597 PL_in_eval = EVAL_NULL; 684 PL_in_eval = EVAL_NULL;
598 PL_comppad = 0; 685 PL_comppad = 0;
599 PL_curpm = 0; 686 PL_curpm = 0;
687 PL_curpad = 0;
600 PL_localizing = 0; 688 PL_localizing = 0;
601 PL_dirty = 0; 689 PL_dirty = 0;
602 PL_restartop = 0; 690 PL_restartop = 0;
691 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
692 PL_warnhook = 0; hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
603 693
604 GvSV (PL_defgv) = NEWSV (0, 0); 694 GvSV (PL_defgv) = newSV (0);
605 GvAV (PL_defgv) = coro->args; coro->args = 0; 695 GvAV (PL_defgv) = coro->args; coro->args = 0;
606 GvSV (PL_errgv) = NEWSV (0, 0); 696 GvSV (PL_errgv) = newSV (0);
607 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 697 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
608 PL_rs = newSVsv (GvSV (irsgv)); 698 PL_rs = newSVsv (GvSV (irsgv));
609 PL_defoutgv = SvREFCNT_inc (stdoutgv); 699 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
610 700
611 { 701 {
612 dSP; 702 dSP;
613 LOGOP myop; 703 LOGOP myop;
614 704
615 Zero (&myop, 1, LOGOP); 705 Zero (&myop, 1, LOGOP);
616 myop.op_next = Nullop; 706 myop.op_next = Nullop;
617 myop.op_flags = OPf_WANT_VOID; 707 myop.op_flags = OPf_WANT_VOID;
618 708
619 PUSHMARK (SP); 709 PUSHMARK (SP);
620 XPUSHs (av_shift (GvAV (PL_defgv))); 710 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
621 PUTBACK; 711 PUTBACK;
622 PL_op = (OP *)&myop; 712 PL_op = (OP *)&myop;
623 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 713 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
624 SPAGAIN; 714 SPAGAIN;
625 } 715 }
626 716
627 ENTER; /* necessary e.g. for dounwind */ 717 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */
628} 718}
629 719
630static void 720static void
631coro_destroy (pTHX_ struct coro *coro) 721coro_destroy (pTHX_ struct coro *coro)
632{ 722{
652 SvREFCNT_dec (GvSV (PL_errgv)); 742 SvREFCNT_dec (GvSV (PL_errgv));
653 SvREFCNT_dec (PL_defoutgv); 743 SvREFCNT_dec (PL_defoutgv);
654 SvREFCNT_dec (PL_rs); 744 SvREFCNT_dec (PL_rs);
655 SvREFCNT_dec (GvSV (irsgv)); 745 SvREFCNT_dec (GvSV (irsgv));
656 746
747 SvREFCNT_dec (PL_diehook);
748 SvREFCNT_dec (PL_warnhook);
749
657 SvREFCNT_dec (coro->saved_deffh); 750 SvREFCNT_dec (coro->saved_deffh);
658 //SvREFCNT_dec (coro->throw); 751 SvREFCNT_dec (coro->throw);
659 752
660 coro_destroy_stacks (aTHX); 753 coro_destroy_stacks (aTHX);
661} 754}
662 755
663static void 756static void
664free_coro_mortal (pTHX) 757free_coro_mortal (pTHX)
665{ 758{
666 if (coro_mortal) 759 if (expect_true (coro_mortal))
667 { 760 {
668 SvREFCNT_dec (coro_mortal); 761 SvREFCNT_dec (coro_mortal);
669 coro_mortal = 0; 762 coro_mortal = 0;
670 } 763 }
671} 764}
700 bot = PL_stack_base + cx->blk_oldsp + 1; 793 bot = PL_stack_base + cx->blk_oldsp + 1;
701 top = cx->blk_gimme == G_ARRAY ? SP + 1 794 top = cx->blk_gimme == G_ARRAY ? SP + 1
702 : cx->blk_gimme == G_SCALAR ? bot + 1 795 : cx->blk_gimme == G_SCALAR ? bot + 1
703 : bot; 796 : bot;
704 797
798 av_extend (av, top - bot);
705 while (bot < top) 799 while (bot < top)
706 av_push (av, SvREFCNT_inc (*bot++)); 800 av_push (av, SvREFCNT_inc (*bot++));
707 801
708 PL_runops = RUNOPS_DEFAULT; 802 PL_runops = RUNOPS_DEFAULT;
709 ENTER; 803 ENTER;
712 PUSHMARK (SP); 806 PUSHMARK (SP);
713 PUSHs (&PL_sv_no); 807 PUSHs (&PL_sv_no);
714 PUSHs (fullname); 808 PUSHs (fullname);
715 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 809 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
716 PUTBACK; 810 PUTBACK;
717 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 811 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0);
718 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 812 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
719 SPAGAIN; 813 SPAGAIN;
720 FREETMPS; 814 FREETMPS;
721 LEAVE; 815 LEAVE;
722 PL_runops = runops_trace; 816 PL_runops = runops_trace;
751 PUSHMARK (SP); 845 PUSHMARK (SP);
752 PUSHs (&PL_sv_yes); 846 PUSHs (&PL_sv_yes);
753 PUSHs (fullname); 847 PUSHs (fullname);
754 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 848 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
755 PUTBACK; 849 PUTBACK;
756 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 850 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0);
757 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 851 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
758 SPAGAIN; 852 SPAGAIN;
759 FREETMPS; 853 FREETMPS;
760 LEAVE; 854 LEAVE;
761 PL_runops = runops_trace; 855 PL_runops = runops_trace;
775 PL_runops = RUNOPS_DEFAULT; 869 PL_runops = RUNOPS_DEFAULT;
776 PUSHMARK (SP); 870 PUSHMARK (SP);
777 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 871 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
778 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 872 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
779 PUTBACK; 873 PUTBACK;
780 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0); 874 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0);
781 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 875 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
782 SPAGAIN; 876 SPAGAIN;
783 FREETMPS; 877 FREETMPS;
784 LEAVE; 878 LEAVE;
785 PL_runops = runops_trace; 879 PL_runops = runops_trace;
795 889
796/* inject a fake call to Coro::State::_cctx_init into the execution */ 890/* 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 */ 891/* _cctx_init should be careful, as it could be called at almost any time */
798/* during execution of a perl program */ 892/* during execution of a perl program */
799static void NOINLINE 893static void NOINLINE
800prepare_cctx (pTHX_ coro_cctx *cctx) 894cctx_prepare (pTHX_ coro_cctx *cctx)
801{ 895{
802 dSP; 896 dSP;
803 LOGOP myop; 897 LOGOP myop;
804 898
805 PL_top_env = &PL_start_env; 899 PL_top_env = &PL_start_env;
823 917
824/* 918/*
825 * this is a _very_ stripped down perl interpreter ;) 919 * this is a _very_ stripped down perl interpreter ;)
826 */ 920 */
827static void 921static void
828coro_run (void *arg) 922cctx_run (void *arg)
829{ 923{
830 dTHX; 924 dTHX;
831 925
832 /* coro_run is the alternative tail of transfer(), so unlock here. */ 926 /* cctx_run is the alternative tail of transfer(), so unlock here. */
833 UNLOCK; 927 UNLOCK;
834 928
835 /* we now skip the entersub that lead to transfer() */ 929 /* we now skip the entersub that lead to transfer() */
836 PL_op = PL_op->op_next; 930 PL_op = PL_op->op_next;
837 931
838 /* inject a fake subroutine call to cctx_init */ 932 /* inject a fake subroutine call to cctx_init */
839 prepare_cctx (aTHX_ (coro_cctx *)arg); 933 cctx_prepare (aTHX_ (coro_cctx *)arg);
840 934
841 /* somebody or something will hit me for both perl_run and PL_restartop */ 935 /* somebody or something will hit me for both perl_run and PL_restartop */
842 PL_restartop = PL_op; 936 PL_restartop = PL_op;
843 perl_run (PL_curinterp); 937 perl_run (PL_curinterp);
844 938
863 ++cctx_count; 957 ++cctx_count;
864 958
865 Newz (0, cctx, 1, coro_cctx); 959 Newz (0, cctx, 1, coro_cctx);
866 960
867#if HAVE_MMAP 961#if HAVE_MMAP
868
869 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 962 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
870 /* mmap supposedly does allocate-on-write for us */ 963 /* 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); 964 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
872 965
873 if (cctx->sptr != (void *)-1) 966 if (cctx->sptr != (void *)-1)
894 stack_start = cctx->sptr; 987 stack_start = cctx->sptr;
895 stack_size = cctx->ssize; 988 stack_size = cctx->ssize;
896 } 989 }
897 990
898 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 991 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
899 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 992 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
900 993
901 return cctx; 994 return cctx;
902} 995}
903 996
904static void 997static void
921 Safefree (cctx->sptr); 1014 Safefree (cctx->sptr);
922 1015
923 Safefree (cctx); 1016 Safefree (cctx);
924} 1017}
925 1018
1019/* wether this cctx should be destructed */
1020#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1021
926static coro_cctx * 1022static coro_cctx *
927cctx_get (pTHX) 1023cctx_get (pTHX)
928{ 1024{
929 while (cctx_first) 1025 while (expect_true (cctx_first))
930 { 1026 {
931 coro_cctx *cctx = cctx_first; 1027 coro_cctx *cctx = cctx_first;
932 cctx_first = cctx->next; 1028 cctx_first = cctx->next;
933 --cctx_idle; 1029 --cctx_idle;
934 1030
935 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1031 if (expect_true (!CCTX_EXPIRED (cctx)))
936 return cctx; 1032 return cctx;
937 1033
938 cctx_destroy (cctx); 1034 cctx_destroy (cctx);
939 } 1035 }
940 1036
943 1039
944static void 1040static void
945cctx_put (coro_cctx *cctx) 1041cctx_put (coro_cctx *cctx)
946{ 1042{
947 /* free another cctx if overlimit */ 1043 /* free another cctx if overlimit */
948 if (cctx_idle >= MAX_IDLE_CCTX) 1044 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
949 { 1045 {
950 coro_cctx *first = cctx_first; 1046 coro_cctx *first = cctx_first;
951 cctx_first = first->next; 1047 cctx_first = first->next;
952 --cctx_idle; 1048 --cctx_idle;
953 1049
959 cctx_first = cctx; 1055 cctx_first = cctx;
960} 1056}
961 1057
962/** coroutine switching *****************************************************/ 1058/** coroutine switching *****************************************************/
963 1059
964static void NOINLINE 1060static void
965transfer_check (pTHX_ struct coro *prev, struct coro *next) 1061transfer_check (pTHX_ struct coro *prev, struct coro *next)
966{ 1062{
967 if (prev != next) 1063 if (expect_true (prev != next))
968 { 1064 {
969 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1065 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"); 1066 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
971 1067
972 if (next->flags & CF_RUNNING) 1068 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"); 1069 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
974 1070
975 if (next->flags & CF_DESTROYED) 1071 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"); 1072 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
977 1073
1074 if (
1075#if PERL_VERSION_ATLEAST (5,9,0)
1076 expect_false (PL_parser)
1077#else
978 if (PL_lex_state != LEX_NOTPARSING) 1078 expect_false (PL_lex_state != LEX_NOTPARSING)
1079#endif
1080 )
979 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1081 croak ("Coro::State::transfer called while parsing, but this is not supported");
980 } 1082 }
981} 1083}
982 1084
983/* always use the TRANSFER macro */ 1085/* always use the TRANSFER macro */
985transfer (pTHX_ struct coro *prev, struct coro *next) 1087transfer (pTHX_ struct coro *prev, struct coro *next)
986{ 1088{
987 dSTACKLEVEL; 1089 dSTACKLEVEL;
988 1090
989 /* sometimes transfer is only called to set idle_sp */ 1091 /* sometimes transfer is only called to set idle_sp */
990 if (!next) 1092 if (expect_false (!next))
991 { 1093 {
992 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1094 ((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 */ 1095 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
994 } 1096 }
995 else if (prev != next) 1097 else if (expect_true (prev != next))
996 { 1098 {
997 coro_cctx *prev__cctx; 1099 coro_cctx *prev__cctx;
998 1100
999 if (prev->flags & CF_NEW) 1101 if (expect_false (prev->flags & CF_NEW))
1000 { 1102 {
1001 /* create a new empty context */ 1103 /* create a new empty context */
1002 Newz (0, prev->cctx, 1, coro_cctx); 1104 Newz (0, prev->cctx, 1, coro_cctx);
1003 prev->flags &= ~CF_NEW; 1105 prev->flags &= ~CF_NEW;
1004 prev->flags |= CF_RUNNING; 1106 prev->flags |= CF_RUNNING;
1007 prev->flags &= ~CF_RUNNING; 1109 prev->flags &= ~CF_RUNNING;
1008 next->flags |= CF_RUNNING; 1110 next->flags |= CF_RUNNING;
1009 1111
1010 LOCK; 1112 LOCK;
1011 1113
1012 if (next->flags & CF_NEW) 1114 if (expect_false (next->flags & CF_NEW))
1013 { 1115 {
1014 /* need to start coroutine */ 1116 /* need to start coroutine */
1015 next->flags &= ~CF_NEW; 1117 next->flags &= ~CF_NEW;
1016 /* first get rid of the old state */ 1118 /* first get rid of the old state */
1017 save_perl (aTHX_ prev); 1119 save_perl (aTHX_ prev);
1026 } 1128 }
1027 1129
1028 prev__cctx = prev->cctx; 1130 prev__cctx = prev->cctx;
1029 1131
1030 /* possibly "free" the cctx */ 1132 /* possibly "free" the cctx */
1031 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1133 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1032 { 1134 {
1033 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1135 /* 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)); 1136 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1035 1137
1036 prev->cctx = 0; 1138 prev->cctx = 0;
1037 1139
1140 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1141 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1142 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1143 if (!next->cctx)
1144 next->cctx = cctx_get (aTHX);
1145
1038 cctx_put (prev__cctx); 1146 cctx_put (prev__cctx);
1039 } 1147 }
1040 1148
1041 ++next->usecount; 1149 ++next->usecount;
1042 1150
1043 if (!next->cctx) 1151 if (expect_true (!next->cctx))
1044 next->cctx = cctx_get (aTHX); 1152 next->cctx = cctx_get (aTHX);
1045 1153
1046 if (prev__cctx != next->cctx) 1154 if (expect_false (prev__cctx != next->cctx))
1047 { 1155 {
1048 prev__cctx->top_env = PL_top_env; 1156 prev__cctx->top_env = PL_top_env;
1049 PL_top_env = next->cctx->top_env; 1157 PL_top_env = next->cctx->top_env;
1050 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1158 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1051 } 1159 }
1052 1160
1053 free_coro_mortal (aTHX); 1161 free_coro_mortal (aTHX);
1054 UNLOCK; 1162 UNLOCK;
1163
1164 if (expect_false (prev->throw || next->throw))
1165 {
1166 struct coro *coro = SvSTATE (coro_current);
1167
1168 if (coro->throw)
1169 {
1170 SV *exception = coro->throw;
1171 coro->throw = 0;
1172 sv_setsv (ERRSV, exception);
1173 croak (0);
1174 }
1175 }
1055 } 1176 }
1056} 1177}
1057 1178
1058struct transfer_args 1179struct transfer_args
1059{ 1180{
1094 save_perl (aTHX_ &temp); 1215 save_perl (aTHX_ &temp);
1095 load_perl (aTHX_ coro); 1216 load_perl (aTHX_ coro);
1096 1217
1097 coro_destroy (aTHX_ coro); 1218 coro_destroy (aTHX_ coro);
1098 1219
1099 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1220 load_perl (aTHX_ &temp);
1100 1221
1101 coro->mainstack = 0; 1222 coro->slot = 0;
1102 } 1223 }
1103 1224
1104 cctx_destroy (coro->cctx); 1225 cctx_destroy (coro->cctx);
1105 SvREFCNT_dec (coro->args); 1226 SvREFCNT_dec (coro->args);
1106 1227
1231 { 1352 {
1232 LOCK; 1353 LOCK;
1233 next_sv = coro_deq (aTHX_ PRIO_MIN); 1354 next_sv = coro_deq (aTHX_ PRIO_MIN);
1234 1355
1235 /* nothing to schedule: call the idle handler */ 1356 /* nothing to schedule: call the idle handler */
1236 if (!next_sv) 1357 if (expect_false (!next_sv))
1237 { 1358 {
1238 dSP; 1359 dSP;
1239 UNLOCK; 1360 UNLOCK;
1240 1361
1241 ENTER; 1362 ENTER;
1251 } 1372 }
1252 1373
1253 ta->next = SvSTATE (next_sv); 1374 ta->next = SvSTATE (next_sv);
1254 1375
1255 /* cannot transfer to destroyed coros, skip and look for next */ 1376 /* cannot transfer to destroyed coros, skip and look for next */
1256 if (ta->next->flags & CF_DESTROYED) 1377 if (expect_false (ta->next->flags & CF_DESTROYED))
1257 { 1378 {
1258 UNLOCK; 1379 UNLOCK;
1259 SvREFCNT_dec (next_sv); 1380 SvREFCNT_dec (next_sv);
1260 /* coro_nready is already taken care of by destroy */ 1381 /* coro_nready is already taken care of by destroy */
1261 continue; 1382 continue;
1317 dTHX; 1438 dTHX;
1318 struct transfer_args ta; 1439 struct transfer_args ta;
1319 1440
1320 prepare_cede (aTHX_ &ta); 1441 prepare_cede (aTHX_ &ta);
1321 1442
1322 if (ta.prev != ta.next) 1443 if (expect_true (ta.prev != ta.next))
1323 { 1444 {
1324 TRANSFER (ta); 1445 TRANSFER (ta);
1325 return 1; 1446 return 1;
1326 } 1447 }
1327 else 1448 else
1363 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1484 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1364 1485
1365 if (coro->flags & CF_RUNNING) 1486 if (coro->flags & CF_RUNNING)
1366 PL_runops = RUNOPS_DEFAULT; 1487 PL_runops = RUNOPS_DEFAULT;
1367 else 1488 else
1368 coro->runops = RUNOPS_DEFAULT; 1489 coro->slot->runops = RUNOPS_DEFAULT;
1369 } 1490 }
1370} 1491}
1371 1492
1372MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1493MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1373 1494
1380#endif 1501#endif
1381 BOOT_PAGESIZE; 1502 BOOT_PAGESIZE;
1382 1503
1383 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1504 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1384 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1505 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1506
1507 hv_sig = coro_get_hv ("SIG", TRUE);
1508 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE);
1509 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE);
1510
1511 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1512 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1385 1513
1386 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1514 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1387 1515
1388 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1516 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1389 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1517 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1420 1548
1421 coro->hv = hv = newHV (); 1549 coro->hv = hv = newHV ();
1422 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1550 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1423 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1551 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1424 1552
1553 av_extend (coro->args, items - 1);
1425 for (i = 1; i < items; i++) 1554 for (i = 1; i < items; i++)
1426 av_push (coro->args, newSVsv (ST (i))); 1555 av_push (coro->args, newSVsv (ST (i)));
1427} 1556}
1428 OUTPUT: 1557 OUTPUT:
1429 RETVAL 1558 RETVAL
1472 } 1601 }
1473 1602
1474 BARRIER; 1603 BARRIER;
1475 TRANSFER (ta); 1604 TRANSFER (ta);
1476 1605
1477 if (GIMME_V != G_VOID && ta.next != ta.prev) 1606 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev))
1478 XSRETURN_YES; 1607 XSRETURN_YES;
1479} 1608}
1480 1609
1481bool 1610bool
1482_destroy (SV *coro_sv) 1611_destroy (SV *coro_sv)
1532 CODE: 1661 CODE:
1533{ 1662{
1534 if (coro->mainstack) 1663 if (coro->mainstack)
1535 { 1664 {
1536 struct coro temp; 1665 struct coro temp;
1537 Zero (&temp, 1, struct coro);
1538 1666
1539 if (!(coro->flags & CF_RUNNING)) 1667 if (!(coro->flags & CF_RUNNING))
1540 { 1668 {
1541 save_perl (aTHX_ &temp); 1669 save_perl (aTHX_ &temp);
1542 load_perl (aTHX_ coro); 1670 load_perl (aTHX_ coro);
1546 dSP; 1674 dSP;
1547 ENTER; 1675 ENTER;
1548 SAVETMPS; 1676 SAVETMPS;
1549 PUSHMARK (SP); 1677 PUSHMARK (SP);
1550 PUTBACK; 1678 PUTBACK;
1679
1551 if (ix) 1680 if (ix)
1552 eval_sv (coderef, 0); 1681 eval_sv (coderef, 0);
1553 else 1682 else
1554 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1683 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1684
1555 SPAGAIN; 1685 SPAGAIN;
1556 FREETMPS; 1686 FREETMPS;
1557 LEAVE; 1687 LEAVE;
1558 PUTBACK; 1688 PUTBACK;
1559 } 1689 }
1617 1747
1618BOOT: 1748BOOT:
1619{ 1749{
1620 int i; 1750 int i;
1621 1751
1622 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1752 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1623 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1753 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1624 av_async_pool = get_av ("Coro::async_pool", TRUE); 1754 av_async_pool = coro_get_av ("Coro::async_pool", TRUE);
1625 1755
1626 coro_current = get_sv ("Coro::current", FALSE); 1756 coro_current = coro_get_sv ("Coro::current", FALSE);
1627 SvREADONLY_on (coro_current); 1757 SvREADONLY_on (coro_current);
1628 1758
1629 coro_stash = gv_stashpv ("Coro", TRUE); 1759 coro_stash = gv_stashpv ("Coro", TRUE);
1630 1760
1631 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1761 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1632 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1762 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1633 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1763 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1634 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1764 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1637 1767
1638 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1768 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1639 coro_ready[i] = newAV (); 1769 coro_ready[i] = newAV ();
1640 1770
1641 { 1771 {
1642 SV *sv = perl_get_sv("Coro::API", 1); 1772 SV *sv = perl_get_sv ("Coro::API", TRUE);
1773 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1643 1774
1644 coroapi.schedule = api_schedule; 1775 coroapi.schedule = api_schedule;
1645 coroapi.cede = api_cede; 1776 coroapi.cede = api_cede;
1646 coroapi.cede_notself = api_cede_notself; 1777 coroapi.cede_notself = api_cede_notself;
1647 coroapi.ready = api_ready; 1778 coroapi.ready = api_ready;
1698 CODE: 1829 CODE:
1699 RETVAL = coro_nready; 1830 RETVAL = coro_nready;
1700 OUTPUT: 1831 OUTPUT:
1701 RETVAL 1832 RETVAL
1702 1833
1834void
1835throw (Coro::State self, SV *throw = &PL_sv_undef)
1836 PROTOTYPE: $;$
1837 CODE:
1838 SvREFCNT_dec (self->throw);
1839 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1840
1703# for async_pool speedup 1841# for async_pool speedup
1704void 1842void
1705_pool_1 (SV *cb) 1843_pool_1 (SV *cb)
1706 CODE: 1844 CODE:
1707{ 1845{
1708 struct coro *coro = SvSTATE (coro_current); 1846 struct coro *coro = SvSTATE (coro_current);
1709 HV *hv = (HV *)SvRV (coro_current); 1847 HV *hv = (HV *)SvRV (coro_current);
1710 AV *defav = GvAV (PL_defgv); 1848 AV *defav = GvAV (PL_defgv);
1711 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1849 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0);
1712 AV *invoke_av; 1850 AV *invoke_av;
1713 int i, len; 1851 int i, len;
1714 1852
1715 if (!invoke) 1853 if (!invoke)
1716 croak ("\3terminate\2\n"); 1854 croak ("\3async_pool terminate\2\n");
1717 1855
1718 SvREFCNT_dec (coro->saved_deffh); 1856 SvREFCNT_dec (coro->saved_deffh);
1719 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1857 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1720 1858
1721 hv_store (hv, "desc", sizeof ("desc") - 1, 1859 hv_store (hv, "desc", sizeof ("desc") - 1,
1722 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1860 newSVpvn (strpair ("[async_pool]")), 0);
1723 1861
1724 invoke_av = (AV *)SvRV (invoke); 1862 invoke_av = (AV *)SvRV (invoke);
1725 len = av_len (invoke_av); 1863 len = av_len (invoke_av);
1726 1864
1727 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1865 sv_setsv (cb, AvARRAY (invoke_av)[0]);
1747 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1885 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1748 coro->saved_deffh = 0; 1886 coro->saved_deffh = 0;
1749 1887
1750 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1888 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1751 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1889 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1752 croak ("\3terminate\2\n"); 1890 croak ("\3async_pool terminate\2\n");
1753 1891
1754 av_clear (GvAV (PL_defgv)); 1892 av_clear (GvAV (PL_defgv));
1755 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1893 hv_store ((HV *)SvRV (coro_current), strpair ("desc"),
1756 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1894 newSVpvn (strpair ("[async_pool idle]")), 0);
1757 1895
1758 coro->prio = 0; 1896 coro->prio = 0;
1759 1897
1760 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1898 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1761 api_trace (coro_current, 0); 1899 api_trace (coro_current, 0);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines