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

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

Diff Legend

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