ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines