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

Diff Legend

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