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.165 by root, Wed Sep 26 19:26:48 2007 UTC vs.
Revision 1.198 by root, Sun Oct 7 03:58:37 2007 UTC

1#include "libcoro/coro.c" 1#include "libcoro/coro.c"
2 2
3#define PERL_NO_GET_CONTEXT 3#define PERL_NO_GET_CONTEXT
4#define PERL_EXT
4 5
5#include "EXTERN.h" 6#include "EXTERN.h"
6#include "perl.h" 7#include "perl.h"
7#include "XSUB.h" 8#include "XSUB.h"
8 9
… …
75/* 5.8.7 */ 76/* 5.8.7 */
76#ifndef SvRV_set 77#ifndef SvRV_set
77# define SvRV_set(s,v) SvRV(s) = (v) 78# define SvRV_set(s,v) SvRV(s) = (v)
78#endif 79#endif
79 80
81/* 5.8.8 */
82#ifndef GV_NOTQUAL
83# define GV_NOTQUAL 0
84#endif
85#ifndef newSV
86# define newSV(l) NEWSV(0,l)
87#endif
88
80#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 89#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
81# undef CORO_STACKGUARD 90# undef CORO_STACKGUARD
82#endif 91#endif
83 92
84#ifndef CORO_STACKGUARD 93#ifndef CORO_STACKGUARD
… …
98#define IN_DESTRUCT (PL_main_cv == Nullcv) 107#define IN_DESTRUCT (PL_main_cv == Nullcv)
99 108
100#if __GNUC__ >= 3 109#if __GNUC__ >= 3
101# define attribute(x) __attribute__(x) 110# define attribute(x) __attribute__(x)
102# define BARRIER __asm__ __volatile__ ("" : : : "memory") 111# define BARRIER __asm__ __volatile__ ("" : : : "memory")
112# define expect(expr,value) __builtin_expect ((expr),(value))
103#else 113#else
104# define attribute(x) 114# define attribute(x)
105# define BARRIER 115# define BARRIER
116# define expect(expr,value) (expr)
106#endif 117#endif
118
119#define expect_false(expr) expect ((expr) != 0, 0)
120#define expect_true(expr) expect ((expr) != 0, 1)
107 121
108#define NOINLINE attribute ((noinline)) 122#define NOINLINE attribute ((noinline))
109 123
110#include "CoroAPI.h" 124#include "CoroAPI.h"
111 125
… …
132static AV *main_mainstack; /* used to differentiate between $main and others */ 146static AV *main_mainstack; /* used to differentiate between $main and others */
133static JMPENV *main_top_env; 147static JMPENV *main_top_env;
134static HV *coro_state_stash, *coro_stash; 148static HV *coro_state_stash, *coro_stash;
135static SV *coro_mortal; /* will be freed after next transfer */ 149static SV *coro_mortal; /* will be freed after next transfer */
136 150
151static GV *irsgv; /* $/ */
152static GV *stdoutgv; /* *STDOUT */
153
137/* async_pool helper stuff */ 154/* async_pool helper stuff */
138static SV *sv_pool_rss; 155static SV *sv_pool_rss;
139static SV *sv_pool_size; 156static SV *sv_pool_size;
140static AV *av_async_pool; 157static AV *av_async_pool;
141 158
142static struct coro_cctx *cctx_first; 159static struct coro_cctx *cctx_first;
143static int cctx_count, cctx_idle; 160static int cctx_count, cctx_idle;
144 161
145enum { 162enum {
146 CC_MAPPED = 0x01, 163 CC_MAPPED = 0x01,
147 CC_TRACE = 0x02,
148 CC_NOREUSE = 0x04, /* throw this away after tracing */ 164 CC_NOREUSE = 0x02, /* throw this away after tracing */
165 CC_TRACE = 0x04,
166 CC_TRACE_SUB = 0x08, /* trace sub calls */
167 CC_TRACE_LINE = 0x10, /* trace each statement */
168 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE,
149}; 169};
150 170
151/* this is a structure representing a c-level coroutine */ 171/* this is a structure representing a c-level coroutine */
152typedef struct coro_cctx { 172typedef struct coro_cctx {
153 struct coro_cctx *next; 173 struct coro_cctx *next;
… …
173 CF_READY = 0x0002, /* coroutine is ready */ 193 CF_READY = 0x0002, /* coroutine is ready */
174 CF_NEW = 0x0004, /* has never been switched to */ 194 CF_NEW = 0x0004, /* has never been switched to */
175 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 195 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
176}; 196};
177 197
198/* the structure where most of the perl state is stored, overlaid on the cxstack */
199typedef struct {
200 SV *defsv;
201 AV *defav;
202 SV *errsv;
203 SV *irsgv;
204#define VAR(name,type) type name;
205# include "state.h"
206#undef VAR
207} perl_slots;
208
209#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
210
178/* this is a structure representing a perl-level coroutine */ 211/* this is a structure representing a perl-level coroutine */
179struct coro { 212struct coro {
180 /* the c coroutine allocated to this perl coroutine, if any */ 213 /* the c coroutine allocated to this perl coroutine, if any */
181 coro_cctx *cctx; 214 coro_cctx *cctx;
182 215
216 /* process data */
217 AV *mainstack;
218 perl_slots *slot; /* basically the saved sp */
219
183 /* data associated with this coroutine (initial args) */ 220 /* data associated with this coroutine (initial args) */
184 AV *args; 221 AV *args;
185 int refcnt; 222 int refcnt;
186 int save; /* CORO_SAVE flags */
187 int flags; /* CF_ flags */ 223 int flags; /* CF_ flags */
188 224
189 /* optionally saved, might be zero */ 225 /* statistics */
190 AV *defav; /* @_ */ 226 int usecount; /* number of transfers to this coro */
191 SV *defsv; /* $_ */
192 SV *errsv; /* $@ */
193 GV *deffh; /* default filehandle */
194 SV *irssv; /* $/ */
195 SV *irssv_sv; /* real $/ cache */
196
197#define VAR(name,type) type name;
198# include "state.h"
199#undef VAR
200 227
201 /* coro process data */ 228 /* coro process data */
202 int prio; 229 int prio;
230 SV *throw;
231
232 /* async_pool */
233 SV *saved_deffh;
203 234
204 /* linked list */ 235 /* linked list */
205 struct coro *next, *prev; 236 struct coro *next, *prev;
206 HV *hv; /* the perl hash associated with this coro, if any */ 237 HV *hv; /* the perl hash associated with this coro, if any */
207}; 238};
… …
296 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 327 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \
297 ? SvMAGIC (cv) \ 328 ? SvMAGIC (cv) \
298 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 329 : mg_find ((SV *)cv, PERL_MAGIC_coro) \
299 : 0 330 : 0
300 331
332static struct coro *
333SvSTATE_ (pTHX_ SV *coro)
334{
335 HV *stash;
336 MAGIC *mg;
337
338 if (SvROK (coro))
339 coro = SvRV (coro);
340
341 if (expect_false (SvTYPE (coro) != SVt_PVHV))
342 croak ("Coro::State object required");
343
344 stash = SvSTASH (coro);
345 if (expect_false (stash != coro_stash && stash != coro_state_stash))
346 {
347 /* very slow, but rare, check */
348 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
349 croak ("Coro::State object required");
350 }
351
352 mg = CORO_MAGIC (coro);
353 return (struct coro *)mg->mg_ptr;
354}
355
356#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
357
301/* the next two functions merely cache the padlists */ 358/* the next two functions merely cache the padlists */
302static void 359static void
303get_padlist (pTHX_ CV *cv) 360get_padlist (pTHX_ CV *cv)
304{ 361{
305 MAGIC *mg = CORO_MAGIC (cv); 362 MAGIC *mg = CORO_MAGIC (cv);
306 AV *av; 363 AV *av;
307 364
308 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 365 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
309 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 366 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
310 else 367 else
311 { 368 {
312#if CORO_PREFER_PERL_FUNCTIONS 369#if CORO_PREFER_PERL_FUNCTIONS
313 /* this is probably cleaner, but also slower? */ 370 /* this is probably cleaner, but also slower? */
… …
325put_padlist (pTHX_ CV *cv) 382put_padlist (pTHX_ CV *cv)
326{ 383{
327 MAGIC *mg = CORO_MAGIC (cv); 384 MAGIC *mg = CORO_MAGIC (cv);
328 AV *av; 385 AV *av;
329 386
330 if (!mg) 387 if (expect_false (!mg))
331 { 388 {
332 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 389 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
333 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 390 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
334 mg->mg_virtual = &vtbl_coro; 391 mg->mg_virtual = &vtbl_coro;
335 mg->mg_obj = (SV *)newAV (); 392 mg->mg_obj = (SV *)newAV ();
336 } 393 }
337 394
338 av = (AV *)mg->mg_obj; 395 av = (AV *)mg->mg_obj;
339 396
340 if (AvFILLp (av) >= AvMAX (av)) 397 if (expect_false (AvFILLp (av) >= AvMAX (av)))
341 av_extend (av, AvMAX (av) + 1); 398 av_extend (av, AvMAX (av) + 1);
342 399
343 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 400 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
344} 401}
345 402
346/** load & save, init *******************************************************/ 403/** load & save, init *******************************************************/
347 404
348#define SB do {
349#define SE } while (0)
350
351#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
352
353static void 405static void
354load_perl (pTHX_ Coro__State c) 406load_perl (pTHX_ Coro__State c)
355{ 407{
408 perl_slots *slot = c->slot;
409 c->slot = 0;
410
411 PL_mainstack = c->mainstack;
412
413 GvSV (PL_defgv) = slot->defsv;
414 GvAV (PL_defgv) = slot->defav;
415 GvSV (PL_errgv) = slot->errsv;
416 GvSV (irsgv) = slot->irsgv;
417
356#define VAR(name,type) PL_ ## name = c->name; 418 #define VAR(name,type) PL_ ## name = slot->name;
357# include "state.h" 419 # include "state.h"
358#undef VAR 420 #undef VAR
359
360 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
361 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
362 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
363 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh);
364
365 if (c->irssv)
366 {
367 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
368 {
369 SvREFCNT_dec (c->irssv);
370 c->irssv = 0;
371 }
372 else
373 {
374 REPLACE_SV (PL_rs, c->irssv);
375 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
376 sv_setsv (c->irssv_sv, PL_rs);
377 }
378 }
379 421
380 { 422 {
381 dSP; 423 dSP;
424
382 CV *cv; 425 CV *cv;
383 426
384 /* now do the ugly restore mess */ 427 /* now do the ugly restore mess */
385 while ((cv = (CV *)POPs)) 428 while (expect_true (cv = (CV *)POPs))
386 { 429 {
387 put_padlist (aTHX_ cv); /* mark this padlist as available */ 430 put_padlist (aTHX_ cv); /* mark this padlist as available */
388 CvDEPTH (cv) = PTR2IV (POPs); 431 CvDEPTH (cv) = PTR2IV (POPs);
389 CvPADLIST (cv) = (AV *)POPs; 432 CvPADLIST (cv) = (AV *)POPs;
390 } 433 }
… …
409 452
410 XPUSHs (Nullsv); 453 XPUSHs (Nullsv);
411 /* this loop was inspired by pp_caller */ 454 /* this loop was inspired by pp_caller */
412 for (;;) 455 for (;;)
413 { 456 {
414 while (cxix >= 0) 457 while (expect_true (cxix >= 0))
415 { 458 {
416 PERL_CONTEXT *cx = &ccstk[cxix--]; 459 PERL_CONTEXT *cx = &ccstk[cxix--];
417 460
418 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 461 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
419 { 462 {
420 CV *cv = cx->blk_sub.cv; 463 CV *cv = cx->blk_sub.cv;
421 464
422 if (CvDEPTH (cv)) 465 if (expect_true (CvDEPTH (cv)))
423 { 466 {
424 EXTEND (SP, 3); 467 EXTEND (SP, 3);
425 PUSHs ((SV *)CvPADLIST (cv)); 468 PUSHs ((SV *)CvPADLIST (cv));
426 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 469 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
427 PUSHs ((SV *)cv); 470 PUSHs ((SV *)cv);
… …
430 get_padlist (aTHX_ cv); 473 get_padlist (aTHX_ cv);
431 } 474 }
432 } 475 }
433 } 476 }
434 477
435 if (top_si->si_type == PERLSI_MAIN) 478 if (expect_true (top_si->si_type == PERLSI_MAIN))
436 break; 479 break;
437 480
438 top_si = top_si->si_prev; 481 top_si = top_si->si_prev;
439 ccstk = top_si->si_cxstack; 482 ccstk = top_si->si_cxstack;
440 cxix = top_si->si_cxix; 483 cxix = top_si->si_cxix;
441 } 484 }
442 485
443 PUTBACK; 486 PUTBACK;
444 } 487 }
445 488
446 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 489 /* allocate some space on the context stack for our purposes */
447 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 490 {
448 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 491 /* we manually unroll here, as usually 2 slots is enough */
449 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 492 int i;
450 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0; 493 if (SLOT_COUNT >= 1) CXINC;
494 if (SLOT_COUNT >= 2) CXINC;
495 if (SLOT_COUNT >= 3) CXINC;
496 for (i = 3; i < SLOT_COUNT; ++i)
497 CXINC;
451 498
499 cxstack_ix -= SLOT_COUNT; /* undo allocation */
500 }
501
502 c->mainstack = PL_mainstack;
503
504 {
505 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
506
507 slot->defav = GvAV (PL_defgv);
508 slot->defsv = DEFSV;
509 slot->errsv = ERRSV;
510 slot->irsgv = GvSV (irsgv);
511
452#define VAR(name,type)c->name = PL_ ## name; 512 #define VAR(name,type) slot->name = PL_ ## name;
453# include "state.h" 513 # include "state.h"
454#undef VAR 514 #undef VAR
515 }
455} 516}
456 517
457/* 518/*
458 * allocate various perl stacks. This is an exact copy 519 * allocate various perl stacks. This is an exact copy
459 * of perl.c:init_stacks, except that it uses less memory 520 * of perl.c:init_stacks, except that it uses less memory
… …
464# define coro_init_stacks init_stacks 525# define coro_init_stacks init_stacks
465#else 526#else
466static void 527static void
467coro_init_stacks (pTHX) 528coro_init_stacks (pTHX)
468{ 529{
469 PL_curstackinfo = new_stackinfo(64, 6); 530 PL_curstackinfo = new_stackinfo(32, 8);
470 PL_curstackinfo->si_type = PERLSI_MAIN; 531 PL_curstackinfo->si_type = PERLSI_MAIN;
471 PL_curstack = PL_curstackinfo->si_stack; 532 PL_curstack = PL_curstackinfo->si_stack;
472 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 533 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
473 534
474 PL_stack_base = AvARRAY(PL_curstack); 535 PL_stack_base = AvARRAY(PL_curstack);
475 PL_stack_sp = PL_stack_base; 536 PL_stack_sp = PL_stack_base;
476 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 537 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
477 538
478 New(50,PL_tmps_stack,64,SV*); 539 New(50,PL_tmps_stack,32,SV*);
479 PL_tmps_floor = -1; 540 PL_tmps_floor = -1;
480 PL_tmps_ix = -1; 541 PL_tmps_ix = -1;
481 PL_tmps_max = 64; 542 PL_tmps_max = 32;
482 543
483 New(54,PL_markstack,16,I32); 544 New(54,PL_markstack,16,I32);
484 PL_markstack_ptr = PL_markstack; 545 PL_markstack_ptr = PL_markstack;
485 PL_markstack_max = PL_markstack + 16; 546 PL_markstack_max = PL_markstack + 16;
486 547
487#ifdef SET_MARK_OFFSET 548#ifdef SET_MARK_OFFSET
488 SET_MARK_OFFSET; 549 SET_MARK_OFFSET;
489#endif 550#endif
490 551
491 New(54,PL_scopestack,16,I32); 552 New(54,PL_scopestack,8,I32);
492 PL_scopestack_ix = 0; 553 PL_scopestack_ix = 0;
493 PL_scopestack_max = 16; 554 PL_scopestack_max = 8;
494 555
495 New(54,PL_savestack,64,ANY); 556 New(54,PL_savestack,24,ANY);
496 PL_savestack_ix = 0; 557 PL_savestack_ix = 0;
497 PL_savestack_max = 64; 558 PL_savestack_max = 24;
498 559
499#if !PERL_VERSION_ATLEAST (5,9,0) 560#if !PERL_VERSION_ATLEAST (5,9,0)
500 New(54,PL_retstack,4,OP*); 561 New(54,PL_retstack,4,OP*);
501 PL_retstack_ix = 0; 562 PL_retstack_ix = 0;
502 PL_retstack_max = 4; 563 PL_retstack_max = 4;
… …
508 * destroy the stacks, the callchain etc... 569 * destroy the stacks, the callchain etc...
509 */ 570 */
510static void 571static void
511coro_destroy_stacks (pTHX) 572coro_destroy_stacks (pTHX)
512{ 573{
513 if (!IN_DESTRUCT)
514 {
515 /* restore all saved variables and stuff */
516 LEAVE_SCOPE (0);
517 assert (PL_tmps_floor == -1);
518
519 /* free all temporaries */
520 FREETMPS;
521 assert (PL_tmps_ix == -1);
522
523 /* unwind all extra stacks */
524 POPSTACK_TO (PL_mainstack);
525
526 /* unwind main stack */
527 dounwind (-1);
528 }
529
530 while (PL_curstackinfo->si_next) 574 while (PL_curstackinfo->si_next)
531 PL_curstackinfo = PL_curstackinfo->si_next; 575 PL_curstackinfo = PL_curstackinfo->si_next;
532 576
533 while (PL_curstackinfo) 577 while (PL_curstackinfo)
534 { 578 {
… …
550 Safefree (PL_retstack); 594 Safefree (PL_retstack);
551#endif 595#endif
552} 596}
553 597
554static size_t 598static size_t
555coro_rss (struct coro *coro) 599coro_rss (pTHX_ struct coro *coro)
556{ 600{
557 size_t rss = sizeof (coro); 601 size_t rss = sizeof (*coro);
558 602
559 if (coro->mainstack) 603 if (coro->mainstack)
560 { 604 {
605 perl_slots tmp_slot;
606 perl_slots *slot;
607
561 if (coro->flags & CF_RUNNING) 608 if (coro->flags & CF_RUNNING)
562 { 609 {
610 slot = &tmp_slot;
611
563 #define VAR(name,type)coro->name = PL_ ## name; 612 #define VAR(name,type) slot->name = PL_ ## name;
564 # include "state.h" 613 # include "state.h"
565 #undef VAR 614 #undef VAR
566 } 615 }
616 else
617 slot = coro->slot;
567 618
568 rss += sizeof (coro->curstackinfo); 619 rss += sizeof (slot->curstackinfo);
569 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
570 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 620 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
571 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 621 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
572 rss += coro->tmps_max * sizeof (SV *); 622 rss += slot->tmps_max * sizeof (SV *);
573 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 623 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
574 rss += coro->scopestack_max * sizeof (I32); 624 rss += slot->scopestack_max * sizeof (I32);
575 rss += coro->savestack_max * sizeof (ANY); 625 rss += slot->savestack_max * sizeof (ANY);
576 626
577#if !PERL_VERSION_ATLEAST (5,9,0) 627#if !PERL_VERSION_ATLEAST (5,9,0)
578 rss += coro->retstack_max * sizeof (OP *); 628 rss += slot->retstack_max * sizeof (OP *);
579#endif 629#endif
580 } 630 }
581 631
582 return rss; 632 return rss;
583} 633}
584 634
585/** coroutine stack handling ************************************************/ 635/** coroutine stack handling ************************************************/
586 636
587static void 637static void
588setup_coro (pTHX_ struct coro *coro) 638coro_setup (pTHX_ struct coro *coro)
589{ 639{
590 /* 640 /*
591 * emulate part of the perl startup here. 641 * emulate part of the perl startup here.
592 */ 642 */
593 coro_init_stacks (aTHX); 643 coro_init_stacks (aTHX);
594 644
645 PL_runops = RUNOPS_DEFAULT;
595 PL_curcop = &PL_compiling; 646 PL_curcop = &PL_compiling;
596 PL_in_eval = EVAL_NULL; 647 PL_in_eval = EVAL_NULL;
597 PL_comppad = 0; 648 PL_comppad = 0;
598 PL_curpm = 0; 649 PL_curpm = 0;
650 PL_curpad = 0;
599 PL_localizing = 0; 651 PL_localizing = 0;
600 PL_dirty = 0; 652 PL_dirty = 0;
601 PL_restartop = 0; 653 PL_restartop = 0;
654 PL_diehook = 0;
655 PL_warnhook = 0;
656
657 GvSV (PL_defgv) = newSV (0);
658 GvAV (PL_defgv) = coro->args; coro->args = 0;
659 GvSV (PL_errgv) = newSV (0);
660 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
661 PL_rs = newSVsv (GvSV (irsgv));
662 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
602 663
603 { 664 {
604 dSP; 665 dSP;
605 LOGOP myop; 666 LOGOP myop;
606 667
607 SvREFCNT_dec (GvAV (PL_defgv));
608 GvAV (PL_defgv) = coro->args; coro->args = 0;
609
610 Zero (&myop, 1, LOGOP); 668 Zero (&myop, 1, LOGOP);
611 myop.op_next = Nullop; 669 myop.op_next = Nullop;
612 myop.op_flags = OPf_WANT_VOID; 670 myop.op_flags = OPf_WANT_VOID;
613 671
614 PUSHMARK (SP); 672 PUSHMARK (SP);
615 XPUSHs (av_shift (GvAV (PL_defgv))); 673 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
616 PUTBACK; 674 PUTBACK;
617 PL_op = (OP *)&myop; 675 PL_op = (OP *)&myop;
618 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 676 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
619 SPAGAIN; 677 SPAGAIN;
620 } 678 }
621 679
622 ENTER; /* necessary e.g. for dounwind */ 680 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */
681}
682
683static void
684coro_destroy (pTHX_ struct coro *coro)
685{
686 if (!IN_DESTRUCT)
687 {
688 /* restore all saved variables and stuff */
689 LEAVE_SCOPE (0);
690 assert (PL_tmps_floor == -1);
691
692 /* free all temporaries */
693 FREETMPS;
694 assert (PL_tmps_ix == -1);
695
696 /* unwind all extra stacks */
697 POPSTACK_TO (PL_mainstack);
698
699 /* unwind main stack */
700 dounwind (-1);
701 }
702
703 SvREFCNT_dec (GvSV (PL_defgv));
704 SvREFCNT_dec (GvAV (PL_defgv));
705 SvREFCNT_dec (GvSV (PL_errgv));
706 SvREFCNT_dec (PL_defoutgv);
707 SvREFCNT_dec (PL_rs);
708 SvREFCNT_dec (GvSV (irsgv));
709
710 SvREFCNT_dec (PL_diehook);
711 SvREFCNT_dec (PL_warnhook);
712
713 SvREFCNT_dec (coro->saved_deffh);
714 SvREFCNT_dec (coro->throw);
715
716 coro_destroy_stacks (aTHX);
623} 717}
624 718
625static void 719static void
626free_coro_mortal (pTHX) 720free_coro_mortal (pTHX)
627{ 721{
628 if (coro_mortal) 722 if (expect_true (coro_mortal))
629 { 723 {
630 SvREFCNT_dec (coro_mortal); 724 SvREFCNT_dec (coro_mortal);
631 coro_mortal = 0; 725 coro_mortal = 0;
632 } 726 }
633} 727}
634 728
635static void
636do_trace (pTHX)
637{
638 if (PL_curcop != &PL_compiling)
639 {
640 runops_proc_t old_runops = PL_runops;
641 dSP;
642 ENTER;
643 SAVETMPS;
644 PUSHMARK (SP);
645 PUTBACK;
646 PL_runops = RUNOPS_DEFAULT;
647 call_pv ("Coro::_do_trace", G_KEEPERR | G_EVAL | G_VOID | G_DISCARD | G_NOARGS);
648 PL_runops = old_runops;
649 SPAGAIN;
650 FREETMPS;
651 LEAVE;
652 PUTBACK;
653 }
654}
655
656static int 729static int
657runops_coro (pTHX) 730runops_trace (pTHX)
658{ 731{
659 COP *oldcop = 0; 732 COP *oldcop = 0;
733 int oldcxix = -2;
734 struct coro *coro = SvSTATE (coro_current); /* trace cctx is tied to specific coro */
735 coro_cctx *cctx = coro->cctx;
660 736
661 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 737 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
662 { 738 {
663 PERL_ASYNC_CHECK (); 739 PERL_ASYNC_CHECK ();
664 740
665 if (oldcop != PL_curcop) 741 if (cctx->flags & CC_TRACE_ALL)
666 { 742 {
743 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB)
744 {
745 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
746 SV **bot, **top;
747 AV *av = newAV (); /* return values */
748 SV **cb;
749 dSP;
750
751 GV *gv = CvGV (cx->blk_sub.cv);
752 SV *fullname = sv_2mortal (newSV (0));
753 if (isGV (gv))
754 gv_efullname3 (fullname, gv, 0);
755
756 bot = PL_stack_base + cx->blk_oldsp + 1;
757 top = cx->blk_gimme == G_ARRAY ? SP + 1
758 : cx->blk_gimme == G_SCALAR ? bot + 1
759 : bot;
760
761 av_extend (av, top - bot);
762 while (bot < top)
763 av_push (av, SvREFCNT_inc (*bot++));
764
765 PL_runops = RUNOPS_DEFAULT;
766 ENTER;
767 SAVETMPS;
768 EXTEND (SP, 3);
769 PUSHMARK (SP);
770 PUSHs (&PL_sv_no);
771 PUSHs (fullname);
772 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
773 PUTBACK;
774 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
775 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
776 SPAGAIN;
777 FREETMPS;
778 LEAVE;
779 PL_runops = runops_trace;
780 }
781
782 if (oldcop != PL_curcop)
783 {
667 oldcop = PL_curcop; 784 oldcop = PL_curcop;
668 do_trace (aTHX); 785
786 if (PL_curcop != &PL_compiling)
787 {
788 SV **cb;
789
790 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB)
791 {
792 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
793
794 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
795 {
796 runops_proc_t old_runops = PL_runops;
797 dSP;
798 GV *gv = CvGV (cx->blk_sub.cv);
799 SV *fullname = sv_2mortal (newSV (0));
800
801 if (isGV (gv))
802 gv_efullname3 (fullname, gv, 0);
803
804 PL_runops = RUNOPS_DEFAULT;
805 ENTER;
806 SAVETMPS;
807 EXTEND (SP, 3);
808 PUSHMARK (SP);
809 PUSHs (&PL_sv_yes);
810 PUSHs (fullname);
811 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
812 PUTBACK;
813 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
814 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
815 SPAGAIN;
816 FREETMPS;
817 LEAVE;
818 PL_runops = runops_trace;
819 }
820
821 oldcxix = cxstack_ix;
822 }
823
824 if (cctx->flags & CC_TRACE_LINE)
825 {
826 dSP;
827
828 PL_runops = RUNOPS_DEFAULT;
829 ENTER;
830 SAVETMPS;
831 EXTEND (SP, 3);
832 PL_runops = RUNOPS_DEFAULT;
833 PUSHMARK (SP);
834 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
835 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
836 PUTBACK;
837 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
838 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
839 SPAGAIN;
840 FREETMPS;
841 LEAVE;
842 PL_runops = runops_trace;
843 }
844 }
845 }
669 } 846 }
670 } 847 }
671 848
672 TAINT_NOT; 849 TAINT_NOT;
673 return 0; 850 return 0;
… …
683 LOGOP myop; 860 LOGOP myop;
684 861
685 PL_top_env = &PL_start_env; 862 PL_top_env = &PL_start_env;
686 863
687 if (cctx->flags & CC_TRACE) 864 if (cctx->flags & CC_TRACE)
688 PL_runops = runops_coro; 865 PL_runops = runops_trace;
689 866
690 Zero (&myop, 1, LOGOP); 867 Zero (&myop, 1, LOGOP);
691 myop.op_next = PL_op; 868 myop.op_next = PL_op;
692 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 869 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
693 870
… …
801 Safefree (cctx->sptr); 978 Safefree (cctx->sptr);
802 979
803 Safefree (cctx); 980 Safefree (cctx);
804} 981}
805 982
983/* wether this cctx should be destructed */
984#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
985
806static coro_cctx * 986static coro_cctx *
807cctx_get (pTHX) 987cctx_get (pTHX)
808{ 988{
809 while (cctx_first) 989 while (expect_true (cctx_first))
810 { 990 {
811 coro_cctx *cctx = cctx_first; 991 coro_cctx *cctx = cctx_first;
812 cctx_first = cctx->next; 992 cctx_first = cctx->next;
813 --cctx_idle; 993 --cctx_idle;
814 994
815 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 995 if (expect_true (!CCTX_EXPIRED (cctx)))
816 return cctx; 996 return cctx;
817 997
818 cctx_destroy (cctx); 998 cctx_destroy (cctx);
819 } 999 }
820 1000
… …
823 1003
824static void 1004static void
825cctx_put (coro_cctx *cctx) 1005cctx_put (coro_cctx *cctx)
826{ 1006{
827 /* free another cctx if overlimit */ 1007 /* free another cctx if overlimit */
828 if (cctx_idle >= MAX_IDLE_CCTX) 1008 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
829 { 1009 {
830 coro_cctx *first = cctx_first; 1010 coro_cctx *first = cctx_first;
831 cctx_first = first->next; 1011 cctx_first = first->next;
832 --cctx_idle; 1012 --cctx_idle;
833 1013
… …
839 cctx_first = cctx; 1019 cctx_first = cctx;
840} 1020}
841 1021
842/** coroutine switching *****************************************************/ 1022/** coroutine switching *****************************************************/
843 1023
844/* never call directly, always through the coro_state_transfer global variable */ 1024static void
1025transfer_check (pTHX_ struct coro *prev, struct coro *next)
1026{
1027 if (expect_true (prev != next))
1028 {
1029 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1030 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
1031
1032 if (expect_false (next->flags & CF_RUNNING))
1033 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
1034
1035 if (expect_false (next->flags & CF_DESTROYED))
1036 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1037
1038 if (
1039#if PERL_VERSION_ATLEAST (5,9,0)
1040 expect_false (PL_parser)
1041#else
1042 expect_false (PL_lex_state != LEX_NOTPARSING)
1043#endif
1044 )
1045 croak ("Coro::State::transfer called while parsing, but this is not supported");
1046 }
1047}
1048
1049/* always use the TRANSFER macro */
845static void NOINLINE 1050static void NOINLINE
846transfer (pTHX_ struct coro *prev, struct coro *next) 1051transfer (pTHX_ struct coro *prev, struct coro *next)
847{ 1052{
848 dSTACKLEVEL; 1053 dSTACKLEVEL;
849 1054
850 /* sometimes transfer is only called to set idle_sp */ 1055 /* sometimes transfer is only called to set idle_sp */
851 if (!next) 1056 if (expect_false (!next))
852 { 1057 {
853 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1058 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
854 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1059 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
855 } 1060 }
856 else if (prev != next) 1061 else if (expect_true (prev != next))
857 { 1062 {
858 coro_cctx *prev__cctx; 1063 coro_cctx *prev__cctx;
859 1064
860 if (prev->flags & CF_NEW) 1065 if (expect_false (prev->flags & CF_NEW))
861 { 1066 {
862 /* create a new empty context */ 1067 /* create a new empty context */
863 Newz (0, prev->cctx, 1, coro_cctx); 1068 Newz (0, prev->cctx, 1, coro_cctx);
864 prev->flags &= ~CF_NEW; 1069 prev->flags &= ~CF_NEW;
865 prev->flags |= CF_RUNNING; 1070 prev->flags |= CF_RUNNING;
866 } 1071 }
867 1072
868 /*TODO: must not croak here */
869 if (!prev->flags & CF_RUNNING)
870 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states");
871
872 if (next->flags & CF_RUNNING)
873 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
874
875 if (next->flags & CF_DESTROYED)
876 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
877
878 prev->flags &= ~CF_RUNNING; 1073 prev->flags &= ~CF_RUNNING;
879 next->flags |= CF_RUNNING; 1074 next->flags |= CF_RUNNING;
880 1075
881 LOCK; 1076 LOCK;
882 1077
883 if (next->flags & CF_NEW) 1078 if (expect_false (next->flags & CF_NEW))
884 { 1079 {
885 /* need to start coroutine */ 1080 /* need to start coroutine */
886 next->flags &= ~CF_NEW; 1081 next->flags &= ~CF_NEW;
887 /* first get rid of the old state */ 1082 /* first get rid of the old state */
888 save_perl (aTHX_ prev); 1083 save_perl (aTHX_ prev);
889 /* setup coroutine call */ 1084 /* setup coroutine call */
890 setup_coro (aTHX_ next); 1085 coro_setup (aTHX_ next);
891 } 1086 }
892 else 1087 else
893 { 1088 {
894 /* coroutine already started */ 1089 /* coroutine already started */
895 save_perl (aTHX_ prev); 1090 save_perl (aTHX_ prev);
… …
897 } 1092 }
898 1093
899 prev__cctx = prev->cctx; 1094 prev__cctx = prev->cctx;
900 1095
901 /* possibly "free" the cctx */ 1096 /* possibly "free" the cctx */
902 if (prev__cctx->idle_sp == STACKLEVEL) 1097 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
903 { 1098 {
904 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1099 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
905 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1100 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
906 1101
907 prev->cctx = 0; 1102 prev->cctx = 0;
908 1103
1104 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1105 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1106 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1107 next->cctx = cctx_get (aTHX);
1108
909 cctx_put (prev__cctx); 1109 cctx_put (prev__cctx);
910 } 1110 }
911 1111
1112 ++next->usecount;
1113
912 if (!next->cctx) 1114 if (expect_true (!next->cctx))
913 next->cctx = cctx_get (aTHX); 1115 next->cctx = cctx_get (aTHX);
914 1116
915 if (prev__cctx != next->cctx) 1117 if (expect_false (prev__cctx != next->cctx))
916 { 1118 {
917 prev__cctx->top_env = PL_top_env; 1119 prev__cctx->top_env = PL_top_env;
918 PL_top_env = next->cctx->top_env; 1120 PL_top_env = next->cctx->top_env;
919 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1121 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
920 } 1122 }
921 1123
922 free_coro_mortal (aTHX); 1124 free_coro_mortal (aTHX);
923 UNLOCK; 1125 UNLOCK;
1126
1127 if (expect_false (prev->throw || next->throw))
1128 {
1129 struct coro *coro = SvSTATE (coro_current);
1130
1131 if (coro->throw)
1132 {
1133 SV *exception = coro->throw;
1134 coro->throw = 0;
1135 sv_setsv (ERRSV, exception);
1136 croak (0);
1137 }
1138 }
924 } 1139 }
925} 1140}
926 1141
927struct transfer_args 1142struct transfer_args
928{ 1143{
929 struct coro *prev, *next; 1144 struct coro *prev, *next;
930}; 1145};
931 1146
932#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1147#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next)
1148#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
933 1149
934/** high level stuff ********************************************************/ 1150/** high level stuff ********************************************************/
935 1151
936static int 1152static int
937coro_state_destroy (pTHX_ struct coro *coro) 1153coro_state_destroy (pTHX_ struct coro *coro)
… …
954 1170
955 if (coro->mainstack && coro->mainstack != main_mainstack) 1171 if (coro->mainstack && coro->mainstack != main_mainstack)
956 { 1172 {
957 struct coro temp; 1173 struct coro temp;
958 1174
959 assert (!(coro->flags & CF_RUNNING));
960
961 Zero (&temp, 1, struct coro);
962 temp.save = CORO_SAVE_ALL;
963
964 if (coro->flags & CF_RUNNING) 1175 if (coro->flags & CF_RUNNING)
965 croak ("FATAL: tried to destroy currently running coroutine"); 1176 croak ("FATAL: tried to destroy currently running coroutine");
966 1177
967 save_perl (aTHX_ &temp); 1178 save_perl (aTHX_ &temp);
968 load_perl (aTHX_ coro); 1179 load_perl (aTHX_ coro);
969 1180
970 coro_destroy_stacks (aTHX); 1181 coro_destroy (aTHX_ coro);
971 1182
972 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1183 load_perl (aTHX_ &temp);
973 1184
974 coro->mainstack = 0; 1185 coro->slot = 0;
975 } 1186 }
976 1187
977 cctx_destroy (coro->cctx); 1188 cctx_destroy (coro->cctx);
978 SvREFCNT_dec (coro->args); 1189 SvREFCNT_dec (coro->args);
979 1190
… …
1020#else 1231#else
1021# define MGf_DUP 0 1232# define MGf_DUP 0
1022#endif 1233#endif
1023}; 1234};
1024 1235
1025static struct coro *
1026SvSTATE_ (pTHX_ SV *coro)
1027{
1028 HV *stash;
1029 MAGIC *mg;
1030
1031 if (SvROK (coro))
1032 coro = SvRV (coro);
1033
1034 stash = SvSTASH (coro);
1035 if (stash != coro_stash && stash != coro_state_stash)
1036 {
1037 /* very slow, but rare, check */
1038 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
1039 croak ("Coro::State object required");
1040 }
1041
1042 mg = CORO_MAGIC (coro);
1043 return (struct coro *)mg->mg_ptr;
1044}
1045
1046#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
1047
1048static void 1236static void
1049prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1237prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
1050{ 1238{
1051 ta->prev = SvSTATE (prev_sv); 1239 ta->prev = SvSTATE (prev_sv);
1052 ta->next = SvSTATE (next_sv); 1240 ta->next = SvSTATE (next_sv);
1241 TRANSFER_CHECK (*ta);
1053} 1242}
1054 1243
1055static void 1244static void
1056api_transfer (SV *prev_sv, SV *next_sv) 1245api_transfer (SV *prev_sv, SV *next_sv)
1057{ 1246{
1058 dTHX; 1247 dTHX;
1059 struct transfer_args ta; 1248 struct transfer_args ta;
1060 1249
1061 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1250 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1062 TRANSFER (ta); 1251 TRANSFER (ta);
1063}
1064
1065static int
1066api_save (SV *coro_sv, int new_save)
1067{
1068 dTHX;
1069 struct coro *coro = SvSTATE (coro_sv);
1070 int old_save = coro->save;
1071
1072 if (new_save >= 0)
1073 coro->save = new_save;
1074
1075 return old_save;
1076} 1252}
1077 1253
1078/** Coro ********************************************************************/ 1254/** Coro ********************************************************************/
1079 1255
1080static void 1256static void
… …
1139 { 1315 {
1140 LOCK; 1316 LOCK;
1141 next_sv = coro_deq (aTHX_ PRIO_MIN); 1317 next_sv = coro_deq (aTHX_ PRIO_MIN);
1142 1318
1143 /* nothing to schedule: call the idle handler */ 1319 /* nothing to schedule: call the idle handler */
1144 if (!next_sv) 1320 if (expect_false (!next_sv))
1145 { 1321 {
1146 dSP; 1322 dSP;
1147 UNLOCK; 1323 UNLOCK;
1148 1324
1149 ENTER; 1325 ENTER;
… …
1159 } 1335 }
1160 1336
1161 ta->next = SvSTATE (next_sv); 1337 ta->next = SvSTATE (next_sv);
1162 1338
1163 /* cannot transfer to destroyed coros, skip and look for next */ 1339 /* cannot transfer to destroyed coros, skip and look for next */
1164 if (ta->next->flags & CF_DESTROYED) 1340 if (expect_false (ta->next->flags & CF_DESTROYED))
1165 { 1341 {
1166 UNLOCK; 1342 UNLOCK;
1167 SvREFCNT_dec (next_sv); 1343 SvREFCNT_dec (next_sv);
1168 /* coro_nready is already taken care of by destroy */ 1344 /* coro_nready is already taken care of by destroy */
1169 continue; 1345 continue;
… …
1174 break; 1350 break;
1175 } 1351 }
1176 1352
1177 /* free this only after the transfer */ 1353 /* free this only after the transfer */
1178 prev_sv = SvRV (coro_current); 1354 prev_sv = SvRV (coro_current);
1179 SvRV_set (coro_current, next_sv);
1180 ta->prev = SvSTATE (prev_sv); 1355 ta->prev = SvSTATE (prev_sv);
1181 1356 TRANSFER_CHECK (*ta);
1182 assert (ta->next->flags & CF_READY); 1357 assert (ta->next->flags & CF_READY);
1183 ta->next->flags &= ~CF_READY; 1358 ta->next->flags &= ~CF_READY;
1359 SvRV_set (coro_current, next_sv);
1184 1360
1185 LOCK; 1361 LOCK;
1186 free_coro_mortal (aTHX); 1362 free_coro_mortal (aTHX);
1187 coro_mortal = prev_sv; 1363 coro_mortal = prev_sv;
1188 UNLOCK; 1364 UNLOCK;
… …
1225 dTHX; 1401 dTHX;
1226 struct transfer_args ta; 1402 struct transfer_args ta;
1227 1403
1228 prepare_cede (aTHX_ &ta); 1404 prepare_cede (aTHX_ &ta);
1229 1405
1230 if (ta.prev != ta.next) 1406 if (expect_true (ta.prev != ta.next))
1231 { 1407 {
1232 TRANSFER (ta); 1408 TRANSFER (ta);
1233 return 1; 1409 return 1;
1234 } 1410 }
1235 else 1411 else
… …
1249 } 1425 }
1250 else 1426 else
1251 return 0; 1427 return 0;
1252} 1428}
1253 1429
1430static void
1431api_trace (SV *coro_sv, int flags)
1432{
1433 dTHX;
1434 struct coro *coro = SvSTATE (coro_sv);
1435
1436 if (flags & CC_TRACE)
1437 {
1438 if (!coro->cctx)
1439 coro->cctx = cctx_new ();
1440 else if (!(coro->cctx->flags & CC_TRACE))
1441 croak ("cannot enable tracing on coroutine with custom stack");
1442
1443 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1444 }
1445 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1446 {
1447 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1448
1449 if (coro->flags & CF_RUNNING)
1450 PL_runops = RUNOPS_DEFAULT;
1451 else
1452 coro->slot->runops = RUNOPS_DEFAULT;
1453 }
1454}
1455
1254MODULE = Coro::State PACKAGE = Coro::State 1456MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1255 1457
1256PROTOTYPES: DISABLE 1458PROTOTYPES: DISABLE
1257 1459
1258BOOT: 1460BOOT:
1259{ 1461{
1260#ifdef USE_ITHREADS 1462#ifdef USE_ITHREADS
1261 MUTEX_INIT (&coro_mutex); 1463 MUTEX_INIT (&coro_mutex);
1262#endif 1464#endif
1263 BOOT_PAGESIZE; 1465 BOOT_PAGESIZE;
1264 1466
1467 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1468 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1469
1265 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1470 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1266 1471
1267 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV)); 1472 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1268 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV)); 1473 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1269 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1270 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1271 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1272 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF)); 1474 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1273 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL)); 1475 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1274 1476
1275 main_mainstack = PL_mainstack; 1477 main_mainstack = PL_mainstack;
1276 main_top_env = PL_top_env; 1478 main_top_env = PL_top_env;
1277 1479
1278 while (main_top_env->je_prev) 1480 while (main_top_env->je_prev)
… …
1291 struct coro *coro; 1493 struct coro *coro;
1292 HV *hv; 1494 HV *hv;
1293 int i; 1495 int i;
1294 1496
1295 Newz (0, coro, 1, struct coro); 1497 Newz (0, coro, 1, struct coro);
1296 coro->args = newAV (); 1498 coro->args = newAV ();
1297 coro->save = CORO_SAVE_DEF;
1298 coro->flags = CF_NEW; 1499 coro->flags = CF_NEW;
1299 1500
1300 if (coro_first) coro_first->prev = coro; 1501 if (coro_first) coro_first->prev = coro;
1301 coro->next = coro_first; 1502 coro->next = coro_first;
1302 coro_first = coro; 1503 coro_first = coro;
1303 1504
1304 coro->hv = hv = newHV (); 1505 coro->hv = hv = newHV ();
1305 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1506 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1306 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1507 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1307 1508
1509 av_extend (coro->args, items - 1);
1308 for (i = 1; i < items; i++) 1510 for (i = 1; i < items; i++)
1309 av_push (coro->args, newSVsv (ST (i))); 1511 av_push (coro->args, newSVsv (ST (i)));
1310} 1512}
1311 OUTPUT: 1513 OUTPUT:
1312 RETVAL 1514 RETVAL
1313 1515
1314int 1516# these not obviously related functions are all rolled into the same xs
1315save (SV *coro, int new_save = -1) 1517# function to increase chances that they all will call transfer with the same
1316 CODE: 1518# stack offset
1317 RETVAL = api_save (coro, new_save);
1318 OUTPUT:
1319 RETVAL
1320
1321int
1322save_also (SV *coro_sv, int save_also)
1323 CODE:
1324{
1325 struct coro *coro = SvSTATE (coro_sv);
1326 RETVAL = coro->save;
1327 coro->save |= save_also;
1328}
1329 OUTPUT:
1330 RETVAL
1331
1332void 1519void
1333_set_stacklevel (...) 1520_set_stacklevel (...)
1334 ALIAS: 1521 ALIAS:
1335 Coro::State::transfer = 1 1522 Coro::State::transfer = 1
1336 Coro::schedule = 2 1523 Coro::schedule = 2
… …
1370 } 1557 }
1371 1558
1372 BARRIER; 1559 BARRIER;
1373 TRANSFER (ta); 1560 TRANSFER (ta);
1374 1561
1375 if (GIMME_V != G_VOID && ta.next != ta.prev) 1562 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev))
1376 XSRETURN_YES; 1563 XSRETURN_YES;
1377} 1564}
1378 1565
1379bool 1566bool
1380_destroy (SV *coro_sv) 1567_destroy (SV *coro_sv)
… …
1430 CODE: 1617 CODE:
1431{ 1618{
1432 if (coro->mainstack) 1619 if (coro->mainstack)
1433 { 1620 {
1434 struct coro temp; 1621 struct coro temp;
1435 Zero (&temp, 1, struct coro);
1436 temp.save = CORO_SAVE_ALL;
1437 1622
1438 if (!(coro->flags & CF_RUNNING)) 1623 if (!(coro->flags & CF_RUNNING))
1439 { 1624 {
1440 save_perl (aTHX_ &temp); 1625 save_perl (aTHX_ &temp);
1441 load_perl (aTHX_ coro); 1626 load_perl (aTHX_ coro);
… …
1445 dSP; 1630 dSP;
1446 ENTER; 1631 ENTER;
1447 SAVETMPS; 1632 SAVETMPS;
1448 PUSHMARK (SP); 1633 PUSHMARK (SP);
1449 PUTBACK; 1634 PUTBACK;
1635
1450 if (ix) 1636 if (ix)
1451 eval_sv (coderef, 0); 1637 eval_sv (coderef, 0);
1452 else 1638 else
1453 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1639 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1640
1454 SPAGAIN; 1641 SPAGAIN;
1455 FREETMPS; 1642 FREETMPS;
1456 LEAVE; 1643 LEAVE;
1457 PUTBACK; 1644 PUTBACK;
1458 } 1645 }
… …
1462 save_perl (aTHX_ coro); 1649 save_perl (aTHX_ coro);
1463 load_perl (aTHX_ &temp); 1650 load_perl (aTHX_ &temp);
1464 } 1651 }
1465 } 1652 }
1466} 1653}
1467 1654
1468SV * 1655SV *
1469is_ready (Coro::State coro) 1656is_ready (Coro::State coro)
1470 PROTOTYPE: $ 1657 PROTOTYPE: $
1471 ALIAS: 1658 ALIAS:
1472 is_ready = CF_READY 1659 is_ready = CF_READY
… …
1477 RETVAL = boolSV (coro->flags & ix); 1664 RETVAL = boolSV (coro->flags & ix);
1478 OUTPUT: 1665 OUTPUT:
1479 RETVAL 1666 RETVAL
1480 1667
1481void 1668void
1482trace (Coro::State coro, int enable = 0) 1669api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1483 CODE:
1484 if (enable)
1485 {
1486 if (coro->flags & CF_RUNNING)
1487 croak ("cannot enable tracing on running coroutine");
1488
1489 if (coro->cctx)
1490 croak ("cannot enable tracing on coroutine with custom stack");
1491
1492 coro->cctx = cctx_new ();
1493 coro->cctx->flags |= CC_TRACE;
1494 }
1495 else
1496 if (coro->cctx && coro->cctx->flags & CC_TRACE)
1497 {
1498 coro->cctx->flags &= ~CC_TRACE;
1499 coro->cctx->flags |= CC_NOREUSE;
1500 }
1501 1670
1502SV * 1671SV *
1503has_stack (Coro::State coro) 1672has_stack (Coro::State coro)
1504 PROTOTYPE: $ 1673 PROTOTYPE: $
1505 CODE: 1674 CODE:
1506 RETVAL = boolSV (!!coro->cctx); 1675 RETVAL = boolSV (!!coro->cctx);
1507 OUTPUT: 1676 OUTPUT:
1508 RETVAL 1677 RETVAL
1509 1678
1679int
1680is_traced (Coro::State coro)
1681 PROTOTYPE: $
1682 CODE:
1683 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1684 OUTPUT:
1685 RETVAL
1686
1510IV 1687IV
1511rss (Coro::State coro) 1688rss (Coro::State coro)
1512 PROTOTYPE: $ 1689 PROTOTYPE: $
1690 ALIAS:
1691 usecount = 1
1513 CODE: 1692 CODE:
1514 RETVAL = coro_rss (coro); 1693 switch (ix)
1694 {
1695 case 0: RETVAL = coro_rss (aTHX_ coro); break;
1696 case 1: RETVAL = coro->usecount; break;
1697 }
1515 OUTPUT: 1698 OUTPUT:
1516 RETVAL 1699 RETVAL
1517 1700
1518 1701
1519MODULE = Coro::State PACKAGE = Coro 1702MODULE = Coro::State PACKAGE = Coro
… …
1521BOOT: 1704BOOT:
1522{ 1705{
1523 int i; 1706 int i;
1524 1707
1525 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1708 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1709 get_sv ("Coro::POOL_RSS" , TRUE); /* silence stupid 5.10 warning */
1526 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1710 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1711 get_sv ("Coro::POOL_SIZE" , TRUE); /* silence stupid 5.10 warning */
1527 av_async_pool = get_av ("Coro::async_pool", TRUE); 1712 av_async_pool = get_av ("Coro::async_pool", TRUE);
1713 get_av ("Coro::async_pool", TRUE); /* silence stupid 5.10 warning */
1528 1714
1529 coro_current = get_sv ("Coro::current", FALSE); 1715 coro_current = get_sv ("Coro::current", FALSE);
1530 SvREADONLY_on (coro_current); 1716 SvREADONLY_on (coro_current);
1531 1717
1532 coro_stash = gv_stashpv ("Coro", TRUE); 1718 coro_stash = gv_stashpv ("Coro", TRUE);
1533 1719
1534 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1720 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1535 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1721 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1536 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1722 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1537 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1723 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
… …
1540 1726
1541 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1727 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1542 coro_ready[i] = newAV (); 1728 coro_ready[i] = newAV ();
1543 1729
1544 { 1730 {
1545 SV *sv = perl_get_sv("Coro::API", 1); 1731 SV *sv = perl_get_sv ("Coro::API", TRUE);
1732 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1546 1733
1547 coroapi.schedule = api_schedule; 1734 coroapi.schedule = api_schedule;
1548 coroapi.save = api_save;
1549 coroapi.cede = api_cede; 1735 coroapi.cede = api_cede;
1550 coroapi.cede_notself = api_cede_notself; 1736 coroapi.cede_notself = api_cede_notself;
1551 coroapi.ready = api_ready; 1737 coroapi.ready = api_ready;
1552 coroapi.is_ready = api_is_ready; 1738 coroapi.is_ready = api_is_ready;
1553 coroapi.nready = &coro_nready; 1739 coroapi.nready = &coro_nready;
… …
1602 CODE: 1788 CODE:
1603 RETVAL = coro_nready; 1789 RETVAL = coro_nready;
1604 OUTPUT: 1790 OUTPUT:
1605 RETVAL 1791 RETVAL
1606 1792
1793void
1794throw (Coro::State self, SV *throw = &PL_sv_undef)
1795 PROTOTYPE: $;$
1796 CODE:
1797 SvREFCNT_dec (self->throw);
1798 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1799
1607# for async_pool speedup 1800# for async_pool speedup
1608void 1801void
1609_pool_1 (SV *cb) 1802_pool_1 (SV *cb)
1610 CODE: 1803 CODE:
1611{ 1804{
1612 int i, len; 1805 struct coro *coro = SvSTATE (coro_current);
1613 HV *hv = (HV *)SvRV (coro_current); 1806 HV *hv = (HV *)SvRV (coro_current);
1614 AV *defav = GvAV (PL_defgv); 1807 AV *defav = GvAV (PL_defgv);
1615 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1808 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1616 AV *invoke_av; 1809 AV *invoke_av;
1810 int i, len;
1617 1811
1618 if (!invoke) 1812 if (!invoke)
1619 croak ("\3terminate\2\n"); 1813 croak ("\3async_pool terminate\2\n");
1814
1815 SvREFCNT_dec (coro->saved_deffh);
1816 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1620 1817
1621 hv_store (hv, "desc", sizeof ("desc") - 1, 1818 hv_store (hv, "desc", sizeof ("desc") - 1,
1622 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1819 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1623 1820
1624 invoke_av = (AV *)SvRV (invoke); 1821 invoke_av = (AV *)SvRV (invoke);
… …
1642{ 1839{
1643 struct coro *coro = SvSTATE (coro_current); 1840 struct coro *coro = SvSTATE (coro_current);
1644 1841
1645 sv_setsv (cb, &PL_sv_undef); 1842 sv_setsv (cb, &PL_sv_undef);
1646 1843
1844 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1845 coro->saved_deffh = 0;
1846
1647 if (coro_rss (coro) > SvIV (sv_pool_rss) 1847 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1648 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1848 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1649 croak ("\3terminate\2\n"); 1849 croak ("\3async_pool terminate\2\n");
1650 1850
1651 av_clear (GvAV (PL_defgv)); 1851 av_clear (GvAV (PL_defgv));
1652 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1852 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1653 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1853 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1654 coro->save = CORO_SAVE_DEF; 1854
1655 coro->prio = 0; 1855 coro->prio = 0;
1856
1857 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1858 api_trace (coro_current, 0);
1859
1656 av_push (av_async_pool, newSVsv (coro_current)); 1860 av_push (av_async_pool, newSVsv (coro_current));
1657} 1861}
1658 1862
1659 1863
1660MODULE = Coro::State PACKAGE = Coro::AIO 1864MODULE = Coro::State PACKAGE = Coro::AIO

Diff Legend

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