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.168 by root, Thu Sep 27 16:10:48 2007 UTC vs.
Revision 1.202 by root, Mon Oct 8 02:50:23 2007 UTC

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

Diff Legend

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