ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

Comparing Coro/Coro/State.xs (file contents):
Revision 1.187 by root, Fri Oct 5 20:31:18 2007 UTC vs.
Revision 1.205 by root, Tue Oct 9 14:07:02 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; /* $/ */
154static GV *stdoutgv; /* *STDOUT */
155
156static HV *hv_sig; /* %SIG */
157static SV *sv_diehook;
158static SV *sv_warnhook;
138 159
139/* async_pool helper stuff */ 160/* async_pool helper stuff */
140static SV *sv_pool_rss; 161static SV *sv_pool_rss;
141static SV *sv_pool_size; 162static SV *sv_pool_size;
142static AV *av_async_pool; 163static AV *av_async_pool;
178 CF_READY = 0x0002, /* coroutine is ready */ 199 CF_READY = 0x0002, /* coroutine is ready */
179 CF_NEW = 0x0004, /* has never been switched to */ 200 CF_NEW = 0x0004, /* has never been switched to */
180 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 201 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
181}; 202};
182 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
183/* this is a structure representing a perl-level coroutine */ 217/* this is a structure representing a perl-level coroutine */
184struct coro { 218struct coro {
185 /* the c coroutine allocated to this perl coroutine, if any */ 219 /* the c coroutine allocated to this perl coroutine, if any */
186 coro_cctx *cctx; 220 coro_cctx *cctx;
187 221
222 /* process data */
223 AV *mainstack;
224 perl_slots *slot; /* basically the saved sp */
225
188 /* data associated with this coroutine (initial args) */ 226 AV *args; /* data associated with this coroutine (initial args) */
189 AV *args; 227 int refcnt; /* coroutines are refcounted, yes */
190 int refcnt;
191 int flags; /* CF_ flags */ 228 int flags; /* CF_ flags */
192 229 HV *hv; /* the perl hash associated with this coro, if any */
193 /* optionally saved, might be zero */
194 AV *defav; /* @_ */
195 SV *defsv; /* $_ */
196 SV *errsv; /* $@ */
197 SV *deffh; /* default filehandle */
198 SV *irssv; /* $/ */
199 SV *irssv_sv; /* real $/ cache */
200
201#define VAR(name,type) type name;
202# include "state.h"
203#undef VAR
204 230
205 /* statistics */ 231 /* statistics */
206 int usecount; /* number of transfers to this coro */ 232 int usecount; /* number of transfers to this coro */
207 233
208 /* coro process data */ 234 /* coro process data */
209 int prio; 235 int prio;
210 //SV *throw; 236 SV *throw; /* exception to be thrown */
211 237
212 /* async_pool */ 238 /* async_pool */
213 SV *saved_deffh; 239 SV *saved_deffh;
214 240
215 /* linked list */ 241 /* linked list */
216 struct coro *next, *prev; 242 struct coro *next, *prev;
217 HV *hv; /* the perl hash associated with this coro, if any */
218}; 243};
219 244
220typedef struct coro *Coro__State; 245typedef struct coro *Coro__State;
221typedef struct coro *Coro__State_or_hashref; 246typedef struct coro *Coro__State_or_hashref;
222 247
234static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 259static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
235static int coro_nready; 260static int coro_nready;
236static struct coro *coro_first; 261static struct coro *coro_first;
237 262
238/** 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}
239 294
240static AV * 295static AV *
241coro_clone_padlist (pTHX_ CV *cv) 296coro_clone_padlist (pTHX_ CV *cv)
242{ 297{
243 AV *padlist = CvPADLIST (cv); 298 AV *padlist = CvPADLIST (cv);
316 MAGIC *mg; 371 MAGIC *mg;
317 372
318 if (SvROK (coro)) 373 if (SvROK (coro))
319 coro = SvRV (coro); 374 coro = SvRV (coro);
320 375
321 if (SvTYPE (coro) != SVt_PVHV) 376 if (expect_false (SvTYPE (coro) != SVt_PVHV))
322 croak ("Coro::State object required"); 377 croak ("Coro::State object required");
323 378
324 stash = SvSTASH (coro); 379 stash = SvSTASH (coro);
325 if (stash != coro_stash && stash != coro_state_stash) 380 if (expect_false (stash != coro_stash && stash != coro_state_stash))
326 { 381 {
327 /* very slow, but rare, check */ 382 /* very slow, but rare, check */
328 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 383 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
329 croak ("Coro::State object required"); 384 croak ("Coro::State object required");
330 } 385 }
340get_padlist (pTHX_ CV *cv) 395get_padlist (pTHX_ CV *cv)
341{ 396{
342 MAGIC *mg = CORO_MAGIC (cv); 397 MAGIC *mg = CORO_MAGIC (cv);
343 AV *av; 398 AV *av;
344 399
345 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 400 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
346 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 401 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
347 else 402 else
348 { 403 {
349#if CORO_PREFER_PERL_FUNCTIONS 404#if CORO_PREFER_PERL_FUNCTIONS
350 /* this is probably cleaner, but also slower? */ 405 /* this is probably cleaner, but also slower? */
362put_padlist (pTHX_ CV *cv) 417put_padlist (pTHX_ CV *cv)
363{ 418{
364 MAGIC *mg = CORO_MAGIC (cv); 419 MAGIC *mg = CORO_MAGIC (cv);
365 AV *av; 420 AV *av;
366 421
367 if (!mg) 422 if (expect_false (!mg))
368 { 423 {
369 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 424 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
370 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 425 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
371 mg->mg_virtual = &vtbl_coro; 426 mg->mg_virtual = &vtbl_coro;
372 mg->mg_obj = (SV *)newAV (); 427 mg->mg_obj = (SV *)newAV ();
373 } 428 }
374 429
375 av = (AV *)mg->mg_obj; 430 av = (AV *)mg->mg_obj;
376 431
377 if (AvFILLp (av) >= AvMAX (av)) 432 if (expect_false (AvFILLp (av) >= AvMAX (av)))
378 av_extend (av, AvMAX (av) + 1); 433 av_extend (av, AvMAX (av) + 1);
379 434
380 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 435 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
381} 436}
382 437
383/** load & save, init *******************************************************/ 438/** load & save, init *******************************************************/
384 439
385static void 440static void
386load_perl (pTHX_ Coro__State c) 441load_perl (pTHX_ Coro__State c)
387{ 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
388#define VAR(name,type) PL_ ## name = c->name; 453 #define VAR(name,type) PL_ ## name = slot->name;
389# include "state.h" 454 # include "state.h"
390#undef VAR 455 #undef VAR
391 456
392 GvSV (PL_defgv) = c->defsv; 457 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
393 GvAV (PL_defgv) = c->defav; 458 /*hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);*/
394 GvSV (PL_errgv) = c->errsv;
395 GvSV (irsgv) = c->irssv_sv;
396 459
397 { 460 {
398 dSP; 461 dSP;
462
399 CV *cv; 463 CV *cv;
400 464
401 /* now do the ugly restore mess */ 465 /* now do the ugly restore mess */
402 while ((cv = (CV *)POPs)) 466 while (expect_true (cv = (CV *)POPs))
403 { 467 {
404 put_padlist (aTHX_ cv); /* mark this padlist as available */ 468 put_padlist (aTHX_ cv); /* mark this padlist as available */
405 CvDEPTH (cv) = PTR2IV (POPs); 469 CvDEPTH (cv) = PTR2IV (POPs);
406 CvPADLIST (cv) = (AV *)POPs; 470 CvPADLIST (cv) = (AV *)POPs;
407 } 471 }
426 490
427 XPUSHs (Nullsv); 491 XPUSHs (Nullsv);
428 /* this loop was inspired by pp_caller */ 492 /* this loop was inspired by pp_caller */
429 for (;;) 493 for (;;)
430 { 494 {
431 while (cxix >= 0) 495 while (expect_true (cxix >= 0))
432 { 496 {
433 PERL_CONTEXT *cx = &ccstk[cxix--]; 497 PERL_CONTEXT *cx = &ccstk[cxix--];
434 498
435 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 499 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
436 { 500 {
437 CV *cv = cx->blk_sub.cv; 501 CV *cv = cx->blk_sub.cv;
438 502
439 if (CvDEPTH (cv)) 503 if (expect_true (CvDEPTH (cv)))
440 { 504 {
441 EXTEND (SP, 3); 505 EXTEND (SP, 3);
442 PUSHs ((SV *)CvPADLIST (cv)); 506 PUSHs ((SV *)CvPADLIST (cv));
443 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 507 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
444 PUSHs ((SV *)cv); 508 PUSHs ((SV *)cv);
447 get_padlist (aTHX_ cv); 511 get_padlist (aTHX_ cv);
448 } 512 }
449 } 513 }
450 } 514 }
451 515
452 if (top_si->si_type == PERLSI_MAIN) 516 if (expect_true (top_si->si_type == PERLSI_MAIN))
453 break; 517 break;
454 518
455 top_si = top_si->si_prev; 519 top_si = top_si->si_prev;
456 ccstk = top_si->si_cxstack; 520 ccstk = top_si->si_cxstack;
457 cxix = top_si->si_cxix; 521 cxix = top_si->si_cxix;
458 } 522 }
459 523
460 PUTBACK; 524 PUTBACK;
461 } 525 }
462 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
463 c->defav = GvAV (PL_defgv); 544 slot->defav = GvAV (PL_defgv);
464 c->defsv = DEFSV; 545 slot->defsv = DEFSV;
465 c->errsv = ERRSV; 546 slot->errsv = ERRSV;
466 c->irssv_sv = GvSV (irsgv); 547 slot->irsgv = GvSV (irsgv);
467 548
468#define VAR(name,type)c->name = PL_ ## name; 549 #define VAR(name,type) slot->name = PL_ ## name;
469# include "state.h" 550 # include "state.h"
470#undef VAR 551 #undef VAR
552 }
471} 553}
472 554
473/* 555/*
474 * allocate various perl stacks. This is an exact copy 556 * allocate various perl stacks. This is an exact copy
475 * of perl.c:init_stacks, except that it uses less memory 557 * of perl.c:init_stacks, except that it uses less memory
480# define coro_init_stacks init_stacks 562# define coro_init_stacks init_stacks
481#else 563#else
482static void 564static void
483coro_init_stacks (pTHX) 565coro_init_stacks (pTHX)
484{ 566{
485 PL_curstackinfo = new_stackinfo(64, 6); 567 PL_curstackinfo = new_stackinfo(32, 8);
486 PL_curstackinfo->si_type = PERLSI_MAIN; 568 PL_curstackinfo->si_type = PERLSI_MAIN;
487 PL_curstack = PL_curstackinfo->si_stack; 569 PL_curstack = PL_curstackinfo->si_stack;
488 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 570 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
489 571
490 PL_stack_base = AvARRAY(PL_curstack); 572 PL_stack_base = AvARRAY(PL_curstack);
491 PL_stack_sp = PL_stack_base; 573 PL_stack_sp = PL_stack_base;
492 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 574 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
493 575
494 New(50,PL_tmps_stack,64,SV*); 576 New(50,PL_tmps_stack,32,SV*);
495 PL_tmps_floor = -1; 577 PL_tmps_floor = -1;
496 PL_tmps_ix = -1; 578 PL_tmps_ix = -1;
497 PL_tmps_max = 64; 579 PL_tmps_max = 32;
498 580
499 New(54,PL_markstack,16,I32); 581 New(54,PL_markstack,16,I32);
500 PL_markstack_ptr = PL_markstack; 582 PL_markstack_ptr = PL_markstack;
501 PL_markstack_max = PL_markstack + 16; 583 PL_markstack_max = PL_markstack + 16;
502 584
503#ifdef SET_MARK_OFFSET 585#ifdef SET_MARK_OFFSET
504 SET_MARK_OFFSET; 586 SET_MARK_OFFSET;
505#endif 587#endif
506 588
507 New(54,PL_scopestack,16,I32); 589 New(54,PL_scopestack,8,I32);
508 PL_scopestack_ix = 0; 590 PL_scopestack_ix = 0;
509 PL_scopestack_max = 16; 591 PL_scopestack_max = 8;
510 592
511 New(54,PL_savestack,64,ANY); 593 New(54,PL_savestack,24,ANY);
512 PL_savestack_ix = 0; 594 PL_savestack_ix = 0;
513 PL_savestack_max = 64; 595 PL_savestack_max = 24;
514 596
515#if !PERL_VERSION_ATLEAST (5,9,0) 597#if !PERL_VERSION_ATLEAST (5,9,0)
516 New(54,PL_retstack,4,OP*); 598 New(54,PL_retstack,4,OP*);
517 PL_retstack_ix = 0; 599 PL_retstack_ix = 0;
518 PL_retstack_max = 4; 600 PL_retstack_max = 4;
555{ 637{
556 size_t rss = sizeof (*coro); 638 size_t rss = sizeof (*coro);
557 639
558 if (coro->mainstack) 640 if (coro->mainstack)
559 { 641 {
642 perl_slots tmp_slot;
643 perl_slots *slot;
644
560 if (coro->flags & CF_RUNNING) 645 if (coro->flags & CF_RUNNING)
561 { 646 {
647 slot = &tmp_slot;
648
562 #define VAR(name,type)coro->name = PL_ ## name; 649 #define VAR(name,type) slot->name = PL_ ## name;
563 # include "state.h" 650 # include "state.h"
564 #undef VAR 651 #undef VAR
565 } 652 }
653 else
654 slot = coro->slot;
566 655
567 rss += sizeof (coro->curstackinfo); 656 rss += sizeof (slot->curstackinfo);
568 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
569 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 657 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
570 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 *);
571 rss += coro->tmps_max * sizeof (SV *); 659 rss += slot->tmps_max * sizeof (SV *);
572 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 660 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
573 rss += coro->scopestack_max * sizeof (I32); 661 rss += slot->scopestack_max * sizeof (I32);
574 rss += coro->savestack_max * sizeof (ANY); 662 rss += slot->savestack_max * sizeof (ANY);
575 663
576#if !PERL_VERSION_ATLEAST (5,9,0) 664#if !PERL_VERSION_ATLEAST (5,9,0)
577 rss += coro->retstack_max * sizeof (OP *); 665 rss += slot->retstack_max * sizeof (OP *);
578#endif 666#endif
579 } 667 }
580 668
581 return rss; 669 return rss;
582} 670}
594 PL_runops = RUNOPS_DEFAULT; 682 PL_runops = RUNOPS_DEFAULT;
595 PL_curcop = &PL_compiling; 683 PL_curcop = &PL_compiling;
596 PL_in_eval = EVAL_NULL; 684 PL_in_eval = EVAL_NULL;
597 PL_comppad = 0; 685 PL_comppad = 0;
598 PL_curpm = 0; 686 PL_curpm = 0;
687 PL_curpad = 0;
599 PL_localizing = 0; 688 PL_localizing = 0;
600 PL_dirty = 0; 689 PL_dirty = 0;
601 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);
602 693
603 GvSV (PL_defgv) = NEWSV (0, 0); 694 GvSV (PL_defgv) = newSV (0);
604 GvAV (PL_defgv) = coro->args; coro->args = 0; 695 GvAV (PL_defgv) = coro->args; coro->args = 0;
605 GvSV (PL_errgv) = NEWSV (0, 0); 696 GvSV (PL_errgv) = newSV (0);
606 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);
607 PL_rs = newSVsv (GvSV (irsgv)); 698 PL_rs = newSVsv (GvSV (irsgv));
608 699 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
609 SvREFCNT_inc (PL_defoutgv);
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
859 coro_cctx *cctx; 953 coro_cctx *cctx;
860 void *stack_start; 954 void *stack_start;
861 size_t stack_size; 955 size_t stack_size;
862 956
863 ++cctx_count; 957 ++cctx_count;
958 fprintf (stderr, "bp1\n");//D
864 959
865 Newz (0, cctx, 1, coro_cctx); 960 Newz (0, cctx, 1, coro_cctx);
866 961
867#if HAVE_MMAP 962#if HAVE_MMAP
868
869 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 963 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
870 /* mmap supposedly does allocate-on-write for us */ 964 /* 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); 965 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
872 966
873 if (cctx->sptr != (void *)-1) 967 if (cctx->sptr != (void *)-1)
894 stack_start = cctx->sptr; 988 stack_start = cctx->sptr;
895 stack_size = cctx->ssize; 989 stack_size = cctx->ssize;
896 } 990 }
897 991
898 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 992 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
899 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 993 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
900 994
901 return cctx; 995 return cctx;
902} 996}
903 997
904static void 998static void
921 Safefree (cctx->sptr); 1015 Safefree (cctx->sptr);
922 1016
923 Safefree (cctx); 1017 Safefree (cctx);
924} 1018}
925 1019
1020/* wether this cctx should be destructed */
1021#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1022
926static coro_cctx * 1023static coro_cctx *
927cctx_get (pTHX) 1024cctx_get (pTHX)
928{ 1025{
929 while (cctx_first) 1026 while (expect_true (cctx_first))
930 { 1027 {
931 coro_cctx *cctx = cctx_first; 1028 coro_cctx *cctx = cctx_first;
932 cctx_first = cctx->next; 1029 cctx_first = cctx->next;
933 --cctx_idle; 1030 --cctx_idle;
934 1031
935 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1032 if (expect_true (!CCTX_EXPIRED (cctx)))
936 return cctx; 1033 return cctx;
937 1034
938 cctx_destroy (cctx); 1035 cctx_destroy (cctx);
939 } 1036 }
940 1037
943 1040
944static void 1041static void
945cctx_put (coro_cctx *cctx) 1042cctx_put (coro_cctx *cctx)
946{ 1043{
947 /* free another cctx if overlimit */ 1044 /* free another cctx if overlimit */
948 if (cctx_idle >= MAX_IDLE_CCTX) 1045 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
949 { 1046 {
950 coro_cctx *first = cctx_first; 1047 coro_cctx *first = cctx_first;
951 cctx_first = first->next; 1048 cctx_first = first->next;
952 --cctx_idle; 1049 --cctx_idle;
953 1050
959 cctx_first = cctx; 1056 cctx_first = cctx;
960} 1057}
961 1058
962/** coroutine switching *****************************************************/ 1059/** coroutine switching *****************************************************/
963 1060
964static void NOINLINE 1061static void
965transfer_check (pTHX_ struct coro *prev, struct coro *next) 1062transfer_check (pTHX_ struct coro *prev, struct coro *next)
966{ 1063{
967 if (prev != next) 1064 if (expect_true (prev != next))
968 { 1065 {
969 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1066 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"); 1067 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
971 1068
972 if (next->flags & CF_RUNNING) 1069 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"); 1070 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
974 1071
975 if (next->flags & CF_DESTROYED) 1072 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"); 1073 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
977 1074
1075 if (
1076#if PERL_VERSION_ATLEAST (5,9,0)
1077 expect_false (PL_parser)
1078#else
978 if (PL_lex_state != LEX_NOTPARSING) 1079 expect_false (PL_lex_state != LEX_NOTPARSING)
1080#endif
1081 )
979 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1082 croak ("Coro::State::transfer called while parsing, but this is not supported");
980 } 1083 }
981} 1084}
982 1085
983/* always use the TRANSFER macro */ 1086/* always use the TRANSFER macro */
985transfer (pTHX_ struct coro *prev, struct coro *next) 1088transfer (pTHX_ struct coro *prev, struct coro *next)
986{ 1089{
987 dSTACKLEVEL; 1090 dSTACKLEVEL;
988 1091
989 /* sometimes transfer is only called to set idle_sp */ 1092 /* sometimes transfer is only called to set idle_sp */
990 if (!next) 1093 if (expect_false (!next))
991 { 1094 {
992 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1095 ((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 */ 1096 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
994 } 1097 }
995 else if (prev != next) 1098 else if (expect_true (prev != next))
996 { 1099 {
997 coro_cctx *prev__cctx; 1100 coro_cctx *prev__cctx;
998 1101
999 if (prev->flags & CF_NEW) 1102 if (expect_false (prev->flags & CF_NEW))
1000 { 1103 {
1001 /* create a new empty context */ 1104 /* create a new empty context */
1002 Newz (0, prev->cctx, 1, coro_cctx); 1105 Newz (0, prev->cctx, 1, coro_cctx);
1003 prev->flags &= ~CF_NEW; 1106 prev->flags &= ~CF_NEW;
1004 prev->flags |= CF_RUNNING; 1107 prev->flags |= CF_RUNNING;
1007 prev->flags &= ~CF_RUNNING; 1110 prev->flags &= ~CF_RUNNING;
1008 next->flags |= CF_RUNNING; 1111 next->flags |= CF_RUNNING;
1009 1112
1010 LOCK; 1113 LOCK;
1011 1114
1012 if (next->flags & CF_NEW) 1115 if (expect_false (next->flags & CF_NEW))
1013 { 1116 {
1014 /* need to start coroutine */ 1117 /* need to start coroutine */
1015 next->flags &= ~CF_NEW; 1118 next->flags &= ~CF_NEW;
1016 /* first get rid of the old state */ 1119 /* first get rid of the old state */
1017 save_perl (aTHX_ prev); 1120 save_perl (aTHX_ prev);
1026 } 1129 }
1027 1130
1028 prev__cctx = prev->cctx; 1131 prev__cctx = prev->cctx;
1029 1132
1030 /* possibly "free" the cctx */ 1133 /* possibly "free" the cctx */
1031 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1134 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1032 { 1135 {
1033 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1136 /* 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)); 1137 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1035 1138
1036 prev->cctx = 0; 1139 prev->cctx = 0;
1037 1140
1141 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1142 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1143 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1144 if (!next->cctx)
1145 next->cctx = cctx_get (aTHX);
1146
1038 cctx_put (prev__cctx); 1147 cctx_put (prev__cctx);
1039 } 1148 }
1040 1149
1041 ++next->usecount; 1150 ++next->usecount;
1042 1151
1043 if (!next->cctx) 1152 if (expect_true (!next->cctx))
1044 next->cctx = cctx_get (aTHX); 1153 next->cctx = cctx_get (aTHX);
1045 1154
1046 if (prev__cctx != next->cctx) 1155 if (expect_false (prev__cctx != next->cctx))
1047 { 1156 {
1048 prev__cctx->top_env = PL_top_env; 1157 prev__cctx->top_env = PL_top_env;
1049 PL_top_env = next->cctx->top_env; 1158 PL_top_env = next->cctx->top_env;
1050 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1159 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1051 } 1160 }
1052 1161
1053 free_coro_mortal (aTHX); 1162 free_coro_mortal (aTHX);
1054 UNLOCK; 1163 UNLOCK;
1164
1165 if (expect_false (prev->throw || next->throw))
1166 {
1167 struct coro *coro = SvSTATE (coro_current);
1168
1169 if (coro->throw)
1170 {
1171 SV *exception = coro->throw;
1172 coro->throw = 0;
1173 sv_setsv (ERRSV, exception);
1174 croak (0);
1175 }
1176 }
1055 } 1177 }
1056} 1178}
1057 1179
1058struct transfer_args 1180struct transfer_args
1059{ 1181{
1094 save_perl (aTHX_ &temp); 1216 save_perl (aTHX_ &temp);
1095 load_perl (aTHX_ coro); 1217 load_perl (aTHX_ coro);
1096 1218
1097 coro_destroy (aTHX_ coro); 1219 coro_destroy (aTHX_ coro);
1098 1220
1099 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1221 load_perl (aTHX_ &temp);
1100 1222
1101 coro->mainstack = 0; 1223 coro->slot = 0;
1102 } 1224 }
1103 1225
1104 cctx_destroy (coro->cctx); 1226 cctx_destroy (coro->cctx);
1105 SvREFCNT_dec (coro->args); 1227 SvREFCNT_dec (coro->args);
1106 1228
1231 { 1353 {
1232 LOCK; 1354 LOCK;
1233 next_sv = coro_deq (aTHX_ PRIO_MIN); 1355 next_sv = coro_deq (aTHX_ PRIO_MIN);
1234 1356
1235 /* nothing to schedule: call the idle handler */ 1357 /* nothing to schedule: call the idle handler */
1236 if (!next_sv) 1358 if (expect_false (!next_sv))
1237 { 1359 {
1238 dSP; 1360 dSP;
1239 UNLOCK; 1361 UNLOCK;
1240 1362
1241 ENTER; 1363 ENTER;
1251 } 1373 }
1252 1374
1253 ta->next = SvSTATE (next_sv); 1375 ta->next = SvSTATE (next_sv);
1254 1376
1255 /* cannot transfer to destroyed coros, skip and look for next */ 1377 /* cannot transfer to destroyed coros, skip and look for next */
1256 if (ta->next->flags & CF_DESTROYED) 1378 if (expect_false (ta->next->flags & CF_DESTROYED))
1257 { 1379 {
1258 UNLOCK; 1380 UNLOCK;
1259 SvREFCNT_dec (next_sv); 1381 SvREFCNT_dec (next_sv);
1260 /* coro_nready is already taken care of by destroy */ 1382 /* coro_nready is already taken care of by destroy */
1261 continue; 1383 continue;
1317 dTHX; 1439 dTHX;
1318 struct transfer_args ta; 1440 struct transfer_args ta;
1319 1441
1320 prepare_cede (aTHX_ &ta); 1442 prepare_cede (aTHX_ &ta);
1321 1443
1322 if (ta.prev != ta.next) 1444 if (expect_true (ta.prev != ta.next))
1323 { 1445 {
1324 TRANSFER (ta); 1446 TRANSFER (ta);
1325 return 1; 1447 return 1;
1326 } 1448 }
1327 else 1449 else
1363 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1485 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1364 1486
1365 if (coro->flags & CF_RUNNING) 1487 if (coro->flags & CF_RUNNING)
1366 PL_runops = RUNOPS_DEFAULT; 1488 PL_runops = RUNOPS_DEFAULT;
1367 else 1489 else
1368 coro->runops = RUNOPS_DEFAULT; 1490 coro->slot->runops = RUNOPS_DEFAULT;
1369 } 1491 }
1370} 1492}
1371 1493
1372MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1494MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1373 1495
1378#ifdef USE_ITHREADS 1500#ifdef USE_ITHREADS
1379 MUTEX_INIT (&coro_mutex); 1501 MUTEX_INIT (&coro_mutex);
1380#endif 1502#endif
1381 BOOT_PAGESIZE; 1503 BOOT_PAGESIZE;
1382 1504
1383 irsgv = gv_fetchpv ("/", 1, SVt_PV); 1505 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1506 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1507
1508 hv_sig = coro_get_hv ("SIG", TRUE);
1509 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE);
1510 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE);
1511
1512 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1513 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1384 1514
1385 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1515 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1386 1516
1387 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1517 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1388 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1518 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1419 1549
1420 coro->hv = hv = newHV (); 1550 coro->hv = hv = newHV ();
1421 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1551 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1422 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1552 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1423 1553
1554 av_extend (coro->args, items - 1);
1424 for (i = 1; i < items; i++) 1555 for (i = 1; i < items; i++)
1425 av_push (coro->args, newSVsv (ST (i))); 1556 av_push (coro->args, newSVsv (ST (i)));
1426} 1557}
1427 OUTPUT: 1558 OUTPUT:
1428 RETVAL 1559 RETVAL
1471 } 1602 }
1472 1603
1473 BARRIER; 1604 BARRIER;
1474 TRANSFER (ta); 1605 TRANSFER (ta);
1475 1606
1476 if (GIMME_V != G_VOID && ta.next != ta.prev) 1607 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev))
1477 XSRETURN_YES; 1608 XSRETURN_YES;
1478} 1609}
1479 1610
1480bool 1611bool
1481_destroy (SV *coro_sv) 1612_destroy (SV *coro_sv)
1531 CODE: 1662 CODE:
1532{ 1663{
1533 if (coro->mainstack) 1664 if (coro->mainstack)
1534 { 1665 {
1535 struct coro temp; 1666 struct coro temp;
1536 Zero (&temp, 1, struct coro);
1537 1667
1538 if (!(coro->flags & CF_RUNNING)) 1668 if (!(coro->flags & CF_RUNNING))
1539 { 1669 {
1540 save_perl (aTHX_ &temp); 1670 save_perl (aTHX_ &temp);
1541 load_perl (aTHX_ coro); 1671 load_perl (aTHX_ coro);
1545 dSP; 1675 dSP;
1546 ENTER; 1676 ENTER;
1547 SAVETMPS; 1677 SAVETMPS;
1548 PUSHMARK (SP); 1678 PUSHMARK (SP);
1549 PUTBACK; 1679 PUTBACK;
1680
1550 if (ix) 1681 if (ix)
1551 eval_sv (coderef, 0); 1682 eval_sv (coderef, 0);
1552 else 1683 else
1553 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1684 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1685
1554 SPAGAIN; 1686 SPAGAIN;
1555 FREETMPS; 1687 FREETMPS;
1556 LEAVE; 1688 LEAVE;
1557 PUTBACK; 1689 PUTBACK;
1558 } 1690 }
1616 1748
1617BOOT: 1749BOOT:
1618{ 1750{
1619 int i; 1751 int i;
1620 1752
1621 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1753 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1622 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1754 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1623 av_async_pool = get_av ("Coro::async_pool", TRUE); 1755 av_async_pool = coro_get_av ("Coro::async_pool", TRUE);
1624 1756
1625 coro_current = get_sv ("Coro::current", FALSE); 1757 coro_current = coro_get_sv ("Coro::current", FALSE);
1626 SvREADONLY_on (coro_current); 1758 SvREADONLY_on (coro_current);
1627 1759
1628 coro_stash = gv_stashpv ("Coro", TRUE); 1760 coro_stash = gv_stashpv ("Coro", TRUE);
1629 1761
1630 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1762 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1631 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1763 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1632 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1764 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1633 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1765 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1636 1768
1637 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1769 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1638 coro_ready[i] = newAV (); 1770 coro_ready[i] = newAV ();
1639 1771
1640 { 1772 {
1641 SV *sv = perl_get_sv("Coro::API", 1); 1773 SV *sv = perl_get_sv ("Coro::API", TRUE);
1774 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1642 1775
1643 coroapi.schedule = api_schedule; 1776 coroapi.schedule = api_schedule;
1644 coroapi.cede = api_cede; 1777 coroapi.cede = api_cede;
1645 coroapi.cede_notself = api_cede_notself; 1778 coroapi.cede_notself = api_cede_notself;
1646 coroapi.ready = api_ready; 1779 coroapi.ready = api_ready;
1697 CODE: 1830 CODE:
1698 RETVAL = coro_nready; 1831 RETVAL = coro_nready;
1699 OUTPUT: 1832 OUTPUT:
1700 RETVAL 1833 RETVAL
1701 1834
1835void
1836throw (Coro::State self, SV *throw = &PL_sv_undef)
1837 PROTOTYPE: $;$
1838 CODE:
1839 SvREFCNT_dec (self->throw);
1840 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1841
1702# for async_pool speedup 1842# for async_pool speedup
1703void 1843void
1704_pool_1 (SV *cb) 1844_pool_1 (SV *cb)
1705 CODE: 1845 CODE:
1706{ 1846{
1707 struct coro *coro = SvSTATE (coro_current); 1847 struct coro *coro = SvSTATE (coro_current);
1708 HV *hv = (HV *)SvRV (coro_current); 1848 HV *hv = (HV *)SvRV (coro_current);
1709 AV *defav = GvAV (PL_defgv); 1849 AV *defav = GvAV (PL_defgv);
1710 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1850 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0);
1711 AV *invoke_av; 1851 AV *invoke_av;
1712 int i, len; 1852 int i, len;
1713 1853
1714 if (!invoke) 1854 if (!invoke)
1715 croak ("\3terminate\2\n"); 1855 croak ("\3async_pool terminate\2\n");
1716 1856
1717 SvREFCNT_dec (coro->saved_deffh); 1857 SvREFCNT_dec (coro->saved_deffh);
1718 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1858 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1719 1859
1720 hv_store (hv, "desc", sizeof ("desc") - 1, 1860 hv_store (hv, "desc", sizeof ("desc") - 1,
1721 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1861 newSVpvn (strpair ("[async_pool]")), 0);
1722 1862
1723 invoke_av = (AV *)SvRV (invoke); 1863 invoke_av = (AV *)SvRV (invoke);
1724 len = av_len (invoke_av); 1864 len = av_len (invoke_av);
1725 1865
1726 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1866 sv_setsv (cb, AvARRAY (invoke_av)[0]);
1746 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1886 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1747 coro->saved_deffh = 0; 1887 coro->saved_deffh = 0;
1748 1888
1749 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1889 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1750 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1890 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1751 croak ("\3terminate\2\n"); 1891 croak ("\3async_pool terminate\2\n");
1752 1892
1753 av_clear (GvAV (PL_defgv)); 1893 av_clear (GvAV (PL_defgv));
1754 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1894 hv_store ((HV *)SvRV (coro_current), strpair ("desc"),
1755 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1895 newSVpvn (strpair ("[async_pool idle]")), 0);
1756 1896
1757 coro->prio = 0; 1897 coro->prio = 0;
1758 1898
1759 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1899 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1760 api_trace (coro_current, 0); 1900 api_trace (coro_current, 0);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines