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.171 by root, Sat Sep 29 19:42:10 2007 UTC vs.
Revision 1.202 by root, Mon Oct 8 02:50:23 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
… …
116#else 130#else
117# define LOCK (void)0 131# define LOCK (void)0
118# define UNLOCK (void)0 132# define UNLOCK (void)0
119#endif 133#endif
120 134
135#define strpair(const) const, sizeof (const) - 1
136
121/* helper storage struct for Coro::AIO */ 137/* helper storage struct for Coro::AIO */
122struct io_state 138struct io_state
123{ 139{
124 int errorno; 140 int errorno;
125 I32 laststype; 141 I32 laststype;
… …
131static struct CoroAPI coroapi; 147static struct CoroAPI coroapi;
132static AV *main_mainstack; /* used to differentiate between $main and others */ 148static AV *main_mainstack; /* used to differentiate between $main and others */
133static JMPENV *main_top_env; 149static JMPENV *main_top_env;
134static HV *coro_state_stash, *coro_stash; 150static HV *coro_state_stash, *coro_stash;
135static SV *coro_mortal; /* will be freed after next transfer */ 151static SV *coro_mortal; /* will be freed after next transfer */
152
153static GV *irsgv; /* $/ */
154static GV *stdoutgv; /* *STDOUT */
155
156static HV *hv_sig; /* %SIG */
157static SV *sv_diehook;
158static SV *sv_warnhook;
136 159
137/* async_pool helper stuff */ 160/* async_pool helper stuff */
138static SV *sv_pool_rss; 161static SV *sv_pool_rss;
139static SV *sv_pool_size; 162static SV *sv_pool_size;
140static AV *av_async_pool; 163static AV *av_async_pool;
… …
176 CF_READY = 0x0002, /* coroutine is ready */ 199 CF_READY = 0x0002, /* coroutine is ready */
177 CF_NEW = 0x0004, /* has never been switched to */ 200 CF_NEW = 0x0004, /* has never been switched to */
178 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 201 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
179}; 202};
180 203
204/* the structure where most of the perl state is stored, overlaid on the cxstack */
205typedef struct {
206 SV *defsv;
207 AV *defav;
208 SV *errsv;
209 SV *irsgv;
210#define VAR(name,type) type name;
211# include "state.h"
212#undef VAR
213} perl_slots;
214
215#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
216
181/* this is a structure representing a perl-level coroutine */ 217/* this is a structure representing a perl-level coroutine */
182struct coro { 218struct coro {
183 /* the c coroutine allocated to this perl coroutine, if any */ 219 /* the c coroutine allocated to this perl coroutine, if any */
184 coro_cctx *cctx; 220 coro_cctx *cctx;
185 221
222 /* process data */
223 AV *mainstack;
224 perl_slots *slot; /* basically the saved sp */
225
186 /* data associated with this coroutine (initial args) */ 226 /* data associated with this coroutine (initial args) */
187 AV *args; 227 AV *args;
188 int refcnt; 228 int refcnt;
189 int save; /* CORO_SAVE flags */
190 int flags; /* CF_ flags */ 229 int flags; /* CF_ flags */
191 230
192 /* optionally saved, might be zero */ 231 /* statistics */
193 AV *defav; /* @_ */ 232 int usecount; /* number of transfers to this coro */
194 SV *defsv; /* $_ */
195 SV *errsv; /* $@ */
196 GV *deffh; /* default filehandle */
197 SV *irssv; /* $/ */
198 SV *irssv_sv; /* real $/ cache */
199
200#define VAR(name,type) type name;
201# include "state.h"
202#undef VAR
203 233
204 /* coro process data */ 234 /* coro process data */
205 int prio; 235 int prio;
236 SV *throw;
237
238 /* async_pool */
239 SV *saved_deffh;
206 240
207 /* linked list */ 241 /* linked list */
208 struct coro *next, *prev; 242 struct coro *next, *prev;
209 HV *hv; /* the perl hash associated with this coro, if any */ 243 HV *hv; /* the perl hash associated with this coro, if any */
210}; 244};
… …
226static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 260static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
227static int coro_nready; 261static int coro_nready;
228static struct coro *coro_first; 262static struct coro *coro_first;
229 263
230/** lowlevel stuff **********************************************************/ 264/** lowlevel stuff **********************************************************/
265
266static SV *
267coro_get_sv (const char *name, int create)
268{
269#if PERL_VERSION_ATLEAST (5,9,0)
270 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
271 get_sv (name, create);
272#endif
273 return get_sv (name, create);
274}
275
276static AV *
277coro_get_av (const char *name, int create)
278{
279#if PERL_VERSION_ATLEAST (5,9,0)
280 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
281 get_av (name, create);
282#endif
283 return get_av (name, create);
284}
285
286static HV *
287coro_get_hv (const char *name, int create)
288{
289#if PERL_VERSION_ATLEAST (5,9,0)
290 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
291 get_hv (name, create);
292#endif
293 return get_hv (name, create);
294}
231 295
232static AV * 296static AV *
233coro_clone_padlist (pTHX_ CV *cv) 297coro_clone_padlist (pTHX_ CV *cv)
234{ 298{
235 AV *padlist = CvPADLIST (cv); 299 AV *padlist = CvPADLIST (cv);
… …
308 MAGIC *mg; 372 MAGIC *mg;
309 373
310 if (SvROK (coro)) 374 if (SvROK (coro))
311 coro = SvRV (coro); 375 coro = SvRV (coro);
312 376
377 if (expect_false (SvTYPE (coro) != SVt_PVHV))
378 croak ("Coro::State object required");
379
313 stash = SvSTASH (coro); 380 stash = SvSTASH (coro);
314 if (stash != coro_stash && stash != coro_state_stash) 381 if (expect_false (stash != coro_stash && stash != coro_state_stash))
315 { 382 {
316 /* very slow, but rare, check */ 383 /* very slow, but rare, check */
317 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 384 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
318 croak ("Coro::State object required"); 385 croak ("Coro::State object required");
319 } 386 }
… …
329get_padlist (pTHX_ CV *cv) 396get_padlist (pTHX_ CV *cv)
330{ 397{
331 MAGIC *mg = CORO_MAGIC (cv); 398 MAGIC *mg = CORO_MAGIC (cv);
332 AV *av; 399 AV *av;
333 400
334 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 401 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
335 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 402 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
336 else 403 else
337 { 404 {
338#if CORO_PREFER_PERL_FUNCTIONS 405#if CORO_PREFER_PERL_FUNCTIONS
339 /* this is probably cleaner, but also slower? */ 406 /* this is probably cleaner, but also slower? */
… …
351put_padlist (pTHX_ CV *cv) 418put_padlist (pTHX_ CV *cv)
352{ 419{
353 MAGIC *mg = CORO_MAGIC (cv); 420 MAGIC *mg = CORO_MAGIC (cv);
354 AV *av; 421 AV *av;
355 422
356 if (!mg) 423 if (expect_false (!mg))
357 { 424 {
358 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 425 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
359 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 426 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
360 mg->mg_virtual = &vtbl_coro; 427 mg->mg_virtual = &vtbl_coro;
361 mg->mg_obj = (SV *)newAV (); 428 mg->mg_obj = (SV *)newAV ();
362 } 429 }
363 430
364 av = (AV *)mg->mg_obj; 431 av = (AV *)mg->mg_obj;
365 432
366 if (AvFILLp (av) >= AvMAX (av)) 433 if (expect_false (AvFILLp (av) >= AvMAX (av)))
367 av_extend (av, AvMAX (av) + 1); 434 av_extend (av, AvMAX (av) + 1);
368 435
369 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 436 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
370} 437}
371 438
372/** load & save, init *******************************************************/ 439/** load & save, init *******************************************************/
373 440
374#define SB do {
375#define SE } while (0)
376
377#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
378
379static void 441static void
380load_perl (pTHX_ Coro__State c) 442load_perl (pTHX_ Coro__State c)
381{ 443{
444 perl_slots *slot = c->slot;
445 c->slot = 0;
446
447 PL_mainstack = c->mainstack;
448
449 GvSV (PL_defgv) = slot->defsv;
450 GvAV (PL_defgv) = slot->defav;
451 GvSV (PL_errgv) = slot->errsv;
452 GvSV (irsgv) = slot->irsgv;
453
382#define VAR(name,type) PL_ ## name = c->name; 454 #define VAR(name,type) PL_ ## name = slot->name;
383# include "state.h" 455 # include "state.h"
384#undef VAR 456 #undef VAR
385 457
386 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 458 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
387 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 459 /*hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);*/
388 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
389 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh);
390
391 if (c->irssv)
392 {
393 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
394 {
395 SvREFCNT_dec (c->irssv);
396 c->irssv = 0;
397 }
398 else
399 {
400 REPLACE_SV (PL_rs, c->irssv);
401 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
402 sv_setsv (c->irssv_sv, PL_rs);
403 }
404 }
405 460
406 { 461 {
407 dSP; 462 dSP;
463
408 CV *cv; 464 CV *cv;
409 465
410 /* now do the ugly restore mess */ 466 /* now do the ugly restore mess */
411 while ((cv = (CV *)POPs)) 467 while (expect_true (cv = (CV *)POPs))
412 { 468 {
413 put_padlist (aTHX_ cv); /* mark this padlist as available */ 469 put_padlist (aTHX_ cv); /* mark this padlist as available */
414 CvDEPTH (cv) = PTR2IV (POPs); 470 CvDEPTH (cv) = PTR2IV (POPs);
415 CvPADLIST (cv) = (AV *)POPs; 471 CvPADLIST (cv) = (AV *)POPs;
416 } 472 }
… …
435 491
436 XPUSHs (Nullsv); 492 XPUSHs (Nullsv);
437 /* this loop was inspired by pp_caller */ 493 /* this loop was inspired by pp_caller */
438 for (;;) 494 for (;;)
439 { 495 {
440 while (cxix >= 0) 496 while (expect_true (cxix >= 0))
441 { 497 {
442 PERL_CONTEXT *cx = &ccstk[cxix--]; 498 PERL_CONTEXT *cx = &ccstk[cxix--];
443 499
444 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 500 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
445 { 501 {
446 CV *cv = cx->blk_sub.cv; 502 CV *cv = cx->blk_sub.cv;
447 503
448 if (CvDEPTH (cv)) 504 if (expect_true (CvDEPTH (cv)))
449 { 505 {
450 EXTEND (SP, 3); 506 EXTEND (SP, 3);
451 PUSHs ((SV *)CvPADLIST (cv)); 507 PUSHs ((SV *)CvPADLIST (cv));
452 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 508 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
453 PUSHs ((SV *)cv); 509 PUSHs ((SV *)cv);
… …
456 get_padlist (aTHX_ cv); 512 get_padlist (aTHX_ cv);
457 } 513 }
458 } 514 }
459 } 515 }
460 516
461 if (top_si->si_type == PERLSI_MAIN) 517 if (expect_true (top_si->si_type == PERLSI_MAIN))
462 break; 518 break;
463 519
464 top_si = top_si->si_prev; 520 top_si = top_si->si_prev;
465 ccstk = top_si->si_cxstack; 521 ccstk = top_si->si_cxstack;
466 cxix = top_si->si_cxix; 522 cxix = top_si->si_cxix;
467 } 523 }
468 524
469 PUTBACK; 525 PUTBACK;
470 } 526 }
471 527
472 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 528 /* allocate some space on the context stack for our purposes */
473 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 529 /* we manually unroll here, as usually 2 slots is enough */
474 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 530 if (SLOT_COUNT >= 1) CXINC;
475 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 531 if (SLOT_COUNT >= 2) CXINC;
476 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0; 532 if (SLOT_COUNT >= 3) CXINC;
533 {
534 int i;
535 for (i = 3; i < SLOT_COUNT; ++i)
536 CXINC;
537 }
538 cxstack_ix -= SLOT_COUNT; /* undo allocation */
477 539
540 c->mainstack = PL_mainstack;
541
542 {
543 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
544
545 slot->defav = GvAV (PL_defgv);
546 slot->defsv = DEFSV;
547 slot->errsv = ERRSV;
548 slot->irsgv = GvSV (irsgv);
549
478#define VAR(name,type)c->name = PL_ ## name; 550 #define VAR(name,type) slot->name = PL_ ## name;
479# include "state.h" 551 # include "state.h"
480#undef VAR 552 #undef VAR
553 }
481} 554}
482 555
483/* 556/*
484 * allocate various perl stacks. This is an exact copy 557 * allocate various perl stacks. This is an exact copy
485 * of perl.c:init_stacks, except that it uses less memory 558 * of perl.c:init_stacks, except that it uses less memory
486 * on the (sometimes correct) assumption that coroutines do 559 * on the (sometimes correct) assumption that coroutines do
487 * not usually need a lot of stackspace. 560 * not usually need a lot of stackspace.
488 */ 561 */
489#if CORO_PREFER_PERL_FUNCTIONS 562#if 1
490# define coro_init_stacks init_stacks 563# define coro_init_stacks init_stacks
491#else 564#else
492static void 565static void
493coro_init_stacks (pTHX) 566coro_init_stacks (pTHX)
494{ 567{
495 PL_curstackinfo = new_stackinfo(64, 6); 568 PL_curstackinfo = new_stackinfo(32, 8);
496 PL_curstackinfo->si_type = PERLSI_MAIN; 569 PL_curstackinfo->si_type = PERLSI_MAIN;
497 PL_curstack = PL_curstackinfo->si_stack; 570 PL_curstack = PL_curstackinfo->si_stack;
498 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 571 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
499 572
500 PL_stack_base = AvARRAY(PL_curstack); 573 PL_stack_base = AvARRAY(PL_curstack);
501 PL_stack_sp = PL_stack_base; 574 PL_stack_sp = PL_stack_base;
502 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 575 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
503 576
504 New(50,PL_tmps_stack,64,SV*); 577 New(50,PL_tmps_stack,32,SV*);
505 PL_tmps_floor = -1; 578 PL_tmps_floor = -1;
506 PL_tmps_ix = -1; 579 PL_tmps_ix = -1;
507 PL_tmps_max = 64; 580 PL_tmps_max = 32;
508 581
509 New(54,PL_markstack,16,I32); 582 New(54,PL_markstack,16,I32);
510 PL_markstack_ptr = PL_markstack; 583 PL_markstack_ptr = PL_markstack;
511 PL_markstack_max = PL_markstack + 16; 584 PL_markstack_max = PL_markstack + 16;
512 585
513#ifdef SET_MARK_OFFSET 586#ifdef SET_MARK_OFFSET
514 SET_MARK_OFFSET; 587 SET_MARK_OFFSET;
515#endif 588#endif
516 589
517 New(54,PL_scopestack,16,I32); 590 New(54,PL_scopestack,8,I32);
518 PL_scopestack_ix = 0; 591 PL_scopestack_ix = 0;
519 PL_scopestack_max = 16; 592 PL_scopestack_max = 8;
520 593
521 New(54,PL_savestack,64,ANY); 594 New(54,PL_savestack,24,ANY);
522 PL_savestack_ix = 0; 595 PL_savestack_ix = 0;
523 PL_savestack_max = 64; 596 PL_savestack_max = 24;
524 597
525#if !PERL_VERSION_ATLEAST (5,9,0) 598#if !PERL_VERSION_ATLEAST (5,9,0)
526 New(54,PL_retstack,4,OP*); 599 New(54,PL_retstack,4,OP*);
527 PL_retstack_ix = 0; 600 PL_retstack_ix = 0;
528 PL_retstack_max = 4; 601 PL_retstack_max = 4;
… …
534 * destroy the stacks, the callchain etc... 607 * destroy the stacks, the callchain etc...
535 */ 608 */
536static void 609static void
537coro_destroy_stacks (pTHX) 610coro_destroy_stacks (pTHX)
538{ 611{
539 if (!IN_DESTRUCT)
540 {
541 /* restore all saved variables and stuff */
542 LEAVE_SCOPE (0);
543 assert (PL_tmps_floor == -1);
544
545 /* free all temporaries */
546 FREETMPS;
547 assert (PL_tmps_ix == -1);
548
549 /* unwind all extra stacks */
550 POPSTACK_TO (PL_mainstack);
551
552 /* unwind main stack */
553 dounwind (-1);
554 }
555
556 while (PL_curstackinfo->si_next) 612 while (PL_curstackinfo->si_next)
557 PL_curstackinfo = PL_curstackinfo->si_next; 613 PL_curstackinfo = PL_curstackinfo->si_next;
558 614
559 while (PL_curstackinfo) 615 while (PL_curstackinfo)
560 { 616 {
… …
578} 634}
579 635
580static size_t 636static size_t
581coro_rss (pTHX_ struct coro *coro) 637coro_rss (pTHX_ struct coro *coro)
582{ 638{
583 size_t rss = sizeof (coro); 639 size_t rss = sizeof (*coro);
584 640
585 if (coro->mainstack) 641 if (coro->mainstack)
586 { 642 {
643 perl_slots tmp_slot;
644 perl_slots *slot;
645
587 if (coro->flags & CF_RUNNING) 646 if (coro->flags & CF_RUNNING)
588 { 647 {
648 slot = &tmp_slot;
649
589 #define VAR(name,type)coro->name = PL_ ## name; 650 #define VAR(name,type) slot->name = PL_ ## name;
590 # include "state.h" 651 # include "state.h"
591 #undef VAR 652 #undef VAR
592 } 653 }
654 else
655 slot = coro->slot;
593 656
594 rss += sizeof (coro->curstackinfo); 657 rss += sizeof (slot->curstackinfo);
595 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
596 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 658 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
597 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 659 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
598 rss += coro->tmps_max * sizeof (SV *); 660 rss += slot->tmps_max * sizeof (SV *);
599 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 661 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
600 rss += coro->scopestack_max * sizeof (I32); 662 rss += slot->scopestack_max * sizeof (I32);
601 rss += coro->savestack_max * sizeof (ANY); 663 rss += slot->savestack_max * sizeof (ANY);
602 664
603#if !PERL_VERSION_ATLEAST (5,9,0) 665#if !PERL_VERSION_ATLEAST (5,9,0)
604 rss += coro->retstack_max * sizeof (OP *); 666 rss += slot->retstack_max * sizeof (OP *);
605#endif 667#endif
606 } 668 }
607 669
608 return rss; 670 return rss;
609} 671}
610 672
611/** coroutine stack handling ************************************************/ 673/** coroutine stack handling ************************************************/
612 674
613static void 675static void
614setup_coro (pTHX_ struct coro *coro) 676coro_setup (pTHX_ struct coro *coro)
615{ 677{
616 /* 678 /*
617 * emulate part of the perl startup here. 679 * emulate part of the perl startup here.
618 */ 680 */
619 coro_init_stacks (aTHX); 681 coro_init_stacks (aTHX);
… …
621 PL_runops = RUNOPS_DEFAULT; 683 PL_runops = RUNOPS_DEFAULT;
622 PL_curcop = &PL_compiling; 684 PL_curcop = &PL_compiling;
623 PL_in_eval = EVAL_NULL; 685 PL_in_eval = EVAL_NULL;
624 PL_comppad = 0; 686 PL_comppad = 0;
625 PL_curpm = 0; 687 PL_curpm = 0;
688 PL_curpad = 0;
626 PL_localizing = 0; 689 PL_localizing = 0;
627 PL_dirty = 0; 690 PL_dirty = 0;
628 PL_restartop = 0; 691 PL_restartop = 0;
692 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
693 PL_warnhook = 0; hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
694
695 GvSV (PL_defgv) = newSV (0);
696 GvAV (PL_defgv) = coro->args; coro->args = 0;
697 GvSV (PL_errgv) = newSV (0);
698 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
699 PL_rs = newSVsv (GvSV (irsgv));
700 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
629 701
630 { 702 {
631 dSP; 703 dSP;
632 LOGOP myop; 704 LOGOP myop;
633 705
634 SvREFCNT_dec (GvAV (PL_defgv));
635 GvAV (PL_defgv) = coro->args; coro->args = 0;
636
637 Zero (&myop, 1, LOGOP); 706 Zero (&myop, 1, LOGOP);
638 myop.op_next = Nullop; 707 myop.op_next = Nullop;
639 myop.op_flags = OPf_WANT_VOID; 708 myop.op_flags = OPf_WANT_VOID;
640 709
641 PUSHMARK (SP); 710 PUSHMARK (SP);
642 XPUSHs (av_shift (GvAV (PL_defgv))); 711 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
643 PUTBACK; 712 PUTBACK;
644 PL_op = (OP *)&myop; 713 PL_op = (OP *)&myop;
645 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 714 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
646 SPAGAIN; 715 SPAGAIN;
647 } 716 }
648 717
649 ENTER; /* necessary e.g. for dounwind */ 718 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */
719}
720
721static void
722coro_destroy (pTHX_ struct coro *coro)
723{
724 if (!IN_DESTRUCT)
725 {
726 /* restore all saved variables and stuff */
727 LEAVE_SCOPE (0);
728 assert (PL_tmps_floor == -1);
729
730 /* free all temporaries */
731 FREETMPS;
732 assert (PL_tmps_ix == -1);
733
734 /* unwind all extra stacks */
735 POPSTACK_TO (PL_mainstack);
736
737 /* unwind main stack */
738 dounwind (-1);
739 }
740
741 SvREFCNT_dec (GvSV (PL_defgv));
742 SvREFCNT_dec (GvAV (PL_defgv));
743 SvREFCNT_dec (GvSV (PL_errgv));
744 SvREFCNT_dec (PL_defoutgv);
745 SvREFCNT_dec (PL_rs);
746 SvREFCNT_dec (GvSV (irsgv));
747
748 SvREFCNT_dec (PL_diehook);
749 SvREFCNT_dec (PL_warnhook);
750
751 SvREFCNT_dec (coro->saved_deffh);
752 SvREFCNT_dec (coro->throw);
753
754 coro_destroy_stacks (aTHX);
650} 755}
651 756
652static void 757static void
653free_coro_mortal (pTHX) 758free_coro_mortal (pTHX)
654{ 759{
655 if (coro_mortal) 760 if (expect_true (coro_mortal))
656 { 761 {
657 SvREFCNT_dec (coro_mortal); 762 SvREFCNT_dec (coro_mortal);
658 coro_mortal = 0; 763 coro_mortal = 0;
659 } 764 }
660} 765}
… …
669 774
670 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 775 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
671 { 776 {
672 PERL_ASYNC_CHECK (); 777 PERL_ASYNC_CHECK ();
673 778
674 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 779 if (cctx->flags & CC_TRACE_ALL)
675 { 780 {
676 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 781 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB)
677 SV **bot, **top;
678 AV *av = newAV (); /* return values */
679 SV **cb;
680 runops_proc_t old_runops = PL_runops;
681 dSP;
682 ENTER;
683 SAVETMPS;
684 EXTEND (SP, 3);
685 PL_runops = RUNOPS_DEFAULT;
686
687 GV *gv = CvGV (cx->blk_sub.cv);
688 SV *fullname = sv_2mortal (newSV (0));
689 if (isGV (gv))
690 gv_efullname3 (fullname, gv, 0);
691
692 bot = PL_stack_base + cx->blk_oldsp + 1;
693 top = cx->blk_gimme == G_ARRAY ? SP + 1
694 : cx->blk_gimme == G_SCALAR ? bot + 1
695 : bot;
696
697 while (bot < top)
698 av_push (av, SvREFCNT_inc (*bot++));
699
700 PUSHMARK (SP);
701 PUSHs (&PL_sv_no);
702 PUSHs (fullname);
703 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
704 PUTBACK;
705 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
706 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
707 SPAGAIN;
708
709 FREETMPS;
710 LEAVE;
711 PL_runops = old_runops;
712 }
713
714 if (oldcop != PL_curcop)
715 {
716 oldcop = PL_curcop;
717
718 if (PL_curcop != &PL_compiling)
719 { 782 {
783 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
784 SV **bot, **top;
785 AV *av = newAV (); /* return values */
720 SV **cb; 786 SV **cb;
721 runops_proc_t old_runops = PL_runops;
722 dSP; 787 dSP;
788
789 GV *gv = CvGV (cx->blk_sub.cv);
790 SV *fullname = sv_2mortal (newSV (0));
791 if (isGV (gv))
792 gv_efullname3 (fullname, gv, 0);
793
794 bot = PL_stack_base + cx->blk_oldsp + 1;
795 top = cx->blk_gimme == G_ARRAY ? SP + 1
796 : cx->blk_gimme == G_SCALAR ? bot + 1
797 : bot;
798
799 av_extend (av, top - bot);
800 while (bot < top)
801 av_push (av, SvREFCNT_inc (*bot++));
802
803 PL_runops = RUNOPS_DEFAULT;
723 ENTER; 804 ENTER;
724 SAVETMPS; 805 SAVETMPS;
725 EXTEND (SP, 3); 806 EXTEND (SP, 3);
726 PL_runops = RUNOPS_DEFAULT; 807 PUSHMARK (SP);
808 PUSHs (&PL_sv_no);
809 PUSHs (fullname);
810 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
811 PUTBACK;
812 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0);
813 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
814 SPAGAIN;
815 FREETMPS;
816 LEAVE;
817 PL_runops = runops_trace;
818 }
727 819
728 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 820 if (oldcop != PL_curcop)
821 {
822 oldcop = PL_curcop;
823
824 if (PL_curcop != &PL_compiling)
729 { 825 {
730 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 826 SV **cb;
731 827
732 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 828 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB)
733 { 829 {
830 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
831
832 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
833 {
834 runops_proc_t old_runops = PL_runops;
835 dSP;
734 GV *gv = CvGV (cx->blk_sub.cv); 836 GV *gv = CvGV (cx->blk_sub.cv);
735 SV *fullname = sv_2mortal (newSV (0)); 837 SV *fullname = sv_2mortal (newSV (0));
838
736 if (isGV (gv)) 839 if (isGV (gv))
737 gv_efullname3 (fullname, gv, 0); 840 gv_efullname3 (fullname, gv, 0);
738 841
842 PL_runops = RUNOPS_DEFAULT;
843 ENTER;
844 SAVETMPS;
845 EXTEND (SP, 3);
846 PUSHMARK (SP);
847 PUSHs (&PL_sv_yes);
848 PUSHs (fullname);
849 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
850 PUTBACK;
851 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0);
852 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
853 SPAGAIN;
854 FREETMPS;
855 LEAVE;
856 PL_runops = runops_trace;
857 }
858
859 oldcxix = cxstack_ix;
860 }
861
862 if (cctx->flags & CC_TRACE_LINE)
863 {
864 dSP;
865
866 PL_runops = RUNOPS_DEFAULT;
867 ENTER;
868 SAVETMPS;
869 EXTEND (SP, 3);
870 PL_runops = RUNOPS_DEFAULT;
739 PUSHMARK (SP); 871 PUSHMARK (SP);
740 PUSHs (&PL_sv_yes); 872 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
741 PUSHs (fullname); 873 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
742 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
743 PUTBACK; 874 PUTBACK;
744 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 875 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0);
745 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 876 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
746 SPAGAIN; 877 SPAGAIN;
878 FREETMPS;
879 LEAVE;
880 PL_runops = runops_trace;
747 } 881 }
748
749 oldcxix = cxstack_ix;
750 } 882 }
751
752 if (cctx->flags & CC_TRACE_LINE)
753 {
754 PUSHMARK (SP);
755 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
756 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
757 PUTBACK;
758 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
759 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
760 SPAGAIN;
761 }
762
763 FREETMPS;
764 LEAVE;
765 PL_runops = old_runops;
766 } 883 }
767 } 884 }
768 } 885 }
769 886
770 TAINT_NOT; 887 TAINT_NOT;
… …
773 890
774/* inject a fake call to Coro::State::_cctx_init into the execution */ 891/* inject a fake call to Coro::State::_cctx_init into the execution */
775/* _cctx_init should be careful, as it could be called at almost any time */ 892/* _cctx_init should be careful, as it could be called at almost any time */
776/* during execution of a perl program */ 893/* during execution of a perl program */
777static void NOINLINE 894static void NOINLINE
778prepare_cctx (pTHX_ coro_cctx *cctx) 895cctx_prepare (pTHX_ coro_cctx *cctx)
779{ 896{
780 dSP; 897 dSP;
781 LOGOP myop; 898 LOGOP myop;
782 899
783 PL_top_env = &PL_start_env; 900 PL_top_env = &PL_start_env;
… …
801 918
802/* 919/*
803 * this is a _very_ stripped down perl interpreter ;) 920 * this is a _very_ stripped down perl interpreter ;)
804 */ 921 */
805static void 922static void
806coro_run (void *arg) 923cctx_run (void *arg)
807{ 924{
808 dTHX; 925 dTHX;
809 926
810 /* coro_run is the alternative tail of transfer(), so unlock here. */ 927 /* cctx_run is the alternative tail of transfer(), so unlock here. */
811 UNLOCK; 928 UNLOCK;
812 929
813 /* we now skip the entersub that lead to transfer() */ 930 /* we now skip the entersub that lead to transfer() */
814 PL_op = PL_op->op_next; 931 PL_op = PL_op->op_next;
815 932
816 /* inject a fake subroutine call to cctx_init */ 933 /* inject a fake subroutine call to cctx_init */
817 prepare_cctx (aTHX_ (coro_cctx *)arg); 934 cctx_prepare (aTHX_ (coro_cctx *)arg);
818 935
819 /* somebody or something will hit me for both perl_run and PL_restartop */ 936 /* somebody or something will hit me for both perl_run and PL_restartop */
820 PL_restartop = PL_op; 937 PL_restartop = PL_op;
821 perl_run (PL_curinterp); 938 perl_run (PL_curinterp);
822 939
… …
841 ++cctx_count; 958 ++cctx_count;
842 959
843 Newz (0, cctx, 1, coro_cctx); 960 Newz (0, cctx, 1, coro_cctx);
844 961
845#if HAVE_MMAP 962#if HAVE_MMAP
846
847 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 963 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
848 /* mmap supposedly does allocate-on-write for us */ 964 /* mmap supposedly does allocate-on-write for us */
849 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 965 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
850 966
851 if (cctx->sptr != (void *)-1) 967 if (cctx->sptr != (void *)-1)
… …
872 stack_start = cctx->sptr; 988 stack_start = cctx->sptr;
873 stack_size = cctx->ssize; 989 stack_size = cctx->ssize;
874 } 990 }
875 991
876 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 992 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
877 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 993 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
878 994
879 return cctx; 995 return cctx;
880} 996}
881 997
882static void 998static void
… …
899 Safefree (cctx->sptr); 1015 Safefree (cctx->sptr);
900 1016
901 Safefree (cctx); 1017 Safefree (cctx);
902} 1018}
903 1019
1020/* wether this cctx should be destructed */
1021#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1022
904static coro_cctx * 1023static coro_cctx *
905cctx_get (pTHX) 1024cctx_get (pTHX)
906{ 1025{
907 while (cctx_first) 1026 while (expect_true (cctx_first))
908 { 1027 {
909 coro_cctx *cctx = cctx_first; 1028 coro_cctx *cctx = cctx_first;
910 cctx_first = cctx->next; 1029 cctx_first = cctx->next;
911 --cctx_idle; 1030 --cctx_idle;
912 1031
913 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1032 if (expect_true (!CCTX_EXPIRED (cctx)))
914 return cctx; 1033 return cctx;
915 1034
916 cctx_destroy (cctx); 1035 cctx_destroy (cctx);
917 } 1036 }
918 1037
… …
921 1040
922static void 1041static void
923cctx_put (coro_cctx *cctx) 1042cctx_put (coro_cctx *cctx)
924{ 1043{
925 /* free another cctx if overlimit */ 1044 /* free another cctx if overlimit */
926 if (cctx_idle >= MAX_IDLE_CCTX) 1045 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
927 { 1046 {
928 coro_cctx *first = cctx_first; 1047 coro_cctx *first = cctx_first;
929 cctx_first = first->next; 1048 cctx_first = first->next;
930 --cctx_idle; 1049 --cctx_idle;
931 1050
… …
937 cctx_first = cctx; 1056 cctx_first = cctx;
938} 1057}
939 1058
940/** coroutine switching *****************************************************/ 1059/** coroutine switching *****************************************************/
941 1060
942static void NOINLINE 1061static void
943transfer_check (pTHX_ struct coro *prev, struct coro *next) 1062transfer_check (pTHX_ struct coro *prev, struct coro *next)
944{ 1063{
945 if (prev != next) 1064 if (expect_true (prev != next))
946 { 1065 {
947 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1066 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
948 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1067 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
949 1068
950 if (next->flags & CF_RUNNING) 1069 if (expect_false (next->flags & CF_RUNNING))
951 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1070 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
952 1071
953 if (next->flags & CF_DESTROYED) 1072 if (expect_false (next->flags & CF_DESTROYED))
954 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1073 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
955 1074
1075 if (
1076#if PERL_VERSION_ATLEAST (5,9,0)
1077 expect_false (PL_parser)
1078#else
956 if (PL_lex_state != LEX_NOTPARSING) 1079 expect_false (PL_lex_state != LEX_NOTPARSING)
1080#endif
1081 )
957 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1082 croak ("Coro::State::transfer called while parsing, but this is not supported");
958 } 1083 }
959} 1084}
960 1085
961/* always use the TRANSFER macro */ 1086/* always use the TRANSFER macro */
… …
963transfer (pTHX_ struct coro *prev, struct coro *next) 1088transfer (pTHX_ struct coro *prev, struct coro *next)
964{ 1089{
965 dSTACKLEVEL; 1090 dSTACKLEVEL;
966 1091
967 /* sometimes transfer is only called to set idle_sp */ 1092 /* sometimes transfer is only called to set idle_sp */
968 if (!next) 1093 if (expect_false (!next))
969 { 1094 {
970 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1095 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
971 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1096 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
972 } 1097 }
973 else if (prev != next) 1098 else if (expect_true (prev != next))
974 { 1099 {
975 coro_cctx *prev__cctx; 1100 coro_cctx *prev__cctx;
976 1101
977 if (prev->flags & CF_NEW) 1102 if (expect_false (prev->flags & CF_NEW))
978 { 1103 {
979 /* create a new empty context */ 1104 /* create a new empty context */
980 Newz (0, prev->cctx, 1, coro_cctx); 1105 Newz (0, prev->cctx, 1, coro_cctx);
981 prev->flags &= ~CF_NEW; 1106 prev->flags &= ~CF_NEW;
982 prev->flags |= CF_RUNNING; 1107 prev->flags |= CF_RUNNING;
… …
985 prev->flags &= ~CF_RUNNING; 1110 prev->flags &= ~CF_RUNNING;
986 next->flags |= CF_RUNNING; 1111 next->flags |= CF_RUNNING;
987 1112
988 LOCK; 1113 LOCK;
989 1114
990 if (next->flags & CF_NEW) 1115 if (expect_false (next->flags & CF_NEW))
991 { 1116 {
992 /* need to start coroutine */ 1117 /* need to start coroutine */
993 next->flags &= ~CF_NEW; 1118 next->flags &= ~CF_NEW;
994 /* first get rid of the old state */ 1119 /* first get rid of the old state */
995 save_perl (aTHX_ prev); 1120 save_perl (aTHX_ prev);
996 /* setup coroutine call */ 1121 /* setup coroutine call */
997 setup_coro (aTHX_ next); 1122 coro_setup (aTHX_ next);
998 } 1123 }
999 else 1124 else
1000 { 1125 {
1001 /* coroutine already started */ 1126 /* coroutine already started */
1002 save_perl (aTHX_ prev); 1127 save_perl (aTHX_ prev);
… …
1004 } 1129 }
1005 1130
1006 prev__cctx = prev->cctx; 1131 prev__cctx = prev->cctx;
1007 1132
1008 /* possibly "free" the cctx */ 1133 /* possibly "free" the cctx */
1009 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1134 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1010 { 1135 {
1011 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1136 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1012 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1137 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1013 1138
1014 prev->cctx = 0; 1139 prev->cctx = 0;
1015 1140
1141 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1142 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1143 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1144 if (!next->cctx)
1145 next->cctx = cctx_get (aTHX);
1146
1016 cctx_put (prev__cctx); 1147 cctx_put (prev__cctx);
1017 } 1148 }
1018 1149
1150 ++next->usecount;
1151
1019 if (!next->cctx) 1152 if (expect_true (!next->cctx))
1020 next->cctx = cctx_get (aTHX); 1153 next->cctx = cctx_get (aTHX);
1021 1154
1022 if (prev__cctx != next->cctx) 1155 if (expect_false (prev__cctx != next->cctx))
1023 { 1156 {
1024 prev__cctx->top_env = PL_top_env; 1157 prev__cctx->top_env = PL_top_env;
1025 PL_top_env = next->cctx->top_env; 1158 PL_top_env = next->cctx->top_env;
1026 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1159 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1027 } 1160 }
1028 1161
1029 free_coro_mortal (aTHX); 1162 free_coro_mortal (aTHX);
1030 UNLOCK; 1163 UNLOCK;
1164
1165 if (expect_false (prev->throw || next->throw))
1166 {
1167 struct coro *coro = SvSTATE (coro_current);
1168
1169 if (coro->throw)
1170 {
1171 SV *exception = coro->throw;
1172 coro->throw = 0;
1173 sv_setsv (ERRSV, exception);
1174 croak (0);
1175 }
1176 }
1031 } 1177 }
1032} 1178}
1033 1179
1034struct transfer_args 1180struct transfer_args
1035{ 1181{
… …
1062 1208
1063 if (coro->mainstack && coro->mainstack != main_mainstack) 1209 if (coro->mainstack && coro->mainstack != main_mainstack)
1064 { 1210 {
1065 struct coro temp; 1211 struct coro temp;
1066 1212
1067 assert (!(coro->flags & CF_RUNNING));
1068
1069 Zero (&temp, 1, struct coro);
1070 temp.save = CORO_SAVE_ALL;
1071
1072 if (coro->flags & CF_RUNNING) 1213 if (coro->flags & CF_RUNNING)
1073 croak ("FATAL: tried to destroy currently running coroutine"); 1214 croak ("FATAL: tried to destroy currently running coroutine");
1074 1215
1075 save_perl (aTHX_ &temp); 1216 save_perl (aTHX_ &temp);
1076 load_perl (aTHX_ coro); 1217 load_perl (aTHX_ coro);
1077 1218
1078 coro_destroy_stacks (aTHX); 1219 coro_destroy (aTHX_ coro);
1079 1220
1080 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1221 load_perl (aTHX_ &temp);
1081 1222
1082 coro->mainstack = 0; 1223 coro->slot = 0;
1083 } 1224 }
1084 1225
1085 cctx_destroy (coro->cctx); 1226 cctx_destroy (coro->cctx);
1086 SvREFCNT_dec (coro->args); 1227 SvREFCNT_dec (coro->args);
1087 1228
… …
1146 1287
1147 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1288 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1148 TRANSFER (ta); 1289 TRANSFER (ta);
1149} 1290}
1150 1291
1151static int
1152api_save (SV *coro_sv, int new_save)
1153{
1154 dTHX;
1155 struct coro *coro = SvSTATE (coro_sv);
1156 int old_save = coro->save;
1157
1158 if (new_save >= 0)
1159 coro->save = new_save;
1160
1161 return old_save;
1162}
1163
1164/** Coro ********************************************************************/ 1292/** Coro ********************************************************************/
1165 1293
1166static void 1294static void
1167coro_enq (pTHX_ SV *coro_sv) 1295coro_enq (pTHX_ SV *coro_sv)
1168{ 1296{
… …
1225 { 1353 {
1226 LOCK; 1354 LOCK;
1227 next_sv = coro_deq (aTHX_ PRIO_MIN); 1355 next_sv = coro_deq (aTHX_ PRIO_MIN);
1228 1356
1229 /* nothing to schedule: call the idle handler */ 1357 /* nothing to schedule: call the idle handler */
1230 if (!next_sv) 1358 if (expect_false (!next_sv))
1231 { 1359 {
1232 dSP; 1360 dSP;
1233 UNLOCK; 1361 UNLOCK;
1234 1362
1235 ENTER; 1363 ENTER;
… …
1245 } 1373 }
1246 1374
1247 ta->next = SvSTATE (next_sv); 1375 ta->next = SvSTATE (next_sv);
1248 1376
1249 /* cannot transfer to destroyed coros, skip and look for next */ 1377 /* cannot transfer to destroyed coros, skip and look for next */
1250 if (ta->next->flags & CF_DESTROYED) 1378 if (expect_false (ta->next->flags & CF_DESTROYED))
1251 { 1379 {
1252 UNLOCK; 1380 UNLOCK;
1253 SvREFCNT_dec (next_sv); 1381 SvREFCNT_dec (next_sv);
1254 /* coro_nready is already taken care of by destroy */ 1382 /* coro_nready is already taken care of by destroy */
1255 continue; 1383 continue;
… …
1311 dTHX; 1439 dTHX;
1312 struct transfer_args ta; 1440 struct transfer_args ta;
1313 1441
1314 prepare_cede (aTHX_ &ta); 1442 prepare_cede (aTHX_ &ta);
1315 1443
1316 if (ta.prev != ta.next) 1444 if (expect_true (ta.prev != ta.next))
1317 { 1445 {
1318 TRANSFER (ta); 1446 TRANSFER (ta);
1319 return 1; 1447 return 1;
1320 } 1448 }
1321 else 1449 else
… …
1335 } 1463 }
1336 else 1464 else
1337 return 0; 1465 return 0;
1338} 1466}
1339 1467
1468static void
1469api_trace (SV *coro_sv, int flags)
1470{
1471 dTHX;
1472 struct coro *coro = SvSTATE (coro_sv);
1473
1474 if (flags & CC_TRACE)
1475 {
1476 if (!coro->cctx)
1477 coro->cctx = cctx_new ();
1478 else if (!(coro->cctx->flags & CC_TRACE))
1479 croak ("cannot enable tracing on coroutine with custom stack");
1480
1481 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1482 }
1483 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1484 {
1485 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1486
1487 if (coro->flags & CF_RUNNING)
1488 PL_runops = RUNOPS_DEFAULT;
1489 else
1490 coro->slot->runops = RUNOPS_DEFAULT;
1491 }
1492}
1493
1340MODULE = Coro::State PACKAGE = Coro::State 1494MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1341 1495
1342PROTOTYPES: DISABLE 1496PROTOTYPES: DISABLE
1343 1497
1344BOOT: 1498BOOT:
1345{ 1499{
1346#ifdef USE_ITHREADS 1500#ifdef USE_ITHREADS
1347 MUTEX_INIT (&coro_mutex); 1501 MUTEX_INIT (&coro_mutex);
1348#endif 1502#endif
1349 BOOT_PAGESIZE; 1503 BOOT_PAGESIZE;
1504
1505 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1506 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1507
1508 hv_sig = coro_get_hv ("SIG", TRUE);
1509 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE);
1510 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE);
1511
1512 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1513 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1350 1514
1351 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1515 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1352 1516
1353 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1517 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1354 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1518 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1355 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1519 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1356 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1520 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1357 1521
1358 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1359 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1360 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1361 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1362 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1363 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1364 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1365
1366 main_mainstack = PL_mainstack; 1522 main_mainstack = PL_mainstack;
1367 main_top_env = PL_top_env; 1523 main_top_env = PL_top_env;
1368 1524
1369 while (main_top_env->je_prev) 1525 while (main_top_env->je_prev)
1370 main_top_env = main_top_env->je_prev; 1526 main_top_env = main_top_env->je_prev;
… …
1382 struct coro *coro; 1538 struct coro *coro;
1383 HV *hv; 1539 HV *hv;
1384 int i; 1540 int i;
1385 1541
1386 Newz (0, coro, 1, struct coro); 1542 Newz (0, coro, 1, struct coro);
1387 coro->args = newAV (); 1543 coro->args = newAV ();
1388 coro->save = CORO_SAVE_DEF;
1389 coro->flags = CF_NEW; 1544 coro->flags = CF_NEW;
1390 1545
1391 if (coro_first) coro_first->prev = coro; 1546 if (coro_first) coro_first->prev = coro;
1392 coro->next = coro_first; 1547 coro->next = coro_first;
1393 coro_first = coro; 1548 coro_first = coro;
1394 1549
1395 coro->hv = hv = newHV (); 1550 coro->hv = hv = newHV ();
1396 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1551 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1397 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1552 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1398 1553
1554 av_extend (coro->args, items - 1);
1399 for (i = 1; i < items; i++) 1555 for (i = 1; i < items; i++)
1400 av_push (coro->args, newSVsv (ST (i))); 1556 av_push (coro->args, newSVsv (ST (i)));
1401} 1557}
1402 OUTPUT: 1558 OUTPUT:
1403 RETVAL 1559 RETVAL
1404 1560
1405int 1561# these not obviously related functions are all rolled into the same xs
1406save (SV *coro, int new_save = -1) 1562# function to increase chances that they all will call transfer with the same
1407 CODE: 1563# stack offset
1408 RETVAL = api_save (coro, new_save);
1409 OUTPUT:
1410 RETVAL
1411
1412int
1413save_also (SV *coro_sv, int save_also)
1414 CODE:
1415{
1416 struct coro *coro = SvSTATE (coro_sv);
1417 RETVAL = coro->save;
1418 coro->save |= save_also;
1419}
1420 OUTPUT:
1421 RETVAL
1422
1423void 1564void
1424_set_stacklevel (...) 1565_set_stacklevel (...)
1425 ALIAS: 1566 ALIAS:
1426 Coro::State::transfer = 1 1567 Coro::State::transfer = 1
1427 Coro::schedule = 2 1568 Coro::schedule = 2
… …
1461 } 1602 }
1462 1603
1463 BARRIER; 1604 BARRIER;
1464 TRANSFER (ta); 1605 TRANSFER (ta);
1465 1606
1466 if (GIMME_V != G_VOID && ta.next != ta.prev) 1607 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev))
1467 XSRETURN_YES; 1608 XSRETURN_YES;
1468} 1609}
1469 1610
1470bool 1611bool
1471_destroy (SV *coro_sv) 1612_destroy (SV *coro_sv)
… …
1521 CODE: 1662 CODE:
1522{ 1663{
1523 if (coro->mainstack) 1664 if (coro->mainstack)
1524 { 1665 {
1525 struct coro temp; 1666 struct coro temp;
1526 Zero (&temp, 1, struct coro);
1527 temp.save = CORO_SAVE_ALL;
1528 1667
1529 if (!(coro->flags & CF_RUNNING)) 1668 if (!(coro->flags & CF_RUNNING))
1530 { 1669 {
1531 save_perl (aTHX_ &temp); 1670 save_perl (aTHX_ &temp);
1532 load_perl (aTHX_ coro); 1671 load_perl (aTHX_ coro);
… …
1536 dSP; 1675 dSP;
1537 ENTER; 1676 ENTER;
1538 SAVETMPS; 1677 SAVETMPS;
1539 PUSHMARK (SP); 1678 PUSHMARK (SP);
1540 PUTBACK; 1679 PUTBACK;
1680
1541 if (ix) 1681 if (ix)
1542 eval_sv (coderef, 0); 1682 eval_sv (coderef, 0);
1543 else 1683 else
1544 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1684 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1685
1545 SPAGAIN; 1686 SPAGAIN;
1546 FREETMPS; 1687 FREETMPS;
1547 LEAVE; 1688 LEAVE;
1548 PUTBACK; 1689 PUTBACK;
1549 } 1690 }
… …
1553 save_perl (aTHX_ coro); 1694 save_perl (aTHX_ coro);
1554 load_perl (aTHX_ &temp); 1695 load_perl (aTHX_ &temp);
1555 } 1696 }
1556 } 1697 }
1557} 1698}
1558 1699
1559SV * 1700SV *
1560is_ready (Coro::State coro) 1701is_ready (Coro::State coro)
1561 PROTOTYPE: $ 1702 PROTOTYPE: $
1562 ALIAS: 1703 ALIAS:
1563 is_ready = CF_READY 1704 is_ready = CF_READY
… …
1568 RETVAL = boolSV (coro->flags & ix); 1709 RETVAL = boolSV (coro->flags & ix);
1569 OUTPUT: 1710 OUTPUT:
1570 RETVAL 1711 RETVAL
1571 1712
1572void 1713void
1573trace (Coro::State coro, int flags = CC_TRACE | CC_TRACE_SUB) 1714api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1574 CODE:
1575 if (flags & CC_TRACE)
1576 {
1577 if (!coro->cctx)
1578 coro->cctx = cctx_new ();
1579 else if (!(coro->cctx->flags & CC_TRACE))
1580 croak ("cannot enable tracing on coroutine with custom stack");
1581
1582 coro->cctx->flags |= flags & (CC_TRACE | CC_TRACE_ALL);
1583 }
1584 else
1585 if (coro->cctx && coro->cctx->flags & CC_TRACE)
1586 {
1587 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1588 coro->cctx->flags |= CC_NOREUSE;
1589
1590 if (coro->flags & CF_RUNNING)
1591 PL_runops = RUNOPS_DEFAULT;
1592 else
1593 coro->runops = RUNOPS_DEFAULT;
1594 }
1595 1715
1596SV * 1716SV *
1597has_stack (Coro::State coro) 1717has_stack (Coro::State coro)
1598 PROTOTYPE: $ 1718 PROTOTYPE: $
1599 CODE: 1719 CODE:
… …
1610 RETVAL 1730 RETVAL
1611 1731
1612IV 1732IV
1613rss (Coro::State coro) 1733rss (Coro::State coro)
1614 PROTOTYPE: $ 1734 PROTOTYPE: $
1735 ALIAS:
1736 usecount = 1
1615 CODE: 1737 CODE:
1738 switch (ix)
1739 {
1616 RETVAL = coro_rss (aTHX_ coro); 1740 case 0: RETVAL = coro_rss (aTHX_ coro); break;
1741 case 1: RETVAL = coro->usecount; break;
1742 }
1617 OUTPUT: 1743 OUTPUT:
1618 RETVAL 1744 RETVAL
1619 1745
1620 1746
1621MODULE = Coro::State PACKAGE = Coro 1747MODULE = Coro::State PACKAGE = Coro
1622 1748
1623BOOT: 1749BOOT:
1624{ 1750{
1625 int i; 1751 int i;
1626 1752
1627 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1753 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1628 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1754 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1629 av_async_pool = get_av ("Coro::async_pool", TRUE); 1755 av_async_pool = coro_get_av ("Coro::async_pool", TRUE);
1630 1756
1631 coro_current = get_sv ("Coro::current", FALSE); 1757 coro_current = coro_get_sv ("Coro::current", FALSE);
1632 SvREADONLY_on (coro_current); 1758 SvREADONLY_on (coro_current);
1633 1759
1634 coro_stash = gv_stashpv ("Coro", TRUE); 1760 coro_stash = gv_stashpv ("Coro", TRUE);
1635 1761
1636 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1762 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1637 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1763 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1638 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1764 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1639 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1765 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
… …
1642 1768
1643 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1769 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1644 coro_ready[i] = newAV (); 1770 coro_ready[i] = newAV ();
1645 1771
1646 { 1772 {
1647 SV *sv = perl_get_sv("Coro::API", 1); 1773 SV *sv = perl_get_sv ("Coro::API", TRUE);
1774 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1648 1775
1649 coroapi.schedule = api_schedule; 1776 coroapi.schedule = api_schedule;
1650 coroapi.save = api_save;
1651 coroapi.cede = api_cede; 1777 coroapi.cede = api_cede;
1652 coroapi.cede_notself = api_cede_notself; 1778 coroapi.cede_notself = api_cede_notself;
1653 coroapi.ready = api_ready; 1779 coroapi.ready = api_ready;
1654 coroapi.is_ready = api_is_ready; 1780 coroapi.is_ready = api_is_ready;
1655 coroapi.nready = &coro_nready; 1781 coroapi.nready = &coro_nready;
… …
1704 CODE: 1830 CODE:
1705 RETVAL = coro_nready; 1831 RETVAL = coro_nready;
1706 OUTPUT: 1832 OUTPUT:
1707 RETVAL 1833 RETVAL
1708 1834
1835void
1836throw (Coro::State self, SV *throw = &PL_sv_undef)
1837 PROTOTYPE: $;$
1838 CODE:
1839 SvREFCNT_dec (self->throw);
1840 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1841
1709# for async_pool speedup 1842# for async_pool speedup
1710void 1843void
1711_pool_1 (SV *cb) 1844_pool_1 (SV *cb)
1712 CODE: 1845 CODE:
1713{ 1846{
1714 int i, len; 1847 struct coro *coro = SvSTATE (coro_current);
1715 HV *hv = (HV *)SvRV (coro_current); 1848 HV *hv = (HV *)SvRV (coro_current);
1716 AV *defav = GvAV (PL_defgv); 1849 AV *defav = GvAV (PL_defgv);
1717 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1850 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0);
1718 AV *invoke_av; 1851 AV *invoke_av;
1852 int i, len;
1719 1853
1720 if (!invoke) 1854 if (!invoke)
1721 croak ("\3terminate\2\n"); 1855 croak ("\3async_pool terminate\2\n");
1856
1857 SvREFCNT_dec (coro->saved_deffh);
1858 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1722 1859
1723 hv_store (hv, "desc", sizeof ("desc") - 1, 1860 hv_store (hv, "desc", sizeof ("desc") - 1,
1724 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1861 newSVpvn (strpair ("[async_pool]")), 0);
1725 1862
1726 invoke_av = (AV *)SvRV (invoke); 1863 invoke_av = (AV *)SvRV (invoke);
1727 len = av_len (invoke_av); 1864 len = av_len (invoke_av);
1728 1865
1729 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1866 sv_setsv (cb, AvARRAY (invoke_av)[0]);
… …
1744{ 1881{
1745 struct coro *coro = SvSTATE (coro_current); 1882 struct coro *coro = SvSTATE (coro_current);
1746 1883
1747 sv_setsv (cb, &PL_sv_undef); 1884 sv_setsv (cb, &PL_sv_undef);
1748 1885
1886 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1887 coro->saved_deffh = 0;
1888
1749 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1889 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1750 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1890 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1751 croak ("\3terminate\2\n"); 1891 croak ("\3async_pool terminate\2\n");
1752 1892
1753 av_clear (GvAV (PL_defgv)); 1893 av_clear (GvAV (PL_defgv));
1754 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1894 hv_store ((HV *)SvRV (coro_current), strpair ("desc"),
1755 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1895 newSVpvn (strpair ("[async_pool idle]")), 0);
1756 coro->save = CORO_SAVE_DEF; 1896
1757 coro->prio = 0; 1897 coro->prio = 0;
1898
1899 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1900 api_trace (coro_current, 0);
1901
1758 av_push (av_async_pool, newSVsv (coro_current)); 1902 av_push (av_async_pool, newSVsv (coro_current));
1759} 1903}
1760 1904
1761 1905
1762MODULE = Coro::State PACKAGE = Coro::AIO 1906MODULE = Coro::State PACKAGE = Coro::AIO

Diff Legend

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