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.210 by root, Wed Oct 10 03:24:40 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;
… …
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 */
136 153
154static GV *irsgv; /* $/ */
155static GV *stdoutgv; /* *STDOUT */
156
157static HV *hv_sig; /* %SIG */
158static SV *sv_diehook;
159static SV *sv_warnhook;
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;
141 165
142static struct coro_cctx *cctx_first; 166static struct coro_cctx *cctx_first[3]; /* index by GIMME_V type, void, scalar, array */
143static int cctx_count, cctx_idle; 167static int cctx_count, cctx_idle[3];
144 168
145enum { 169enum {
146 CC_MAPPED = 0x01, 170 CC_MAPPED = 0x01,
147 CC_NOREUSE = 0x02, /* throw this away after tracing */ 171 CC_NOREUSE = 0x02, /* throw this away after tracing */
148 CC_TRACE = 0x04, 172 CC_TRACE = 0x04,
… …
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;
222 int gimme;
185 223
224 /* process data */
225 AV *mainstack;
226 perl_slots *slot; /* basically the saved sp */
227
186 /* data associated with this coroutine (initial args) */ 228 AV *args; /* data associated with this coroutine (initial args) */
187 AV *args; 229 int refcnt; /* coroutines are refcounted, yes */
188 int refcnt;
189 int save; /* CORO_SAVE flags */
190 int flags; /* CF_ flags */ 230 int flags; /* CF_ flags */
191 231 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 232
204 /* statistics */ 233 /* statistics */
205 int usecount; /* number of switches to this coro */ 234 int usecount; /* number of transfers to this coro */
206 235
207 /* coro process data */ 236 /* coro process data */
208 int prio; 237 int prio;
238 SV *throw; /* exception to be thrown */
239
240 /* async_pool */
241 SV *saved_deffh;
209 242
210 /* linked list */ 243 /* linked list */
211 struct coro *next, *prev; 244 struct coro *next, *prev;
212 HV *hv; /* the perl hash associated with this coro, if any */
213}; 245};
214 246
215typedef struct coro *Coro__State; 247typedef struct coro *Coro__State;
216typedef struct coro *Coro__State_or_hashref; 248typedef struct coro *Coro__State_or_hashref;
217 249
… …
229static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 261static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
230static int coro_nready; 262static int coro_nready;
231static struct coro *coro_first; 263static struct coro *coro_first;
232 264
233/** lowlevel stuff **********************************************************/ 265/** lowlevel stuff **********************************************************/
266
267static SV *
268coro_get_sv (const char *name, int create)
269{
270#if PERL_VERSION_ATLEAST (5,9,0)
271 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
272 get_sv (name, create);
273#endif
274 return get_sv (name, create);
275}
276
277static AV *
278coro_get_av (const char *name, int create)
279{
280#if PERL_VERSION_ATLEAST (5,9,0)
281 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
282 get_av (name, create);
283#endif
284 return get_av (name, create);
285}
286
287static HV *
288coro_get_hv (const char *name, int create)
289{
290#if PERL_VERSION_ATLEAST (5,9,0)
291 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
292 get_hv (name, create);
293#endif
294 return get_hv (name, create);
295}
234 296
235static AV * 297static AV *
236coro_clone_padlist (pTHX_ CV *cv) 298coro_clone_padlist (pTHX_ CV *cv)
237{ 299{
238 AV *padlist = CvPADLIST (cv); 300 AV *padlist = CvPADLIST (cv);
… …
311 MAGIC *mg; 373 MAGIC *mg;
312 374
313 if (SvROK (coro)) 375 if (SvROK (coro))
314 coro = SvRV (coro); 376 coro = SvRV (coro);
315 377
316 if (SvTYPE (coro) != SVt_PVHV) 378 if (expect_false (SvTYPE (coro) != SVt_PVHV))
317 croak ("Coro::State object required"); 379 croak ("Coro::State object required");
318 380
319 stash = SvSTASH (coro); 381 stash = SvSTASH (coro);
320 if (stash != coro_stash && stash != coro_state_stash) 382 if (expect_false (stash != coro_stash && stash != coro_state_stash))
321 { 383 {
322 /* very slow, but rare, check */ 384 /* very slow, but rare, check */
323 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 385 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
324 croak ("Coro::State object required"); 386 croak ("Coro::State object required");
325 } 387 }
… …
335get_padlist (pTHX_ CV *cv) 397get_padlist (pTHX_ CV *cv)
336{ 398{
337 MAGIC *mg = CORO_MAGIC (cv); 399 MAGIC *mg = CORO_MAGIC (cv);
338 AV *av; 400 AV *av;
339 401
340 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 402 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
341 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 403 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
342 else 404 else
343 { 405 {
344#if CORO_PREFER_PERL_FUNCTIONS 406#if CORO_PREFER_PERL_FUNCTIONS
345 /* this is probably cleaner, but also slower? */ 407 /* this is probably cleaner, but also slower? */
… …
357put_padlist (pTHX_ CV *cv) 419put_padlist (pTHX_ CV *cv)
358{ 420{
359 MAGIC *mg = CORO_MAGIC (cv); 421 MAGIC *mg = CORO_MAGIC (cv);
360 AV *av; 422 AV *av;
361 423
362 if (!mg) 424 if (expect_false (!mg))
363 { 425 {
364 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 426 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
365 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 427 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
366 mg->mg_virtual = &vtbl_coro; 428 mg->mg_virtual = &vtbl_coro;
367 mg->mg_obj = (SV *)newAV (); 429 mg->mg_obj = (SV *)newAV ();
368 } 430 }
369 431
370 av = (AV *)mg->mg_obj; 432 av = (AV *)mg->mg_obj;
371 433
372 if (AvFILLp (av) >= AvMAX (av)) 434 if (expect_false (AvFILLp (av) >= AvMAX (av)))
373 av_extend (av, AvMAX (av) + 1); 435 av_extend (av, AvMAX (av) + 1);
374 436
375 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 437 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
376} 438}
377 439
378/** load & save, init *******************************************************/ 440/** load & save, init *******************************************************/
379 441
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 442static void
386load_perl (pTHX_ Coro__State c) 443load_perl (pTHX_ Coro__State c)
387{ 444{
445 perl_slots *slot = c->slot;
446 c->slot = 0;
447
448 PL_mainstack = c->mainstack;
449
450 GvSV (PL_defgv) = slot->defsv;
451 GvAV (PL_defgv) = slot->defav;
452 GvSV (PL_errgv) = slot->errsv;
453 GvSV (irsgv) = slot->irsgv;
454
388#define VAR(name,type) PL_ ## name = c->name; 455 #define VAR(name,type) PL_ ## name = slot->name;
389# include "state.h" 456 # include "state.h"
390#undef VAR 457 #undef VAR
391 458
392 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 459 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
393 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 460 /*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 461
412 { 462 {
413 dSP; 463 dSP;
464
414 CV *cv; 465 CV *cv;
415 466
416 /* now do the ugly restore mess */ 467 /* now do the ugly restore mess */
417 while ((cv = (CV *)POPs)) 468 while (expect_true (cv = (CV *)POPs))
418 { 469 {
419 put_padlist (aTHX_ cv); /* mark this padlist as available */ 470 put_padlist (aTHX_ cv); /* mark this padlist as available */
420 CvDEPTH (cv) = PTR2IV (POPs); 471 CvDEPTH (cv) = PTR2IV (POPs);
421 CvPADLIST (cv) = (AV *)POPs; 472 CvPADLIST (cv) = (AV *)POPs;
422 } 473 }
… …
441 492
442 XPUSHs (Nullsv); 493 XPUSHs (Nullsv);
443 /* this loop was inspired by pp_caller */ 494 /* this loop was inspired by pp_caller */
444 for (;;) 495 for (;;)
445 { 496 {
446 while (cxix >= 0) 497 while (expect_true (cxix >= 0))
447 { 498 {
448 PERL_CONTEXT *cx = &ccstk[cxix--]; 499 PERL_CONTEXT *cx = &ccstk[cxix--];
449 500
450 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 501 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
451 { 502 {
452 CV *cv = cx->blk_sub.cv; 503 CV *cv = cx->blk_sub.cv;
453 504
454 if (CvDEPTH (cv)) 505 if (expect_true (CvDEPTH (cv)))
455 { 506 {
456 EXTEND (SP, 3); 507 EXTEND (SP, 3);
457 PUSHs ((SV *)CvPADLIST (cv)); 508 PUSHs ((SV *)CvPADLIST (cv));
458 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 509 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
459 PUSHs ((SV *)cv); 510 PUSHs ((SV *)cv);
… …
462 get_padlist (aTHX_ cv); 513 get_padlist (aTHX_ cv);
463 } 514 }
464 } 515 }
465 } 516 }
466 517
467 if (top_si->si_type == PERLSI_MAIN) 518 if (expect_true (top_si->si_type == PERLSI_MAIN))
468 break; 519 break;
469 520
470 top_si = top_si->si_prev; 521 top_si = top_si->si_prev;
471 ccstk = top_si->si_cxstack; 522 ccstk = top_si->si_cxstack;
472 cxix = top_si->si_cxix; 523 cxix = top_si->si_cxix;
473 } 524 }
474 525
475 PUTBACK; 526 PUTBACK;
476 } 527 }
477 528
478 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 529 /* allocate some space on the context stack for our purposes */
479 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 530 /* we manually unroll here, as usually 2 slots is enough */
480 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 531 if (SLOT_COUNT >= 1) CXINC;
481 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 532 if (SLOT_COUNT >= 2) CXINC;
482 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0; 533 if (SLOT_COUNT >= 3) CXINC;
534 {
535 int i;
536 for (i = 3; i < SLOT_COUNT; ++i)
537 CXINC;
538 }
539 cxstack_ix -= SLOT_COUNT; /* undo allocation */
483 540
541 c->mainstack = PL_mainstack;
542
543 {
544 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
545
546 slot->defav = GvAV (PL_defgv);
547 slot->defsv = DEFSV;
548 slot->errsv = ERRSV;
549 slot->irsgv = GvSV (irsgv);
550
484#define VAR(name,type)c->name = PL_ ## name; 551 #define VAR(name,type) slot->name = PL_ ## name;
485# include "state.h" 552 # include "state.h"
486#undef VAR 553 #undef VAR
554 }
487} 555}
488 556
489/* 557/*
490 * allocate various perl stacks. This is an exact copy 558 * allocate various perl stacks. This is an exact copy
491 * of perl.c:init_stacks, except that it uses less memory 559 * of perl.c:init_stacks, except that it uses less memory
… …
496# define coro_init_stacks init_stacks 564# define coro_init_stacks init_stacks
497#else 565#else
498static void 566static void
499coro_init_stacks (pTHX) 567coro_init_stacks (pTHX)
500{ 568{
501 PL_curstackinfo = new_stackinfo(64, 6); 569 PL_curstackinfo = new_stackinfo(32, 8);
502 PL_curstackinfo->si_type = PERLSI_MAIN; 570 PL_curstackinfo->si_type = PERLSI_MAIN;
503 PL_curstack = PL_curstackinfo->si_stack; 571 PL_curstack = PL_curstackinfo->si_stack;
504 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 572 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
505 573
506 PL_stack_base = AvARRAY(PL_curstack); 574 PL_stack_base = AvARRAY(PL_curstack);
507 PL_stack_sp = PL_stack_base; 575 PL_stack_sp = PL_stack_base;
508 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 576 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
509 577
510 New(50,PL_tmps_stack,64,SV*); 578 New(50,PL_tmps_stack,32,SV*);
511 PL_tmps_floor = -1; 579 PL_tmps_floor = -1;
512 PL_tmps_ix = -1; 580 PL_tmps_ix = -1;
513 PL_tmps_max = 64; 581 PL_tmps_max = 32;
514 582
515 New(54,PL_markstack,16,I32); 583 New(54,PL_markstack,16,I32);
516 PL_markstack_ptr = PL_markstack; 584 PL_markstack_ptr = PL_markstack;
517 PL_markstack_max = PL_markstack + 16; 585 PL_markstack_max = PL_markstack + 16;
518 586
519#ifdef SET_MARK_OFFSET 587#ifdef SET_MARK_OFFSET
520 SET_MARK_OFFSET; 588 SET_MARK_OFFSET;
521#endif 589#endif
522 590
523 New(54,PL_scopestack,16,I32); 591 New(54,PL_scopestack,8,I32);
524 PL_scopestack_ix = 0; 592 PL_scopestack_ix = 0;
525 PL_scopestack_max = 16; 593 PL_scopestack_max = 8;
526 594
527 New(54,PL_savestack,64,ANY); 595 New(54,PL_savestack,24,ANY);
528 PL_savestack_ix = 0; 596 PL_savestack_ix = 0;
529 PL_savestack_max = 64; 597 PL_savestack_max = 24;
530 598
531#if !PERL_VERSION_ATLEAST (5,9,0) 599#if !PERL_VERSION_ATLEAST (5,9,0)
532 New(54,PL_retstack,4,OP*); 600 New(54,PL_retstack,4,OP*);
533 PL_retstack_ix = 0; 601 PL_retstack_ix = 0;
534 PL_retstack_max = 4; 602 PL_retstack_max = 4;
… …
540 * destroy the stacks, the callchain etc... 608 * destroy the stacks, the callchain etc...
541 */ 609 */
542static void 610static void
543coro_destroy_stacks (pTHX) 611coro_destroy_stacks (pTHX)
544{ 612{
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) 613 while (PL_curstackinfo->si_next)
563 PL_curstackinfo = PL_curstackinfo->si_next; 614 PL_curstackinfo = PL_curstackinfo->si_next;
564 615
565 while (PL_curstackinfo) 616 while (PL_curstackinfo)
566 { 617 {
… …
584} 635}
585 636
586static size_t 637static size_t
587coro_rss (pTHX_ struct coro *coro) 638coro_rss (pTHX_ struct coro *coro)
588{ 639{
589 size_t rss = sizeof (coro); 640 size_t rss = sizeof (*coro);
590 641
591 if (coro->mainstack) 642 if (coro->mainstack)
592 { 643 {
644 perl_slots tmp_slot;
645 perl_slots *slot;
646
593 if (coro->flags & CF_RUNNING) 647 if (coro->flags & CF_RUNNING)
594 { 648 {
649 slot = &tmp_slot;
650
595 #define VAR(name,type)coro->name = PL_ ## name; 651 #define VAR(name,type) slot->name = PL_ ## name;
596 # include "state.h" 652 # include "state.h"
597 #undef VAR 653 #undef VAR
598 } 654 }
655 else
656 slot = coro->slot;
599 657
600 rss += sizeof (coro->curstackinfo); 658 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); 659 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
603 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 660 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
604 rss += coro->tmps_max * sizeof (SV *); 661 rss += slot->tmps_max * sizeof (SV *);
605 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 662 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
606 rss += coro->scopestack_max * sizeof (I32); 663 rss += slot->scopestack_max * sizeof (I32);
607 rss += coro->savestack_max * sizeof (ANY); 664 rss += slot->savestack_max * sizeof (ANY);
608 665
609#if !PERL_VERSION_ATLEAST (5,9,0) 666#if !PERL_VERSION_ATLEAST (5,9,0)
610 rss += coro->retstack_max * sizeof (OP *); 667 rss += slot->retstack_max * sizeof (OP *);
611#endif 668#endif
612 } 669 }
613 670
614 return rss; 671 return rss;
615} 672}
616 673
617/** coroutine stack handling ************************************************/ 674/** coroutine stack handling ************************************************/
618 675
619static void 676static void
620setup_coro (pTHX_ struct coro *coro) 677coro_setup (pTHX_ struct coro *coro)
621{ 678{
622 /* 679 /*
623 * emulate part of the perl startup here. 680 * emulate part of the perl startup here.
624 */ 681 */
625 coro_init_stacks (aTHX); 682 coro_init_stacks (aTHX);
… …
627 PL_runops = RUNOPS_DEFAULT; 684 PL_runops = RUNOPS_DEFAULT;
628 PL_curcop = &PL_compiling; 685 PL_curcop = &PL_compiling;
629 PL_in_eval = EVAL_NULL; 686 PL_in_eval = EVAL_NULL;
630 PL_comppad = 0; 687 PL_comppad = 0;
631 PL_curpm = 0; 688 PL_curpm = 0;
689 PL_curpad = 0;
632 PL_localizing = 0; 690 PL_localizing = 0;
633 PL_dirty = 0; 691 PL_dirty = 0;
634 PL_restartop = 0; 692 PL_restartop = 0;
693 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
694 PL_warnhook = 0; hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
695
696 GvSV (PL_defgv) = newSV (0);
697 GvAV (PL_defgv) = coro->args; coro->args = 0;
698 GvSV (PL_errgv) = newSV (0);
699 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
700 PL_rs = newSVsv (GvSV (irsgv));
701 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
635 702
636 { 703 {
637 dSP; 704 dSP;
638 LOGOP myop; 705 LOGOP myop;
639 706
640 SvREFCNT_dec (GvAV (PL_defgv));
641 GvAV (PL_defgv) = coro->args; coro->args = 0;
642
643 Zero (&myop, 1, LOGOP); 707 Zero (&myop, 1, LOGOP);
644 myop.op_next = Nullop; 708 myop.op_next = Nullop;
645 myop.op_flags = OPf_WANT_VOID; 709 myop.op_flags = OPf_WANT_VOID;
646 710
647 PUSHMARK (SP); 711 PUSHMARK (SP);
648 XPUSHs (av_shift (GvAV (PL_defgv))); 712 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
649 PUTBACK; 713 PUTBACK;
650 PL_op = (OP *)&myop; 714 PL_op = (OP *)&myop;
651 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 715 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
652 SPAGAIN; 716 SPAGAIN;
717
718 /*
719 * now its very tricky. the "tail" of the next transfer might end up
720 * either in a new cctx, or an existing one.
721 * in case of an existing one we have to take care of whatever
722 * entersub and transfer do to the perl stack.
723 */
724 ENTER;
725 EXTEND (SP, 4);
726 PUSHs ((SV *)0); /* items */
727 PUSHs ((SV *)0); /* ix, set_stacklevel */
728 PUSHs ((SV *)(sp - PL_stack_base + 1)); /* ax */
729 PUSHs ((SV *)0); /* again */
730 PUTBACK;
653 } 731 }
654 732
655 ENTER; /* necessary e.g. for dounwind */ 733 /* this newly created coroutine might be run on an existing cctx which most
734 * likely was suspended in set_stacklevel, called from entersub.
735 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
736 * so we ENTER here for symmetry
737 */
738 ENTER;
739}
740
741static void
742coro_destroy (pTHX_ struct coro *coro)
743{
744 if (!IN_DESTRUCT)
745 {
746 /* restore all saved variables and stuff */
747 LEAVE_SCOPE (0);
748 assert (PL_tmps_floor == -1);
749
750 /* free all temporaries */
751 FREETMPS;
752 assert (PL_tmps_ix == -1);
753
754 /* unwind all extra stacks */
755 POPSTACK_TO (PL_mainstack);
756
757 /* unwind main stack */
758 dounwind (-1);
759 }
760
761 SvREFCNT_dec (GvSV (PL_defgv));
762 SvREFCNT_dec (GvAV (PL_defgv));
763 SvREFCNT_dec (GvSV (PL_errgv));
764 SvREFCNT_dec (PL_defoutgv);
765 SvREFCNT_dec (PL_rs);
766 SvREFCNT_dec (GvSV (irsgv));
767
768 SvREFCNT_dec (PL_diehook);
769 SvREFCNT_dec (PL_warnhook);
770
771 SvREFCNT_dec (coro->saved_deffh);
772 SvREFCNT_dec (coro->throw);
773
774 coro_destroy_stacks (aTHX);
656} 775}
657 776
658static void 777static void
659free_coro_mortal (pTHX) 778free_coro_mortal (pTHX)
660{ 779{
661 if (coro_mortal) 780 if (expect_true (coro_mortal))
662 { 781 {
663 SvREFCNT_dec (coro_mortal); 782 SvREFCNT_dec (coro_mortal);
664 coro_mortal = 0; 783 coro_mortal = 0;
665 } 784 }
666} 785}
… …
695 bot = PL_stack_base + cx->blk_oldsp + 1; 814 bot = PL_stack_base + cx->blk_oldsp + 1;
696 top = cx->blk_gimme == G_ARRAY ? SP + 1 815 top = cx->blk_gimme == G_ARRAY ? SP + 1
697 : cx->blk_gimme == G_SCALAR ? bot + 1 816 : cx->blk_gimme == G_SCALAR ? bot + 1
698 : bot; 817 : bot;
699 818
819 av_extend (av, top - bot);
700 while (bot < top) 820 while (bot < top)
701 av_push (av, SvREFCNT_inc (*bot++)); 821 av_push (av, SvREFCNT_inc (*bot++));
702 822
703 PL_runops = RUNOPS_DEFAULT; 823 PL_runops = RUNOPS_DEFAULT;
704 ENTER; 824 ENTER;
… …
707 PUSHMARK (SP); 827 PUSHMARK (SP);
708 PUSHs (&PL_sv_no); 828 PUSHs (&PL_sv_no);
709 PUSHs (fullname); 829 PUSHs (fullname);
710 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 830 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
711 PUTBACK; 831 PUTBACK;
712 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 832 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); 833 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
714 SPAGAIN; 834 SPAGAIN;
715 FREETMPS; 835 FREETMPS;
716 LEAVE; 836 LEAVE;
717 PL_runops = runops_trace; 837 PL_runops = runops_trace;
… …
746 PUSHMARK (SP); 866 PUSHMARK (SP);
747 PUSHs (&PL_sv_yes); 867 PUSHs (&PL_sv_yes);
748 PUSHs (fullname); 868 PUSHs (fullname);
749 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 869 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
750 PUTBACK; 870 PUTBACK;
751 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 871 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); 872 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
753 SPAGAIN; 873 SPAGAIN;
754 FREETMPS; 874 FREETMPS;
755 LEAVE; 875 LEAVE;
756 PL_runops = runops_trace; 876 PL_runops = runops_trace;
… …
770 PL_runops = RUNOPS_DEFAULT; 890 PL_runops = RUNOPS_DEFAULT;
771 PUSHMARK (SP); 891 PUSHMARK (SP);
772 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 892 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
773 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 893 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
774 PUTBACK; 894 PUTBACK;
775 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0); 895 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); 896 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
777 SPAGAIN; 897 SPAGAIN;
778 FREETMPS; 898 FREETMPS;
779 LEAVE; 899 LEAVE;
780 PL_runops = runops_trace; 900 PL_runops = runops_trace;
… …
790 910
791/* inject a fake call to Coro::State::_cctx_init into the execution */ 911/* 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 */ 912/* _cctx_init should be careful, as it could be called at almost any time */
793/* during execution of a perl program */ 913/* during execution of a perl program */
794static void NOINLINE 914static void NOINLINE
795prepare_cctx (pTHX_ coro_cctx *cctx) 915cctx_prepare (pTHX_ coro_cctx *cctx)
796{ 916{
797 dSP; 917 dSP;
798 LOGOP myop; 918 LOGOP myop;
799 919
800 PL_top_env = &PL_start_env; 920 PL_top_env = &PL_start_env;
… …
818 938
819/* 939/*
820 * this is a _very_ stripped down perl interpreter ;) 940 * this is a _very_ stripped down perl interpreter ;)
821 */ 941 */
822static void 942static void
823coro_run (void *arg) 943cctx_run (void *arg)
824{ 944{
825 dTHX; 945 dTHX;
826 946
827 /* coro_run is the alternative tail of transfer(), so unlock here. */ 947 /* cctx_run is the alternative tail of transfer(), so unlock here. */
828 UNLOCK; 948 UNLOCK;
829 949
830 /* we now skip the entersub that lead to transfer() */ 950 /* we now skip the entersub that lead to transfer() */
831 PL_op = PL_op->op_next; 951 PL_op = PL_op->op_next;
832 952
833 /* inject a fake subroutine call to cctx_init */ 953 /* inject a fake subroutine call to cctx_init */
834 prepare_cctx (aTHX_ (coro_cctx *)arg); 954 cctx_prepare (aTHX_ (coro_cctx *)arg);
835 955
836 /* somebody or something will hit me for both perl_run and PL_restartop */ 956 /* somebody or something will hit me for both perl_run and PL_restartop */
837 PL_restartop = PL_op; 957 PL_restartop = PL_op;
838 perl_run (PL_curinterp); 958 perl_run (PL_curinterp);
839 959
… …
858 ++cctx_count; 978 ++cctx_count;
859 979
860 Newz (0, cctx, 1, coro_cctx); 980 Newz (0, cctx, 1, coro_cctx);
861 981
862#if HAVE_MMAP 982#if HAVE_MMAP
863
864 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 983 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
865 /* mmap supposedly does allocate-on-write for us */ 984 /* 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); 985 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
867 986
868 if (cctx->sptr != (void *)-1) 987 if (cctx->sptr != (void *)-1)
… …
889 stack_start = cctx->sptr; 1008 stack_start = cctx->sptr;
890 stack_size = cctx->ssize; 1009 stack_size = cctx->ssize;
891 } 1010 }
892 1011
893 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1012 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
894 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1013 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
895 1014
896 return cctx; 1015 return cctx;
897} 1016}
898 1017
899static void 1018static void
… …
916 Safefree (cctx->sptr); 1035 Safefree (cctx->sptr);
917 1036
918 Safefree (cctx); 1037 Safefree (cctx);
919} 1038}
920 1039
1040/* wether this cctx should be destructed */
1041#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1042
921static coro_cctx * 1043static coro_cctx *
922cctx_get (pTHX) 1044cctx_get (pTHX_ int gimme)
923{ 1045{
924 while (cctx_first) 1046 while (expect_true (cctx_first[gimme]))
925 { 1047 {
926 coro_cctx *cctx = cctx_first; 1048 coro_cctx *cctx = cctx_first[gimme];
927 cctx_first = cctx->next; 1049 cctx_first[gimme] = cctx->next;
928 --cctx_idle; 1050 --cctx_idle[gimme];
929 1051
930 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1052 if (expect_true (!CCTX_EXPIRED (cctx)))
931 return cctx; 1053 return cctx;
932 1054
933 cctx_destroy (cctx); 1055 cctx_destroy (cctx);
934 } 1056 }
935 1057
1058 assert (!gimme);
936 return cctx_new (); 1059 return cctx_new ();
937} 1060}
938 1061
939static void 1062static void
940cctx_put (coro_cctx *cctx) 1063cctx_put (coro_cctx *cctx, int gimme)
941{ 1064{
942 /* free another cctx if overlimit */ 1065 /* free another cctx if overlimit */
943 if (cctx_idle >= MAX_IDLE_CCTX) 1066 if (expect_false (cctx_idle[gimme] >= MAX_IDLE_CCTX))
944 { 1067 {
945 coro_cctx *first = cctx_first; 1068 coro_cctx *first = cctx_first[gimme];
946 cctx_first = first->next; 1069 cctx_first[gimme] = first->next;
947 --cctx_idle; 1070 --cctx_idle[gimme];
948 1071
949 cctx_destroy (first); 1072 cctx_destroy (first);
950 } 1073 }
951 1074
952 ++cctx_idle; 1075 ++cctx_idle[gimme];
953 cctx->next = cctx_first; 1076 cctx->next = cctx_first[gimme];
954 cctx_first = cctx; 1077 cctx_first[gimme] = cctx;
955} 1078}
956 1079
957/** coroutine switching *****************************************************/ 1080/** coroutine switching *****************************************************/
958 1081
959static void NOINLINE 1082static void
960transfer_check (pTHX_ struct coro *prev, struct coro *next) 1083transfer_check (pTHX_ struct coro *prev, struct coro *next)
961{ 1084{
962 if (prev != next) 1085 if (expect_true (prev != next))
963 { 1086 {
964 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1087 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"); 1088 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
966 1089
967 if (next->flags & CF_RUNNING) 1090 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"); 1091 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
969 1092
970 if (next->flags & CF_DESTROYED) 1093 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"); 1094 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
972 1095
1096 if (
1097#if PERL_VERSION_ATLEAST (5,9,0)
1098 expect_false (PL_parser)
1099#else
973 if (PL_lex_state != LEX_NOTPARSING) 1100 expect_false (PL_lex_state != LEX_NOTPARSING)
1101#endif
1102 )
974 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1103 croak ("Coro::State::transfer called while parsing, but this is not supported");
975 } 1104 }
976} 1105}
977 1106
978/* always use the TRANSFER macro */ 1107/* always use the TRANSFER macro */
… …
980transfer (pTHX_ struct coro *prev, struct coro *next) 1109transfer (pTHX_ struct coro *prev, struct coro *next)
981{ 1110{
982 dSTACKLEVEL; 1111 dSTACKLEVEL;
983 1112
984 /* sometimes transfer is only called to set idle_sp */ 1113 /* sometimes transfer is only called to set idle_sp */
985 if (!next) 1114 if (expect_false (!next))
986 { 1115 {
987 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1116 ((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 */ 1117 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
989 } 1118 }
990 else if (prev != next) 1119 else if (expect_true (prev != next))
991 { 1120 {
992 coro_cctx *prev__cctx; 1121 coro_cctx *prev__cctx;
993 1122
994 if (prev->flags & CF_NEW) 1123 if (expect_false (prev->flags & CF_NEW))
995 { 1124 {
996 /* create a new empty context */ 1125 /* create a new empty context */
997 Newz (0, prev->cctx, 1, coro_cctx); 1126 Newz (0, prev->cctx, 1, coro_cctx);
998 prev->flags &= ~CF_NEW; 1127 prev->flags &= ~CF_NEW;
999 prev->flags |= CF_RUNNING; 1128 prev->flags |= CF_RUNNING;
… …
1002 prev->flags &= ~CF_RUNNING; 1131 prev->flags &= ~CF_RUNNING;
1003 next->flags |= CF_RUNNING; 1132 next->flags |= CF_RUNNING;
1004 1133
1005 LOCK; 1134 LOCK;
1006 1135
1007 if (next->flags & CF_NEW) 1136 if (expect_false (next->flags & CF_NEW))
1008 { 1137 {
1009 /* need to start coroutine */ 1138 /* need to start coroutine */
1010 next->flags &= ~CF_NEW; 1139 next->flags &= ~CF_NEW;
1011 /* first get rid of the old state */ 1140 /* first get rid of the old state */
1012 save_perl (aTHX_ prev); 1141 save_perl (aTHX_ prev);
1013 /* setup coroutine call */ 1142 /* setup coroutine call */
1014 setup_coro (aTHX_ next); 1143 coro_setup (aTHX_ next);
1015 } 1144 }
1016 else 1145 else
1017 { 1146 {
1018 /* coroutine already started */ 1147 /* coroutine already started */
1019 save_perl (aTHX_ prev); 1148 save_perl (aTHX_ prev);
… …
1021 } 1150 }
1022 1151
1023 prev__cctx = prev->cctx; 1152 prev__cctx = prev->cctx;
1024 1153
1025 /* possibly "free" the cctx */ 1154 /* possibly "free" the cctx */
1026 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1155 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1027 { 1156 {
1028 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1157 /* 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)); 1158 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1030 1159
1031 prev->cctx = 0; 1160 prev->cctx = 0;
1032 1161
1162 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1163 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1164 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1165 if (!next->cctx)
1166 next->cctx = cctx_get (aTHX_ next->gimme);
1167
1033 cctx_put (prev__cctx); 1168 cctx_put (prev__cctx, prev->gimme);
1034 } 1169 }
1035 1170
1036 ++next->usecount; 1171 ++next->usecount;
1037 1172
1038 if (!next->cctx) 1173 if (expect_true (!next->cctx))
1039 next->cctx = cctx_get (aTHX); 1174 next->cctx = cctx_get (aTHX_ next->gimme);
1040 1175
1041 if (prev__cctx != next->cctx) 1176 if (expect_false (prev__cctx != next->cctx))
1042 { 1177 {
1043 prev__cctx->top_env = PL_top_env; 1178 prev__cctx->top_env = PL_top_env;
1044 PL_top_env = next->cctx->top_env; 1179 PL_top_env = next->cctx->top_env;
1045 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1180 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1046 } 1181 }
1047 1182
1048 free_coro_mortal (aTHX); 1183 free_coro_mortal (aTHX);
1049 UNLOCK; 1184 UNLOCK;
1185
1186 if (expect_false (prev->throw || next->throw))
1187 {
1188 struct coro *coro = SvSTATE (coro_current);
1189
1190 if (coro->throw)
1191 {
1192 SV *exception = coro->throw;
1193 coro->throw = 0;
1194 sv_setsv (ERRSV, exception);
1195 croak (0);
1196 }
1197 }
1050 } 1198 }
1051} 1199}
1052 1200
1053struct transfer_args 1201struct transfer_args
1054{ 1202{
… …
1081 1229
1082 if (coro->mainstack && coro->mainstack != main_mainstack) 1230 if (coro->mainstack && coro->mainstack != main_mainstack)
1083 { 1231 {
1084 struct coro temp; 1232 struct coro temp;
1085 1233
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) 1234 if (coro->flags & CF_RUNNING)
1092 croak ("FATAL: tried to destroy currently running coroutine"); 1235 croak ("FATAL: tried to destroy currently running coroutine");
1093 1236
1094 save_perl (aTHX_ &temp); 1237 save_perl (aTHX_ &temp);
1095 load_perl (aTHX_ coro); 1238 load_perl (aTHX_ coro);
1096 1239
1097 coro_destroy_stacks (aTHX); 1240 coro_destroy (aTHX_ coro);
1098 1241
1099 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1242 load_perl (aTHX_ &temp);
1100 1243
1101 coro->mainstack = 0; 1244 coro->slot = 0;
1102 } 1245 }
1103 1246
1104 cctx_destroy (coro->cctx); 1247 cctx_destroy (coro->cctx);
1105 SvREFCNT_dec (coro->args); 1248 SvREFCNT_dec (coro->args);
1106 1249
… …
1165 1308
1166 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1309 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1167 TRANSFER (ta); 1310 TRANSFER (ta);
1168} 1311}
1169 1312
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 ********************************************************************/ 1313/** Coro ********************************************************************/
1184 1314
1185static void 1315static void
1186coro_enq (pTHX_ SV *coro_sv) 1316coro_enq (pTHX_ SV *coro_sv)
1187{ 1317{
… …
1244 { 1374 {
1245 LOCK; 1375 LOCK;
1246 next_sv = coro_deq (aTHX_ PRIO_MIN); 1376 next_sv = coro_deq (aTHX_ PRIO_MIN);
1247 1377
1248 /* nothing to schedule: call the idle handler */ 1378 /* nothing to schedule: call the idle handler */
1249 if (!next_sv) 1379 if (expect_false (!next_sv))
1250 { 1380 {
1251 dSP; 1381 dSP;
1252 UNLOCK; 1382 UNLOCK;
1253 1383
1254 ENTER; 1384 ENTER;
… …
1264 } 1394 }
1265 1395
1266 ta->next = SvSTATE (next_sv); 1396 ta->next = SvSTATE (next_sv);
1267 1397
1268 /* cannot transfer to destroyed coros, skip and look for next */ 1398 /* cannot transfer to destroyed coros, skip and look for next */
1269 if (ta->next->flags & CF_DESTROYED) 1399 if (expect_false (ta->next->flags & CF_DESTROYED))
1270 { 1400 {
1271 UNLOCK; 1401 UNLOCK;
1272 SvREFCNT_dec (next_sv); 1402 SvREFCNT_dec (next_sv);
1273 /* coro_nready is already taken care of by destroy */ 1403 /* coro_nready is already taken care of by destroy */
1274 continue; 1404 continue;
… …
1330 dTHX; 1460 dTHX;
1331 struct transfer_args ta; 1461 struct transfer_args ta;
1332 1462
1333 prepare_cede (aTHX_ &ta); 1463 prepare_cede (aTHX_ &ta);
1334 1464
1335 if (ta.prev != ta.next) 1465 if (expect_true (ta.prev != ta.next))
1336 { 1466 {
1337 TRANSFER (ta); 1467 TRANSFER (ta);
1338 return 1; 1468 return 1;
1339 } 1469 }
1340 else 1470 else
… …
1376 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1506 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1377 1507
1378 if (coro->flags & CF_RUNNING) 1508 if (coro->flags & CF_RUNNING)
1379 PL_runops = RUNOPS_DEFAULT; 1509 PL_runops = RUNOPS_DEFAULT;
1380 else 1510 else
1381 coro->runops = RUNOPS_DEFAULT; 1511 coro->slot->runops = RUNOPS_DEFAULT;
1382 } 1512 }
1383} 1513}
1384 1514
1385MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1515MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1386 1516
… …
1390{ 1520{
1391#ifdef USE_ITHREADS 1521#ifdef USE_ITHREADS
1392 MUTEX_INIT (&coro_mutex); 1522 MUTEX_INIT (&coro_mutex);
1393#endif 1523#endif
1394 BOOT_PAGESIZE; 1524 BOOT_PAGESIZE;
1525
1526 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1527 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1528
1529 hv_sig = coro_get_hv ("SIG", TRUE);
1530 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE);
1531 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE);
1532
1533 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1534 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1395 1535
1396 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1536 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1397 1537
1398 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1538 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1399 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1539 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1400 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1540 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1401 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1541 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1402 1542
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; 1543 main_mainstack = PL_mainstack;
1412 main_top_env = PL_top_env; 1544 main_top_env = PL_top_env;
1413 1545
1414 while (main_top_env->je_prev) 1546 while (main_top_env->je_prev)
1415 main_top_env = main_top_env->je_prev; 1547 main_top_env = main_top_env->je_prev;
1416 1548
1417 coroapi.ver = CORO_API_VERSION; 1549 coroapi.ver = CORO_API_VERSION;
1550 coroapi.rev = CORO_API_REVISION;
1418 coroapi.transfer = api_transfer; 1551 coroapi.transfer = api_transfer;
1419 1552
1420 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1553 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1421} 1554}
1422 1555
… …
1427 struct coro *coro; 1560 struct coro *coro;
1428 HV *hv; 1561 HV *hv;
1429 int i; 1562 int i;
1430 1563
1431 Newz (0, coro, 1, struct coro); 1564 Newz (0, coro, 1, struct coro);
1432 coro->args = newAV (); 1565 coro->args = newAV ();
1433 coro->save = CORO_SAVE_DEF;
1434 coro->flags = CF_NEW; 1566 coro->flags = CF_NEW;
1435 1567
1436 if (coro_first) coro_first->prev = coro; 1568 if (coro_first) coro_first->prev = coro;
1437 coro->next = coro_first; 1569 coro->next = coro_first;
1438 coro_first = coro; 1570 coro_first = coro;
1439 1571
1440 coro->hv = hv = newHV (); 1572 coro->hv = hv = newHV ();
1441 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1573 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)); 1574 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1443 1575
1576 av_extend (coro->args, items - 1);
1444 for (i = 1; i < items; i++) 1577 for (i = 1; i < items; i++)
1445 av_push (coro->args, newSVsv (ST (i))); 1578 av_push (coro->args, newSVsv (ST (i)));
1446} 1579}
1447 OUTPUT: 1580 OUTPUT:
1448 RETVAL 1581 RETVAL
1449 1582
1450int 1583# these not obviously related functions are all rolled into the same xs
1451save (SV *coro, int new_save = -1) 1584# function to increase chances that they all will call transfer with the same
1452 CODE: 1585# 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 1586void
1469_set_stacklevel (...) 1587_set_stacklevel (...)
1470 ALIAS: 1588 ALIAS:
1471 Coro::State::transfer = 1 1589 Coro::State::transfer = 1
1472 Coro::schedule = 2 1590 Coro::schedule = 2
… …
1504 1622
1505 break; 1623 break;
1506 } 1624 }
1507 1625
1508 BARRIER; 1626 BARRIER;
1627 PUTBACK;
1509 TRANSFER (ta); 1628 TRANSFER (ta);
1510 1629 SPAGAIN; /* might be the sp of a different coroutine now */
1511 if (GIMME_V != G_VOID && ta.next != ta.prev) 1630 /* be extra careful not to ever do anything after TRANSFER */
1512 XSRETURN_YES;
1513} 1631}
1514 1632
1515bool 1633bool
1516_destroy (SV *coro_sv) 1634_destroy (SV *coro_sv)
1517 CODE: 1635 CODE:
… …
1543 RETVAL 1661 RETVAL
1544 1662
1545int 1663int
1546cctx_idle () 1664cctx_idle ()
1547 CODE: 1665 CODE:
1548 RETVAL = cctx_idle; 1666 RETVAL = cctx_idle[0] + cctx_idle[1] + cctx_idle[2];
1549 OUTPUT: 1667 OUTPUT:
1550 RETVAL 1668 RETVAL
1551 1669
1552void 1670void
1553list () 1671list ()
… …
1566 CODE: 1684 CODE:
1567{ 1685{
1568 if (coro->mainstack) 1686 if (coro->mainstack)
1569 { 1687 {
1570 struct coro temp; 1688 struct coro temp;
1571 Zero (&temp, 1, struct coro);
1572 temp.save = CORO_SAVE_ALL;
1573 1689
1574 if (!(coro->flags & CF_RUNNING)) 1690 if (!(coro->flags & CF_RUNNING))
1575 { 1691 {
1576 save_perl (aTHX_ &temp); 1692 save_perl (aTHX_ &temp);
1577 load_perl (aTHX_ coro); 1693 load_perl (aTHX_ coro);
… …
1579 1695
1580 { 1696 {
1581 dSP; 1697 dSP;
1582 ENTER; 1698 ENTER;
1583 SAVETMPS; 1699 SAVETMPS;
1700 PUTBACK;
1701 PUSHSTACK;
1584 PUSHMARK (SP); 1702 PUSHMARK (SP);
1585 PUTBACK; 1703
1586 if (ix) 1704 if (ix)
1587 eval_sv (coderef, 0); 1705 eval_sv (coderef, 0);
1588 else 1706 else
1589 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1707 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1708
1590 SPAGAIN; 1709 POPSTACK;
1591 FREETMPS; 1710 FREETMPS;
1592 LEAVE; 1711 LEAVE;
1593 PUTBACK; 1712 PUTBACK;
1594 } 1713 }
1595 1714
… …
1652 1771
1653BOOT: 1772BOOT:
1654{ 1773{
1655 int i; 1774 int i;
1656 1775
1657 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1776 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1658 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1777 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1659 av_async_pool = get_av ("Coro::async_pool", TRUE); 1778 av_async_pool = coro_get_av ("Coro::async_pool", TRUE);
1660 1779
1661 coro_current = get_sv ("Coro::current", FALSE); 1780 coro_current = coro_get_sv ("Coro::current", FALSE);
1662 SvREADONLY_on (coro_current); 1781 SvREADONLY_on (coro_current);
1663 1782
1664 coro_stash = gv_stashpv ("Coro", TRUE); 1783 coro_stash = gv_stashpv ("Coro", TRUE);
1665 1784
1666 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1785 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1667 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1786 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1668 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1787 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1669 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1788 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
… …
1672 1791
1673 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1792 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1674 coro_ready[i] = newAV (); 1793 coro_ready[i] = newAV ();
1675 1794
1676 { 1795 {
1677 SV *sv = perl_get_sv("Coro::API", 1); 1796 SV *sv = perl_get_sv ("Coro::API", TRUE);
1797 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1678 1798
1679 coroapi.schedule = api_schedule; 1799 coroapi.schedule = api_schedule;
1680 coroapi.save = api_save;
1681 coroapi.cede = api_cede; 1800 coroapi.cede = api_cede;
1682 coroapi.cede_notself = api_cede_notself; 1801 coroapi.cede_notself = api_cede_notself;
1683 coroapi.ready = api_ready; 1802 coroapi.ready = api_ready;
1684 coroapi.is_ready = api_is_ready; 1803 coroapi.is_ready = api_is_ready;
1685 coroapi.nready = &coro_nready; 1804 coroapi.nready = &coro_nready;
… …
1734 CODE: 1853 CODE:
1735 RETVAL = coro_nready; 1854 RETVAL = coro_nready;
1736 OUTPUT: 1855 OUTPUT:
1737 RETVAL 1856 RETVAL
1738 1857
1858void
1859throw (Coro::State self, SV *throw = &PL_sv_undef)
1860 PROTOTYPE: $;$
1861 CODE:
1862 SvREFCNT_dec (self->throw);
1863 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1864
1739# for async_pool speedup 1865# for async_pool speedup
1740void 1866void
1741_pool_1 (SV *cb) 1867_pool_1 (SV *cb)
1742 CODE: 1868 CODE:
1743{ 1869{
1744 int i, len; 1870 struct coro *coro = SvSTATE (coro_current);
1745 HV *hv = (HV *)SvRV (coro_current); 1871 HV *hv = (HV *)SvRV (coro_current);
1746 AV *defav = GvAV (PL_defgv); 1872 AV *defav = GvAV (PL_defgv);
1747 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1873 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0);
1748 AV *invoke_av; 1874 AV *invoke_av;
1875 int i, len;
1749 1876
1750 if (!invoke) 1877 if (!invoke)
1751 croak ("\3terminate\2\n"); 1878 croak ("\3async_pool terminate\2\n");
1879
1880 SvREFCNT_dec (coro->saved_deffh);
1881 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1752 1882
1753 hv_store (hv, "desc", sizeof ("desc") - 1, 1883 hv_store (hv, "desc", sizeof ("desc") - 1,
1754 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1884 newSVpvn (strpair ("[async_pool]")), 0);
1755 1885
1756 invoke_av = (AV *)SvRV (invoke); 1886 invoke_av = (AV *)SvRV (invoke);
1757 len = av_len (invoke_av); 1887 len = av_len (invoke_av);
1758 1888
1759 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1889 sv_setsv (cb, AvARRAY (invoke_av)[0]);
… …
1774{ 1904{
1775 struct coro *coro = SvSTATE (coro_current); 1905 struct coro *coro = SvSTATE (coro_current);
1776 1906
1777 sv_setsv (cb, &PL_sv_undef); 1907 sv_setsv (cb, &PL_sv_undef);
1778 1908
1909 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1910 coro->saved_deffh = 0;
1911
1779 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1912 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1780 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1913 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1781 croak ("\3terminate\2\n"); 1914 croak ("\3async_pool terminate\2\n");
1782 1915
1783 av_clear (GvAV (PL_defgv)); 1916 av_clear (GvAV (PL_defgv));
1784 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1917 hv_store ((HV *)SvRV (coro_current), strpair ("desc"),
1785 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1918 newSVpvn (strpair ("[async_pool idle]")), 0);
1786 1919
1787 coro->save = CORO_SAVE_DEF;
1788 coro->prio = 0; 1920 coro->prio = 0;
1789 1921
1790 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 1922 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1791 api_trace (coro_current, 0); 1923 api_trace (coro_current, 0);
1792 1924

Diff Legend

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