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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines