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.167 by root, Thu Sep 27 15:52:31 2007 UTC vs.
Revision 1.213 by root, Thu Oct 11 00:40:48 2007 UTC

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

Diff Legend

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