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.175 by root, Sun Sep 30 13:43:45 2007 UTC vs.
Revision 1.200 by root, Sun Oct 7 15:08:23 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;
… …
131static struct CoroAPI coroapi; 147static struct CoroAPI coroapi;
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 */
152
153static GV *irsgv; /* $/ */
154static GV *stdoutgv; /* *STDOUT */
155
156static HV *hv_sig; /* %SIG */
157static SV *sv_diehook;
158static SV *sv_warnhook;
136 159
137/* async_pool helper stuff */ 160/* async_pool helper stuff */
138static SV *sv_pool_rss; 161static SV *sv_pool_rss;
139static SV *sv_pool_size; 162static SV *sv_pool_size;
140static AV *av_async_pool; 163static AV *av_async_pool;
… …
176 CF_READY = 0x0002, /* coroutine is ready */ 199 CF_READY = 0x0002, /* coroutine is ready */
177 CF_NEW = 0x0004, /* has never been switched to */ 200 CF_NEW = 0x0004, /* has never been switched to */
178 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 201 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
179}; 202};
180 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
181/* this is a structure representing a perl-level coroutine */ 217/* this is a structure representing a perl-level coroutine */
182struct coro { 218struct coro {
183 /* the c coroutine allocated to this perl coroutine, if any */ 219 /* the c coroutine allocated to this perl coroutine, if any */
184 coro_cctx *cctx; 220 coro_cctx *cctx;
185 221
222 /* process data */
223 AV *mainstack;
224 perl_slots *slot; /* basically the saved sp */
225
186 /* data associated with this coroutine (initial args) */ 226 /* data associated with this coroutine (initial args) */
187 AV *args; 227 AV *args;
188 int refcnt; 228 int refcnt;
189 int save; /* CORO_SAVE flags */
190 int flags; /* CF_ flags */ 229 int flags; /* CF_ flags */
191 230
192 /* optionally saved, might be zero */
193 AV *defav; /* @_ */
194 SV *defsv; /* $_ */
195 SV *errsv; /* $@ */
196 GV *deffh; /* default filehandle */
197 SV *irssv; /* $/ */
198 SV *irssv_sv; /* real $/ cache */
199
200#define VAR(name,type) type name;
201# include "state.h"
202#undef VAR
203
204 /* statistics */ 231 /* statistics */
205 int usecount; /* number of switches to this coro */ 232 int usecount; /* number of transfers to this coro */
206 233
207 /* coro process data */ 234 /* coro process data */
208 int prio; 235 int prio;
236 SV *throw;
237
238 /* async_pool */
239 SV *saved_deffh;
209 240
210 /* linked list */ 241 /* linked list */
211 struct coro *next, *prev; 242 struct coro *next, *prev;
212 HV *hv; /* the perl hash associated with this coro, if any */ 243 HV *hv; /* the perl hash associated with this coro, if any */
213}; 244};
… …
229static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 260static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
230static int coro_nready; 261static int coro_nready;
231static struct coro *coro_first; 262static struct coro *coro_first;
232 263
233/** lowlevel stuff **********************************************************/ 264/** lowlevel stuff **********************************************************/
265
266static SV *
267coro_get_sv (const char *name, int create)
268{
269#if PERL_VERSION_ATLEAST (5,9,0)
270 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
271 get_sv (name, create);
272#endif
273 return get_sv (name, create);
274}
275
276static AV *
277coro_get_av (const char *name, int create)
278{
279#if PERL_VERSION_ATLEAST (5,9,0)
280 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
281 get_av (name, create);
282#endif
283 return get_av (name, create);
284}
285
286static HV *
287coro_get_hv (const char *name, int create)
288{
289#if PERL_VERSION_ATLEAST (5,9,0)
290 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
291 get_hv (name, create);
292#endif
293 return get_hv (name, create);
294}
234 295
235static AV * 296static AV *
236coro_clone_padlist (pTHX_ CV *cv) 297coro_clone_padlist (pTHX_ CV *cv)
237{ 298{
238 AV *padlist = CvPADLIST (cv); 299 AV *padlist = CvPADLIST (cv);
… …
311 MAGIC *mg; 372 MAGIC *mg;
312 373
313 if (SvROK (coro)) 374 if (SvROK (coro))
314 coro = SvRV (coro); 375 coro = SvRV (coro);
315 376
316 if (SvTYPE (coro) != SVt_PVHV) 377 if (expect_false (SvTYPE (coro) != SVt_PVHV))
317 croak ("Coro::State object required"); 378 croak ("Coro::State object required");
318 379
319 stash = SvSTASH (coro); 380 stash = SvSTASH (coro);
320 if (stash != coro_stash && stash != coro_state_stash) 381 if (expect_false (stash != coro_stash && stash != coro_state_stash))
321 { 382 {
322 /* very slow, but rare, check */ 383 /* very slow, but rare, check */
323 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 384 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
324 croak ("Coro::State object required"); 385 croak ("Coro::State object required");
325 } 386 }
… …
335get_padlist (pTHX_ CV *cv) 396get_padlist (pTHX_ CV *cv)
336{ 397{
337 MAGIC *mg = CORO_MAGIC (cv); 398 MAGIC *mg = CORO_MAGIC (cv);
338 AV *av; 399 AV *av;
339 400
340 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 401 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
341 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 402 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
342 else 403 else
343 { 404 {
344#if CORO_PREFER_PERL_FUNCTIONS 405#if CORO_PREFER_PERL_FUNCTIONS
345 /* this is probably cleaner, but also slower? */ 406 /* this is probably cleaner, but also slower? */
… …
357put_padlist (pTHX_ CV *cv) 418put_padlist (pTHX_ CV *cv)
358{ 419{
359 MAGIC *mg = CORO_MAGIC (cv); 420 MAGIC *mg = CORO_MAGIC (cv);
360 AV *av; 421 AV *av;
361 422
362 if (!mg) 423 if (expect_false (!mg))
363 { 424 {
364 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 425 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
365 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 426 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
366 mg->mg_virtual = &vtbl_coro; 427 mg->mg_virtual = &vtbl_coro;
367 mg->mg_obj = (SV *)newAV (); 428 mg->mg_obj = (SV *)newAV ();
368 } 429 }
369 430
370 av = (AV *)mg->mg_obj; 431 av = (AV *)mg->mg_obj;
371 432
372 if (AvFILLp (av) >= AvMAX (av)) 433 if (expect_false (AvFILLp (av) >= AvMAX (av)))
373 av_extend (av, AvMAX (av) + 1); 434 av_extend (av, AvMAX (av) + 1);
374 435
375 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 436 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
376} 437}
377 438
378/** load & save, init *******************************************************/ 439/** load & save, init *******************************************************/
379 440
380#define SB do {
381#define SE } while (0)
382
383#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
384
385static void 441static void
386load_perl (pTHX_ Coro__State c) 442load_perl (pTHX_ Coro__State c)
387{ 443{
444 perl_slots *slot = c->slot;
445 c->slot = 0;
446
447 PL_mainstack = c->mainstack;
448
449 GvSV (PL_defgv) = slot->defsv;
450 GvAV (PL_defgv) = slot->defav;
451 GvSV (PL_errgv) = slot->errsv;
452 GvSV (irsgv) = slot->irsgv;
453
388#define VAR(name,type) PL_ ## name = c->name; 454 #define VAR(name,type) PL_ ## name = slot->name;
389# include "state.h" 455 # include "state.h"
390#undef VAR 456 #undef VAR
391
392 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
393 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
394 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
395 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh);
396
397 if (c->irssv)
398 {
399 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
400 {
401 SvREFCNT_dec (c->irssv);
402 c->irssv = 0;
403 }
404 else
405 {
406 REPLACE_SV (PL_rs, c->irssv);
407 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
408 sv_setsv (c->irssv_sv, PL_rs);
409 }
410 }
411 457
412 { 458 {
413 dSP; 459 dSP;
460
414 CV *cv; 461 CV *cv;
415 462
416 /* now do the ugly restore mess */ 463 /* now do the ugly restore mess */
417 while ((cv = (CV *)POPs)) 464 while (expect_true (cv = (CV *)POPs))
418 { 465 {
419 put_padlist (aTHX_ cv); /* mark this padlist as available */ 466 put_padlist (aTHX_ cv); /* mark this padlist as available */
420 CvDEPTH (cv) = PTR2IV (POPs); 467 CvDEPTH (cv) = PTR2IV (POPs);
421 CvPADLIST (cv) = (AV *)POPs; 468 CvPADLIST (cv) = (AV *)POPs;
422 } 469 }
… …
441 488
442 XPUSHs (Nullsv); 489 XPUSHs (Nullsv);
443 /* this loop was inspired by pp_caller */ 490 /* this loop was inspired by pp_caller */
444 for (;;) 491 for (;;)
445 { 492 {
446 while (cxix >= 0) 493 while (expect_true (cxix >= 0))
447 { 494 {
448 PERL_CONTEXT *cx = &ccstk[cxix--]; 495 PERL_CONTEXT *cx = &ccstk[cxix--];
449 496
450 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 497 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
451 { 498 {
452 CV *cv = cx->blk_sub.cv; 499 CV *cv = cx->blk_sub.cv;
453 500
454 if (CvDEPTH (cv)) 501 if (expect_true (CvDEPTH (cv)))
455 { 502 {
456 EXTEND (SP, 3); 503 EXTEND (SP, 3);
457 PUSHs ((SV *)CvPADLIST (cv)); 504 PUSHs ((SV *)CvPADLIST (cv));
458 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 505 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
459 PUSHs ((SV *)cv); 506 PUSHs ((SV *)cv);
… …
462 get_padlist (aTHX_ cv); 509 get_padlist (aTHX_ cv);
463 } 510 }
464 } 511 }
465 } 512 }
466 513
467 if (top_si->si_type == PERLSI_MAIN) 514 if (expect_true (top_si->si_type == PERLSI_MAIN))
468 break; 515 break;
469 516
470 top_si = top_si->si_prev; 517 top_si = top_si->si_prev;
471 ccstk = top_si->si_cxstack; 518 ccstk = top_si->si_cxstack;
472 cxix = top_si->si_cxix; 519 cxix = top_si->si_cxix;
473 } 520 }
474 521
475 PUTBACK; 522 PUTBACK;
476 } 523 }
477 524
478 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 525 /* allocate some space on the context stack for our purposes */
479 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 526 {
480 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 527 /* we manually unroll here, as usually 2 slots is enough */
481 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 528 int i;
482 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0; 529 if (SLOT_COUNT >= 1) CXINC;
530 if (SLOT_COUNT >= 2) CXINC;
531 if (SLOT_COUNT >= 3) CXINC;
532 for (i = 3; i < SLOT_COUNT; ++i)
533 CXINC;
483 534
535 cxstack_ix -= SLOT_COUNT; /* undo allocation */
536 }
537
538 c->mainstack = PL_mainstack;
539
540 {
541 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
542
543 slot->defav = GvAV (PL_defgv);
544 slot->defsv = DEFSV;
545 slot->errsv = ERRSV;
546 slot->irsgv = GvSV (irsgv);
547
484#define VAR(name,type)c->name = PL_ ## name; 548 #define VAR(name,type) slot->name = PL_ ## name;
485# include "state.h" 549 # include "state.h"
486#undef VAR 550 #undef VAR
551 }
487} 552}
488 553
489/* 554/*
490 * allocate various perl stacks. This is an exact copy 555 * allocate various perl stacks. This is an exact copy
491 * of perl.c:init_stacks, except that it uses less memory 556 * of perl.c:init_stacks, except that it uses less memory
… …
496# define coro_init_stacks init_stacks 561# define coro_init_stacks init_stacks
497#else 562#else
498static void 563static void
499coro_init_stacks (pTHX) 564coro_init_stacks (pTHX)
500{ 565{
501 PL_curstackinfo = new_stackinfo(64, 6); 566 PL_curstackinfo = new_stackinfo(32, 8);
502 PL_curstackinfo->si_type = PERLSI_MAIN; 567 PL_curstackinfo->si_type = PERLSI_MAIN;
503 PL_curstack = PL_curstackinfo->si_stack; 568 PL_curstack = PL_curstackinfo->si_stack;
504 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 569 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
505 570
506 PL_stack_base = AvARRAY(PL_curstack); 571 PL_stack_base = AvARRAY(PL_curstack);
507 PL_stack_sp = PL_stack_base; 572 PL_stack_sp = PL_stack_base;
508 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 573 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
509 574
510 New(50,PL_tmps_stack,64,SV*); 575 New(50,PL_tmps_stack,32,SV*);
511 PL_tmps_floor = -1; 576 PL_tmps_floor = -1;
512 PL_tmps_ix = -1; 577 PL_tmps_ix = -1;
513 PL_tmps_max = 64; 578 PL_tmps_max = 32;
514 579
515 New(54,PL_markstack,16,I32); 580 New(54,PL_markstack,16,I32);
516 PL_markstack_ptr = PL_markstack; 581 PL_markstack_ptr = PL_markstack;
517 PL_markstack_max = PL_markstack + 16; 582 PL_markstack_max = PL_markstack + 16;
518 583
519#ifdef SET_MARK_OFFSET 584#ifdef SET_MARK_OFFSET
520 SET_MARK_OFFSET; 585 SET_MARK_OFFSET;
521#endif 586#endif
522 587
523 New(54,PL_scopestack,16,I32); 588 New(54,PL_scopestack,8,I32);
524 PL_scopestack_ix = 0; 589 PL_scopestack_ix = 0;
525 PL_scopestack_max = 16; 590 PL_scopestack_max = 8;
526 591
527 New(54,PL_savestack,64,ANY); 592 New(54,PL_savestack,24,ANY);
528 PL_savestack_ix = 0; 593 PL_savestack_ix = 0;
529 PL_savestack_max = 64; 594 PL_savestack_max = 24;
530 595
531#if !PERL_VERSION_ATLEAST (5,9,0) 596#if !PERL_VERSION_ATLEAST (5,9,0)
532 New(54,PL_retstack,4,OP*); 597 New(54,PL_retstack,4,OP*);
533 PL_retstack_ix = 0; 598 PL_retstack_ix = 0;
534 PL_retstack_max = 4; 599 PL_retstack_max = 4;
… …
540 * destroy the stacks, the callchain etc... 605 * destroy the stacks, the callchain etc...
541 */ 606 */
542static void 607static void
543coro_destroy_stacks (pTHX) 608coro_destroy_stacks (pTHX)
544{ 609{
545 if (!IN_DESTRUCT)
546 {
547 /* restore all saved variables and stuff */
548 LEAVE_SCOPE (0);
549 assert (PL_tmps_floor == -1);
550
551 /* free all temporaries */
552 FREETMPS;
553 assert (PL_tmps_ix == -1);
554
555 /* unwind all extra stacks */
556 POPSTACK_TO (PL_mainstack);
557
558 /* unwind main stack */
559 dounwind (-1);
560 }
561
562 while (PL_curstackinfo->si_next) 610 while (PL_curstackinfo->si_next)
563 PL_curstackinfo = PL_curstackinfo->si_next; 611 PL_curstackinfo = PL_curstackinfo->si_next;
564 612
565 while (PL_curstackinfo) 613 while (PL_curstackinfo)
566 { 614 {
… …
584} 632}
585 633
586static size_t 634static size_t
587coro_rss (pTHX_ struct coro *coro) 635coro_rss (pTHX_ struct coro *coro)
588{ 636{
589 size_t rss = sizeof (coro); 637 size_t rss = sizeof (*coro);
590 638
591 if (coro->mainstack) 639 if (coro->mainstack)
592 { 640 {
641 perl_slots tmp_slot;
642 perl_slots *slot;
643
593 if (coro->flags & CF_RUNNING) 644 if (coro->flags & CF_RUNNING)
594 { 645 {
646 slot = &tmp_slot;
647
595 #define VAR(name,type)coro->name = PL_ ## name; 648 #define VAR(name,type) slot->name = PL_ ## name;
596 # include "state.h" 649 # include "state.h"
597 #undef VAR 650 #undef VAR
598 } 651 }
652 else
653 slot = coro->slot;
599 654
600 rss += sizeof (coro->curstackinfo); 655 rss += sizeof (slot->curstackinfo);
601 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
602 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 656 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
603 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 657 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
604 rss += coro->tmps_max * sizeof (SV *); 658 rss += slot->tmps_max * sizeof (SV *);
605 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 659 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
606 rss += coro->scopestack_max * sizeof (I32); 660 rss += slot->scopestack_max * sizeof (I32);
607 rss += coro->savestack_max * sizeof (ANY); 661 rss += slot->savestack_max * sizeof (ANY);
608 662
609#if !PERL_VERSION_ATLEAST (5,9,0) 663#if !PERL_VERSION_ATLEAST (5,9,0)
610 rss += coro->retstack_max * sizeof (OP *); 664 rss += slot->retstack_max * sizeof (OP *);
611#endif 665#endif
612 } 666 }
613 667
614 return rss; 668 return rss;
615} 669}
616 670
617/** coroutine stack handling ************************************************/ 671/** coroutine stack handling ************************************************/
618 672
619static void 673static void
620setup_coro (pTHX_ struct coro *coro) 674coro_setup (pTHX_ struct coro *coro)
621{ 675{
622 /* 676 /*
623 * emulate part of the perl startup here. 677 * emulate part of the perl startup here.
624 */ 678 */
625 coro_init_stacks (aTHX); 679 coro_init_stacks (aTHX);
… …
627 PL_runops = RUNOPS_DEFAULT; 681 PL_runops = RUNOPS_DEFAULT;
628 PL_curcop = &PL_compiling; 682 PL_curcop = &PL_compiling;
629 PL_in_eval = EVAL_NULL; 683 PL_in_eval = EVAL_NULL;
630 PL_comppad = 0; 684 PL_comppad = 0;
631 PL_curpm = 0; 685 PL_curpm = 0;
686 PL_curpad = 0;
632 PL_localizing = 0; 687 PL_localizing = 0;
633 PL_dirty = 0; 688 PL_dirty = 0;
634 PL_restartop = 0; 689 PL_restartop = 0;
690 SvREFCNT_inc (PL_diehook ); hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
691 SvREFCNT_inc (PL_warnhook); hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
692
693 GvSV (PL_defgv) = newSV (0);
694 GvAV (PL_defgv) = coro->args; coro->args = 0;
695 GvSV (PL_errgv) = newSV (0);
696 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
697 PL_rs = newSVsv (GvSV (irsgv));
698 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
635 699
636 { 700 {
637 dSP; 701 dSP;
638 LOGOP myop; 702 LOGOP myop;
639 703
640 SvREFCNT_dec (GvAV (PL_defgv));
641 GvAV (PL_defgv) = coro->args; coro->args = 0;
642
643 Zero (&myop, 1, LOGOP); 704 Zero (&myop, 1, LOGOP);
644 myop.op_next = Nullop; 705 myop.op_next = Nullop;
645 myop.op_flags = OPf_WANT_VOID; 706 myop.op_flags = OPf_WANT_VOID;
646 707
647 PUSHMARK (SP); 708 PUSHMARK (SP);
648 XPUSHs (av_shift (GvAV (PL_defgv))); 709 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
649 PUTBACK; 710 PUTBACK;
650 PL_op = (OP *)&myop; 711 PL_op = (OP *)&myop;
651 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 712 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
652 SPAGAIN; 713 SPAGAIN;
653 } 714 }
654 715
655 ENTER; /* necessary e.g. for dounwind */ 716 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */
717}
718
719static void
720coro_destroy (pTHX_ struct coro *coro)
721{
722 if (!IN_DESTRUCT)
723 {
724 /* restore all saved variables and stuff */
725 LEAVE_SCOPE (0);
726 assert (PL_tmps_floor == -1);
727
728 /* free all temporaries */
729 FREETMPS;
730 assert (PL_tmps_ix == -1);
731
732 /* unwind all extra stacks */
733 POPSTACK_TO (PL_mainstack);
734
735 /* unwind main stack */
736 dounwind (-1);
737 }
738
739 SvREFCNT_dec (GvSV (PL_defgv));
740 SvREFCNT_dec (GvAV (PL_defgv));
741 SvREFCNT_dec (GvSV (PL_errgv));
742 SvREFCNT_dec (PL_defoutgv);
743 SvREFCNT_dec (PL_rs);
744 SvREFCNT_dec (GvSV (irsgv));
745
746 SvREFCNT_dec (PL_diehook);
747 SvREFCNT_dec (PL_warnhook);
748
749 SvREFCNT_dec (coro->saved_deffh);
750 SvREFCNT_dec (coro->throw);
751
752 coro_destroy_stacks (aTHX);
656} 753}
657 754
658static void 755static void
659free_coro_mortal (pTHX) 756free_coro_mortal (pTHX)
660{ 757{
661 if (coro_mortal) 758 if (expect_true (coro_mortal))
662 { 759 {
663 SvREFCNT_dec (coro_mortal); 760 SvREFCNT_dec (coro_mortal);
664 coro_mortal = 0; 761 coro_mortal = 0;
665 } 762 }
666} 763}
… …
695 bot = PL_stack_base + cx->blk_oldsp + 1; 792 bot = PL_stack_base + cx->blk_oldsp + 1;
696 top = cx->blk_gimme == G_ARRAY ? SP + 1 793 top = cx->blk_gimme == G_ARRAY ? SP + 1
697 : cx->blk_gimme == G_SCALAR ? bot + 1 794 : cx->blk_gimme == G_SCALAR ? bot + 1
698 : bot; 795 : bot;
699 796
797 av_extend (av, top - bot);
700 while (bot < top) 798 while (bot < top)
701 av_push (av, SvREFCNT_inc (*bot++)); 799 av_push (av, SvREFCNT_inc (*bot++));
702 800
703 PL_runops = RUNOPS_DEFAULT; 801 PL_runops = RUNOPS_DEFAULT;
704 ENTER; 802 ENTER;
… …
707 PUSHMARK (SP); 805 PUSHMARK (SP);
708 PUSHs (&PL_sv_no); 806 PUSHs (&PL_sv_no);
709 PUSHs (fullname); 807 PUSHs (fullname);
710 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 808 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
711 PUTBACK; 809 PUTBACK;
712 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 810 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0);
713 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 811 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
714 SPAGAIN; 812 SPAGAIN;
715 FREETMPS; 813 FREETMPS;
716 LEAVE; 814 LEAVE;
717 PL_runops = runops_trace; 815 PL_runops = runops_trace;
… …
746 PUSHMARK (SP); 844 PUSHMARK (SP);
747 PUSHs (&PL_sv_yes); 845 PUSHs (&PL_sv_yes);
748 PUSHs (fullname); 846 PUSHs (fullname);
749 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 847 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
750 PUTBACK; 848 PUTBACK;
751 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 849 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0);
752 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 850 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
753 SPAGAIN; 851 SPAGAIN;
754 FREETMPS; 852 FREETMPS;
755 LEAVE; 853 LEAVE;
756 PL_runops = runops_trace; 854 PL_runops = runops_trace;
… …
770 PL_runops = RUNOPS_DEFAULT; 868 PL_runops = RUNOPS_DEFAULT;
771 PUSHMARK (SP); 869 PUSHMARK (SP);
772 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 870 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
773 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 871 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
774 PUTBACK; 872 PUTBACK;
775 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0); 873 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0);
776 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 874 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
777 SPAGAIN; 875 SPAGAIN;
778 FREETMPS; 876 FREETMPS;
779 LEAVE; 877 LEAVE;
780 PL_runops = runops_trace; 878 PL_runops = runops_trace;
… …
916 Safefree (cctx->sptr); 1014 Safefree (cctx->sptr);
917 1015
918 Safefree (cctx); 1016 Safefree (cctx);
919} 1017}
920 1018
1019/* wether this cctx should be destructed */
1020#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1021
921static coro_cctx * 1022static coro_cctx *
922cctx_get (pTHX) 1023cctx_get (pTHX)
923{ 1024{
924 while (cctx_first) 1025 while (expect_true (cctx_first))
925 { 1026 {
926 coro_cctx *cctx = cctx_first; 1027 coro_cctx *cctx = cctx_first;
927 cctx_first = cctx->next; 1028 cctx_first = cctx->next;
928 --cctx_idle; 1029 --cctx_idle;
929 1030
930 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1031 if (expect_true (!CCTX_EXPIRED (cctx)))
931 return cctx; 1032 return cctx;
932 1033
933 cctx_destroy (cctx); 1034 cctx_destroy (cctx);
934 } 1035 }
935 1036
… …
938 1039
939static void 1040static void
940cctx_put (coro_cctx *cctx) 1041cctx_put (coro_cctx *cctx)
941{ 1042{
942 /* free another cctx if overlimit */ 1043 /* free another cctx if overlimit */
943 if (cctx_idle >= MAX_IDLE_CCTX) 1044 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
944 { 1045 {
945 coro_cctx *first = cctx_first; 1046 coro_cctx *first = cctx_first;
946 cctx_first = first->next; 1047 cctx_first = first->next;
947 --cctx_idle; 1048 --cctx_idle;
948 1049
… …
954 cctx_first = cctx; 1055 cctx_first = cctx;
955} 1056}
956 1057
957/** coroutine switching *****************************************************/ 1058/** coroutine switching *****************************************************/
958 1059
959static void NOINLINE 1060static void
960transfer_check (pTHX_ struct coro *prev, struct coro *next) 1061transfer_check (pTHX_ struct coro *prev, struct coro *next)
961{ 1062{
962 if (prev != next) 1063 if (expect_true (prev != next))
963 { 1064 {
964 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1065 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
965 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");
966 1067
967 if (next->flags & CF_RUNNING) 1068 if (expect_false (next->flags & CF_RUNNING))
968 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");
969 1070
970 if (next->flags & CF_DESTROYED) 1071 if (expect_false (next->flags & CF_DESTROYED))
971 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");
972 1073
1074 if (
1075#if PERL_VERSION_ATLEAST (5,9,0)
1076 expect_false (PL_parser)
1077#else
973 if (PL_lex_state != LEX_NOTPARSING) 1078 expect_false (PL_lex_state != LEX_NOTPARSING)
1079#endif
1080 )
974 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");
975 } 1082 }
976} 1083}
977 1084
978/* always use the TRANSFER macro */ 1085/* always use the TRANSFER macro */
… …
980transfer (pTHX_ struct coro *prev, struct coro *next) 1087transfer (pTHX_ struct coro *prev, struct coro *next)
981{ 1088{
982 dSTACKLEVEL; 1089 dSTACKLEVEL;
983 1090
984 /* sometimes transfer is only called to set idle_sp */ 1091 /* sometimes transfer is only called to set idle_sp */
985 if (!next) 1092 if (expect_false (!next))
986 { 1093 {
987 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1094 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
988 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 */
989 } 1096 }
990 else if (prev != next) 1097 else if (expect_true (prev != next))
991 { 1098 {
992 coro_cctx *prev__cctx; 1099 coro_cctx *prev__cctx;
993 1100
994 if (prev->flags & CF_NEW) 1101 if (expect_false (prev->flags & CF_NEW))
995 { 1102 {
996 /* create a new empty context */ 1103 /* create a new empty context */
997 Newz (0, prev->cctx, 1, coro_cctx); 1104 Newz (0, prev->cctx, 1, coro_cctx);
998 prev->flags &= ~CF_NEW; 1105 prev->flags &= ~CF_NEW;
999 prev->flags |= CF_RUNNING; 1106 prev->flags |= CF_RUNNING;
… …
1002 prev->flags &= ~CF_RUNNING; 1109 prev->flags &= ~CF_RUNNING;
1003 next->flags |= CF_RUNNING; 1110 next->flags |= CF_RUNNING;
1004 1111
1005 LOCK; 1112 LOCK;
1006 1113
1007 if (next->flags & CF_NEW) 1114 if (expect_false (next->flags & CF_NEW))
1008 { 1115 {
1009 /* need to start coroutine */ 1116 /* need to start coroutine */
1010 next->flags &= ~CF_NEW; 1117 next->flags &= ~CF_NEW;
1011 /* first get rid of the old state */ 1118 /* first get rid of the old state */
1012 save_perl (aTHX_ prev); 1119 save_perl (aTHX_ prev);
1013 /* setup coroutine call */ 1120 /* setup coroutine call */
1014 setup_coro (aTHX_ next); 1121 coro_setup (aTHX_ next);
1015 } 1122 }
1016 else 1123 else
1017 { 1124 {
1018 /* coroutine already started */ 1125 /* coroutine already started */
1019 save_perl (aTHX_ prev); 1126 save_perl (aTHX_ prev);
… …
1021 } 1128 }
1022 1129
1023 prev__cctx = prev->cctx; 1130 prev__cctx = prev->cctx;
1024 1131
1025 /* possibly "free" the cctx */ 1132 /* possibly "free" the cctx */
1026 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)))
1027 { 1134 {
1028 /* 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 */
1029 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));
1030 1137
1031 prev->cctx = 0; 1138 prev->cctx = 0;
1032 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 next->cctx = cctx_get (aTHX);
1144
1033 cctx_put (prev__cctx); 1145 cctx_put (prev__cctx);
1034 } 1146 }
1035 1147
1036 ++next->usecount; 1148 ++next->usecount;
1037 1149
1038 if (!next->cctx) 1150 if (expect_true (!next->cctx))
1039 next->cctx = cctx_get (aTHX); 1151 next->cctx = cctx_get (aTHX);
1040 1152
1041 if (prev__cctx != next->cctx) 1153 if (expect_false (prev__cctx != next->cctx))
1042 { 1154 {
1043 prev__cctx->top_env = PL_top_env; 1155 prev__cctx->top_env = PL_top_env;
1044 PL_top_env = next->cctx->top_env; 1156 PL_top_env = next->cctx->top_env;
1045 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1157 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1046 } 1158 }
1047 1159
1048 free_coro_mortal (aTHX); 1160 free_coro_mortal (aTHX);
1049 UNLOCK; 1161 UNLOCK;
1162
1163 if (expect_false (prev->throw || next->throw))
1164 {
1165 struct coro *coro = SvSTATE (coro_current);
1166
1167 if (coro->throw)
1168 {
1169 SV *exception = coro->throw;
1170 coro->throw = 0;
1171 sv_setsv (ERRSV, exception);
1172 croak (0);
1173 }
1174 }
1050 } 1175 }
1051} 1176}
1052 1177
1053struct transfer_args 1178struct transfer_args
1054{ 1179{
… …
1081 1206
1082 if (coro->mainstack && coro->mainstack != main_mainstack) 1207 if (coro->mainstack && coro->mainstack != main_mainstack)
1083 { 1208 {
1084 struct coro temp; 1209 struct coro temp;
1085 1210
1086 assert (!(coro->flags & CF_RUNNING));
1087
1088 Zero (&temp, 1, struct coro);
1089 temp.save = CORO_SAVE_ALL;
1090
1091 if (coro->flags & CF_RUNNING) 1211 if (coro->flags & CF_RUNNING)
1092 croak ("FATAL: tried to destroy currently running coroutine"); 1212 croak ("FATAL: tried to destroy currently running coroutine");
1093 1213
1094 save_perl (aTHX_ &temp); 1214 save_perl (aTHX_ &temp);
1095 load_perl (aTHX_ coro); 1215 load_perl (aTHX_ coro);
1096 1216
1097 coro_destroy_stacks (aTHX); 1217 coro_destroy (aTHX_ coro);
1098 1218
1099 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1219 load_perl (aTHX_ &temp);
1100 1220
1101 coro->mainstack = 0; 1221 coro->slot = 0;
1102 } 1222 }
1103 1223
1104 cctx_destroy (coro->cctx); 1224 cctx_destroy (coro->cctx);
1105 SvREFCNT_dec (coro->args); 1225 SvREFCNT_dec (coro->args);
1106 1226
… …
1165 1285
1166 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1286 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1167 TRANSFER (ta); 1287 TRANSFER (ta);
1168} 1288}
1169 1289
1170static int
1171api_save (SV *coro_sv, int new_save)
1172{
1173 dTHX;
1174 struct coro *coro = SvSTATE (coro_sv);
1175 int old_save = coro->save;
1176
1177 if (new_save >= 0)
1178 coro->save = new_save;
1179
1180 return old_save;
1181}
1182
1183/** Coro ********************************************************************/ 1290/** Coro ********************************************************************/
1184 1291
1185static void 1292static void
1186coro_enq (pTHX_ SV *coro_sv) 1293coro_enq (pTHX_ SV *coro_sv)
1187{ 1294{
… …
1244 { 1351 {
1245 LOCK; 1352 LOCK;
1246 next_sv = coro_deq (aTHX_ PRIO_MIN); 1353 next_sv = coro_deq (aTHX_ PRIO_MIN);
1247 1354
1248 /* nothing to schedule: call the idle handler */ 1355 /* nothing to schedule: call the idle handler */
1249 if (!next_sv) 1356 if (expect_false (!next_sv))
1250 { 1357 {
1251 dSP; 1358 dSP;
1252 UNLOCK; 1359 UNLOCK;
1253 1360
1254 ENTER; 1361 ENTER;
… …
1264 } 1371 }
1265 1372
1266 ta->next = SvSTATE (next_sv); 1373 ta->next = SvSTATE (next_sv);
1267 1374
1268 /* cannot transfer to destroyed coros, skip and look for next */ 1375 /* cannot transfer to destroyed coros, skip and look for next */
1269 if (ta->next->flags & CF_DESTROYED) 1376 if (expect_false (ta->next->flags & CF_DESTROYED))
1270 { 1377 {
1271 UNLOCK; 1378 UNLOCK;
1272 SvREFCNT_dec (next_sv); 1379 SvREFCNT_dec (next_sv);
1273 /* coro_nready is already taken care of by destroy */ 1380 /* coro_nready is already taken care of by destroy */
1274 continue; 1381 continue;
… …
1330 dTHX; 1437 dTHX;
1331 struct transfer_args ta; 1438 struct transfer_args ta;
1332 1439
1333 prepare_cede (aTHX_ &ta); 1440 prepare_cede (aTHX_ &ta);
1334 1441
1335 if (ta.prev != ta.next) 1442 if (expect_true (ta.prev != ta.next))
1336 { 1443 {
1337 TRANSFER (ta); 1444 TRANSFER (ta);
1338 return 1; 1445 return 1;
1339 } 1446 }
1340 else 1447 else
… …
1376 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1483 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1377 1484
1378 if (coro->flags & CF_RUNNING) 1485 if (coro->flags & CF_RUNNING)
1379 PL_runops = RUNOPS_DEFAULT; 1486 PL_runops = RUNOPS_DEFAULT;
1380 else 1487 else
1381 coro->runops = RUNOPS_DEFAULT; 1488 coro->slot->runops = RUNOPS_DEFAULT;
1382 } 1489 }
1383} 1490}
1384 1491
1385MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1492MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1386 1493
… …
1390{ 1497{
1391#ifdef USE_ITHREADS 1498#ifdef USE_ITHREADS
1392 MUTEX_INIT (&coro_mutex); 1499 MUTEX_INIT (&coro_mutex);
1393#endif 1500#endif
1394 BOOT_PAGESIZE; 1501 BOOT_PAGESIZE;
1502
1503 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1504 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1505
1506 hv_sig = coro_get_hv ("SIG", TRUE);
1507 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE);
1508 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE);
1509
1510 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1511 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1395 1512
1396 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1513 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1397 1514
1398 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1515 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1399 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1516 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1400 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1517 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1401 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1518 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1402 1519
1403 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1404 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1405 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1406 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1407 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1408 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1409 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1410
1411 main_mainstack = PL_mainstack; 1520 main_mainstack = PL_mainstack;
1412 main_top_env = PL_top_env; 1521 main_top_env = PL_top_env;
1413 1522
1414 while (main_top_env->je_prev) 1523 while (main_top_env->je_prev)
1415 main_top_env = main_top_env->je_prev; 1524 main_top_env = main_top_env->je_prev;
… …
1427 struct coro *coro; 1536 struct coro *coro;
1428 HV *hv; 1537 HV *hv;
1429 int i; 1538 int i;
1430 1539
1431 Newz (0, coro, 1, struct coro); 1540 Newz (0, coro, 1, struct coro);
1432 coro->args = newAV (); 1541 coro->args = newAV ();
1433 coro->save = CORO_SAVE_DEF;
1434 coro->flags = CF_NEW; 1542 coro->flags = CF_NEW;
1435 1543
1436 if (coro_first) coro_first->prev = coro; 1544 if (coro_first) coro_first->prev = coro;
1437 coro->next = coro_first; 1545 coro->next = coro_first;
1438 coro_first = coro; 1546 coro_first = coro;
1439 1547
1440 coro->hv = hv = newHV (); 1548 coro->hv = hv = newHV ();
1441 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1549 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1442 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1550 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1443 1551
1552 av_extend (coro->args, items - 1);
1444 for (i = 1; i < items; i++) 1553 for (i = 1; i < items; i++)
1445 av_push (coro->args, newSVsv (ST (i))); 1554 av_push (coro->args, newSVsv (ST (i)));
1446} 1555}
1447 OUTPUT: 1556 OUTPUT:
1448 RETVAL 1557 RETVAL
1449 1558
1450int 1559# these not obviously related functions are all rolled into the same xs
1451save (SV *coro, int new_save = -1) 1560# function to increase chances that they all will call transfer with the same
1452 CODE: 1561# stack offset
1453 RETVAL = api_save (coro, new_save);
1454 OUTPUT:
1455 RETVAL
1456
1457int
1458save_also (SV *coro_sv, int save_also)
1459 CODE:
1460{
1461 struct coro *coro = SvSTATE (coro_sv);
1462 RETVAL = coro->save;
1463 coro->save |= save_also;
1464}
1465 OUTPUT:
1466 RETVAL
1467
1468void 1562void
1469_set_stacklevel (...) 1563_set_stacklevel (...)
1470 ALIAS: 1564 ALIAS:
1471 Coro::State::transfer = 1 1565 Coro::State::transfer = 1
1472 Coro::schedule = 2 1566 Coro::schedule = 2
… …
1506 } 1600 }
1507 1601
1508 BARRIER; 1602 BARRIER;
1509 TRANSFER (ta); 1603 TRANSFER (ta);
1510 1604
1511 if (GIMME_V != G_VOID && ta.next != ta.prev) 1605 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev))
1512 XSRETURN_YES; 1606 XSRETURN_YES;
1513} 1607}
1514 1608
1515bool 1609bool
1516_destroy (SV *coro_sv) 1610_destroy (SV *coro_sv)
… …
1566 CODE: 1660 CODE:
1567{ 1661{
1568 if (coro->mainstack) 1662 if (coro->mainstack)
1569 { 1663 {
1570 struct coro temp; 1664 struct coro temp;
1571 Zero (&temp, 1, struct coro);
1572 temp.save = CORO_SAVE_ALL;
1573 1665
1574 if (!(coro->flags & CF_RUNNING)) 1666 if (!(coro->flags & CF_RUNNING))
1575 { 1667 {
1576 save_perl (aTHX_ &temp); 1668 save_perl (aTHX_ &temp);
1577 load_perl (aTHX_ coro); 1669 load_perl (aTHX_ coro);
… …
1581 dSP; 1673 dSP;
1582 ENTER; 1674 ENTER;
1583 SAVETMPS; 1675 SAVETMPS;
1584 PUSHMARK (SP); 1676 PUSHMARK (SP);
1585 PUTBACK; 1677 PUTBACK;
1678
1586 if (ix) 1679 if (ix)
1587 eval_sv (coderef, 0); 1680 eval_sv (coderef, 0);
1588 else 1681 else
1589 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1682 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1683
1590 SPAGAIN; 1684 SPAGAIN;
1591 FREETMPS; 1685 FREETMPS;
1592 LEAVE; 1686 LEAVE;
1593 PUTBACK; 1687 PUTBACK;
1594 } 1688 }
… …
1652 1746
1653BOOT: 1747BOOT:
1654{ 1748{
1655 int i; 1749 int i;
1656 1750
1657 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1751 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1658 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1752 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1659 av_async_pool = get_av ("Coro::async_pool", TRUE); 1753 av_async_pool = coro_get_av ("Coro::async_pool", TRUE);
1660 1754
1661 coro_current = get_sv ("Coro::current", FALSE); 1755 coro_current = coro_get_sv ("Coro::current", FALSE);
1662 SvREADONLY_on (coro_current); 1756 SvREADONLY_on (coro_current);
1663 1757
1664 coro_stash = gv_stashpv ("Coro", TRUE); 1758 coro_stash = gv_stashpv ("Coro", TRUE);
1665 1759
1666 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1760 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1667 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1761 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1668 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1762 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1669 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1763 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
… …
1672 1766
1673 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1767 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1674 coro_ready[i] = newAV (); 1768 coro_ready[i] = newAV ();
1675 1769
1676 { 1770 {
1677 SV *sv = perl_get_sv("Coro::API", 1); 1771 SV *sv = perl_get_sv ("Coro::API", TRUE);
1772 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1678 1773
1679 coroapi.schedule = api_schedule; 1774 coroapi.schedule = api_schedule;
1680 coroapi.save = api_save;
1681 coroapi.cede = api_cede; 1775 coroapi.cede = api_cede;
1682 coroapi.cede_notself = api_cede_notself; 1776 coroapi.cede_notself = api_cede_notself;
1683 coroapi.ready = api_ready; 1777 coroapi.ready = api_ready;
1684 coroapi.is_ready = api_is_ready; 1778 coroapi.is_ready = api_is_ready;
1685 coroapi.nready = &coro_nready; 1779 coroapi.nready = &coro_nready;
… …
1734 CODE: 1828 CODE:
1735 RETVAL = coro_nready; 1829 RETVAL = coro_nready;
1736 OUTPUT: 1830 OUTPUT:
1737 RETVAL 1831 RETVAL
1738 1832
1833void
1834throw (Coro::State self, SV *throw = &PL_sv_undef)
1835 PROTOTYPE: $;$
1836 CODE:
1837 SvREFCNT_dec (self->throw);
1838 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1839
1739# for async_pool speedup 1840# for async_pool speedup
1740void 1841void
1741_pool_1 (SV *cb) 1842_pool_1 (SV *cb)
1742 CODE: 1843 CODE:
1743{ 1844{
1744 int i, len; 1845 struct coro *coro = SvSTATE (coro_current);
1745 HV *hv = (HV *)SvRV (coro_current); 1846 HV *hv = (HV *)SvRV (coro_current);
1746 AV *defav = GvAV (PL_defgv); 1847 AV *defav = GvAV (PL_defgv);
1747 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1848 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0);
1748 AV *invoke_av; 1849 AV *invoke_av;
1850 int i, len;
1749 1851
1750 if (!invoke) 1852 if (!invoke)
1751 croak ("\3terminate\2\n"); 1853 croak ("\3async_pool terminate\2\n");
1854
1855 SvREFCNT_dec (coro->saved_deffh);
1856 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1752 1857
1753 hv_store (hv, "desc", sizeof ("desc") - 1, 1858 hv_store (hv, "desc", sizeof ("desc") - 1,
1754 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1859 newSVpvn (strpair ("[async_pool]")), 0);
1755 1860
1756 invoke_av = (AV *)SvRV (invoke); 1861 invoke_av = (AV *)SvRV (invoke);
1757 len = av_len (invoke_av); 1862 len = av_len (invoke_av);
1758 1863
1759 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1864 sv_setsv (cb, AvARRAY (invoke_av)[0]);
… …
1774{ 1879{
1775 struct coro *coro = SvSTATE (coro_current); 1880 struct coro *coro = SvSTATE (coro_current);
1776 1881
1777 sv_setsv (cb, &PL_sv_undef); 1882 sv_setsv (cb, &PL_sv_undef);
1778 1883
1884 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1885 coro->saved_deffh = 0;
1886
1779 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1887 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1780 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1888 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1781 croak ("\3terminate\2\n"); 1889 croak ("\3async_pool terminate\2\n");
1782 1890
1783 av_clear (GvAV (PL_defgv)); 1891 av_clear (GvAV (PL_defgv));
1784 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1892 hv_store ((HV *)SvRV (coro_current), strpair ("desc"),
1785 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1893 newSVpvn (strpair ("[async_pool idle]")), 0);
1786 1894
1787 coro->save = CORO_SAVE_DEF;
1788 coro->prio = 0; 1895 coro->prio = 0;
1789 1896
1790 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1897 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1791 api_trace (coro_current, 0); 1898 api_trace (coro_current, 0);
1792 1899

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines