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.177 by root, Tue Oct 2 10:24:44 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;
… …
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 AV *args; /* data associated with this coroutine (initial args) */
187 AV *args; 227 int refcnt; /* coroutines are refcounted, yes */
188 int refcnt;
189 int save; /* CORO_SAVE flags */
190 int flags; /* CF_ flags */ 228 int flags; /* CF_ flags */
191 229 HV *hv; /* the perl hash associated with this coro, if any */
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 230
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; /* exception to be thrown */
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 */
213}; 243};
214 244
215typedef struct coro *Coro__State; 245typedef struct coro *Coro__State;
216typedef struct coro *Coro__State_or_hashref; 246typedef struct coro *Coro__State_or_hashref;
217 247
… …
229static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 259static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
230static int coro_nready; 260static int coro_nready;
231static struct coro *coro_first; 261static struct coro *coro_first;
232 262
233/** 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}
234 294
235static AV * 295static AV *
236coro_clone_padlist (pTHX_ CV *cv) 296coro_clone_padlist (pTHX_ CV *cv)
237{ 297{
238 AV *padlist = CvPADLIST (cv); 298 AV *padlist = CvPADLIST (cv);
… …
311 MAGIC *mg; 371 MAGIC *mg;
312 372
313 if (SvROK (coro)) 373 if (SvROK (coro))
314 coro = SvRV (coro); 374 coro = SvRV (coro);
315 375
316 if (SvTYPE (coro) != SVt_PVHV) 376 if (expect_false (SvTYPE (coro) != SVt_PVHV))
317 croak ("Coro::State object required"); 377 croak ("Coro::State object required");
318 378
319 stash = SvSTASH (coro); 379 stash = SvSTASH (coro);
320 if (stash != coro_stash && stash != coro_state_stash) 380 if (expect_false (stash != coro_stash && stash != coro_state_stash))
321 { 381 {
322 /* very slow, but rare, check */ 382 /* very slow, but rare, check */
323 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 383 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
324 croak ("Coro::State object required"); 384 croak ("Coro::State object required");
325 } 385 }
… …
335get_padlist (pTHX_ CV *cv) 395get_padlist (pTHX_ CV *cv)
336{ 396{
337 MAGIC *mg = CORO_MAGIC (cv); 397 MAGIC *mg = CORO_MAGIC (cv);
338 AV *av; 398 AV *av;
339 399
340 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 400 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
341 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 401 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
342 else 402 else
343 { 403 {
344#if CORO_PREFER_PERL_FUNCTIONS 404#if CORO_PREFER_PERL_FUNCTIONS
345 /* this is probably cleaner, but also slower? */ 405 /* this is probably cleaner, but also slower? */
… …
357put_padlist (pTHX_ CV *cv) 417put_padlist (pTHX_ CV *cv)
358{ 418{
359 MAGIC *mg = CORO_MAGIC (cv); 419 MAGIC *mg = CORO_MAGIC (cv);
360 AV *av; 420 AV *av;
361 421
362 if (!mg) 422 if (expect_false (!mg))
363 { 423 {
364 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 424 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
365 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 425 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
366 mg->mg_virtual = &vtbl_coro; 426 mg->mg_virtual = &vtbl_coro;
367 mg->mg_obj = (SV *)newAV (); 427 mg->mg_obj = (SV *)newAV ();
368 } 428 }
369 429
370 av = (AV *)mg->mg_obj; 430 av = (AV *)mg->mg_obj;
371 431
372 if (AvFILLp (av) >= AvMAX (av)) 432 if (expect_false (AvFILLp (av) >= AvMAX (av)))
373 av_extend (av, AvMAX (av) + 1); 433 av_extend (av, AvMAX (av) + 1);
374 434
375 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 435 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
376} 436}
377 437
378/** load & save, init *******************************************************/ 438/** load & save, init *******************************************************/
379 439
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 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 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 457 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
393 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 458 /*hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);*/
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 459
412 { 460 {
413 dSP; 461 dSP;
462
414 CV *cv; 463 CV *cv;
415 464
416 /* now do the ugly restore mess */ 465 /* now do the ugly restore mess */
417 while ((cv = (CV *)POPs)) 466 while (expect_true (cv = (CV *)POPs))
418 { 467 {
419 put_padlist (aTHX_ cv); /* mark this padlist as available */ 468 put_padlist (aTHX_ cv); /* mark this padlist as available */
420 CvDEPTH (cv) = PTR2IV (POPs); 469 CvDEPTH (cv) = PTR2IV (POPs);
421 CvPADLIST (cv) = (AV *)POPs; 470 CvPADLIST (cv) = (AV *)POPs;
422 } 471 }
… …
441 490
442 XPUSHs (Nullsv); 491 XPUSHs (Nullsv);
443 /* this loop was inspired by pp_caller */ 492 /* this loop was inspired by pp_caller */
444 for (;;) 493 for (;;)
445 { 494 {
446 while (cxix >= 0) 495 while (expect_true (cxix >= 0))
447 { 496 {
448 PERL_CONTEXT *cx = &ccstk[cxix--]; 497 PERL_CONTEXT *cx = &ccstk[cxix--];
449 498
450 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 499 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
451 { 500 {
452 CV *cv = cx->blk_sub.cv; 501 CV *cv = cx->blk_sub.cv;
453 502
454 if (CvDEPTH (cv)) 503 if (expect_true (CvDEPTH (cv)))
455 { 504 {
456 EXTEND (SP, 3); 505 EXTEND (SP, 3);
457 PUSHs ((SV *)CvPADLIST (cv)); 506 PUSHs ((SV *)CvPADLIST (cv));
458 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 507 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
459 PUSHs ((SV *)cv); 508 PUSHs ((SV *)cv);
… …
462 get_padlist (aTHX_ cv); 511 get_padlist (aTHX_ cv);
463 } 512 }
464 } 513 }
465 } 514 }
466 515
467 if (top_si->si_type == PERLSI_MAIN) 516 if (expect_true (top_si->si_type == PERLSI_MAIN))
468 break; 517 break;
469 518
470 top_si = top_si->si_prev; 519 top_si = top_si->si_prev;
471 ccstk = top_si->si_cxstack; 520 ccstk = top_si->si_cxstack;
472 cxix = top_si->si_cxix; 521 cxix = top_si->si_cxix;
473 } 522 }
474 523
475 PUTBACK; 524 PUTBACK;
476 } 525 }
477 526
478 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 527 /* allocate some space on the context stack for our purposes */
479 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 528 /* we manually unroll here, as usually 2 slots is enough */
480 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 529 if (SLOT_COUNT >= 1) CXINC;
481 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 530 if (SLOT_COUNT >= 2) CXINC;
482 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0; 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 */
483 538
539 c->mainstack = PL_mainstack;
540
541 {
542 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
543
544 slot->defav = GvAV (PL_defgv);
545 slot->defsv = DEFSV;
546 slot->errsv = ERRSV;
547 slot->irsgv = GvSV (irsgv);
548
484#define VAR(name,type)c->name = PL_ ## name; 549 #define VAR(name,type) slot->name = PL_ ## name;
485# include "state.h" 550 # include "state.h"
486#undef VAR 551 #undef VAR
552 }
487} 553}
488 554
489/* 555/*
490 * allocate various perl stacks. This is an exact copy 556 * allocate various perl stacks. This is an exact copy
491 * of perl.c:init_stacks, except that it uses less memory 557 * of perl.c:init_stacks, except that it uses less memory
… …
496# define coro_init_stacks init_stacks 562# define coro_init_stacks init_stacks
497#else 563#else
498static void 564static void
499coro_init_stacks (pTHX) 565coro_init_stacks (pTHX)
500{ 566{
501 PL_curstackinfo = new_stackinfo(64, 6); 567 PL_curstackinfo = new_stackinfo(32, 8);
502 PL_curstackinfo->si_type = PERLSI_MAIN; 568 PL_curstackinfo->si_type = PERLSI_MAIN;
503 PL_curstack = PL_curstackinfo->si_stack; 569 PL_curstack = PL_curstackinfo->si_stack;
504 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 570 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
505 571
506 PL_stack_base = AvARRAY(PL_curstack); 572 PL_stack_base = AvARRAY(PL_curstack);
507 PL_stack_sp = PL_stack_base; 573 PL_stack_sp = PL_stack_base;
508 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 574 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
509 575
510 New(50,PL_tmps_stack,64,SV*); 576 New(50,PL_tmps_stack,32,SV*);
511 PL_tmps_floor = -1; 577 PL_tmps_floor = -1;
512 PL_tmps_ix = -1; 578 PL_tmps_ix = -1;
513 PL_tmps_max = 64; 579 PL_tmps_max = 32;
514 580
515 New(54,PL_markstack,16,I32); 581 New(54,PL_markstack,16,I32);
516 PL_markstack_ptr = PL_markstack; 582 PL_markstack_ptr = PL_markstack;
517 PL_markstack_max = PL_markstack + 16; 583 PL_markstack_max = PL_markstack + 16;
518 584
519#ifdef SET_MARK_OFFSET 585#ifdef SET_MARK_OFFSET
520 SET_MARK_OFFSET; 586 SET_MARK_OFFSET;
521#endif 587#endif
522 588
523 New(54,PL_scopestack,16,I32); 589 New(54,PL_scopestack,8,I32);
524 PL_scopestack_ix = 0; 590 PL_scopestack_ix = 0;
525 PL_scopestack_max = 16; 591 PL_scopestack_max = 8;
526 592
527 New(54,PL_savestack,64,ANY); 593 New(54,PL_savestack,24,ANY);
528 PL_savestack_ix = 0; 594 PL_savestack_ix = 0;
529 PL_savestack_max = 64; 595 PL_savestack_max = 24;
530 596
531#if !PERL_VERSION_ATLEAST (5,9,0) 597#if !PERL_VERSION_ATLEAST (5,9,0)
532 New(54,PL_retstack,4,OP*); 598 New(54,PL_retstack,4,OP*);
533 PL_retstack_ix = 0; 599 PL_retstack_ix = 0;
534 PL_retstack_max = 4; 600 PL_retstack_max = 4;
… …
540 * destroy the stacks, the callchain etc... 606 * destroy the stacks, the callchain etc...
541 */ 607 */
542static void 608static void
543coro_destroy_stacks (pTHX) 609coro_destroy_stacks (pTHX)
544{ 610{
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) 611 while (PL_curstackinfo->si_next)
563 PL_curstackinfo = PL_curstackinfo->si_next; 612 PL_curstackinfo = PL_curstackinfo->si_next;
564 613
565 while (PL_curstackinfo) 614 while (PL_curstackinfo)
566 { 615 {
… …
584} 633}
585 634
586static size_t 635static size_t
587coro_rss (pTHX_ struct coro *coro) 636coro_rss (pTHX_ struct coro *coro)
588{ 637{
589 size_t rss = sizeof (coro); 638 size_t rss = sizeof (*coro);
590 639
591 if (coro->mainstack) 640 if (coro->mainstack)
592 { 641 {
642 perl_slots tmp_slot;
643 perl_slots *slot;
644
593 if (coro->flags & CF_RUNNING) 645 if (coro->flags & CF_RUNNING)
594 { 646 {
647 slot = &tmp_slot;
648
595 #define VAR(name,type)coro->name = PL_ ## name; 649 #define VAR(name,type) slot->name = PL_ ## name;
596 # include "state.h" 650 # include "state.h"
597 #undef VAR 651 #undef VAR
598 } 652 }
653 else
654 slot = coro->slot;
599 655
600 rss += sizeof (coro->curstackinfo); 656 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); 657 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
603 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 658 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
604 rss += coro->tmps_max * sizeof (SV *); 659 rss += slot->tmps_max * sizeof (SV *);
605 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 660 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
606 rss += coro->scopestack_max * sizeof (I32); 661 rss += slot->scopestack_max * sizeof (I32);
607 rss += coro->savestack_max * sizeof (ANY); 662 rss += slot->savestack_max * sizeof (ANY);
608 663
609#if !PERL_VERSION_ATLEAST (5,9,0) 664#if !PERL_VERSION_ATLEAST (5,9,0)
610 rss += coro->retstack_max * sizeof (OP *); 665 rss += slot->retstack_max * sizeof (OP *);
611#endif 666#endif
612 } 667 }
613 668
614 return rss; 669 return rss;
615} 670}
616 671
617/** coroutine stack handling ************************************************/ 672/** coroutine stack handling ************************************************/
618 673
619static void 674static void
620setup_coro (pTHX_ struct coro *coro) 675coro_setup (pTHX_ struct coro *coro)
621{ 676{
622 /* 677 /*
623 * emulate part of the perl startup here. 678 * emulate part of the perl startup here.
624 */ 679 */
625 coro_init_stacks (aTHX); 680 coro_init_stacks (aTHX);
… …
627 PL_runops = RUNOPS_DEFAULT; 682 PL_runops = RUNOPS_DEFAULT;
628 PL_curcop = &PL_compiling; 683 PL_curcop = &PL_compiling;
629 PL_in_eval = EVAL_NULL; 684 PL_in_eval = EVAL_NULL;
630 PL_comppad = 0; 685 PL_comppad = 0;
631 PL_curpm = 0; 686 PL_curpm = 0;
687 PL_curpad = 0;
632 PL_localizing = 0; 688 PL_localizing = 0;
633 PL_dirty = 0; 689 PL_dirty = 0;
634 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);
693
694 GvSV (PL_defgv) = newSV (0);
695 GvAV (PL_defgv) = coro->args; coro->args = 0;
696 GvSV (PL_errgv) = newSV (0);
697 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
698 PL_rs = newSVsv (GvSV (irsgv));
699 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
635 700
636 { 701 {
637 dSP; 702 dSP;
638 LOGOP myop; 703 LOGOP myop;
639 704
640 SvREFCNT_dec (GvAV (PL_defgv));
641 GvAV (PL_defgv) = coro->args; coro->args = 0;
642
643 Zero (&myop, 1, LOGOP); 705 Zero (&myop, 1, LOGOP);
644 myop.op_next = Nullop; 706 myop.op_next = Nullop;
645 myop.op_flags = OPf_WANT_VOID; 707 myop.op_flags = OPf_WANT_VOID;
646 708
647 PUSHMARK (SP); 709 PUSHMARK (SP);
648 XPUSHs (av_shift (GvAV (PL_defgv))); 710 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
649 PUTBACK; 711 PUTBACK;
650 PL_op = (OP *)&myop; 712 PL_op = (OP *)&myop;
651 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 713 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
652 SPAGAIN; 714 SPAGAIN;
653 } 715 }
654 716
655 ENTER; /* necessary e.g. for dounwind */ 717 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */
718}
719
720static void
721coro_destroy (pTHX_ struct coro *coro)
722{
723 if (!IN_DESTRUCT)
724 {
725 /* restore all saved variables and stuff */
726 LEAVE_SCOPE (0);
727 assert (PL_tmps_floor == -1);
728
729 /* free all temporaries */
730 FREETMPS;
731 assert (PL_tmps_ix == -1);
732
733 /* unwind all extra stacks */
734 POPSTACK_TO (PL_mainstack);
735
736 /* unwind main stack */
737 dounwind (-1);
738 }
739
740 SvREFCNT_dec (GvSV (PL_defgv));
741 SvREFCNT_dec (GvAV (PL_defgv));
742 SvREFCNT_dec (GvSV (PL_errgv));
743 SvREFCNT_dec (PL_defoutgv);
744 SvREFCNT_dec (PL_rs);
745 SvREFCNT_dec (GvSV (irsgv));
746
747 SvREFCNT_dec (PL_diehook);
748 SvREFCNT_dec (PL_warnhook);
749
750 SvREFCNT_dec (coro->saved_deffh);
751 SvREFCNT_dec (coro->throw);
752
753 coro_destroy_stacks (aTHX);
656} 754}
657 755
658static void 756static void
659free_coro_mortal (pTHX) 757free_coro_mortal (pTHX)
660{ 758{
661 if (coro_mortal) 759 if (expect_true (coro_mortal))
662 { 760 {
663 SvREFCNT_dec (coro_mortal); 761 SvREFCNT_dec (coro_mortal);
664 coro_mortal = 0; 762 coro_mortal = 0;
665 } 763 }
666} 764}
… …
695 bot = PL_stack_base + cx->blk_oldsp + 1; 793 bot = PL_stack_base + cx->blk_oldsp + 1;
696 top = cx->blk_gimme == G_ARRAY ? SP + 1 794 top = cx->blk_gimme == G_ARRAY ? SP + 1
697 : cx->blk_gimme == G_SCALAR ? bot + 1 795 : cx->blk_gimme == G_SCALAR ? bot + 1
698 : bot; 796 : bot;
699 797
798 av_extend (av, top - bot);
700 while (bot < top) 799 while (bot < top)
701 av_push (av, SvREFCNT_inc (*bot++)); 800 av_push (av, SvREFCNT_inc (*bot++));
702 801
703 PL_runops = RUNOPS_DEFAULT; 802 PL_runops = RUNOPS_DEFAULT;
704 ENTER; 803 ENTER;
… …
707 PUSHMARK (SP); 806 PUSHMARK (SP);
708 PUSHs (&PL_sv_no); 807 PUSHs (&PL_sv_no);
709 PUSHs (fullname); 808 PUSHs (fullname);
710 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 809 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
711 PUTBACK; 810 PUTBACK;
712 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);
713 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);
714 SPAGAIN; 813 SPAGAIN;
715 FREETMPS; 814 FREETMPS;
716 LEAVE; 815 LEAVE;
717 PL_runops = runops_trace; 816 PL_runops = runops_trace;
… …
746 PUSHMARK (SP); 845 PUSHMARK (SP);
747 PUSHs (&PL_sv_yes); 846 PUSHs (&PL_sv_yes);
748 PUSHs (fullname); 847 PUSHs (fullname);
749 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);
750 PUTBACK; 849 PUTBACK;
751 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);
752 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);
753 SPAGAIN; 852 SPAGAIN;
754 FREETMPS; 853 FREETMPS;
755 LEAVE; 854 LEAVE;
756 PL_runops = runops_trace; 855 PL_runops = runops_trace;
… …
770 PL_runops = RUNOPS_DEFAULT; 869 PL_runops = RUNOPS_DEFAULT;
771 PUSHMARK (SP); 870 PUSHMARK (SP);
772 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 871 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
773 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 872 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
774 PUTBACK; 873 PUTBACK;
775 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);
776 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);
777 SPAGAIN; 876 SPAGAIN;
778 FREETMPS; 877 FREETMPS;
779 LEAVE; 878 LEAVE;
780 PL_runops = runops_trace; 879 PL_runops = runops_trace;
… …
790 889
791/* 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 */
792/* _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 */
793/* during execution of a perl program */ 892/* during execution of a perl program */
794static void NOINLINE 893static void NOINLINE
795prepare_cctx (pTHX_ coro_cctx *cctx) 894cctx_prepare (pTHX_ coro_cctx *cctx)
796{ 895{
797 dSP; 896 dSP;
798 LOGOP myop; 897 LOGOP myop;
799 898
800 PL_top_env = &PL_start_env; 899 PL_top_env = &PL_start_env;
… …
818 917
819/* 918/*
820 * this is a _very_ stripped down perl interpreter ;) 919 * this is a _very_ stripped down perl interpreter ;)
821 */ 920 */
822static void 921static void
823coro_run (void *arg) 922cctx_run (void *arg)
824{ 923{
825 dTHX; 924 dTHX;
826 925
827 /* coro_run is the alternative tail of transfer(), so unlock here. */ 926 /* cctx_run is the alternative tail of transfer(), so unlock here. */
828 UNLOCK; 927 UNLOCK;
829 928
830 /* we now skip the entersub that lead to transfer() */ 929 /* we now skip the entersub that lead to transfer() */
831 PL_op = PL_op->op_next; 930 PL_op = PL_op->op_next;
832 931
833 /* inject a fake subroutine call to cctx_init */ 932 /* inject a fake subroutine call to cctx_init */
834 prepare_cctx (aTHX_ (coro_cctx *)arg); 933 cctx_prepare (aTHX_ (coro_cctx *)arg);
835 934
836 /* 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 */
837 PL_restartop = PL_op; 936 PL_restartop = PL_op;
838 perl_run (PL_curinterp); 937 perl_run (PL_curinterp);
839 938
… …
858 ++cctx_count; 957 ++cctx_count;
859 958
860 Newz (0, cctx, 1, coro_cctx); 959 Newz (0, cctx, 1, coro_cctx);
861 960
862#if HAVE_MMAP 961#if HAVE_MMAP
863
864 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;
865 /* mmap supposedly does allocate-on-write for us */ 963 /* mmap supposedly does allocate-on-write for us */
866 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);
867 965
868 if (cctx->sptr != (void *)-1) 966 if (cctx->sptr != (void *)-1)
… …
889 stack_start = cctx->sptr; 987 stack_start = cctx->sptr;
890 stack_size = cctx->ssize; 988 stack_size = cctx->ssize;
891 } 989 }
892 990
893 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 991 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
894 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);
895 993
896 return cctx; 994 return cctx;
897} 995}
898 996
899static void 997static void
… …
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 if (!next->cctx)
1144 next->cctx = cctx_get (aTHX);
1145
1033 cctx_put (prev__cctx); 1146 cctx_put (prev__cctx);
1034 } 1147 }
1035 1148
1036 ++next->usecount; 1149 ++next->usecount;
1037 1150
1038 if (!next->cctx) 1151 if (expect_true (!next->cctx))
1039 next->cctx = cctx_get (aTHX); 1152 next->cctx = cctx_get (aTHX);
1040 1153
1041 if (prev__cctx != next->cctx) 1154 if (expect_false (prev__cctx != next->cctx))
1042 { 1155 {
1043 prev__cctx->top_env = PL_top_env; 1156 prev__cctx->top_env = PL_top_env;
1044 PL_top_env = next->cctx->top_env; 1157 PL_top_env = next->cctx->top_env;
1045 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1158 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1046 } 1159 }
1047 1160
1048 free_coro_mortal (aTHX); 1161 free_coro_mortal (aTHX);
1049 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 }
1050 } 1176 }
1051} 1177}
1052 1178
1053struct transfer_args 1179struct transfer_args
1054{ 1180{
… …
1084 struct coro temp; 1210 struct coro temp;
1085 1211
1086 if (coro->flags & CF_RUNNING) 1212 if (coro->flags & CF_RUNNING)
1087 croak ("FATAL: tried to destroy currently running coroutine"); 1213 croak ("FATAL: tried to destroy currently running coroutine");
1088 1214
1089 Zero (&temp, 1, struct coro);
1090 temp.save = CORO_SAVE_ALL;
1091
1092 save_perl (aTHX_ &temp); 1215 save_perl (aTHX_ &temp);
1093 load_perl (aTHX_ coro); 1216 load_perl (aTHX_ coro);
1094 1217
1095 coro_destroy_stacks (aTHX); 1218 coro_destroy (aTHX_ coro);
1096 1219
1097 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1220 load_perl (aTHX_ &temp);
1098 1221
1099 coro->mainstack = 0; 1222 coro->slot = 0;
1100 } 1223 }
1101 1224
1102 cctx_destroy (coro->cctx); 1225 cctx_destroy (coro->cctx);
1103 SvREFCNT_dec (coro->args); 1226 SvREFCNT_dec (coro->args);
1104 1227
… …
1163 1286
1164 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1287 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1165 TRANSFER (ta); 1288 TRANSFER (ta);
1166} 1289}
1167 1290
1168static int
1169api_save (SV *coro_sv, int new_save)
1170{
1171 dTHX;
1172 struct coro *coro = SvSTATE (coro_sv);
1173 int old_save = coro->save;
1174
1175 if (new_save >= 0)
1176 coro->save = new_save;
1177
1178 return old_save;
1179}
1180
1181/** Coro ********************************************************************/ 1291/** Coro ********************************************************************/
1182 1292
1183static void 1293static void
1184coro_enq (pTHX_ SV *coro_sv) 1294coro_enq (pTHX_ SV *coro_sv)
1185{ 1295{
… …
1242 { 1352 {
1243 LOCK; 1353 LOCK;
1244 next_sv = coro_deq (aTHX_ PRIO_MIN); 1354 next_sv = coro_deq (aTHX_ PRIO_MIN);
1245 1355
1246 /* nothing to schedule: call the idle handler */ 1356 /* nothing to schedule: call the idle handler */
1247 if (!next_sv) 1357 if (expect_false (!next_sv))
1248 { 1358 {
1249 dSP; 1359 dSP;
1250 UNLOCK; 1360 UNLOCK;
1251 1361
1252 ENTER; 1362 ENTER;
… …
1262 } 1372 }
1263 1373
1264 ta->next = SvSTATE (next_sv); 1374 ta->next = SvSTATE (next_sv);
1265 1375
1266 /* cannot transfer to destroyed coros, skip and look for next */ 1376 /* cannot transfer to destroyed coros, skip and look for next */
1267 if (ta->next->flags & CF_DESTROYED) 1377 if (expect_false (ta->next->flags & CF_DESTROYED))
1268 { 1378 {
1269 UNLOCK; 1379 UNLOCK;
1270 SvREFCNT_dec (next_sv); 1380 SvREFCNT_dec (next_sv);
1271 /* coro_nready is already taken care of by destroy */ 1381 /* coro_nready is already taken care of by destroy */
1272 continue; 1382 continue;
… …
1328 dTHX; 1438 dTHX;
1329 struct transfer_args ta; 1439 struct transfer_args ta;
1330 1440
1331 prepare_cede (aTHX_ &ta); 1441 prepare_cede (aTHX_ &ta);
1332 1442
1333 if (ta.prev != ta.next) 1443 if (expect_true (ta.prev != ta.next))
1334 { 1444 {
1335 TRANSFER (ta); 1445 TRANSFER (ta);
1336 return 1; 1446 return 1;
1337 } 1447 }
1338 else 1448 else
… …
1374 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1484 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1375 1485
1376 if (coro->flags & CF_RUNNING) 1486 if (coro->flags & CF_RUNNING)
1377 PL_runops = RUNOPS_DEFAULT; 1487 PL_runops = RUNOPS_DEFAULT;
1378 else 1488 else
1379 coro->runops = RUNOPS_DEFAULT; 1489 coro->slot->runops = RUNOPS_DEFAULT;
1380 } 1490 }
1381} 1491}
1382 1492
1383MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1493MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1384 1494
… …
1388{ 1498{
1389#ifdef USE_ITHREADS 1499#ifdef USE_ITHREADS
1390 MUTEX_INIT (&coro_mutex); 1500 MUTEX_INIT (&coro_mutex);
1391#endif 1501#endif
1392 BOOT_PAGESIZE; 1502 BOOT_PAGESIZE;
1503
1504 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
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);
1393 1513
1394 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1514 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1395 1515
1396 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1516 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1397 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1517 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1398 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1518 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1399 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1519 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1400 1520
1401 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1402 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1403 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1404 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1405 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1406 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1407 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1408
1409 main_mainstack = PL_mainstack; 1521 main_mainstack = PL_mainstack;
1410 main_top_env = PL_top_env; 1522 main_top_env = PL_top_env;
1411 1523
1412 while (main_top_env->je_prev) 1524 while (main_top_env->je_prev)
1413 main_top_env = main_top_env->je_prev; 1525 main_top_env = main_top_env->je_prev;
… …
1425 struct coro *coro; 1537 struct coro *coro;
1426 HV *hv; 1538 HV *hv;
1427 int i; 1539 int i;
1428 1540
1429 Newz (0, coro, 1, struct coro); 1541 Newz (0, coro, 1, struct coro);
1430 coro->args = newAV (); 1542 coro->args = newAV ();
1431 coro->save = CORO_SAVE_DEF;
1432 coro->flags = CF_NEW; 1543 coro->flags = CF_NEW;
1433 1544
1434 if (coro_first) coro_first->prev = coro; 1545 if (coro_first) coro_first->prev = coro;
1435 coro->next = coro_first; 1546 coro->next = coro_first;
1436 coro_first = coro; 1547 coro_first = coro;
1437 1548
1438 coro->hv = hv = newHV (); 1549 coro->hv = hv = newHV ();
1439 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;
1440 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1551 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1441 1552
1553 av_extend (coro->args, items - 1);
1442 for (i = 1; i < items; i++) 1554 for (i = 1; i < items; i++)
1443 av_push (coro->args, newSVsv (ST (i))); 1555 av_push (coro->args, newSVsv (ST (i)));
1444} 1556}
1445 OUTPUT: 1557 OUTPUT:
1446 RETVAL
1447
1448int
1449save (SV *coro, int new_save = -1)
1450 CODE:
1451 RETVAL = api_save (coro, new_save);
1452 OUTPUT:
1453 RETVAL
1454
1455int
1456save_also (SV *coro_sv, int save_also)
1457 CODE:
1458{
1459 struct coro *coro = SvSTATE (coro_sv);
1460 RETVAL = coro->save;
1461 coro->save |= save_also;
1462}
1463 OUTPUT:
1464 RETVAL 1558 RETVAL
1465 1559
1466# these not obviously related functions are all rolled into the same xs 1560# these not obviously related functions are all rolled into the same xs
1467# function to increase chances that they all will call transfer with the same 1561# function to increase chances that they all will call transfer with the same
1468# stack offset 1562# stack offset
… …
1507 } 1601 }
1508 1602
1509 BARRIER; 1603 BARRIER;
1510 TRANSFER (ta); 1604 TRANSFER (ta);
1511 1605
1512 if (GIMME_V != G_VOID && ta.next != ta.prev) 1606 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev))
1513 XSRETURN_YES; 1607 XSRETURN_YES;
1514} 1608}
1515 1609
1516bool 1610bool
1517_destroy (SV *coro_sv) 1611_destroy (SV *coro_sv)
… …
1567 CODE: 1661 CODE:
1568{ 1662{
1569 if (coro->mainstack) 1663 if (coro->mainstack)
1570 { 1664 {
1571 struct coro temp; 1665 struct coro temp;
1572 Zero (&temp, 1, struct coro);
1573 temp.save = CORO_SAVE_ALL;
1574 1666
1575 if (!(coro->flags & CF_RUNNING)) 1667 if (!(coro->flags & CF_RUNNING))
1576 { 1668 {
1577 save_perl (aTHX_ &temp); 1669 save_perl (aTHX_ &temp);
1578 load_perl (aTHX_ coro); 1670 load_perl (aTHX_ coro);
… …
1582 dSP; 1674 dSP;
1583 ENTER; 1675 ENTER;
1584 SAVETMPS; 1676 SAVETMPS;
1585 PUSHMARK (SP); 1677 PUSHMARK (SP);
1586 PUTBACK; 1678 PUTBACK;
1679
1587 if (ix) 1680 if (ix)
1588 eval_sv (coderef, 0); 1681 eval_sv (coderef, 0);
1589 else 1682 else
1590 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1683 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1684
1591 SPAGAIN; 1685 SPAGAIN;
1592 FREETMPS; 1686 FREETMPS;
1593 LEAVE; 1687 LEAVE;
1594 PUTBACK; 1688 PUTBACK;
1595 } 1689 }
… …
1653 1747
1654BOOT: 1748BOOT:
1655{ 1749{
1656 int i; 1750 int i;
1657 1751
1658 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1752 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1659 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1753 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1660 av_async_pool = get_av ("Coro::async_pool", TRUE); 1754 av_async_pool = coro_get_av ("Coro::async_pool", TRUE);
1661 1755
1662 coro_current = get_sv ("Coro::current", FALSE); 1756 coro_current = coro_get_sv ("Coro::current", FALSE);
1663 SvREADONLY_on (coro_current); 1757 SvREADONLY_on (coro_current);
1664 1758
1665 coro_stash = gv_stashpv ("Coro", TRUE); 1759 coro_stash = gv_stashpv ("Coro", TRUE);
1666 1760
1667 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1761 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1668 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1762 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1669 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1763 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1670 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1764 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
… …
1673 1767
1674 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1768 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1675 coro_ready[i] = newAV (); 1769 coro_ready[i] = newAV ();
1676 1770
1677 { 1771 {
1678 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 */
1679 1774
1680 coroapi.schedule = api_schedule; 1775 coroapi.schedule = api_schedule;
1681 coroapi.save = api_save;
1682 coroapi.cede = api_cede; 1776 coroapi.cede = api_cede;
1683 coroapi.cede_notself = api_cede_notself; 1777 coroapi.cede_notself = api_cede_notself;
1684 coroapi.ready = api_ready; 1778 coroapi.ready = api_ready;
1685 coroapi.is_ready = api_is_ready; 1779 coroapi.is_ready = api_is_ready;
1686 coroapi.nready = &coro_nready; 1780 coroapi.nready = &coro_nready;
… …
1735 CODE: 1829 CODE:
1736 RETVAL = coro_nready; 1830 RETVAL = coro_nready;
1737 OUTPUT: 1831 OUTPUT:
1738 RETVAL 1832 RETVAL
1739 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
1740# for async_pool speedup 1841# for async_pool speedup
1741void 1842void
1742_pool_1 (SV *cb) 1843_pool_1 (SV *cb)
1743 CODE: 1844 CODE:
1744{ 1845{
1745 int i, len; 1846 struct coro *coro = SvSTATE (coro_current);
1746 HV *hv = (HV *)SvRV (coro_current); 1847 HV *hv = (HV *)SvRV (coro_current);
1747 AV *defav = GvAV (PL_defgv); 1848 AV *defav = GvAV (PL_defgv);
1748 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1849 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0);
1749 AV *invoke_av; 1850 AV *invoke_av;
1851 int i, len;
1750 1852
1751 if (!invoke) 1853 if (!invoke)
1752 croak ("\3terminate\2\n"); 1854 croak ("\3async_pool terminate\2\n");
1855
1856 SvREFCNT_dec (coro->saved_deffh);
1857 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1753 1858
1754 hv_store (hv, "desc", sizeof ("desc") - 1, 1859 hv_store (hv, "desc", sizeof ("desc") - 1,
1755 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1860 newSVpvn (strpair ("[async_pool]")), 0);
1756 1861
1757 invoke_av = (AV *)SvRV (invoke); 1862 invoke_av = (AV *)SvRV (invoke);
1758 len = av_len (invoke_av); 1863 len = av_len (invoke_av);
1759 1864
1760 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1865 sv_setsv (cb, AvARRAY (invoke_av)[0]);
… …
1775{ 1880{
1776 struct coro *coro = SvSTATE (coro_current); 1881 struct coro *coro = SvSTATE (coro_current);
1777 1882
1778 sv_setsv (cb, &PL_sv_undef); 1883 sv_setsv (cb, &PL_sv_undef);
1779 1884
1885 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1886 coro->saved_deffh = 0;
1887
1780 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1888 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1781 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1889 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1782 croak ("\3terminate\2\n"); 1890 croak ("\3async_pool terminate\2\n");
1783 1891
1784 av_clear (GvAV (PL_defgv)); 1892 av_clear (GvAV (PL_defgv));
1785 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1893 hv_store ((HV *)SvRV (coro_current), strpair ("desc"),
1786 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1894 newSVpvn (strpair ("[async_pool idle]")), 0);
1787 1895
1788 coro->save = CORO_SAVE_DEF;
1789 coro->prio = 0; 1896 coro->prio = 0;
1790 1897
1791 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1898 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1792 api_trace (coro_current, 0); 1899 api_trace (coro_current, 0);
1793 1900

Diff Legend

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