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.164 by root, Tue Sep 25 01:47:23 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;
161
162enum {
163 CC_MAPPED = 0x01,
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,
169};
144 170
145/* this is a structure representing a c-level coroutine */ 171/* this is a structure representing a c-level coroutine */
146typedef struct coro_cctx { 172typedef struct coro_cctx {
147 struct coro_cctx *next; 173 struct coro_cctx *next;
148 174
… …
157 coro_context cctx; 183 coro_context cctx;
158 184
159#if CORO_USE_VALGRIND 185#if CORO_USE_VALGRIND
160 int valgrind_id; 186 int valgrind_id;
161#endif 187#endif
162 char inuse, mapped; 188 unsigned char flags;
163} coro_cctx; 189} coro_cctx;
164 190
165enum { 191enum {
166 CF_RUNNING = 0x0001, /* coroutine is running */ 192 CF_RUNNING = 0x0001, /* coroutine is running */
167 CF_READY = 0x0002, /* coroutine is ready */ 193 CF_READY = 0x0002, /* coroutine is ready */
168 CF_NEW = 0x0004, /* has never been switched to */ 194 CF_NEW = 0x0004, /* has never been switched to */
169 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 195 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
170}; 196};
171 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
172/* this is a structure representing a perl-level coroutine */ 211/* this is a structure representing a perl-level coroutine */
173struct coro { 212struct coro {
174 /* the c coroutine allocated to this perl coroutine, if any */ 213 /* the c coroutine allocated to this perl coroutine, if any */
175 coro_cctx *cctx; 214 coro_cctx *cctx;
176 215
216 /* process data */
217 AV *mainstack;
218 perl_slots *slot; /* basically the saved sp */
219
177 /* data associated with this coroutine (initial args) */ 220 /* data associated with this coroutine (initial args) */
178 AV *args; 221 AV *args;
179 int refcnt; 222 int refcnt;
180 int save; /* CORO_SAVE flags */
181 int flags; /* CF_ flags */ 223 int flags; /* CF_ flags */
182 224
183 /* optionally saved, might be zero */ 225 /* statistics */
184 AV *defav; /* @_ */ 226 int usecount; /* number of transfers to this coro */
185 SV *defsv; /* $_ */
186 SV *errsv; /* $@ */
187 GV *deffh; /* default filehandle */
188 SV *irssv; /* $/ */
189 SV *irssv_sv; /* real $/ cache */
190
191#define VAR(name,type) type name;
192# include "state.h"
193#undef VAR
194 227
195 /* coro process data */ 228 /* coro process data */
196 int prio; 229 int prio;
230 SV *throw;
231
232 /* async_pool */
233 SV *saved_deffh;
197 234
198 /* linked list */ 235 /* linked list */
199 struct coro *next, *prev; 236 struct coro *next, *prev;
200 HV *hv; /* the perl hash associated with this coro, if any */ 237 HV *hv; /* the perl hash associated with this coro, if any */
201}; 238};
… …
290 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 327 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \
291 ? SvMAGIC (cv) \ 328 ? SvMAGIC (cv) \
292 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 329 : mg_find ((SV *)cv, PERL_MAGIC_coro) \
293 : 0 330 : 0
294 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
295/* the next two functions merely cache the padlists */ 358/* the next two functions merely cache the padlists */
296static void 359static void
297get_padlist (pTHX_ CV *cv) 360get_padlist (pTHX_ CV *cv)
298{ 361{
299 MAGIC *mg = CORO_MAGIC (cv); 362 MAGIC *mg = CORO_MAGIC (cv);
300 AV *av; 363 AV *av;
301 364
302 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 365 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
303 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 366 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
304 else 367 else
305 { 368 {
306#if CORO_PREFER_PERL_FUNCTIONS 369#if CORO_PREFER_PERL_FUNCTIONS
307 /* this is probably cleaner, but also slower? */ 370 /* this is probably cleaner, but also slower? */
… …
319put_padlist (pTHX_ CV *cv) 382put_padlist (pTHX_ CV *cv)
320{ 383{
321 MAGIC *mg = CORO_MAGIC (cv); 384 MAGIC *mg = CORO_MAGIC (cv);
322 AV *av; 385 AV *av;
323 386
324 if (!mg) 387 if (expect_false (!mg))
325 { 388 {
326 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 389 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
327 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 390 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
328 mg->mg_virtual = &vtbl_coro; 391 mg->mg_virtual = &vtbl_coro;
329 mg->mg_obj = (SV *)newAV (); 392 mg->mg_obj = (SV *)newAV ();
330 } 393 }
331 394
332 av = (AV *)mg->mg_obj; 395 av = (AV *)mg->mg_obj;
333 396
334 if (AvFILLp (av) >= AvMAX (av)) 397 if (expect_false (AvFILLp (av) >= AvMAX (av)))
335 av_extend (av, AvMAX (av) + 1); 398 av_extend (av, AvMAX (av) + 1);
336 399
337 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 400 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
338} 401}
339 402
340/** load & save, init *******************************************************/ 403/** load & save, init *******************************************************/
341 404
342#define SB do {
343#define SE } while (0)
344
345#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
346
347static void 405static void
348load_perl (pTHX_ Coro__State c) 406load_perl (pTHX_ Coro__State c)
349{ 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
350#define VAR(name,type) PL_ ## name = c->name; 418 #define VAR(name,type) PL_ ## name = slot->name;
351# include "state.h" 419 # include "state.h"
352#undef VAR 420 #undef VAR
353
354 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
355 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
356 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
357 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh);
358
359 if (c->irssv)
360 {
361 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
362 {
363 SvREFCNT_dec (c->irssv);
364 c->irssv = 0;
365 }
366 else
367 {
368 REPLACE_SV (PL_rs, c->irssv);
369 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
370 sv_setsv (c->irssv_sv, PL_rs);
371 }
372 }
373 421
374 { 422 {
375 dSP; 423 dSP;
424
376 CV *cv; 425 CV *cv;
377 426
378 /* now do the ugly restore mess */ 427 /* now do the ugly restore mess */
379 while ((cv = (CV *)POPs)) 428 while (expect_true (cv = (CV *)POPs))
380 { 429 {
381 put_padlist (aTHX_ cv); /* mark this padlist as available */ 430 put_padlist (aTHX_ cv); /* mark this padlist as available */
382 CvDEPTH (cv) = PTR2IV (POPs); 431 CvDEPTH (cv) = PTR2IV (POPs);
383 CvPADLIST (cv) = (AV *)POPs; 432 CvPADLIST (cv) = (AV *)POPs;
384 } 433 }
… …
403 452
404 XPUSHs (Nullsv); 453 XPUSHs (Nullsv);
405 /* this loop was inspired by pp_caller */ 454 /* this loop was inspired by pp_caller */
406 for (;;) 455 for (;;)
407 { 456 {
408 while (cxix >= 0) 457 while (expect_true (cxix >= 0))
409 { 458 {
410 PERL_CONTEXT *cx = &ccstk[cxix--]; 459 PERL_CONTEXT *cx = &ccstk[cxix--];
411 460
412 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 461 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
413 { 462 {
414 CV *cv = cx->blk_sub.cv; 463 CV *cv = cx->blk_sub.cv;
415 464
416 if (CvDEPTH (cv)) 465 if (expect_true (CvDEPTH (cv)))
417 { 466 {
418 EXTEND (SP, 3); 467 EXTEND (SP, 3);
419 PUSHs ((SV *)CvPADLIST (cv)); 468 PUSHs ((SV *)CvPADLIST (cv));
420 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 469 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
421 PUSHs ((SV *)cv); 470 PUSHs ((SV *)cv);
… …
424 get_padlist (aTHX_ cv); 473 get_padlist (aTHX_ cv);
425 } 474 }
426 } 475 }
427 } 476 }
428 477
429 if (top_si->si_type == PERLSI_MAIN) 478 if (expect_true (top_si->si_type == PERLSI_MAIN))
430 break; 479 break;
431 480
432 top_si = top_si->si_prev; 481 top_si = top_si->si_prev;
433 ccstk = top_si->si_cxstack; 482 ccstk = top_si->si_cxstack;
434 cxix = top_si->si_cxix; 483 cxix = top_si->si_cxix;
435 } 484 }
436 485
437 PUTBACK; 486 PUTBACK;
438 } 487 }
439 488
440 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 */
441 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 490 {
442 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 491 /* we manually unroll here, as usually 2 slots is enough */
443 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 492 int i;
444 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;
445 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
446#define VAR(name,type)c->name = PL_ ## name; 512 #define VAR(name,type) slot->name = PL_ ## name;
447# include "state.h" 513 # include "state.h"
448#undef VAR 514 #undef VAR
515 }
449} 516}
450 517
451/* 518/*
452 * allocate various perl stacks. This is an exact copy 519 * allocate various perl stacks. This is an exact copy
453 * of perl.c:init_stacks, except that it uses less memory 520 * of perl.c:init_stacks, except that it uses less memory
… …
458# define coro_init_stacks init_stacks 525# define coro_init_stacks init_stacks
459#else 526#else
460static void 527static void
461coro_init_stacks (pTHX) 528coro_init_stacks (pTHX)
462{ 529{
463 PL_curstackinfo = new_stackinfo(64, 6); 530 PL_curstackinfo = new_stackinfo(32, 8);
464 PL_curstackinfo->si_type = PERLSI_MAIN; 531 PL_curstackinfo->si_type = PERLSI_MAIN;
465 PL_curstack = PL_curstackinfo->si_stack; 532 PL_curstack = PL_curstackinfo->si_stack;
466 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 533 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
467 534
468 PL_stack_base = AvARRAY(PL_curstack); 535 PL_stack_base = AvARRAY(PL_curstack);
469 PL_stack_sp = PL_stack_base; 536 PL_stack_sp = PL_stack_base;
470 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 537 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
471 538
472 New(50,PL_tmps_stack,64,SV*); 539 New(50,PL_tmps_stack,32,SV*);
473 PL_tmps_floor = -1; 540 PL_tmps_floor = -1;
474 PL_tmps_ix = -1; 541 PL_tmps_ix = -1;
475 PL_tmps_max = 64; 542 PL_tmps_max = 32;
476 543
477 New(54,PL_markstack,16,I32); 544 New(54,PL_markstack,16,I32);
478 PL_markstack_ptr = PL_markstack; 545 PL_markstack_ptr = PL_markstack;
479 PL_markstack_max = PL_markstack + 16; 546 PL_markstack_max = PL_markstack + 16;
480 547
481#ifdef SET_MARK_OFFSET 548#ifdef SET_MARK_OFFSET
482 SET_MARK_OFFSET; 549 SET_MARK_OFFSET;
483#endif 550#endif
484 551
485 New(54,PL_scopestack,16,I32); 552 New(54,PL_scopestack,8,I32);
486 PL_scopestack_ix = 0; 553 PL_scopestack_ix = 0;
487 PL_scopestack_max = 16; 554 PL_scopestack_max = 8;
488 555
489 New(54,PL_savestack,64,ANY); 556 New(54,PL_savestack,24,ANY);
490 PL_savestack_ix = 0; 557 PL_savestack_ix = 0;
491 PL_savestack_max = 64; 558 PL_savestack_max = 24;
492 559
493#if !PERL_VERSION_ATLEAST (5,9,0) 560#if !PERL_VERSION_ATLEAST (5,9,0)
494 New(54,PL_retstack,4,OP*); 561 New(54,PL_retstack,4,OP*);
495 PL_retstack_ix = 0; 562 PL_retstack_ix = 0;
496 PL_retstack_max = 4; 563 PL_retstack_max = 4;
… …
502 * destroy the stacks, the callchain etc... 569 * destroy the stacks, the callchain etc...
503 */ 570 */
504static void 571static void
505coro_destroy_stacks (pTHX) 572coro_destroy_stacks (pTHX)
506{ 573{
507 if (!IN_DESTRUCT)
508 {
509 /* restore all saved variables and stuff */
510 LEAVE_SCOPE (0);
511 assert (PL_tmps_floor == -1);
512
513 /* free all temporaries */
514 FREETMPS;
515 assert (PL_tmps_ix == -1);
516
517 /* unwind all extra stacks */
518 POPSTACK_TO (PL_mainstack);
519
520 /* unwind main stack */
521 dounwind (-1);
522 }
523
524 while (PL_curstackinfo->si_next) 574 while (PL_curstackinfo->si_next)
525 PL_curstackinfo = PL_curstackinfo->si_next; 575 PL_curstackinfo = PL_curstackinfo->si_next;
526 576
527 while (PL_curstackinfo) 577 while (PL_curstackinfo)
528 { 578 {
… …
544 Safefree (PL_retstack); 594 Safefree (PL_retstack);
545#endif 595#endif
546} 596}
547 597
548static size_t 598static size_t
549coro_rss (struct coro *coro) 599coro_rss (pTHX_ struct coro *coro)
550{ 600{
551 size_t rss = sizeof (coro); 601 size_t rss = sizeof (*coro);
552 602
553 if (coro->mainstack) 603 if (coro->mainstack)
554 { 604 {
605 perl_slots tmp_slot;
606 perl_slots *slot;
607
555 if (coro->flags & CF_RUNNING) 608 if (coro->flags & CF_RUNNING)
556 { 609 {
610 slot = &tmp_slot;
611
557 #define VAR(name,type)coro->name = PL_ ## name; 612 #define VAR(name,type) slot->name = PL_ ## name;
558 # include "state.h" 613 # include "state.h"
559 #undef VAR 614 #undef VAR
560 } 615 }
616 else
617 slot = coro->slot;
561 618
562 rss += sizeof (coro->curstackinfo); 619 rss += sizeof (slot->curstackinfo);
563 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
564 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 620 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
565 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 621 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
566 rss += coro->tmps_max * sizeof (SV *); 622 rss += slot->tmps_max * sizeof (SV *);
567 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 623 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
568 rss += coro->scopestack_max * sizeof (I32); 624 rss += slot->scopestack_max * sizeof (I32);
569 rss += coro->savestack_max * sizeof (ANY); 625 rss += slot->savestack_max * sizeof (ANY);
570 626
571#if !PERL_VERSION_ATLEAST (5,9,0) 627#if !PERL_VERSION_ATLEAST (5,9,0)
572 rss += coro->retstack_max * sizeof (OP *); 628 rss += slot->retstack_max * sizeof (OP *);
573#endif 629#endif
574 } 630 }
575 631
576 return rss; 632 return rss;
577} 633}
578 634
579/** coroutine stack handling ************************************************/ 635/** coroutine stack handling ************************************************/
580 636
581static void 637static void
582setup_coro (pTHX_ struct coro *coro) 638coro_setup (pTHX_ struct coro *coro)
583{ 639{
584 /* 640 /*
585 * emulate part of the perl startup here. 641 * emulate part of the perl startup here.
586 */ 642 */
587 coro_init_stacks (aTHX); 643 coro_init_stacks (aTHX);
588 644
645 PL_runops = RUNOPS_DEFAULT;
589 PL_curcop = &PL_compiling; 646 PL_curcop = &PL_compiling;
590 PL_in_eval = EVAL_NULL; 647 PL_in_eval = EVAL_NULL;
591 PL_comppad = 0; 648 PL_comppad = 0;
592 PL_curpm = 0; 649 PL_curpm = 0;
650 PL_curpad = 0;
593 PL_localizing = 0; 651 PL_localizing = 0;
594 PL_dirty = 0; 652 PL_dirty = 0;
595 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);
596 663
597 { 664 {
598 dSP; 665 dSP;
599 LOGOP myop; 666 LOGOP myop;
600 667
601 SvREFCNT_dec (GvAV (PL_defgv));
602 GvAV (PL_defgv) = coro->args; coro->args = 0;
603
604 Zero (&myop, 1, LOGOP); 668 Zero (&myop, 1, LOGOP);
605 myop.op_next = Nullop; 669 myop.op_next = Nullop;
606 myop.op_flags = OPf_WANT_VOID; 670 myop.op_flags = OPf_WANT_VOID;
607 671
608 PUSHMARK (SP); 672 PUSHMARK (SP);
609 XPUSHs (av_shift (GvAV (PL_defgv))); 673 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
610 PUTBACK; 674 PUTBACK;
611 PL_op = (OP *)&myop; 675 PL_op = (OP *)&myop;
612 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 676 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
613 SPAGAIN; 677 SPAGAIN;
614 } 678 }
615 679
616 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);
617} 717}
618 718
619static void 719static void
620free_coro_mortal (pTHX) 720free_coro_mortal (pTHX)
621{ 721{
622 if (coro_mortal) 722 if (expect_true (coro_mortal))
623 { 723 {
624 SvREFCNT_dec (coro_mortal); 724 SvREFCNT_dec (coro_mortal);
625 coro_mortal = 0; 725 coro_mortal = 0;
626 } 726 }
727}
728
729static int
730runops_trace (pTHX)
731{
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;
736
737 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
738 {
739 PERL_ASYNC_CHECK ();
740
741 if (cctx->flags & CC_TRACE_ALL)
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 {
784 oldcop = PL_curcop;
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 }
846 }
847 }
848
849 TAINT_NOT;
850 return 0;
627} 851}
628 852
629/* inject a fake call to Coro::State::_cctx_init into the execution */ 853/* inject a fake call to Coro::State::_cctx_init into the execution */
630/* _cctx_init should be careful, as it could be called at almost any time */ 854/* _cctx_init should be careful, as it could be called at almost any time */
631/* during execution of a perl program */ 855/* during execution of a perl program */
632static void NOINLINE 856static void NOINLINE
633prepare_cctx (pTHX_ coro_cctx *cctx) 857prepare_cctx (pTHX_ coro_cctx *cctx)
634{ 858{
635 dSP; 859 dSP;
636 LOGOP myop; 860 LOGOP myop;
861
862 PL_top_env = &PL_start_env;
863
864 if (cctx->flags & CC_TRACE)
865 PL_runops = runops_trace;
637 866
638 Zero (&myop, 1, LOGOP); 867 Zero (&myop, 1, LOGOP);
639 myop.op_next = PL_op; 868 myop.op_next = PL_op;
640 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 869 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
641 870
… …
658 dTHX; 887 dTHX;
659 888
660 /* coro_run is the alternative tail of transfer(), so unlock here. */ 889 /* coro_run is the alternative tail of transfer(), so unlock here. */
661 UNLOCK; 890 UNLOCK;
662 891
663 PL_top_env = &PL_start_env; 892 /* we now skip the entersub that lead to transfer() */
893 PL_op = PL_op->op_next;
664 894
665 /* inject a fake subroutine call to cctx_init */ 895 /* inject a fake subroutine call to cctx_init */
666 prepare_cctx (aTHX_ (coro_cctx *)arg); 896 prepare_cctx (aTHX_ (coro_cctx *)arg);
667 897
668 /* somebody or something will hit me for both perl_run and PL_restartop */ 898 /* somebody or something will hit me for both perl_run and PL_restartop */
… …
702# if CORO_STACKGUARD 932# if CORO_STACKGUARD
703 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 933 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
704# endif 934# endif
705 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 935 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr;
706 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 936 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
707 cctx->mapped = 1; 937 cctx->flags |= CC_MAPPED;
708 } 938 }
709 else 939 else
710#endif 940#endif
711 { 941 {
712 cctx->ssize = coro_stacksize * (long)sizeof (long); 942 cctx->ssize = coro_stacksize * (long)sizeof (long);
… …
739#if CORO_USE_VALGRIND 969#if CORO_USE_VALGRIND
740 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 970 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
741#endif 971#endif
742 972
743#if HAVE_MMAP 973#if HAVE_MMAP
744 if (cctx->mapped) 974 if (cctx->flags & CC_MAPPED)
745 munmap (cctx->sptr, cctx->ssize); 975 munmap (cctx->sptr, cctx->ssize);
746 else 976 else
747#endif 977#endif
748 Safefree (cctx->sptr); 978 Safefree (cctx->sptr);
749 979
750 Safefree (cctx); 980 Safefree (cctx);
751} 981}
752 982
983/* wether this cctx should be destructed */
984#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
985
753static coro_cctx * 986static coro_cctx *
754cctx_get (pTHX) 987cctx_get (pTHX)
755{ 988{
756 while (cctx_first) 989 while (expect_true (cctx_first))
757 { 990 {
758 coro_cctx *cctx = cctx_first; 991 coro_cctx *cctx = cctx_first;
759 cctx_first = cctx->next; 992 cctx_first = cctx->next;
760 --cctx_idle; 993 --cctx_idle;
761 994
762 if (cctx->ssize >= coro_stacksize) 995 if (expect_true (!CCTX_EXPIRED (cctx)))
763 return cctx; 996 return cctx;
764 997
765 cctx_destroy (cctx); 998 cctx_destroy (cctx);
766 } 999 }
767 1000
768 PL_op = PL_op->op_next;
769 return cctx_new (); 1001 return cctx_new ();
770} 1002}
771 1003
772static void 1004static void
773cctx_put (coro_cctx *cctx) 1005cctx_put (coro_cctx *cctx)
774{ 1006{
775 /* free another cctx if overlimit */ 1007 /* free another cctx if overlimit */
776 if (cctx_idle >= MAX_IDLE_CCTX) 1008 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
777 { 1009 {
778 coro_cctx *first = cctx_first; 1010 coro_cctx *first = cctx_first;
779 cctx_first = first->next; 1011 cctx_first = first->next;
780 --cctx_idle; 1012 --cctx_idle;
781 1013
782 assert (!first->inuse);
783 cctx_destroy (first); 1014 cctx_destroy (first);
784 } 1015 }
785 1016
786 ++cctx_idle; 1017 ++cctx_idle;
787 cctx->next = cctx_first; 1018 cctx->next = cctx_first;
788 cctx_first = cctx; 1019 cctx_first = cctx;
789} 1020}
790 1021
791/** coroutine switching *****************************************************/ 1022/** coroutine switching *****************************************************/
792 1023
793/* 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 */
794static void NOINLINE 1050static void NOINLINE
795transfer (pTHX_ struct coro *prev, struct coro *next) 1051transfer (pTHX_ struct coro *prev, struct coro *next)
796{ 1052{
797 dSTACKLEVEL; 1053 dSTACKLEVEL;
798 1054
799 /* sometimes transfer is only called to set idle_sp */ 1055 /* sometimes transfer is only called to set idle_sp */
800 if (!next) 1056 if (expect_false (!next))
801 { 1057 {
802 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1058 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
803 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 */
804 } 1060 }
805 else if (prev != next) 1061 else if (expect_true (prev != next))
806 { 1062 {
807 coro_cctx *prev__cctx; 1063 coro_cctx *prev__cctx;
808 1064
809 if (prev->flags & CF_NEW) 1065 if (expect_false (prev->flags & CF_NEW))
810 { 1066 {
811 /* create a new empty context */ 1067 /* create a new empty context */
812 Newz (0, prev->cctx, 1, coro_cctx); 1068 Newz (0, prev->cctx, 1, coro_cctx);
813 prev->cctx->inuse = 1;
814 prev->flags &= ~CF_NEW; 1069 prev->flags &= ~CF_NEW;
815 prev->flags |= CF_RUNNING; 1070 prev->flags |= CF_RUNNING;
816 } 1071 }
817 1072
818 /*TODO: must not croak here */
819 if (!prev->flags & CF_RUNNING)
820 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states");
821
822 if (next->flags & CF_RUNNING)
823 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
824
825 if (next->flags & CF_DESTROYED)
826 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
827
828 prev->flags &= ~CF_RUNNING; 1073 prev->flags &= ~CF_RUNNING;
829 next->flags |= CF_RUNNING; 1074 next->flags |= CF_RUNNING;
830 1075
831 LOCK; 1076 LOCK;
832 1077
833 if (next->flags & CF_NEW) 1078 if (expect_false (next->flags & CF_NEW))
834 { 1079 {
835 /* need to start coroutine */ 1080 /* need to start coroutine */
836 next->flags &= ~CF_NEW; 1081 next->flags &= ~CF_NEW;
837 /* first get rid of the old state */ 1082 /* first get rid of the old state */
838 save_perl (aTHX_ prev); 1083 save_perl (aTHX_ prev);
839 /* setup coroutine call */ 1084 /* setup coroutine call */
840 setup_coro (aTHX_ next); 1085 coro_setup (aTHX_ next);
841 /* need a new stack */
842 assert (!next->cctx);
843 } 1086 }
844 else 1087 else
845 { 1088 {
846 /* coroutine already started */ 1089 /* coroutine already started */
847 save_perl (aTHX_ prev); 1090 save_perl (aTHX_ prev);
… …
849 } 1092 }
850 1093
851 prev__cctx = prev->cctx; 1094 prev__cctx = prev->cctx;
852 1095
853 /* possibly "free" the cctx */ 1096 /* possibly "free" the cctx */
854 if (prev__cctx->idle_sp == STACKLEVEL) 1097 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
855 { 1098 {
856 /* 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 */
857 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));
858 1101
859 prev->cctx = 0; 1102 prev->cctx = 0;
860 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
861 cctx_put (prev__cctx); 1109 cctx_put (prev__cctx);
862 prev__cctx->inuse = 0;
863 } 1110 }
864 1111
1112 ++next->usecount;
1113
865 if (!next->cctx) 1114 if (expect_true (!next->cctx))
866 {
867 next->cctx = cctx_get (aTHX); 1115 next->cctx = cctx_get (aTHX);
868 assert (!next->cctx->inuse);
869 next->cctx->inuse = 1;
870 }
871 1116
872 if (prev__cctx != next->cctx) 1117 if (expect_false (prev__cctx != next->cctx))
873 { 1118 {
874 prev__cctx->top_env = PL_top_env; 1119 prev__cctx->top_env = PL_top_env;
875 PL_top_env = next->cctx->top_env; 1120 PL_top_env = next->cctx->top_env;
876 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1121 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
877 } 1122 }
878 1123
879 free_coro_mortal (aTHX); 1124 free_coro_mortal (aTHX);
880 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 }
881 } 1139 }
882} 1140}
883 1141
884struct transfer_args 1142struct transfer_args
885{ 1143{
886 struct coro *prev, *next; 1144 struct coro *prev, *next;
887}; 1145};
888 1146
889#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)
890 1149
891/** high level stuff ********************************************************/ 1150/** high level stuff ********************************************************/
892 1151
893static int 1152static int
894coro_state_destroy (pTHX_ struct coro *coro) 1153coro_state_destroy (pTHX_ struct coro *coro)
… …
911 1170
912 if (coro->mainstack && coro->mainstack != main_mainstack) 1171 if (coro->mainstack && coro->mainstack != main_mainstack)
913 { 1172 {
914 struct coro temp; 1173 struct coro temp;
915 1174
916 assert (!(coro->flags & CF_RUNNING));
917
918 Zero (&temp, 1, struct coro);
919 temp.save = CORO_SAVE_ALL;
920
921 if (coro->flags & CF_RUNNING) 1175 if (coro->flags & CF_RUNNING)
922 croak ("FATAL: tried to destroy currently running coroutine"); 1176 croak ("FATAL: tried to destroy currently running coroutine");
923 1177
924 save_perl (aTHX_ &temp); 1178 save_perl (aTHX_ &temp);
925 load_perl (aTHX_ coro); 1179 load_perl (aTHX_ coro);
926 1180
927 coro_destroy_stacks (aTHX); 1181 coro_destroy (aTHX_ coro);
928 1182
929 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1183 load_perl (aTHX_ &temp);
930 1184
931 coro->mainstack = 0; 1185 coro->slot = 0;
932 } 1186 }
933 1187
934 cctx_destroy (coro->cctx); 1188 cctx_destroy (coro->cctx);
935 SvREFCNT_dec (coro->args); 1189 SvREFCNT_dec (coro->args);
936 1190
… …
977#else 1231#else
978# define MGf_DUP 0 1232# define MGf_DUP 0
979#endif 1233#endif
980}; 1234};
981 1235
982static struct coro *
983SvSTATE_ (pTHX_ SV *coro)
984{
985 HV *stash;
986 MAGIC *mg;
987
988 if (SvROK (coro))
989 coro = SvRV (coro);
990
991 stash = SvSTASH (coro);
992 if (stash != coro_stash && stash != coro_state_stash)
993 {
994 /* very slow, but rare, check */
995 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
996 croak ("Coro::State object required");
997 }
998
999 mg = CORO_MAGIC (coro);
1000 return (struct coro *)mg->mg_ptr;
1001}
1002
1003#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
1004
1005static void 1236static void
1006prepare_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)
1007{ 1238{
1008 ta->prev = SvSTATE (prev_sv); 1239 ta->prev = SvSTATE (prev_sv);
1009 ta->next = SvSTATE (next_sv); 1240 ta->next = SvSTATE (next_sv);
1241 TRANSFER_CHECK (*ta);
1010} 1242}
1011 1243
1012static void 1244static void
1013api_transfer (SV *prev_sv, SV *next_sv) 1245api_transfer (SV *prev_sv, SV *next_sv)
1014{ 1246{
1015 dTHX; 1247 dTHX;
1016 struct transfer_args ta; 1248 struct transfer_args ta;
1017 1249
1018 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1250 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1019 TRANSFER (ta); 1251 TRANSFER (ta);
1020}
1021
1022static int
1023api_save (SV *coro_sv, int new_save)
1024{
1025 dTHX;
1026 struct coro *coro = SvSTATE (coro_sv);
1027 int old_save = coro->save;
1028
1029 if (new_save >= 0)
1030 coro->save = new_save;
1031
1032 return old_save;
1033} 1252}
1034 1253
1035/** Coro ********************************************************************/ 1254/** Coro ********************************************************************/
1036 1255
1037static void 1256static void
… …
1096 { 1315 {
1097 LOCK; 1316 LOCK;
1098 next_sv = coro_deq (aTHX_ PRIO_MIN); 1317 next_sv = coro_deq (aTHX_ PRIO_MIN);
1099 1318
1100 /* nothing to schedule: call the idle handler */ 1319 /* nothing to schedule: call the idle handler */
1101 if (!next_sv) 1320 if (expect_false (!next_sv))
1102 { 1321 {
1103 dSP; 1322 dSP;
1104 UNLOCK; 1323 UNLOCK;
1105 1324
1106 ENTER; 1325 ENTER;
… …
1116 } 1335 }
1117 1336
1118 ta->next = SvSTATE (next_sv); 1337 ta->next = SvSTATE (next_sv);
1119 1338
1120 /* cannot transfer to destroyed coros, skip and look for next */ 1339 /* cannot transfer to destroyed coros, skip and look for next */
1121 if (ta->next->flags & CF_DESTROYED) 1340 if (expect_false (ta->next->flags & CF_DESTROYED))
1122 { 1341 {
1123 UNLOCK; 1342 UNLOCK;
1124 SvREFCNT_dec (next_sv); 1343 SvREFCNT_dec (next_sv);
1125 /* coro_nready is already taken care of by destroy */ 1344 /* coro_nready is already taken care of by destroy */
1126 continue; 1345 continue;
… …
1131 break; 1350 break;
1132 } 1351 }
1133 1352
1134 /* free this only after the transfer */ 1353 /* free this only after the transfer */
1135 prev_sv = SvRV (coro_current); 1354 prev_sv = SvRV (coro_current);
1136 SvRV_set (coro_current, next_sv);
1137 ta->prev = SvSTATE (prev_sv); 1355 ta->prev = SvSTATE (prev_sv);
1138 1356 TRANSFER_CHECK (*ta);
1139 assert (ta->next->flags & CF_READY); 1357 assert (ta->next->flags & CF_READY);
1140 ta->next->flags &= ~CF_READY; 1358 ta->next->flags &= ~CF_READY;
1359 SvRV_set (coro_current, next_sv);
1141 1360
1142 LOCK; 1361 LOCK;
1143 free_coro_mortal (aTHX); 1362 free_coro_mortal (aTHX);
1144 coro_mortal = prev_sv; 1363 coro_mortal = prev_sv;
1145 UNLOCK; 1364 UNLOCK;
… …
1182 dTHX; 1401 dTHX;
1183 struct transfer_args ta; 1402 struct transfer_args ta;
1184 1403
1185 prepare_cede (aTHX_ &ta); 1404 prepare_cede (aTHX_ &ta);
1186 1405
1187 if (ta.prev != ta.next) 1406 if (expect_true (ta.prev != ta.next))
1188 { 1407 {
1189 TRANSFER (ta); 1408 TRANSFER (ta);
1190 return 1; 1409 return 1;
1191 } 1410 }
1192 else 1411 else
… …
1206 } 1425 }
1207 else 1426 else
1208 return 0; 1427 return 0;
1209} 1428}
1210 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
1211MODULE = Coro::State PACKAGE = Coro::State 1456MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1212 1457
1213PROTOTYPES: DISABLE 1458PROTOTYPES: DISABLE
1214 1459
1215BOOT: 1460BOOT:
1216{ 1461{
1217#ifdef USE_ITHREADS 1462#ifdef USE_ITHREADS
1218 MUTEX_INIT (&coro_mutex); 1463 MUTEX_INIT (&coro_mutex);
1219#endif 1464#endif
1220 BOOT_PAGESIZE; 1465 BOOT_PAGESIZE;
1221 1466
1467 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1468 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1469
1222 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1470 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1223 1471
1224 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV)); 1472 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1225 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV)); 1473 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1226 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1227 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1228 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1229 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF)); 1474 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1230 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL)); 1475 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1231 1476
1232 main_mainstack = PL_mainstack; 1477 main_mainstack = PL_mainstack;
1233 main_top_env = PL_top_env; 1478 main_top_env = PL_top_env;
1234 1479
1235 while (main_top_env->je_prev) 1480 while (main_top_env->je_prev)
… …
1248 struct coro *coro; 1493 struct coro *coro;
1249 HV *hv; 1494 HV *hv;
1250 int i; 1495 int i;
1251 1496
1252 Newz (0, coro, 1, struct coro); 1497 Newz (0, coro, 1, struct coro);
1253 coro->args = newAV (); 1498 coro->args = newAV ();
1254 coro->save = CORO_SAVE_DEF;
1255 coro->flags = CF_NEW; 1499 coro->flags = CF_NEW;
1256 1500
1257 if (coro_first) coro_first->prev = coro; 1501 if (coro_first) coro_first->prev = coro;
1258 coro->next = coro_first; 1502 coro->next = coro_first;
1259 coro_first = coro; 1503 coro_first = coro;
1260 1504
1261 coro->hv = hv = newHV (); 1505 coro->hv = hv = newHV ();
1262 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;
1263 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1507 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1264 1508
1509 av_extend (coro->args, items - 1);
1265 for (i = 1; i < items; i++) 1510 for (i = 1; i < items; i++)
1266 av_push (coro->args, newSVsv (ST (i))); 1511 av_push (coro->args, newSVsv (ST (i)));
1267} 1512}
1268 OUTPUT: 1513 OUTPUT:
1269 RETVAL 1514 RETVAL
1270 1515
1271int 1516# these not obviously related functions are all rolled into the same xs
1272save (SV *coro, int new_save = -1) 1517# function to increase chances that they all will call transfer with the same
1273 CODE: 1518# stack offset
1274 RETVAL = api_save (coro, new_save);
1275 OUTPUT:
1276 RETVAL
1277
1278int
1279save_also (SV *coro_sv, int save_also)
1280 CODE:
1281{
1282 struct coro *coro = SvSTATE (coro_sv);
1283 RETVAL = coro->save;
1284 coro->save |= save_also;
1285}
1286 OUTPUT:
1287 RETVAL
1288
1289void 1519void
1290_set_stacklevel (...) 1520_set_stacklevel (...)
1291 ALIAS: 1521 ALIAS:
1292 Coro::State::transfer = 1 1522 Coro::State::transfer = 1
1293 Coro::schedule = 2 1523 Coro::schedule = 2
… …
1327 } 1557 }
1328 1558
1329 BARRIER; 1559 BARRIER;
1330 TRANSFER (ta); 1560 TRANSFER (ta);
1331 1561
1332 if (GIMME_V != G_VOID && ta.next != ta.prev) 1562 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev))
1333 XSRETURN_YES; 1563 XSRETURN_YES;
1334} 1564}
1335 1565
1336bool 1566bool
1337_destroy (SV *coro_sv) 1567_destroy (SV *coro_sv)
… …
1387 CODE: 1617 CODE:
1388{ 1618{
1389 if (coro->mainstack) 1619 if (coro->mainstack)
1390 { 1620 {
1391 struct coro temp; 1621 struct coro temp;
1392 Zero (&temp, 1, struct coro);
1393 temp.save = CORO_SAVE_ALL;
1394 1622
1395 if (!(coro->flags & CF_RUNNING)) 1623 if (!(coro->flags & CF_RUNNING))
1396 { 1624 {
1397 save_perl (aTHX_ &temp); 1625 save_perl (aTHX_ &temp);
1398 load_perl (aTHX_ coro); 1626 load_perl (aTHX_ coro);
… …
1402 dSP; 1630 dSP;
1403 ENTER; 1631 ENTER;
1404 SAVETMPS; 1632 SAVETMPS;
1405 PUSHMARK (SP); 1633 PUSHMARK (SP);
1406 PUTBACK; 1634 PUTBACK;
1635
1407 if (ix) 1636 if (ix)
1408 eval_sv (coderef, 0); 1637 eval_sv (coderef, 0);
1409 else 1638 else
1410 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1639 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1640
1411 SPAGAIN; 1641 SPAGAIN;
1412 FREETMPS; 1642 FREETMPS;
1413 LEAVE; 1643 LEAVE;
1414 PUTBACK; 1644 PUTBACK;
1415 } 1645 }
… …
1419 save_perl (aTHX_ coro); 1649 save_perl (aTHX_ coro);
1420 load_perl (aTHX_ &temp); 1650 load_perl (aTHX_ &temp);
1421 } 1651 }
1422 } 1652 }
1423} 1653}
1424 1654
1425SV * 1655SV *
1426is_ready (Coro::State coro) 1656is_ready (Coro::State coro)
1427 PROTOTYPE: $ 1657 PROTOTYPE: $
1428 ALIAS: 1658 ALIAS:
1429 is_ready = CF_READY 1659 is_ready = CF_READY
… …
1433 CODE: 1663 CODE:
1434 RETVAL = boolSV (coro->flags & ix); 1664 RETVAL = boolSV (coro->flags & ix);
1435 OUTPUT: 1665 OUTPUT:
1436 RETVAL 1666 RETVAL
1437 1667
1668void
1669api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1670
1438SV * 1671SV *
1439has_stack (Coro::State coro) 1672has_stack (Coro::State coro)
1440 PROTOTYPE: $ 1673 PROTOTYPE: $
1441 CODE: 1674 CODE:
1442 RETVAL = boolSV (!!coro->cctx); 1675 RETVAL = boolSV (!!coro->cctx);
1443 OUTPUT: 1676 OUTPUT:
1444 RETVAL 1677 RETVAL
1445 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
1446IV 1687IV
1447rss (Coro::State coro) 1688rss (Coro::State coro)
1448 PROTOTYPE: $ 1689 PROTOTYPE: $
1690 ALIAS:
1691 usecount = 1
1449 CODE: 1692 CODE:
1450 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 }
1451 OUTPUT: 1698 OUTPUT:
1452 RETVAL 1699 RETVAL
1453 1700
1454 1701
1455MODULE = Coro::State PACKAGE = Coro 1702MODULE = Coro::State PACKAGE = Coro
… …
1457BOOT: 1704BOOT:
1458{ 1705{
1459 int i; 1706 int i;
1460 1707
1461 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 */
1462 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 */
1463 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 */
1464 1714
1465 coro_current = get_sv ("Coro::current", FALSE); 1715 coro_current = get_sv ("Coro::current", FALSE);
1466 SvREADONLY_on (coro_current); 1716 SvREADONLY_on (coro_current);
1467 1717
1468 coro_stash = gv_stashpv ("Coro", TRUE); 1718 coro_stash = gv_stashpv ("Coro", TRUE);
1469 1719
1470 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1720 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1471 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1721 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1472 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1722 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1473 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1723 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
… …
1476 1726
1477 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1727 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1478 coro_ready[i] = newAV (); 1728 coro_ready[i] = newAV ();
1479 1729
1480 { 1730 {
1481 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 */
1482 1733
1483 coroapi.schedule = api_schedule; 1734 coroapi.schedule = api_schedule;
1484 coroapi.save = api_save;
1485 coroapi.cede = api_cede; 1735 coroapi.cede = api_cede;
1486 coroapi.cede_notself = api_cede_notself; 1736 coroapi.cede_notself = api_cede_notself;
1487 coroapi.ready = api_ready; 1737 coroapi.ready = api_ready;
1488 coroapi.is_ready = api_is_ready; 1738 coroapi.is_ready = api_is_ready;
1489 coroapi.nready = &coro_nready; 1739 coroapi.nready = &coro_nready;
… …
1538 CODE: 1788 CODE:
1539 RETVAL = coro_nready; 1789 RETVAL = coro_nready;
1540 OUTPUT: 1790 OUTPUT:
1541 RETVAL 1791 RETVAL
1542 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
1543# for async_pool speedup 1800# for async_pool speedup
1544void 1801void
1545_pool_1 (SV *cb) 1802_pool_1 (SV *cb)
1546 CODE: 1803 CODE:
1547{ 1804{
1548 int i, len; 1805 struct coro *coro = SvSTATE (coro_current);
1549 HV *hv = (HV *)SvRV (coro_current); 1806 HV *hv = (HV *)SvRV (coro_current);
1550 AV *defav = GvAV (PL_defgv); 1807 AV *defav = GvAV (PL_defgv);
1551 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1808 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1552 AV *invoke_av; 1809 AV *invoke_av;
1810 int i, len;
1553 1811
1554 if (!invoke) 1812 if (!invoke)
1555 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);
1556 1817
1557 hv_store (hv, "desc", sizeof ("desc") - 1, 1818 hv_store (hv, "desc", sizeof ("desc") - 1,
1558 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1819 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1559 1820
1560 invoke_av = (AV *)SvRV (invoke); 1821 invoke_av = (AV *)SvRV (invoke);
… …
1578{ 1839{
1579 struct coro *coro = SvSTATE (coro_current); 1840 struct coro *coro = SvSTATE (coro_current);
1580 1841
1581 sv_setsv (cb, &PL_sv_undef); 1842 sv_setsv (cb, &PL_sv_undef);
1582 1843
1844 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1845 coro->saved_deffh = 0;
1846
1583 if (coro_rss (coro) > SvIV (sv_pool_rss) 1847 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1584 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1848 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1585 croak ("\3terminate\2\n"); 1849 croak ("\3async_pool terminate\2\n");
1586 1850
1587 av_clear (GvAV (PL_defgv)); 1851 av_clear (GvAV (PL_defgv));
1588 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1852 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1589 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1853 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1590 coro->save = CORO_SAVE_DEF; 1854
1591 coro->prio = 0; 1855 coro->prio = 0;
1856
1857 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1858 api_trace (coro_current, 0);
1859
1592 av_push (av_async_pool, newSVsv (coro_current)); 1860 av_push (av_async_pool, newSVsv (coro_current));
1593} 1861}
1594 1862
1595 1863
1596MODULE = Coro::State PACKAGE = Coro::AIO 1864MODULE = Coro::State PACKAGE = Coro::AIO

Diff Legend

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