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.211 by root, Wed Oct 10 03:37:58 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
9#include "patchlevel.h" 10#include "patchlevel.h"
10 11
11#include <stdio.h> 12#include <stdio.h>
12#include <errno.h> 13#include <errno.h>
13#include <assert.h> 14#include <assert.h>
15#include <inttypes.h> /* portable stdint.h */
14 16
15#ifdef HAVE_MMAP 17#ifdef HAVE_MMAP
16# include <unistd.h> 18# include <unistd.h>
17# include <sys/mman.h> 19# include <sys/mman.h>
18# ifndef MAP_ANONYMOUS 20# ifndef MAP_ANONYMOUS
… …
75/* 5.8.7 */ 77/* 5.8.7 */
76#ifndef SvRV_set 78#ifndef SvRV_set
77# define SvRV_set(s,v) SvRV(s) = (v) 79# define SvRV_set(s,v) SvRV(s) = (v)
78#endif 80#endif
79 81
82/* 5.8.8 */
83#ifndef GV_NOTQUAL
84# define GV_NOTQUAL 0
85#endif
86#ifndef newSV
87# define newSV(l) NEWSV(0,l)
88#endif
89
80#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 90#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
81# undef CORO_STACKGUARD 91# undef CORO_STACKGUARD
82#endif 92#endif
83 93
84#ifndef CORO_STACKGUARD 94#ifndef CORO_STACKGUARD
… …
98#define IN_DESTRUCT (PL_main_cv == Nullcv) 108#define IN_DESTRUCT (PL_main_cv == Nullcv)
99 109
100#if __GNUC__ >= 3 110#if __GNUC__ >= 3
101# define attribute(x) __attribute__(x) 111# define attribute(x) __attribute__(x)
102# define BARRIER __asm__ __volatile__ ("" : : : "memory") 112# define BARRIER __asm__ __volatile__ ("" : : : "memory")
113# define expect(expr,value) __builtin_expect ((expr),(value))
103#else 114#else
104# define attribute(x) 115# define attribute(x)
105# define BARRIER 116# define BARRIER
117# define expect(expr,value) (expr)
106#endif 118#endif
119
120#define expect_false(expr) expect ((expr) != 0, 0)
121#define expect_true(expr) expect ((expr) != 0, 1)
107 122
108#define NOINLINE attribute ((noinline)) 123#define NOINLINE attribute ((noinline))
109 124
110#include "CoroAPI.h" 125#include "CoroAPI.h"
111 126
… …
116#else 131#else
117# define LOCK (void)0 132# define LOCK (void)0
118# define UNLOCK (void)0 133# define UNLOCK (void)0
119#endif 134#endif
120 135
136#define strpair(const) const, sizeof (const) - 1
137
121/* helper storage struct for Coro::AIO */ 138/* helper storage struct for Coro::AIO */
122struct io_state 139struct io_state
123{ 140{
124 int errorno; 141 int errorno;
125 I32 laststype; 142 I32 laststype;
… …
131static struct CoroAPI coroapi; 148static struct CoroAPI coroapi;
132static AV *main_mainstack; /* used to differentiate between $main and others */ 149static AV *main_mainstack; /* used to differentiate between $main and others */
133static JMPENV *main_top_env; 150static JMPENV *main_top_env;
134static HV *coro_state_stash, *coro_stash; 151static HV *coro_state_stash, *coro_stash;
135static SV *coro_mortal; /* will be freed after next transfer */ 152static SV *coro_mortal; /* will be freed after next transfer */
153
154static GV *irsgv; /* $/ */
155static GV *stdoutgv; /* *STDOUT */
156
157static HV *hv_sig; /* %SIG */
158static SV *sv_diehook;
159static SV *sv_warnhook;
136 160
137/* async_pool helper stuff */ 161/* async_pool helper stuff */
138static SV *sv_pool_rss; 162static SV *sv_pool_rss;
139static SV *sv_pool_size; 163static SV *sv_pool_size;
140static AV *av_async_pool; 164static AV *av_async_pool;
… …
176 CF_READY = 0x0002, /* coroutine is ready */ 200 CF_READY = 0x0002, /* coroutine is ready */
177 CF_NEW = 0x0004, /* has never been switched to */ 201 CF_NEW = 0x0004, /* has never been switched to */
178 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 202 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
179}; 203};
180 204
205/* the structure where most of the perl state is stored, overlaid on the cxstack */
206typedef struct {
207 SV *defsv;
208 AV *defav;
209 SV *errsv;
210 SV *irsgv;
211#define VAR(name,type) type name;
212# include "state.h"
213#undef VAR
214} perl_slots;
215
216#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
217
181/* this is a structure representing a perl-level coroutine */ 218/* this is a structure representing a perl-level coroutine */
182struct coro { 219struct coro {
183 /* the c coroutine allocated to this perl coroutine, if any */ 220 /* the c coroutine allocated to this perl coroutine, if any */
184 coro_cctx *cctx; 221 coro_cctx *cctx;
185 222
223 /* process data */
224 AV *mainstack;
225 perl_slots *slot; /* basically the saved sp */
226
186 /* data associated with this coroutine (initial args) */ 227 AV *args; /* data associated with this coroutine (initial args) */
187 AV *args; 228 int refcnt; /* coroutines are refcounted, yes */
188 int refcnt;
189 int save; /* CORO_SAVE flags */
190 int flags; /* CF_ flags */ 229 int flags; /* CF_ flags */
191 230 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 231
204 /* statistics */ 232 /* statistics */
205 int usecount; /* number of switches to this coro */ 233 int usecount; /* number of transfers to this coro */
206 234
207 /* coro process data */ 235 /* coro process data */
208 int prio; 236 int prio;
237 SV *throw; /* exception to be thrown */
238
239 /* async_pool */
240 SV *saved_deffh;
209 241
210 /* linked list */ 242 /* linked list */
211 struct coro *next, *prev; 243 struct coro *next, *prev;
212 HV *hv; /* the perl hash associated with this coro, if any */
213}; 244};
214 245
215typedef struct coro *Coro__State; 246typedef struct coro *Coro__State;
216typedef struct coro *Coro__State_or_hashref; 247typedef struct coro *Coro__State_or_hashref;
217 248
… …
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 457
392 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 458 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
393 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 459 /*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 460
412 { 461 {
413 dSP; 462 dSP;
463
414 CV *cv; 464 CV *cv;
415 465
416 /* now do the ugly restore mess */ 466 /* now do the ugly restore mess */
417 while ((cv = (CV *)POPs)) 467 while (expect_true (cv = (CV *)POPs))
418 { 468 {
419 put_padlist (aTHX_ cv); /* mark this padlist as available */ 469 put_padlist (aTHX_ cv); /* mark this padlist as available */
420 CvDEPTH (cv) = PTR2IV (POPs); 470 CvDEPTH (cv) = PTR2IV (POPs);
421 CvPADLIST (cv) = (AV *)POPs; 471 CvPADLIST (cv) = (AV *)POPs;
422 } 472 }
… …
441 491
442 XPUSHs (Nullsv); 492 XPUSHs (Nullsv);
443 /* this loop was inspired by pp_caller */ 493 /* this loop was inspired by pp_caller */
444 for (;;) 494 for (;;)
445 { 495 {
446 while (cxix >= 0) 496 while (expect_true (cxix >= 0))
447 { 497 {
448 PERL_CONTEXT *cx = &ccstk[cxix--]; 498 PERL_CONTEXT *cx = &ccstk[cxix--];
449 499
450 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 500 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
451 { 501 {
452 CV *cv = cx->blk_sub.cv; 502 CV *cv = cx->blk_sub.cv;
453 503
454 if (CvDEPTH (cv)) 504 if (expect_true (CvDEPTH (cv)))
455 { 505 {
456 EXTEND (SP, 3); 506 EXTEND (SP, 3);
457 PUSHs ((SV *)CvPADLIST (cv)); 507 PUSHs ((SV *)CvPADLIST (cv));
458 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 508 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
459 PUSHs ((SV *)cv); 509 PUSHs ((SV *)cv);
… …
462 get_padlist (aTHX_ cv); 512 get_padlist (aTHX_ cv);
463 } 513 }
464 } 514 }
465 } 515 }
466 516
467 if (top_si->si_type == PERLSI_MAIN) 517 if (expect_true (top_si->si_type == PERLSI_MAIN))
468 break; 518 break;
469 519
470 top_si = top_si->si_prev; 520 top_si = top_si->si_prev;
471 ccstk = top_si->si_cxstack; 521 ccstk = top_si->si_cxstack;
472 cxix = top_si->si_cxix; 522 cxix = top_si->si_cxix;
473 } 523 }
474 524
475 PUTBACK; 525 PUTBACK;
476 } 526 }
477 527
478 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 528 /* allocate some space on the context stack for our purposes */
479 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 529 /* we manually unroll here, as usually 2 slots is enough */
480 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 530 if (SLOT_COUNT >= 1) CXINC;
481 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 531 if (SLOT_COUNT >= 2) CXINC;
482 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0; 532 if (SLOT_COUNT >= 3) CXINC;
533 {
534 int i;
535 for (i = 3; i < SLOT_COUNT; ++i)
536 CXINC;
537 }
538 cxstack_ix -= SLOT_COUNT; /* undo allocation */
483 539
540 c->mainstack = PL_mainstack;
541
542 {
543 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
544
545 slot->defav = GvAV (PL_defgv);
546 slot->defsv = DEFSV;
547 slot->errsv = ERRSV;
548 slot->irsgv = GvSV (irsgv);
549
484#define VAR(name,type)c->name = PL_ ## name; 550 #define VAR(name,type) slot->name = PL_ ## name;
485# include "state.h" 551 # include "state.h"
486#undef VAR 552 #undef VAR
553 }
487} 554}
488 555
489/* 556/*
490 * allocate various perl stacks. This is an exact copy 557 * allocate various perl stacks. This is an exact copy
491 * of perl.c:init_stacks, except that it uses less memory 558 * of perl.c:init_stacks, except that it uses less memory
… …
496# define coro_init_stacks init_stacks 563# define coro_init_stacks init_stacks
497#else 564#else
498static void 565static void
499coro_init_stacks (pTHX) 566coro_init_stacks (pTHX)
500{ 567{
501 PL_curstackinfo = new_stackinfo(64, 6); 568 PL_curstackinfo = new_stackinfo(32, 8);
502 PL_curstackinfo->si_type = PERLSI_MAIN; 569 PL_curstackinfo->si_type = PERLSI_MAIN;
503 PL_curstack = PL_curstackinfo->si_stack; 570 PL_curstack = PL_curstackinfo->si_stack;
504 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 571 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
505 572
506 PL_stack_base = AvARRAY(PL_curstack); 573 PL_stack_base = AvARRAY(PL_curstack);
507 PL_stack_sp = PL_stack_base; 574 PL_stack_sp = PL_stack_base;
508 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 575 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
509 576
510 New(50,PL_tmps_stack,64,SV*); 577 New(50,PL_tmps_stack,32,SV*);
511 PL_tmps_floor = -1; 578 PL_tmps_floor = -1;
512 PL_tmps_ix = -1; 579 PL_tmps_ix = -1;
513 PL_tmps_max = 64; 580 PL_tmps_max = 32;
514 581
515 New(54,PL_markstack,16,I32); 582 New(54,PL_markstack,16,I32);
516 PL_markstack_ptr = PL_markstack; 583 PL_markstack_ptr = PL_markstack;
517 PL_markstack_max = PL_markstack + 16; 584 PL_markstack_max = PL_markstack + 16;
518 585
519#ifdef SET_MARK_OFFSET 586#ifdef SET_MARK_OFFSET
520 SET_MARK_OFFSET; 587 SET_MARK_OFFSET;
521#endif 588#endif
522 589
523 New(54,PL_scopestack,16,I32); 590 New(54,PL_scopestack,8,I32);
524 PL_scopestack_ix = 0; 591 PL_scopestack_ix = 0;
525 PL_scopestack_max = 16; 592 PL_scopestack_max = 8;
526 593
527 New(54,PL_savestack,64,ANY); 594 New(54,PL_savestack,24,ANY);
528 PL_savestack_ix = 0; 595 PL_savestack_ix = 0;
529 PL_savestack_max = 64; 596 PL_savestack_max = 24;
530 597
531#if !PERL_VERSION_ATLEAST (5,9,0) 598#if !PERL_VERSION_ATLEAST (5,9,0)
532 New(54,PL_retstack,4,OP*); 599 New(54,PL_retstack,4,OP*);
533 PL_retstack_ix = 0; 600 PL_retstack_ix = 0;
534 PL_retstack_max = 4; 601 PL_retstack_max = 4;
… …
540 * destroy the stacks, the callchain etc... 607 * destroy the stacks, the callchain etc...
541 */ 608 */
542static void 609static void
543coro_destroy_stacks (pTHX) 610coro_destroy_stacks (pTHX)
544{ 611{
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) 612 while (PL_curstackinfo->si_next)
563 PL_curstackinfo = PL_curstackinfo->si_next; 613 PL_curstackinfo = PL_curstackinfo->si_next;
564 614
565 while (PL_curstackinfo) 615 while (PL_curstackinfo)
566 { 616 {
… …
584} 634}
585 635
586static size_t 636static size_t
587coro_rss (pTHX_ struct coro *coro) 637coro_rss (pTHX_ struct coro *coro)
588{ 638{
589 size_t rss = sizeof (coro); 639 size_t rss = sizeof (*coro);
590 640
591 if (coro->mainstack) 641 if (coro->mainstack)
592 { 642 {
643 perl_slots tmp_slot;
644 perl_slots *slot;
645
593 if (coro->flags & CF_RUNNING) 646 if (coro->flags & CF_RUNNING)
594 { 647 {
648 slot = &tmp_slot;
649
595 #define VAR(name,type)coro->name = PL_ ## name; 650 #define VAR(name,type) slot->name = PL_ ## name;
596 # include "state.h" 651 # include "state.h"
597 #undef VAR 652 #undef VAR
598 } 653 }
654 else
655 slot = coro->slot;
599 656
600 rss += sizeof (coro->curstackinfo); 657 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); 658 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
603 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 659 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
604 rss += coro->tmps_max * sizeof (SV *); 660 rss += slot->tmps_max * sizeof (SV *);
605 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 661 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
606 rss += coro->scopestack_max * sizeof (I32); 662 rss += slot->scopestack_max * sizeof (I32);
607 rss += coro->savestack_max * sizeof (ANY); 663 rss += slot->savestack_max * sizeof (ANY);
608 664
609#if !PERL_VERSION_ATLEAST (5,9,0) 665#if !PERL_VERSION_ATLEAST (5,9,0)
610 rss += coro->retstack_max * sizeof (OP *); 666 rss += slot->retstack_max * sizeof (OP *);
611#endif 667#endif
612 } 668 }
613 669
614 return rss; 670 return rss;
615} 671}
616 672
617/** coroutine stack handling ************************************************/ 673/** coroutine stack handling ************************************************/
618 674
619static void 675static void
620setup_coro (pTHX_ struct coro *coro) 676coro_setup (pTHX_ struct coro *coro)
621{ 677{
622 /* 678 /*
623 * emulate part of the perl startup here. 679 * emulate part of the perl startup here.
624 */ 680 */
625 coro_init_stacks (aTHX); 681 coro_init_stacks (aTHX);
… …
627 PL_runops = RUNOPS_DEFAULT; 683 PL_runops = RUNOPS_DEFAULT;
628 PL_curcop = &PL_compiling; 684 PL_curcop = &PL_compiling;
629 PL_in_eval = EVAL_NULL; 685 PL_in_eval = EVAL_NULL;
630 PL_comppad = 0; 686 PL_comppad = 0;
631 PL_curpm = 0; 687 PL_curpm = 0;
688 PL_curpad = 0;
632 PL_localizing = 0; 689 PL_localizing = 0;
633 PL_dirty = 0; 690 PL_dirty = 0;
634 PL_restartop = 0; 691 PL_restartop = 0;
692 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
693 PL_warnhook = 0; hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
694
695 GvSV (PL_defgv) = newSV (0);
696 GvAV (PL_defgv) = coro->args; coro->args = 0;
697 GvSV (PL_errgv) = newSV (0);
698 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
699 PL_rs = newSVsv (GvSV (irsgv));
700 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
635 701
636 { 702 {
637 dSP; 703 dSP;
638 LOGOP myop; 704 LOGOP myop;
639 705
640 SvREFCNT_dec (GvAV (PL_defgv));
641 GvAV (PL_defgv) = coro->args; coro->args = 0;
642
643 Zero (&myop, 1, LOGOP); 706 Zero (&myop, 1, LOGOP);
644 myop.op_next = Nullop; 707 myop.op_next = Nullop;
645 myop.op_flags = OPf_WANT_VOID; 708 myop.op_flags = OPf_WANT_VOID;
646 709
647 PUSHMARK (SP); 710 PUSHMARK (SP);
648 XPUSHs (av_shift (GvAV (PL_defgv))); 711 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
649 PUTBACK; 712 PUTBACK;
650 PL_op = (OP *)&myop; 713 PL_op = (OP *)&myop;
651 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 714 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
652 SPAGAIN; 715 SPAGAIN;
653 } 716 }
654 717
655 ENTER; /* necessary e.g. for dounwind */ 718 /* this newly created coroutine might be run on an existing cctx which most
719 * likely was suspended in set_stacklevel, called from entersub.
720 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
721 * so we ENTER here for symmetry
722 */
723 ENTER;
724}
725
726static void
727coro_destroy (pTHX_ struct coro *coro)
728{
729 if (!IN_DESTRUCT)
730 {
731 /* restore all saved variables and stuff */
732 LEAVE_SCOPE (0);
733 assert (PL_tmps_floor == -1);
734
735 /* free all temporaries */
736 FREETMPS;
737 assert (PL_tmps_ix == -1);
738
739 /* unwind all extra stacks */
740 POPSTACK_TO (PL_mainstack);
741
742 /* unwind main stack */
743 dounwind (-1);
744 }
745
746 SvREFCNT_dec (GvSV (PL_defgv));
747 SvREFCNT_dec (GvAV (PL_defgv));
748 SvREFCNT_dec (GvSV (PL_errgv));
749 SvREFCNT_dec (PL_defoutgv);
750 SvREFCNT_dec (PL_rs);
751 SvREFCNT_dec (GvSV (irsgv));
752
753 SvREFCNT_dec (PL_diehook);
754 SvREFCNT_dec (PL_warnhook);
755
756 SvREFCNT_dec (coro->saved_deffh);
757 SvREFCNT_dec (coro->throw);
758
759 coro_destroy_stacks (aTHX);
656} 760}
657 761
658static void 762static void
659free_coro_mortal (pTHX) 763free_coro_mortal (pTHX)
660{ 764{
661 if (coro_mortal) 765 if (expect_true (coro_mortal))
662 { 766 {
663 SvREFCNT_dec (coro_mortal); 767 SvREFCNT_dec (coro_mortal);
664 coro_mortal = 0; 768 coro_mortal = 0;
665 } 769 }
666} 770}
… …
695 bot = PL_stack_base + cx->blk_oldsp + 1; 799 bot = PL_stack_base + cx->blk_oldsp + 1;
696 top = cx->blk_gimme == G_ARRAY ? SP + 1 800 top = cx->blk_gimme == G_ARRAY ? SP + 1
697 : cx->blk_gimme == G_SCALAR ? bot + 1 801 : cx->blk_gimme == G_SCALAR ? bot + 1
698 : bot; 802 : bot;
699 803
804 av_extend (av, top - bot);
700 while (bot < top) 805 while (bot < top)
701 av_push (av, SvREFCNT_inc (*bot++)); 806 av_push (av, SvREFCNT_inc (*bot++));
702 807
703 PL_runops = RUNOPS_DEFAULT; 808 PL_runops = RUNOPS_DEFAULT;
704 ENTER; 809 ENTER;
… …
707 PUSHMARK (SP); 812 PUSHMARK (SP);
708 PUSHs (&PL_sv_no); 813 PUSHs (&PL_sv_no);
709 PUSHs (fullname); 814 PUSHs (fullname);
710 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 815 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
711 PUTBACK; 816 PUTBACK;
712 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 817 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); 818 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
714 SPAGAIN; 819 SPAGAIN;
715 FREETMPS; 820 FREETMPS;
716 LEAVE; 821 LEAVE;
717 PL_runops = runops_trace; 822 PL_runops = runops_trace;
… …
746 PUSHMARK (SP); 851 PUSHMARK (SP);
747 PUSHs (&PL_sv_yes); 852 PUSHs (&PL_sv_yes);
748 PUSHs (fullname); 853 PUSHs (fullname);
749 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 854 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
750 PUTBACK; 855 PUTBACK;
751 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 856 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); 857 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
753 SPAGAIN; 858 SPAGAIN;
754 FREETMPS; 859 FREETMPS;
755 LEAVE; 860 LEAVE;
756 PL_runops = runops_trace; 861 PL_runops = runops_trace;
… …
770 PL_runops = RUNOPS_DEFAULT; 875 PL_runops = RUNOPS_DEFAULT;
771 PUSHMARK (SP); 876 PUSHMARK (SP);
772 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 877 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
773 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 878 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
774 PUTBACK; 879 PUTBACK;
775 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0); 880 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); 881 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
777 SPAGAIN; 882 SPAGAIN;
778 FREETMPS; 883 FREETMPS;
779 LEAVE; 884 LEAVE;
780 PL_runops = runops_trace; 885 PL_runops = runops_trace;
… …
790 895
791/* inject a fake call to Coro::State::_cctx_init into the execution */ 896/* 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 */ 897/* _cctx_init should be careful, as it could be called at almost any time */
793/* during execution of a perl program */ 898/* during execution of a perl program */
794static void NOINLINE 899static void NOINLINE
795prepare_cctx (pTHX_ coro_cctx *cctx) 900cctx_prepare (pTHX_ coro_cctx *cctx)
796{ 901{
797 dSP; 902 dSP;
798 LOGOP myop; 903 LOGOP myop;
799 904
800 PL_top_env = &PL_start_env; 905 PL_top_env = &PL_start_env;
… …
818 923
819/* 924/*
820 * this is a _very_ stripped down perl interpreter ;) 925 * this is a _very_ stripped down perl interpreter ;)
821 */ 926 */
822static void 927static void
823coro_run (void *arg) 928cctx_run (void *arg)
824{ 929{
825 dTHX; 930 dTHX;
826 931
827 /* coro_run is the alternative tail of transfer(), so unlock here. */ 932 /* cctx_run is the alternative tail of transfer(), so unlock here. */
828 UNLOCK; 933 UNLOCK;
829 934
830 /* we now skip the entersub that lead to transfer() */ 935 /* we now skip the entersub that lead to transfer() */
831 PL_op = PL_op->op_next; 936 PL_op = PL_op->op_next;
832 937
833 /* inject a fake subroutine call to cctx_init */ 938 /* inject a fake subroutine call to cctx_init */
834 prepare_cctx (aTHX_ (coro_cctx *)arg); 939 cctx_prepare (aTHX_ (coro_cctx *)arg);
835 940
836 /* somebody or something will hit me for both perl_run and PL_restartop */ 941 /* somebody or something will hit me for both perl_run and PL_restartop */
837 PL_restartop = PL_op; 942 PL_restartop = PL_op;
838 perl_run (PL_curinterp); 943 perl_run (PL_curinterp);
839 944
… …
858 ++cctx_count; 963 ++cctx_count;
859 964
860 Newz (0, cctx, 1, coro_cctx); 965 Newz (0, cctx, 1, coro_cctx);
861 966
862#if HAVE_MMAP 967#if HAVE_MMAP
863
864 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 968 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
865 /* mmap supposedly does allocate-on-write for us */ 969 /* 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); 970 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
867 971
868 if (cctx->sptr != (void *)-1) 972 if (cctx->sptr != (void *)-1)
… …
889 stack_start = cctx->sptr; 993 stack_start = cctx->sptr;
890 stack_size = cctx->ssize; 994 stack_size = cctx->ssize;
891 } 995 }
892 996
893 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 997 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
894 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 998 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
895 999
896 return cctx; 1000 return cctx;
897} 1001}
898 1002
899static void 1003static void
… …
916 Safefree (cctx->sptr); 1020 Safefree (cctx->sptr);
917 1021
918 Safefree (cctx); 1022 Safefree (cctx);
919} 1023}
920 1024
1025/* wether this cctx should be destructed */
1026#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1027
921static coro_cctx * 1028static coro_cctx *
922cctx_get (pTHX) 1029cctx_get (pTHX)
923{ 1030{
924 while (cctx_first) 1031 while (expect_true (cctx_first))
925 { 1032 {
926 coro_cctx *cctx = cctx_first; 1033 coro_cctx *cctx = cctx_first;
927 cctx_first = cctx->next; 1034 cctx_first = cctx->next;
928 --cctx_idle; 1035 --cctx_idle;
929 1036
930 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1037 if (expect_true (!CCTX_EXPIRED (cctx)))
931 return cctx; 1038 return cctx;
932 1039
933 cctx_destroy (cctx); 1040 cctx_destroy (cctx);
934 } 1041 }
935 1042
… …
938 1045
939static void 1046static void
940cctx_put (coro_cctx *cctx) 1047cctx_put (coro_cctx *cctx)
941{ 1048{
942 /* free another cctx if overlimit */ 1049 /* free another cctx if overlimit */
943 if (cctx_idle >= MAX_IDLE_CCTX) 1050 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
944 { 1051 {
945 coro_cctx *first = cctx_first; 1052 coro_cctx *first = cctx_first;
946 cctx_first = first->next; 1053 cctx_first = first->next;
947 --cctx_idle; 1054 --cctx_idle;
948 1055
… …
954 cctx_first = cctx; 1061 cctx_first = cctx;
955} 1062}
956 1063
957/** coroutine switching *****************************************************/ 1064/** coroutine switching *****************************************************/
958 1065
959static void NOINLINE 1066static void
960transfer_check (pTHX_ struct coro *prev, struct coro *next) 1067transfer_check (pTHX_ struct coro *prev, struct coro *next)
961{ 1068{
962 if (prev != next) 1069 if (expect_true (prev != next))
963 { 1070 {
964 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1071 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"); 1072 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
966 1073
967 if (next->flags & CF_RUNNING) 1074 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"); 1075 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
969 1076
970 if (next->flags & CF_DESTROYED) 1077 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"); 1078 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
972 1079
1080 if (
1081#if PERL_VERSION_ATLEAST (5,9,0)
1082 expect_false (PL_parser)
1083#else
973 if (PL_lex_state != LEX_NOTPARSING) 1084 expect_false (PL_lex_state != LEX_NOTPARSING)
1085#endif
1086 )
974 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1087 croak ("Coro::State::transfer called while parsing, but this is not supported");
975 } 1088 }
976} 1089}
977 1090
978/* always use the TRANSFER macro */ 1091/* always use the TRANSFER macro */
… …
980transfer (pTHX_ struct coro *prev, struct coro *next) 1093transfer (pTHX_ struct coro *prev, struct coro *next)
981{ 1094{
982 dSTACKLEVEL; 1095 dSTACKLEVEL;
983 1096
984 /* sometimes transfer is only called to set idle_sp */ 1097 /* sometimes transfer is only called to set idle_sp */
985 if (!next) 1098 if (expect_false (!next))
986 { 1099 {
987 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1100 ((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 */ 1101 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
989 } 1102 }
990 else if (prev != next) 1103 else if (expect_true (prev != next))
991 { 1104 {
992 coro_cctx *prev__cctx; 1105 coro_cctx *prev__cctx;
993 1106
994 if (prev->flags & CF_NEW) 1107 if (expect_false (prev->flags & CF_NEW))
995 { 1108 {
996 /* create a new empty context */ 1109 /* create a new empty context */
997 Newz (0, prev->cctx, 1, coro_cctx); 1110 Newz (0, prev->cctx, 1, coro_cctx);
998 prev->flags &= ~CF_NEW; 1111 prev->flags &= ~CF_NEW;
999 prev->flags |= CF_RUNNING; 1112 prev->flags |= CF_RUNNING;
… …
1002 prev->flags &= ~CF_RUNNING; 1115 prev->flags &= ~CF_RUNNING;
1003 next->flags |= CF_RUNNING; 1116 next->flags |= CF_RUNNING;
1004 1117
1005 LOCK; 1118 LOCK;
1006 1119
1007 if (next->flags & CF_NEW) 1120 if (expect_false (next->flags & CF_NEW))
1008 { 1121 {
1009 /* need to start coroutine */ 1122 /* need to start coroutine */
1010 next->flags &= ~CF_NEW; 1123 next->flags &= ~CF_NEW;
1011 /* first get rid of the old state */ 1124 /* first get rid of the old state */
1012 save_perl (aTHX_ prev); 1125 save_perl (aTHX_ prev);
1013 /* setup coroutine call */ 1126 /* setup coroutine call */
1014 setup_coro (aTHX_ next); 1127 coro_setup (aTHX_ next);
1015 } 1128 }
1016 else 1129 else
1017 { 1130 {
1018 /* coroutine already started */ 1131 /* coroutine already started */
1019 save_perl (aTHX_ prev); 1132 save_perl (aTHX_ prev);
… …
1021 } 1134 }
1022 1135
1023 prev__cctx = prev->cctx; 1136 prev__cctx = prev->cctx;
1024 1137
1025 /* possibly "free" the cctx */ 1138 /* possibly "free" the cctx */
1026 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1139 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1027 { 1140 {
1028 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1141 /* 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)); 1142 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1030 1143
1031 prev->cctx = 0; 1144 prev->cctx = 0;
1032 1145
1146 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1147 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1148 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1149 if (!next->cctx)
1150 next->cctx = cctx_get (aTHX);
1151
1033 cctx_put (prev__cctx); 1152 cctx_put (prev__cctx);
1034 } 1153 }
1035 1154
1036 ++next->usecount; 1155 ++next->usecount;
1037 1156
1038 if (!next->cctx) 1157 if (expect_true (!next->cctx))
1039 next->cctx = cctx_get (aTHX); 1158 next->cctx = cctx_get (aTHX);
1040 1159
1041 if (prev__cctx != next->cctx) 1160 if (expect_false (prev__cctx != next->cctx))
1042 { 1161 {
1043 prev__cctx->top_env = PL_top_env; 1162 prev__cctx->top_env = PL_top_env;
1044 PL_top_env = next->cctx->top_env; 1163 PL_top_env = next->cctx->top_env;
1045 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1164 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1046 } 1165 }
1047 1166
1048 free_coro_mortal (aTHX); 1167 free_coro_mortal (aTHX);
1049 UNLOCK; 1168 UNLOCK;
1169
1170 if (expect_false (prev->throw || next->throw))
1171 {
1172 struct coro *coro = SvSTATE (coro_current);
1173
1174 if (coro->throw)
1175 {
1176 SV *exception = coro->throw;
1177 coro->throw = 0;
1178 sv_setsv (ERRSV, exception);
1179 croak (0);
1180 }
1181 }
1050 } 1182 }
1051} 1183}
1052 1184
1053struct transfer_args 1185struct transfer_args
1054{ 1186{
… …
1081 1213
1082 if (coro->mainstack && coro->mainstack != main_mainstack) 1214 if (coro->mainstack && coro->mainstack != main_mainstack)
1083 { 1215 {
1084 struct coro temp; 1216 struct coro temp;
1085 1217
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) 1218 if (coro->flags & CF_RUNNING)
1092 croak ("FATAL: tried to destroy currently running coroutine"); 1219 croak ("FATAL: tried to destroy currently running coroutine");
1093 1220
1094 save_perl (aTHX_ &temp); 1221 save_perl (aTHX_ &temp);
1095 load_perl (aTHX_ coro); 1222 load_perl (aTHX_ coro);
1096 1223
1097 coro_destroy_stacks (aTHX); 1224 coro_destroy (aTHX_ coro);
1098 1225
1099 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1226 load_perl (aTHX_ &temp);
1100 1227
1101 coro->mainstack = 0; 1228 coro->slot = 0;
1102 } 1229 }
1103 1230
1104 cctx_destroy (coro->cctx); 1231 cctx_destroy (coro->cctx);
1105 SvREFCNT_dec (coro->args); 1232 SvREFCNT_dec (coro->args);
1106 1233
… …
1165 1292
1166 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1293 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1167 TRANSFER (ta); 1294 TRANSFER (ta);
1168} 1295}
1169 1296
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 ********************************************************************/ 1297/** Coro ********************************************************************/
1184 1298
1185static void 1299static void
1186coro_enq (pTHX_ SV *coro_sv) 1300coro_enq (pTHX_ SV *coro_sv)
1187{ 1301{
… …
1244 { 1358 {
1245 LOCK; 1359 LOCK;
1246 next_sv = coro_deq (aTHX_ PRIO_MIN); 1360 next_sv = coro_deq (aTHX_ PRIO_MIN);
1247 1361
1248 /* nothing to schedule: call the idle handler */ 1362 /* nothing to schedule: call the idle handler */
1249 if (!next_sv) 1363 if (expect_false (!next_sv))
1250 { 1364 {
1251 dSP; 1365 dSP;
1252 UNLOCK; 1366 UNLOCK;
1253 1367
1254 ENTER; 1368 ENTER;
… …
1264 } 1378 }
1265 1379
1266 ta->next = SvSTATE (next_sv); 1380 ta->next = SvSTATE (next_sv);
1267 1381
1268 /* cannot transfer to destroyed coros, skip and look for next */ 1382 /* cannot transfer to destroyed coros, skip and look for next */
1269 if (ta->next->flags & CF_DESTROYED) 1383 if (expect_false (ta->next->flags & CF_DESTROYED))
1270 { 1384 {
1271 UNLOCK; 1385 UNLOCK;
1272 SvREFCNT_dec (next_sv); 1386 SvREFCNT_dec (next_sv);
1273 /* coro_nready is already taken care of by destroy */ 1387 /* coro_nready is already taken care of by destroy */
1274 continue; 1388 continue;
… …
1330 dTHX; 1444 dTHX;
1331 struct transfer_args ta; 1445 struct transfer_args ta;
1332 1446
1333 prepare_cede (aTHX_ &ta); 1447 prepare_cede (aTHX_ &ta);
1334 1448
1335 if (ta.prev != ta.next) 1449 if (expect_true (ta.prev != ta.next))
1336 { 1450 {
1337 TRANSFER (ta); 1451 TRANSFER (ta);
1338 return 1; 1452 return 1;
1339 } 1453 }
1340 else 1454 else
… …
1376 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1490 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1377 1491
1378 if (coro->flags & CF_RUNNING) 1492 if (coro->flags & CF_RUNNING)
1379 PL_runops = RUNOPS_DEFAULT; 1493 PL_runops = RUNOPS_DEFAULT;
1380 else 1494 else
1381 coro->runops = RUNOPS_DEFAULT; 1495 coro->slot->runops = RUNOPS_DEFAULT;
1382 } 1496 }
1383} 1497}
1384 1498
1385MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1499MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1386 1500
… …
1390{ 1504{
1391#ifdef USE_ITHREADS 1505#ifdef USE_ITHREADS
1392 MUTEX_INIT (&coro_mutex); 1506 MUTEX_INIT (&coro_mutex);
1393#endif 1507#endif
1394 BOOT_PAGESIZE; 1508 BOOT_PAGESIZE;
1509
1510 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1511 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1512
1513 hv_sig = coro_get_hv ("SIG", TRUE);
1514 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE);
1515 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE);
1516
1517 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1518 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1395 1519
1396 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1520 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1397 1521
1398 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1522 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1399 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1523 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1400 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1524 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1401 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1525 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1402 1526
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; 1527 main_mainstack = PL_mainstack;
1412 main_top_env = PL_top_env; 1528 main_top_env = PL_top_env;
1413 1529
1414 while (main_top_env->je_prev) 1530 while (main_top_env->je_prev)
1415 main_top_env = main_top_env->je_prev; 1531 main_top_env = main_top_env->je_prev;
1416 1532
1417 coroapi.ver = CORO_API_VERSION; 1533 coroapi.ver = CORO_API_VERSION;
1534 coroapi.rev = CORO_API_REVISION;
1418 coroapi.transfer = api_transfer; 1535 coroapi.transfer = api_transfer;
1419 1536
1420 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1537 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1421} 1538}
1422 1539
… …
1427 struct coro *coro; 1544 struct coro *coro;
1428 HV *hv; 1545 HV *hv;
1429 int i; 1546 int i;
1430 1547
1431 Newz (0, coro, 1, struct coro); 1548 Newz (0, coro, 1, struct coro);
1432 coro->args = newAV (); 1549 coro->args = newAV ();
1433 coro->save = CORO_SAVE_DEF;
1434 coro->flags = CF_NEW; 1550 coro->flags = CF_NEW;
1435 1551
1436 if (coro_first) coro_first->prev = coro; 1552 if (coro_first) coro_first->prev = coro;
1437 coro->next = coro_first; 1553 coro->next = coro_first;
1438 coro_first = coro; 1554 coro_first = coro;
1439 1555
1440 coro->hv = hv = newHV (); 1556 coro->hv = hv = newHV ();
1441 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1557 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)); 1558 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1443 1559
1560 av_extend (coro->args, items - 1);
1444 for (i = 1; i < items; i++) 1561 for (i = 1; i < items; i++)
1445 av_push (coro->args, newSVsv (ST (i))); 1562 av_push (coro->args, newSVsv (ST (i)));
1446} 1563}
1447 OUTPUT: 1564 OUTPUT:
1448 RETVAL 1565 RETVAL
1449 1566
1450int 1567# these not obviously related functions are all rolled into the same xs
1451save (SV *coro, int new_save = -1) 1568# function to increase chances that they all will call transfer with the same
1452 CODE: 1569# 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 1570void
1469_set_stacklevel (...) 1571_set_stacklevel (...)
1470 ALIAS: 1572 ALIAS:
1471 Coro::State::transfer = 1 1573 Coro::State::transfer = 1
1472 Coro::schedule = 2 1574 Coro::schedule = 2
… …
1504 1606
1505 break; 1607 break;
1506 } 1608 }
1507 1609
1508 BARRIER; 1610 BARRIER;
1611 PUTBACK;
1509 TRANSFER (ta); 1612 TRANSFER (ta);
1510 1613 SPAGAIN; /* might be the sp of a different coroutine now */
1511 if (GIMME_V != G_VOID && ta.next != ta.prev) 1614 /* be extra careful not to ever do anything after TRANSFER */
1512 XSRETURN_YES;
1513} 1615}
1514 1616
1515bool 1617bool
1516_destroy (SV *coro_sv) 1618_destroy (SV *coro_sv)
1517 CODE: 1619 CODE:
… …
1566 CODE: 1668 CODE:
1567{ 1669{
1568 if (coro->mainstack) 1670 if (coro->mainstack)
1569 { 1671 {
1570 struct coro temp; 1672 struct coro temp;
1571 Zero (&temp, 1, struct coro);
1572 temp.save = CORO_SAVE_ALL;
1573 1673
1574 if (!(coro->flags & CF_RUNNING)) 1674 if (!(coro->flags & CF_RUNNING))
1575 { 1675 {
1576 save_perl (aTHX_ &temp); 1676 save_perl (aTHX_ &temp);
1577 load_perl (aTHX_ coro); 1677 load_perl (aTHX_ coro);
… …
1579 1679
1580 { 1680 {
1581 dSP; 1681 dSP;
1582 ENTER; 1682 ENTER;
1583 SAVETMPS; 1683 SAVETMPS;
1684 PUTBACK;
1685 PUSHSTACK;
1584 PUSHMARK (SP); 1686 PUSHMARK (SP);
1585 PUTBACK; 1687
1586 if (ix) 1688 if (ix)
1587 eval_sv (coderef, 0); 1689 eval_sv (coderef, 0);
1588 else 1690 else
1589 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1691 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1692
1693 POPSTACK;
1590 SPAGAIN; 1694 SPAGAIN;
1591 FREETMPS; 1695 FREETMPS;
1592 LEAVE; 1696 LEAVE;
1593 PUTBACK; 1697 PUTBACK;
1594 } 1698 }
… …
1652 1756
1653BOOT: 1757BOOT:
1654{ 1758{
1655 int i; 1759 int i;
1656 1760
1657 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1761 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1658 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1762 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1659 av_async_pool = get_av ("Coro::async_pool", TRUE); 1763 av_async_pool = coro_get_av ("Coro::async_pool", TRUE);
1660 1764
1661 coro_current = get_sv ("Coro::current", FALSE); 1765 coro_current = coro_get_sv ("Coro::current", FALSE);
1662 SvREADONLY_on (coro_current); 1766 SvREADONLY_on (coro_current);
1663 1767
1664 coro_stash = gv_stashpv ("Coro", TRUE); 1768 coro_stash = gv_stashpv ("Coro", TRUE);
1665 1769
1666 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1770 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1667 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1771 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1668 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1772 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1669 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1773 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
… …
1672 1776
1673 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1777 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1674 coro_ready[i] = newAV (); 1778 coro_ready[i] = newAV ();
1675 1779
1676 { 1780 {
1677 SV *sv = perl_get_sv("Coro::API", 1); 1781 SV *sv = perl_get_sv ("Coro::API", TRUE);
1782 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1678 1783
1679 coroapi.schedule = api_schedule; 1784 coroapi.schedule = api_schedule;
1680 coroapi.save = api_save;
1681 coroapi.cede = api_cede; 1785 coroapi.cede = api_cede;
1682 coroapi.cede_notself = api_cede_notself; 1786 coroapi.cede_notself = api_cede_notself;
1683 coroapi.ready = api_ready; 1787 coroapi.ready = api_ready;
1684 coroapi.is_ready = api_is_ready; 1788 coroapi.is_ready = api_is_ready;
1685 coroapi.nready = &coro_nready; 1789 coroapi.nready = &coro_nready;
… …
1734 CODE: 1838 CODE:
1735 RETVAL = coro_nready; 1839 RETVAL = coro_nready;
1736 OUTPUT: 1840 OUTPUT:
1737 RETVAL 1841 RETVAL
1738 1842
1843void
1844throw (Coro::State self, SV *throw = &PL_sv_undef)
1845 PROTOTYPE: $;$
1846 CODE:
1847 SvREFCNT_dec (self->throw);
1848 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1849
1739# for async_pool speedup 1850# for async_pool speedup
1740void 1851void
1741_pool_1 (SV *cb) 1852_pool_1 (SV *cb)
1742 CODE: 1853 CODE:
1743{ 1854{
1744 int i, len; 1855 struct coro *coro = SvSTATE (coro_current);
1745 HV *hv = (HV *)SvRV (coro_current); 1856 HV *hv = (HV *)SvRV (coro_current);
1746 AV *defav = GvAV (PL_defgv); 1857 AV *defav = GvAV (PL_defgv);
1747 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1858 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0);
1748 AV *invoke_av; 1859 AV *invoke_av;
1860 int i, len;
1749 1861
1750 if (!invoke) 1862 if (!invoke)
1751 croak ("\3terminate\2\n"); 1863 croak ("\3async_pool terminate\2\n");
1864
1865 SvREFCNT_dec (coro->saved_deffh);
1866 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1752 1867
1753 hv_store (hv, "desc", sizeof ("desc") - 1, 1868 hv_store (hv, "desc", sizeof ("desc") - 1,
1754 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1869 newSVpvn (strpair ("[async_pool]")), 0);
1755 1870
1756 invoke_av = (AV *)SvRV (invoke); 1871 invoke_av = (AV *)SvRV (invoke);
1757 len = av_len (invoke_av); 1872 len = av_len (invoke_av);
1758 1873
1759 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1874 sv_setsv (cb, AvARRAY (invoke_av)[0]);
… …
1774{ 1889{
1775 struct coro *coro = SvSTATE (coro_current); 1890 struct coro *coro = SvSTATE (coro_current);
1776 1891
1777 sv_setsv (cb, &PL_sv_undef); 1892 sv_setsv (cb, &PL_sv_undef);
1778 1893
1894 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1895 coro->saved_deffh = 0;
1896
1779 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1897 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1780 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1898 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1781 croak ("\3terminate\2\n"); 1899 croak ("\3async_pool terminate\2\n");
1782 1900
1783 av_clear (GvAV (PL_defgv)); 1901 av_clear (GvAV (PL_defgv));
1784 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1902 hv_store ((HV *)SvRV (coro_current), strpair ("desc"),
1785 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1903 newSVpvn (strpair ("[async_pool idle]")), 0);
1786 1904
1787 coro->save = CORO_SAVE_DEF;
1788 coro->prio = 0; 1905 coro->prio = 0;
1789 1906
1790 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1907 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1791 api_trace (coro_current, 0); 1908 api_trace (coro_current, 0);
1792 1909

Diff Legend

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