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.172 by root, Sun Sep 30 13:15:01 2007 UTC vs.
Revision 1.213 by root, Thu Oct 11 00:40:48 2007 UTC

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

Diff Legend

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