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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.164 by root, Tue Sep 25 01:47:23 2007 UTC vs.
Revision 1.202 by root, Mon Oct 8 02:50:23 2007 UTC

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

Diff Legend

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