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.209 by root, Wed Oct 10 02:58:17 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_NOREUSE = 0x02, /* throw this away after tracing */ 171 CC_NOREUSE = 0x02, /* throw this away after tracing */
148 CC_TRACE = 0x04, 172 CC_TRACE = 0x04,
… …
176 CF_READY = 0x0002, /* coroutine is ready */ 200 CF_READY = 0x0002, /* coroutine is ready */
177 CF_NEW = 0x0004, /* has never been switched to */ 201 CF_NEW = 0x0004, /* has never been switched to */
178 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 202 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
179}; 203};
180 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
181/* this is a structure representing a perl-level coroutine */ 218/* this is a structure representing a perl-level coroutine */
182struct coro { 219struct coro {
183 /* the c coroutine allocated to this perl coroutine, if any */ 220 /* the c coroutine allocated to this perl coroutine, if any */
184 coro_cctx *cctx; 221 coro_cctx *cctx;
222 int gimme;
185 223
224 /* process data */
225 AV *mainstack;
226 perl_slots *slot; /* basically the saved sp */
227
186 /* data associated with this coroutine (initial args) */ 228 AV *args; /* data associated with this coroutine (initial args) */
187 AV *args; 229 int refcnt; /* coroutines are refcounted, yes */
188 int refcnt;
189 int save; /* CORO_SAVE flags */
190 int flags; /* CF_ flags */ 230 int flags; /* CF_ flags */
231 HV *hv; /* the perl hash associated with this coro, if any */
191 232
192 /* optionally saved, might be zero */ 233 /* statistics */
193 AV *defav; /* @_ */ 234 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 235
204 /* coro process data */ 236 /* coro process data */
205 int prio; 237 int prio;
238 SV *throw; /* exception to be thrown */
239
240 /* async_pool */
241 SV *saved_deffh;
206 242
207 /* linked list */ 243 /* linked list */
208 struct coro *next, *prev; 244 struct coro *next, *prev;
209 HV *hv; /* the perl hash associated with this coro, if any */
210}; 245};
211 246
212typedef struct coro *Coro__State; 247typedef struct coro *Coro__State;
213typedef struct coro *Coro__State_or_hashref; 248typedef struct coro *Coro__State_or_hashref;
214 249
… …
226static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 261static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
227static int coro_nready; 262static int coro_nready;
228static struct coro *coro_first; 263static struct coro *coro_first;
229 264
230/** 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}
231 296
232static AV * 297static AV *
233coro_clone_padlist (pTHX_ CV *cv) 298coro_clone_padlist (pTHX_ CV *cv)
234{ 299{
235 AV *padlist = CvPADLIST (cv); 300 AV *padlist = CvPADLIST (cv);
… …
299 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 364 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \
300 ? SvMAGIC (cv) \ 365 ? SvMAGIC (cv) \
301 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 366 : mg_find ((SV *)cv, PERL_MAGIC_coro) \
302 : 0 367 : 0
303 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
304/* the next two functions merely cache the padlists */ 395/* the next two functions merely cache the padlists */
305static void 396static void
306get_padlist (pTHX_ CV *cv) 397get_padlist (pTHX_ CV *cv)
307{ 398{
308 MAGIC *mg = CORO_MAGIC (cv); 399 MAGIC *mg = CORO_MAGIC (cv);
309 AV *av; 400 AV *av;
310 401
311 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 402 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
312 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 403 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
313 else 404 else
314 { 405 {
315#if CORO_PREFER_PERL_FUNCTIONS 406#if CORO_PREFER_PERL_FUNCTIONS
316 /* this is probably cleaner, but also slower? */ 407 /* this is probably cleaner, but also slower? */
… …
328put_padlist (pTHX_ CV *cv) 419put_padlist (pTHX_ CV *cv)
329{ 420{
330 MAGIC *mg = CORO_MAGIC (cv); 421 MAGIC *mg = CORO_MAGIC (cv);
331 AV *av; 422 AV *av;
332 423
333 if (!mg) 424 if (expect_false (!mg))
334 { 425 {
335 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 426 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
336 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 427 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
337 mg->mg_virtual = &vtbl_coro; 428 mg->mg_virtual = &vtbl_coro;
338 mg->mg_obj = (SV *)newAV (); 429 mg->mg_obj = (SV *)newAV ();
339 } 430 }
340 431
341 av = (AV *)mg->mg_obj; 432 av = (AV *)mg->mg_obj;
342 433
343 if (AvFILLp (av) >= AvMAX (av)) 434 if (expect_false (AvFILLp (av) >= AvMAX (av)))
344 av_extend (av, AvMAX (av) + 1); 435 av_extend (av, AvMAX (av) + 1);
345 436
346 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 437 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
347} 438}
348 439
349/** load & save, init *******************************************************/ 440/** load & save, init *******************************************************/
350
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 441
356static void 442static void
357load_perl (pTHX_ Coro__State c) 443load_perl (pTHX_ Coro__State c)
358{ 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
359#define VAR(name,type) PL_ ## name = c->name; 455 #define VAR(name,type) PL_ ## name = slot->name;
360# include "state.h" 456 # include "state.h"
361#undef VAR 457 #undef VAR
362 458
363 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 459 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
364 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 460 /*hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);*/
365 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
366 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh);
367
368 if (c->irssv)
369 {
370 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
371 {
372 SvREFCNT_dec (c->irssv);
373 c->irssv = 0;
374 }
375 else
376 {
377 REPLACE_SV (PL_rs, c->irssv);
378 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
379 sv_setsv (c->irssv_sv, PL_rs);
380 }
381 }
382 461
383 { 462 {
384 dSP; 463 dSP;
464
385 CV *cv; 465 CV *cv;
386 466
387 /* now do the ugly restore mess */ 467 /* now do the ugly restore mess */
388 while ((cv = (CV *)POPs)) 468 while (expect_true (cv = (CV *)POPs))
389 { 469 {
390 put_padlist (aTHX_ cv); /* mark this padlist as available */ 470 put_padlist (aTHX_ cv); /* mark this padlist as available */
391 CvDEPTH (cv) = PTR2IV (POPs); 471 CvDEPTH (cv) = PTR2IV (POPs);
392 CvPADLIST (cv) = (AV *)POPs; 472 CvPADLIST (cv) = (AV *)POPs;
393 } 473 }
… …
412 492
413 XPUSHs (Nullsv); 493 XPUSHs (Nullsv);
414 /* this loop was inspired by pp_caller */ 494 /* this loop was inspired by pp_caller */
415 for (;;) 495 for (;;)
416 { 496 {
417 while (cxix >= 0) 497 while (expect_true (cxix >= 0))
418 { 498 {
419 PERL_CONTEXT *cx = &ccstk[cxix--]; 499 PERL_CONTEXT *cx = &ccstk[cxix--];
420 500
421 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 501 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
422 { 502 {
423 CV *cv = cx->blk_sub.cv; 503 CV *cv = cx->blk_sub.cv;
424 504
425 if (CvDEPTH (cv)) 505 if (expect_true (CvDEPTH (cv)))
426 { 506 {
427 EXTEND (SP, 3); 507 EXTEND (SP, 3);
428 PUSHs ((SV *)CvPADLIST (cv)); 508 PUSHs ((SV *)CvPADLIST (cv));
429 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 509 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
430 PUSHs ((SV *)cv); 510 PUSHs ((SV *)cv);
… …
433 get_padlist (aTHX_ cv); 513 get_padlist (aTHX_ cv);
434 } 514 }
435 } 515 }
436 } 516 }
437 517
438 if (top_si->si_type == PERLSI_MAIN) 518 if (expect_true (top_si->si_type == PERLSI_MAIN))
439 break; 519 break;
440 520
441 top_si = top_si->si_prev; 521 top_si = top_si->si_prev;
442 ccstk = top_si->si_cxstack; 522 ccstk = top_si->si_cxstack;
443 cxix = top_si->si_cxix; 523 cxix = top_si->si_cxix;
444 } 524 }
445 525
446 PUTBACK; 526 PUTBACK;
447 } 527 }
448 528
449 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 */
450 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 530 /* we manually unroll here, as usually 2 slots is enough */
451 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 531 if (SLOT_COUNT >= 1) CXINC;
452 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 532 if (SLOT_COUNT >= 2) CXINC;
453 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 */
454 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
455#define VAR(name,type)c->name = PL_ ## name; 551 #define VAR(name,type) slot->name = PL_ ## name;
456# include "state.h" 552 # include "state.h"
457#undef VAR 553 #undef VAR
554 }
458} 555}
459 556
460/* 557/*
461 * allocate various perl stacks. This is an exact copy 558 * allocate various perl stacks. This is an exact copy
462 * of perl.c:init_stacks, except that it uses less memory 559 * of perl.c:init_stacks, except that it uses less memory
… …
467# define coro_init_stacks init_stacks 564# define coro_init_stacks init_stacks
468#else 565#else
469static void 566static void
470coro_init_stacks (pTHX) 567coro_init_stacks (pTHX)
471{ 568{
472 PL_curstackinfo = new_stackinfo(64, 6); 569 PL_curstackinfo = new_stackinfo(32, 8);
473 PL_curstackinfo->si_type = PERLSI_MAIN; 570 PL_curstackinfo->si_type = PERLSI_MAIN;
474 PL_curstack = PL_curstackinfo->si_stack; 571 PL_curstack = PL_curstackinfo->si_stack;
475 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 572 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
476 573
477 PL_stack_base = AvARRAY(PL_curstack); 574 PL_stack_base = AvARRAY(PL_curstack);
478 PL_stack_sp = PL_stack_base; 575 PL_stack_sp = PL_stack_base;
479 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 576 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
480 577
481 New(50,PL_tmps_stack,64,SV*); 578 New(50,PL_tmps_stack,32,SV*);
482 PL_tmps_floor = -1; 579 PL_tmps_floor = -1;
483 PL_tmps_ix = -1; 580 PL_tmps_ix = -1;
484 PL_tmps_max = 64; 581 PL_tmps_max = 32;
485 582
486 New(54,PL_markstack,16,I32); 583 New(54,PL_markstack,16,I32);
487 PL_markstack_ptr = PL_markstack; 584 PL_markstack_ptr = PL_markstack;
488 PL_markstack_max = PL_markstack + 16; 585 PL_markstack_max = PL_markstack + 16;
489 586
490#ifdef SET_MARK_OFFSET 587#ifdef SET_MARK_OFFSET
491 SET_MARK_OFFSET; 588 SET_MARK_OFFSET;
492#endif 589#endif
493 590
494 New(54,PL_scopestack,16,I32); 591 New(54,PL_scopestack,8,I32);
495 PL_scopestack_ix = 0; 592 PL_scopestack_ix = 0;
496 PL_scopestack_max = 16; 593 PL_scopestack_max = 8;
497 594
498 New(54,PL_savestack,64,ANY); 595 New(54,PL_savestack,24,ANY);
499 PL_savestack_ix = 0; 596 PL_savestack_ix = 0;
500 PL_savestack_max = 64; 597 PL_savestack_max = 24;
501 598
502#if !PERL_VERSION_ATLEAST (5,9,0) 599#if !PERL_VERSION_ATLEAST (5,9,0)
503 New(54,PL_retstack,4,OP*); 600 New(54,PL_retstack,4,OP*);
504 PL_retstack_ix = 0; 601 PL_retstack_ix = 0;
505 PL_retstack_max = 4; 602 PL_retstack_max = 4;
… …
511 * destroy the stacks, the callchain etc... 608 * destroy the stacks, the callchain etc...
512 */ 609 */
513static void 610static void
514coro_destroy_stacks (pTHX) 611coro_destroy_stacks (pTHX)
515{ 612{
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) 613 while (PL_curstackinfo->si_next)
534 PL_curstackinfo = PL_curstackinfo->si_next; 614 PL_curstackinfo = PL_curstackinfo->si_next;
535 615
536 while (PL_curstackinfo) 616 while (PL_curstackinfo)
537 { 617 {
… …
553 Safefree (PL_retstack); 633 Safefree (PL_retstack);
554#endif 634#endif
555} 635}
556 636
557static size_t 637static size_t
558coro_rss (struct coro *coro) 638coro_rss (pTHX_ struct coro *coro)
559{ 639{
560 size_t rss = sizeof (coro); 640 size_t rss = sizeof (*coro);
561 641
562 if (coro->mainstack) 642 if (coro->mainstack)
563 { 643 {
644 perl_slots tmp_slot;
645 perl_slots *slot;
646
564 if (coro->flags & CF_RUNNING) 647 if (coro->flags & CF_RUNNING)
565 { 648 {
649 slot = &tmp_slot;
650
566 #define VAR(name,type)coro->name = PL_ ## name; 651 #define VAR(name,type) slot->name = PL_ ## name;
567 # include "state.h" 652 # include "state.h"
568 #undef VAR 653 #undef VAR
569 } 654 }
655 else
656 slot = coro->slot;
570 657
571 rss += sizeof (coro->curstackinfo); 658 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); 659 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
574 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 660 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
575 rss += coro->tmps_max * sizeof (SV *); 661 rss += slot->tmps_max * sizeof (SV *);
576 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 662 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
577 rss += coro->scopestack_max * sizeof (I32); 663 rss += slot->scopestack_max * sizeof (I32);
578 rss += coro->savestack_max * sizeof (ANY); 664 rss += slot->savestack_max * sizeof (ANY);
579 665
580#if !PERL_VERSION_ATLEAST (5,9,0) 666#if !PERL_VERSION_ATLEAST (5,9,0)
581 rss += coro->retstack_max * sizeof (OP *); 667 rss += slot->retstack_max * sizeof (OP *);
582#endif 668#endif
583 } 669 }
584 670
585 return rss; 671 return rss;
586} 672}
587 673
588/** coroutine stack handling ************************************************/ 674/** coroutine stack handling ************************************************/
589 675
590static void 676static void
591setup_coro (pTHX_ struct coro *coro) 677coro_setup (pTHX_ struct coro *coro)
592{ 678{
593 /* 679 /*
594 * emulate part of the perl startup here. 680 * emulate part of the perl startup here.
595 */ 681 */
596 coro_init_stacks (aTHX); 682 coro_init_stacks (aTHX);
597 683
684 PL_runops = RUNOPS_DEFAULT;
598 PL_curcop = &PL_compiling; 685 PL_curcop = &PL_compiling;
599 PL_in_eval = EVAL_NULL; 686 PL_in_eval = EVAL_NULL;
600 PL_comppad = 0; 687 PL_comppad = 0;
601 PL_curpm = 0; 688 PL_curpm = 0;
689 PL_curpad = 0;
602 PL_localizing = 0; 690 PL_localizing = 0;
603 PL_dirty = 0; 691 PL_dirty = 0;
604 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);
605 702
606 { 703 {
607 dSP; 704 dSP;
608 LOGOP myop; 705 LOGOP myop;
609 706
610 SvREFCNT_dec (GvAV (PL_defgv));
611 GvAV (PL_defgv) = coro->args; coro->args = 0;
612
613 Zero (&myop, 1, LOGOP); 707 Zero (&myop, 1, LOGOP);
614 myop.op_next = Nullop; 708 myop.op_next = Nullop;
615 myop.op_flags = OPf_WANT_VOID; 709 myop.op_flags = OPf_WANT_VOID;
616 710
617 PUSHMARK (SP); 711 PUSHMARK (SP);
618 XPUSHs (av_shift (GvAV (PL_defgv))); 712 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
619 PUTBACK; 713 PUTBACK;
620 PL_op = (OP *)&myop; 714 PL_op = (OP *)&myop;
621 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 715 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
622 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;
623 } 731 }
732}
624 733
625 ENTER; /* necessary e.g. for dounwind */ 734static void
735coro_destroy (pTHX_ struct coro *coro)
736{
737 if (!IN_DESTRUCT)
738 {
739 /* restore all saved variables and stuff */
740 LEAVE_SCOPE (0);
741 assert (PL_tmps_floor == -1);
742
743 /* free all temporaries */
744 FREETMPS;
745 assert (PL_tmps_ix == -1);
746
747 /* unwind all extra stacks */
748 POPSTACK_TO (PL_mainstack);
749
750 /* unwind main stack */
751 dounwind (-1);
752 }
753
754 SvREFCNT_dec (GvSV (PL_defgv));
755 SvREFCNT_dec (GvAV (PL_defgv));
756 SvREFCNT_dec (GvSV (PL_errgv));
757 SvREFCNT_dec (PL_defoutgv);
758 SvREFCNT_dec (PL_rs);
759 SvREFCNT_dec (GvSV (irsgv));
760
761 SvREFCNT_dec (PL_diehook);
762 SvREFCNT_dec (PL_warnhook);
763
764 SvREFCNT_dec (coro->saved_deffh);
765 SvREFCNT_dec (coro->throw);
766
767 coro_destroy_stacks (aTHX);
626} 768}
627 769
628static void 770static void
629free_coro_mortal (pTHX) 771free_coro_mortal (pTHX)
630{ 772{
631 if (coro_mortal) 773 if (expect_true (coro_mortal))
632 { 774 {
633 SvREFCNT_dec (coro_mortal); 775 SvREFCNT_dec (coro_mortal);
634 coro_mortal = 0; 776 coro_mortal = 0;
635 } 777 }
636} 778}
637 779
638static int 780static int
639runops_coro (pTHX) 781runops_trace (pTHX)
640{ 782{
641 COP *oldcop = 0; 783 COP *oldcop = 0;
642 int oldcxix = -2; 784 int oldcxix = -2;
785 struct coro *coro = SvSTATE (coro_current); /* trace cctx is tied to specific coro */
786 coro_cctx *cctx = coro->cctx;
643 787
644 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 788 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
645 { 789 {
646 PERL_ASYNC_CHECK (); 790 PERL_ASYNC_CHECK ();
647 791
648 if (PL_op->op_type == OP_LEAVESUB) 792 if (cctx->flags & CC_TRACE_ALL)
649 { 793 {
650 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 794 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 { 795 {
692 runops_proc_t old_runops = PL_runops; 796 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
797 SV **bot, **top;
798 AV *av = newAV (); /* return values */
799 SV **cb;
693 dSP; 800 dSP;
801
802 GV *gv = CvGV (cx->blk_sub.cv);
803 SV *fullname = sv_2mortal (newSV (0));
804 if (isGV (gv))
805 gv_efullname3 (fullname, gv, 0);
806
807 bot = PL_stack_base + cx->blk_oldsp + 1;
808 top = cx->blk_gimme == G_ARRAY ? SP + 1
809 : cx->blk_gimme == G_SCALAR ? bot + 1
810 : bot;
811
812 av_extend (av, top - bot);
813 while (bot < top)
814 av_push (av, SvREFCNT_inc (*bot++));
815
816 PL_runops = RUNOPS_DEFAULT;
694 ENTER; 817 ENTER;
695 SAVETMPS; 818 SAVETMPS;
696 EXTEND (SP, 3); 819 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); 820 PUSHMARK (SP);
724 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 821 PUSHs (&PL_sv_no);
725 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 822 PUSHs (fullname);
823 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
726 PUTBACK; 824 PUTBACK;
825 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0);
727 call_pv ("Coro::_do_trace_line", G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 826 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
728 SPAGAIN; 827 SPAGAIN;
729 }
730
731 FREETMPS; 828 FREETMPS;
732 LEAVE; 829 LEAVE;
733 PL_runops = old_runops; 830 PL_runops = runops_trace;
831 }
832
833 if (oldcop != PL_curcop)
834 {
835 oldcop = PL_curcop;
836
837 if (PL_curcop != &PL_compiling)
838 {
839 SV **cb;
840
841 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB)
842 {
843 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
844
845 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
846 {
847 runops_proc_t old_runops = PL_runops;
848 dSP;
849 GV *gv = CvGV (cx->blk_sub.cv);
850 SV *fullname = sv_2mortal (newSV (0));
851
852 if (isGV (gv))
853 gv_efullname3 (fullname, gv, 0);
854
855 PL_runops = RUNOPS_DEFAULT;
856 ENTER;
857 SAVETMPS;
858 EXTEND (SP, 3);
859 PUSHMARK (SP);
860 PUSHs (&PL_sv_yes);
861 PUSHs (fullname);
862 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
863 PUTBACK;
864 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0);
865 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
866 SPAGAIN;
867 FREETMPS;
868 LEAVE;
869 PL_runops = runops_trace;
870 }
871
872 oldcxix = cxstack_ix;
873 }
874
875 if (cctx->flags & CC_TRACE_LINE)
876 {
877 dSP;
878
879 PL_runops = RUNOPS_DEFAULT;
880 ENTER;
881 SAVETMPS;
882 EXTEND (SP, 3);
883 PL_runops = RUNOPS_DEFAULT;
884 PUSHMARK (SP);
885 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
886 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
887 PUTBACK;
888 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0);
889 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
890 SPAGAIN;
891 FREETMPS;
892 LEAVE;
893 PL_runops = runops_trace;
894 }
895 }
734 } 896 }
735 } 897 }
736 } 898 }
737 899
738 TAINT_NOT; 900 TAINT_NOT;
… …
741 903
742/* inject a fake call to Coro::State::_cctx_init into the execution */ 904/* 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 */ 905/* _cctx_init should be careful, as it could be called at almost any time */
744/* during execution of a perl program */ 906/* during execution of a perl program */
745static void NOINLINE 907static void NOINLINE
746prepare_cctx (pTHX_ coro_cctx *cctx) 908cctx_prepare (pTHX_ coro_cctx *cctx)
747{ 909{
748 dSP; 910 dSP;
749 LOGOP myop; 911 LOGOP myop;
750 912
751 PL_top_env = &PL_start_env; 913 PL_top_env = &PL_start_env;
752 914
753 if (cctx->flags & CC_TRACE) 915 if (cctx->flags & CC_TRACE)
754 PL_runops = runops_coro; 916 PL_runops = runops_trace;
755 917
756 Zero (&myop, 1, LOGOP); 918 Zero (&myop, 1, LOGOP);
757 myop.op_next = PL_op; 919 myop.op_next = PL_op;
758 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 920 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
759 921
… …
769 931
770/* 932/*
771 * this is a _very_ stripped down perl interpreter ;) 933 * this is a _very_ stripped down perl interpreter ;)
772 */ 934 */
773static void 935static void
774coro_run (void *arg) 936cctx_run (void *arg)
775{ 937{
776 dTHX; 938 dTHX;
777 939
778 /* coro_run is the alternative tail of transfer(), so unlock here. */ 940 /* cctx_run is the alternative tail of transfer(), so unlock here. */
779 UNLOCK; 941 UNLOCK;
780 942
781 /* we now skip the entersub that lead to transfer() */ 943 /* we now skip the entersub that lead to transfer() */
782 PL_op = PL_op->op_next; 944 PL_op = PL_op->op_next;
783 945
784 /* inject a fake subroutine call to cctx_init */ 946 /* inject a fake subroutine call to cctx_init */
785 prepare_cctx (aTHX_ (coro_cctx *)arg); 947 cctx_prepare (aTHX_ (coro_cctx *)arg);
786 948
787 /* somebody or something will hit me for both perl_run and PL_restartop */ 949 /* somebody or something will hit me for both perl_run and PL_restartop */
788 PL_restartop = PL_op; 950 PL_restartop = PL_op;
789 perl_run (PL_curinterp); 951 perl_run (PL_curinterp);
790 952
… …
809 ++cctx_count; 971 ++cctx_count;
810 972
811 Newz (0, cctx, 1, coro_cctx); 973 Newz (0, cctx, 1, coro_cctx);
812 974
813#if HAVE_MMAP 975#if HAVE_MMAP
814
815 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 976 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
816 /* mmap supposedly does allocate-on-write for us */ 977 /* 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); 978 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
818 979
819 if (cctx->sptr != (void *)-1) 980 if (cctx->sptr != (void *)-1)
… …
840 stack_start = cctx->sptr; 1001 stack_start = cctx->sptr;
841 stack_size = cctx->ssize; 1002 stack_size = cctx->ssize;
842 } 1003 }
843 1004
844 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1005 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
845 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1006 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
846 1007
847 return cctx; 1008 return cctx;
848} 1009}
849 1010
850static void 1011static void
… …
867 Safefree (cctx->sptr); 1028 Safefree (cctx->sptr);
868 1029
869 Safefree (cctx); 1030 Safefree (cctx);
870} 1031}
871 1032
1033/* wether this cctx should be destructed */
1034#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1035
872static coro_cctx * 1036static coro_cctx *
873cctx_get (pTHX) 1037cctx_get (pTHX_ int gimme)
874{ 1038{
875 while (cctx_first) 1039 while (expect_true (cctx_first[gimme]))
876 { 1040 {
877 coro_cctx *cctx = cctx_first; 1041 coro_cctx *cctx = cctx_first[gimme];
878 cctx_first = cctx->next; 1042 cctx_first[gimme] = cctx->next;
879 --cctx_idle; 1043 --cctx_idle[gimme];
880 1044
881 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1045 if (expect_true (!CCTX_EXPIRED (cctx)))
882 return cctx; 1046 return cctx;
883 1047
884 cctx_destroy (cctx); 1048 cctx_destroy (cctx);
885 } 1049 }
886 1050
1051 assert (!gimme);
887 return cctx_new (); 1052 return cctx_new ();
888} 1053}
889 1054
890static void 1055static void
891cctx_put (coro_cctx *cctx) 1056cctx_put (coro_cctx *cctx, int gimme)
892{ 1057{
893 /* free another cctx if overlimit */ 1058 /* free another cctx if overlimit */
894 if (cctx_idle >= MAX_IDLE_CCTX) 1059 if (expect_false (cctx_idle[gimme] >= MAX_IDLE_CCTX))
895 { 1060 {
896 coro_cctx *first = cctx_first; 1061 coro_cctx *first = cctx_first[gimme];
897 cctx_first = first->next; 1062 cctx_first[gimme] = first->next;
898 --cctx_idle; 1063 --cctx_idle[gimme];
899 1064
900 cctx_destroy (first); 1065 cctx_destroy (first);
901 } 1066 }
902 1067
903 ++cctx_idle; 1068 ++cctx_idle[gimme];
904 cctx->next = cctx_first; 1069 cctx->next = cctx_first[gimme];
905 cctx_first = cctx; 1070 cctx_first[gimme] = cctx;
906} 1071}
907 1072
908/** coroutine switching *****************************************************/ 1073/** coroutine switching *****************************************************/
909 1074
910/* never call directly, always through the coro_state_transfer global variable */ 1075static void
1076transfer_check (pTHX_ struct coro *prev, struct coro *next)
1077{
1078 if (expect_true (prev != next))
1079 {
1080 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1081 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
1082
1083 if (expect_false (next->flags & CF_RUNNING))
1084 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
1085
1086 if (expect_false (next->flags & CF_DESTROYED))
1087 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1088
1089 if (
1090#if PERL_VERSION_ATLEAST (5,9,0)
1091 expect_false (PL_parser)
1092#else
1093 expect_false (PL_lex_state != LEX_NOTPARSING)
1094#endif
1095 )
1096 croak ("Coro::State::transfer called while parsing, but this is not supported");
1097 }
1098}
1099
1100/* always use the TRANSFER macro */
911static void NOINLINE 1101static void NOINLINE
912transfer (pTHX_ struct coro *prev, struct coro *next) 1102transfer (pTHX_ struct coro *prev, struct coro *next)
913{ 1103{
914 dSTACKLEVEL; 1104 dSTACKLEVEL;
915 1105
916 /* sometimes transfer is only called to set idle_sp */ 1106 /* sometimes transfer is only called to set idle_sp */
917 if (!next) 1107 if (expect_false (!next))
918 { 1108 {
919 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1109 ((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 */ 1110 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
921 } 1111 }
922 else if (prev != next) 1112 else if (expect_true (prev != next))
923 { 1113 {
924 coro_cctx *prev__cctx; 1114 coro_cctx *prev__cctx;
925 1115
926 if (prev->flags & CF_NEW) 1116 if (expect_false (prev->flags & CF_NEW))
927 { 1117 {
928 /* create a new empty context */ 1118 /* create a new empty context */
929 Newz (0, prev->cctx, 1, coro_cctx); 1119 Newz (0, prev->cctx, 1, coro_cctx);
930 prev->flags &= ~CF_NEW; 1120 prev->flags &= ~CF_NEW;
931 prev->flags |= CF_RUNNING; 1121 prev->flags |= CF_RUNNING;
932 } 1122 }
933 1123
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; 1124 prev->flags &= ~CF_RUNNING;
945 next->flags |= CF_RUNNING; 1125 next->flags |= CF_RUNNING;
946 1126
947 LOCK; 1127 LOCK;
948 1128
949 if (next->flags & CF_NEW) 1129 if (expect_false (next->flags & CF_NEW))
950 { 1130 {
951 /* need to start coroutine */ 1131 /* need to start coroutine */
952 next->flags &= ~CF_NEW; 1132 next->flags &= ~CF_NEW;
953 /* first get rid of the old state */ 1133 /* first get rid of the old state */
954 save_perl (aTHX_ prev); 1134 save_perl (aTHX_ prev);
955 /* setup coroutine call */ 1135 /* setup coroutine call */
956 setup_coro (aTHX_ next); 1136 coro_setup (aTHX_ next);
957 } 1137 }
958 else 1138 else
959 { 1139 {
960 /* coroutine already started */ 1140 /* coroutine already started */
961 save_perl (aTHX_ prev); 1141 save_perl (aTHX_ prev);
… …
963 } 1143 }
964 1144
965 prev__cctx = prev->cctx; 1145 prev__cctx = prev->cctx;
966 1146
967 /* possibly "free" the cctx */ 1147 /* possibly "free" the cctx */
968 if (prev__cctx->idle_sp == STACKLEVEL) 1148 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
969 { 1149 {
970 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1150 /* 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)); 1151 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
972 1152
973 prev->cctx = 0; 1153 prev->cctx = 0;
974 1154
1155 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1156 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1157 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1158 if (!next->cctx)
1159 next->cctx = cctx_get (aTHX_ next->gimme);
1160
975 cctx_put (prev__cctx); 1161 cctx_put (prev__cctx, prev->gimme);
976 } 1162 }
977 1163
1164 ++next->usecount;
1165
978 if (!next->cctx) 1166 if (expect_true (!next->cctx))
979 next->cctx = cctx_get (aTHX); 1167 next->cctx = cctx_get (aTHX_ next->gimme);
980 1168
981 if (prev__cctx != next->cctx) 1169 if (expect_false (prev__cctx != next->cctx))
982 { 1170 {
983 prev__cctx->top_env = PL_top_env; 1171 prev__cctx->top_env = PL_top_env;
984 PL_top_env = next->cctx->top_env; 1172 PL_top_env = next->cctx->top_env;
985 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1173 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
986 } 1174 }
987 1175
988 free_coro_mortal (aTHX); 1176 free_coro_mortal (aTHX);
989 UNLOCK; 1177 UNLOCK;
1178
1179 if (expect_false (prev->throw || next->throw))
1180 {
1181 struct coro *coro = SvSTATE (coro_current);
1182
1183 if (coro->throw)
1184 {
1185 SV *exception = coro->throw;
1186 coro->throw = 0;
1187 sv_setsv (ERRSV, exception);
1188 croak (0);
1189 }
1190 }
990 } 1191 }
991} 1192}
992 1193
993struct transfer_args 1194struct transfer_args
994{ 1195{
995 struct coro *prev, *next; 1196 struct coro *prev, *next;
996}; 1197};
997 1198
998#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1199#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next)
1200#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
999 1201
1000/** high level stuff ********************************************************/ 1202/** high level stuff ********************************************************/
1001 1203
1002static int 1204static int
1003coro_state_destroy (pTHX_ struct coro *coro) 1205coro_state_destroy (pTHX_ struct coro *coro)
… …
1020 1222
1021 if (coro->mainstack && coro->mainstack != main_mainstack) 1223 if (coro->mainstack && coro->mainstack != main_mainstack)
1022 { 1224 {
1023 struct coro temp; 1225 struct coro temp;
1024 1226
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) 1227 if (coro->flags & CF_RUNNING)
1031 croak ("FATAL: tried to destroy currently running coroutine"); 1228 croak ("FATAL: tried to destroy currently running coroutine");
1032 1229
1033 save_perl (aTHX_ &temp); 1230 save_perl (aTHX_ &temp);
1034 load_perl (aTHX_ coro); 1231 load_perl (aTHX_ coro);
1035 1232
1036 coro_destroy_stacks (aTHX); 1233 coro_destroy (aTHX_ coro);
1037 1234
1038 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1235 load_perl (aTHX_ &temp);
1039 1236
1040 coro->mainstack = 0; 1237 coro->slot = 0;
1041 } 1238 }
1042 1239
1043 cctx_destroy (coro->cctx); 1240 cctx_destroy (coro->cctx);
1044 SvREFCNT_dec (coro->args); 1241 SvREFCNT_dec (coro->args);
1045 1242
… …
1086#else 1283#else
1087# define MGf_DUP 0 1284# define MGf_DUP 0
1088#endif 1285#endif
1089}; 1286};
1090 1287
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 1288static void
1115prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1289prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
1116{ 1290{
1117 ta->prev = SvSTATE (prev_sv); 1291 ta->prev = SvSTATE (prev_sv);
1118 ta->next = SvSTATE (next_sv); 1292 ta->next = SvSTATE (next_sv);
1293 TRANSFER_CHECK (*ta);
1119} 1294}
1120 1295
1121static void 1296static void
1122api_transfer (SV *prev_sv, SV *next_sv) 1297api_transfer (SV *prev_sv, SV *next_sv)
1123{ 1298{
1124 dTHX; 1299 dTHX;
1125 struct transfer_args ta; 1300 struct transfer_args ta;
1126 1301
1127 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1302 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1128 TRANSFER (ta); 1303 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} 1304}
1143 1305
1144/** Coro ********************************************************************/ 1306/** Coro ********************************************************************/
1145 1307
1146static void 1308static void
… …
1205 { 1367 {
1206 LOCK; 1368 LOCK;
1207 next_sv = coro_deq (aTHX_ PRIO_MIN); 1369 next_sv = coro_deq (aTHX_ PRIO_MIN);
1208 1370
1209 /* nothing to schedule: call the idle handler */ 1371 /* nothing to schedule: call the idle handler */
1210 if (!next_sv) 1372 if (expect_false (!next_sv))
1211 { 1373 {
1212 dSP; 1374 dSP;
1213 UNLOCK; 1375 UNLOCK;
1214 1376
1215 ENTER; 1377 ENTER;
… …
1225 } 1387 }
1226 1388
1227 ta->next = SvSTATE (next_sv); 1389 ta->next = SvSTATE (next_sv);
1228 1390
1229 /* cannot transfer to destroyed coros, skip and look for next */ 1391 /* cannot transfer to destroyed coros, skip and look for next */
1230 if (ta->next->flags & CF_DESTROYED) 1392 if (expect_false (ta->next->flags & CF_DESTROYED))
1231 { 1393 {
1232 UNLOCK; 1394 UNLOCK;
1233 SvREFCNT_dec (next_sv); 1395 SvREFCNT_dec (next_sv);
1234 /* coro_nready is already taken care of by destroy */ 1396 /* coro_nready is already taken care of by destroy */
1235 continue; 1397 continue;
… …
1240 break; 1402 break;
1241 } 1403 }
1242 1404
1243 /* free this only after the transfer */ 1405 /* free this only after the transfer */
1244 prev_sv = SvRV (coro_current); 1406 prev_sv = SvRV (coro_current);
1245 SvRV_set (coro_current, next_sv);
1246 ta->prev = SvSTATE (prev_sv); 1407 ta->prev = SvSTATE (prev_sv);
1247 1408 TRANSFER_CHECK (*ta);
1248 assert (ta->next->flags & CF_READY); 1409 assert (ta->next->flags & CF_READY);
1249 ta->next->flags &= ~CF_READY; 1410 ta->next->flags &= ~CF_READY;
1411 SvRV_set (coro_current, next_sv);
1250 1412
1251 LOCK; 1413 LOCK;
1252 free_coro_mortal (aTHX); 1414 free_coro_mortal (aTHX);
1253 coro_mortal = prev_sv; 1415 coro_mortal = prev_sv;
1254 UNLOCK; 1416 UNLOCK;
… …
1291 dTHX; 1453 dTHX;
1292 struct transfer_args ta; 1454 struct transfer_args ta;
1293 1455
1294 prepare_cede (aTHX_ &ta); 1456 prepare_cede (aTHX_ &ta);
1295 1457
1296 if (ta.prev != ta.next) 1458 if (expect_true (ta.prev != ta.next))
1297 { 1459 {
1298 TRANSFER (ta); 1460 TRANSFER (ta);
1299 return 1; 1461 return 1;
1300 } 1462 }
1301 else 1463 else
… …
1315 } 1477 }
1316 else 1478 else
1317 return 0; 1479 return 0;
1318} 1480}
1319 1481
1482static void
1483api_trace (SV *coro_sv, int flags)
1484{
1485 dTHX;
1486 struct coro *coro = SvSTATE (coro_sv);
1487
1488 if (flags & CC_TRACE)
1489 {
1490 if (!coro->cctx)
1491 coro->cctx = cctx_new ();
1492 else if (!(coro->cctx->flags & CC_TRACE))
1493 croak ("cannot enable tracing on coroutine with custom stack");
1494
1495 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1496 }
1497 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1498 {
1499 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1500
1501 if (coro->flags & CF_RUNNING)
1502 PL_runops = RUNOPS_DEFAULT;
1503 else
1504 coro->slot->runops = RUNOPS_DEFAULT;
1505 }
1506}
1507
1320MODULE = Coro::State PACKAGE = Coro::State 1508MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1321 1509
1322PROTOTYPES: DISABLE 1510PROTOTYPES: DISABLE
1323 1511
1324BOOT: 1512BOOT:
1325{ 1513{
1326#ifdef USE_ITHREADS 1514#ifdef USE_ITHREADS
1327 MUTEX_INIT (&coro_mutex); 1515 MUTEX_INIT (&coro_mutex);
1328#endif 1516#endif
1329 BOOT_PAGESIZE; 1517 BOOT_PAGESIZE;
1518
1519 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1520 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1521
1522 hv_sig = coro_get_hv ("SIG", TRUE);
1523 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE);
1524 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE);
1525
1526 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1527 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1330 1528
1331 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1529 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1332 1530
1333 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1531 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1334 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1532 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1335 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1533 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1336 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1534 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1337 1535
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; 1536 main_mainstack = PL_mainstack;
1347 main_top_env = PL_top_env; 1537 main_top_env = PL_top_env;
1348 1538
1349 while (main_top_env->je_prev) 1539 while (main_top_env->je_prev)
1350 main_top_env = main_top_env->je_prev; 1540 main_top_env = main_top_env->je_prev;
… …
1362 struct coro *coro; 1552 struct coro *coro;
1363 HV *hv; 1553 HV *hv;
1364 int i; 1554 int i;
1365 1555
1366 Newz (0, coro, 1, struct coro); 1556 Newz (0, coro, 1, struct coro);
1367 coro->args = newAV (); 1557 coro->args = newAV ();
1368 coro->save = CORO_SAVE_DEF;
1369 coro->flags = CF_NEW; 1558 coro->flags = CF_NEW;
1370 1559
1371 if (coro_first) coro_first->prev = coro; 1560 if (coro_first) coro_first->prev = coro;
1372 coro->next = coro_first; 1561 coro->next = coro_first;
1373 coro_first = coro; 1562 coro_first = coro;
1374 1563
1375 coro->hv = hv = newHV (); 1564 coro->hv = hv = newHV ();
1376 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1565 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)); 1566 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1378 1567
1568 av_extend (coro->args, items - 1);
1379 for (i = 1; i < items; i++) 1569 for (i = 1; i < items; i++)
1380 av_push (coro->args, newSVsv (ST (i))); 1570 av_push (coro->args, newSVsv (ST (i)));
1381} 1571}
1382 OUTPUT: 1572 OUTPUT:
1383 RETVAL 1573 RETVAL
1384 1574
1385int 1575# these not obviously related functions are all rolled into the same xs
1386save (SV *coro, int new_save = -1) 1576# function to increase chances that they all will call transfer with the same
1387 CODE: 1577# 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 1578void
1404_set_stacklevel (...) 1579_set_stacklevel (...)
1405 ALIAS: 1580 ALIAS:
1406 Coro::State::transfer = 1 1581 Coro::State::transfer = 1
1407 Coro::schedule = 2 1582 Coro::schedule = 2
1408 Coro::cede = 3 1583 Coro::cede = 3
1409 Coro::cede_notself = 4 1584 Coro::cede_notself = 4
1585 Coro::Event::next = 5
1586 Coro::Event::next_cancel = 6
1410 CODE: 1587 PPCODE:
1411{ 1588{
1412 struct transfer_args ta; 1589 struct transfer_args ta;
1590 int again = 0;
1413 1591
1414 switch (ix) 1592 do
1415 { 1593 {
1594 switch (ix)
1595 {
1416 case 0: 1596 case 0:
1417 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1597 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1418 ta.next = 0; 1598 ta.next = 0;
1419 break; 1599 break;
1420 1600
1421 case 1: 1601 case 1:
1422 if (items != 2) 1602 if (items != 2)
1423 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items); 1603 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1424 1604
1425 prepare_transfer (aTHX_ &ta, ST (0), ST (1)); 1605 prepare_transfer (aTHX_ &ta, ST(0), ST(1));
1426 break; 1606 break;
1427 1607
1428 case 2: 1608 case 2:
1429 prepare_schedule (aTHX_ &ta); 1609 prepare_schedule (aTHX_ &ta);
1430 break; 1610 break;
1431 1611
1432 case 3: 1612 case 3:
1433 prepare_cede (aTHX_ &ta); 1613 prepare_cede (aTHX_ &ta);
1434 break; 1614 break;
1435 1615
1436 case 4: 1616 case 4:
1437 if (!prepare_cede_notself (aTHX_ &ta)) 1617 if (!prepare_cede_notself (aTHX_ &ta))
1438 XSRETURN_EMPTY; 1618 XSRETURN_EMPTY;
1439 1619
1440 break; 1620 break;
1621
1622 case 5:
1623 case 6:
1624 if (items != 1)
1625 croak ("Coro::Event::next (watcher) expects one argument, not %d", items);
1626
1627 {
1628 SV *ev = coroapi.coro_event_next (ST (0), ix == 6, GIMME_V != G_VOID);
1629
1630 if (ev)
1631 {
1632 if (GIMME_V != G_VOID)
1633 {
1634 XPUSHs (ev);
1635 XSRETURN (1);
1636 }
1637 else
1638 XSRETURN_EMPTY;
1639 }
1640 }
1641
1642 prepare_schedule (aTHX_ &ta);
1643 again = 1;
1644 break;
1645 }
1646
1647 /* our caller, entersub, caches *only* this value */
1648 ta.prev->gimme = GIMME_V == G_VOID ? 0
1649 : GIMME_V == G_SCALAR ? 1
1650 : 2;
1651
1652 /* we need to save all local variables, as we might execute a different coroutine when transfer returns */
1653 sp += 2; /* save args */
1654 EXTEND (SP, 4);
1655 PUSHs ((SV *)(intptr_t)items);
1656 PUSHs ((SV *)(intptr_t)ix);
1657 PUSHs ((SV *)(intptr_t)ax);
1658 PUSHs ((SV *)(intptr_t)again);
1659 PUTBACK;
1660 BARRIER;
1661 TRANSFER (ta);
1662 BARRIER;
1663 SPAGAIN;
1664 again = (intptr_t)POPs;
1665 ax = (intptr_t)POPs;
1666 ix = (intptr_t)POPs;
1667 items = (intptr_t)POPs;
1668 sp -= 2; /* restore args */
1441 } 1669 }
1670 while (again);
1442 1671
1443 BARRIER;
1444 TRANSFER (ta);
1445
1446 if (GIMME_V != G_VOID && ta.next != ta.prev) 1672 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev))
1447 XSRETURN_YES; 1673 XSRETURN_YES;
1674
1675 XSRETURN_EMPTY; /* not understood why this is necessary, likely some stack handling bug */
1448} 1676}
1449 1677
1450bool 1678bool
1451_destroy (SV *coro_sv) 1679_destroy (SV *coro_sv)
1452 CODE: 1680 CODE:
… …
1478 RETVAL 1706 RETVAL
1479 1707
1480int 1708int
1481cctx_idle () 1709cctx_idle ()
1482 CODE: 1710 CODE:
1483 RETVAL = cctx_idle; 1711 RETVAL = cctx_idle[0] + cctx_idle[1] + cctx_idle[2];
1484 OUTPUT: 1712 OUTPUT:
1485 RETVAL 1713 RETVAL
1486 1714
1487void 1715void
1488list () 1716list ()
… …
1501 CODE: 1729 CODE:
1502{ 1730{
1503 if (coro->mainstack) 1731 if (coro->mainstack)
1504 { 1732 {
1505 struct coro temp; 1733 struct coro temp;
1506 Zero (&temp, 1, struct coro);
1507 temp.save = CORO_SAVE_ALL;
1508 1734
1509 if (!(coro->flags & CF_RUNNING)) 1735 if (!(coro->flags & CF_RUNNING))
1510 { 1736 {
1511 save_perl (aTHX_ &temp); 1737 save_perl (aTHX_ &temp);
1512 load_perl (aTHX_ coro); 1738 load_perl (aTHX_ coro);
… …
1514 1740
1515 { 1741 {
1516 dSP; 1742 dSP;
1517 ENTER; 1743 ENTER;
1518 SAVETMPS; 1744 SAVETMPS;
1745 PUTBACK;
1746 PUSHSTACK;
1519 PUSHMARK (SP); 1747 PUSHMARK (SP);
1520 PUTBACK; 1748
1521 if (ix) 1749 if (ix)
1522 eval_sv (coderef, 0); 1750 eval_sv (coderef, 0);
1523 else 1751 else
1524 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1752 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1753
1525 SPAGAIN; 1754 POPSTACK;
1526 FREETMPS; 1755 FREETMPS;
1527 LEAVE; 1756 LEAVE;
1528 PUTBACK;
1529 } 1757 }
1530 1758
1531 if (!(coro->flags & CF_RUNNING)) 1759 if (!(coro->flags & CF_RUNNING))
1532 { 1760 {
1533 save_perl (aTHX_ coro); 1761 save_perl (aTHX_ coro);
1534 load_perl (aTHX_ &temp); 1762 load_perl (aTHX_ &temp);
1535 } 1763 }
1536 } 1764 }
1537} 1765}
1538 1766
1539SV * 1767SV *
1540is_ready (Coro::State coro) 1768is_ready (Coro::State coro)
1541 PROTOTYPE: $ 1769 PROTOTYPE: $
1542 ALIAS: 1770 ALIAS:
1543 is_ready = CF_READY 1771 is_ready = CF_READY
… …
1548 RETVAL = boolSV (coro->flags & ix); 1776 RETVAL = boolSV (coro->flags & ix);
1549 OUTPUT: 1777 OUTPUT:
1550 RETVAL 1778 RETVAL
1551 1779
1552void 1780void
1553trace (Coro::State coro, int flags = CC_TRACE | CC_TRACE_SUB) 1781api_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 1782
1571SV * 1783SV *
1572has_stack (Coro::State coro) 1784has_stack (Coro::State coro)
1573 PROTOTYPE: $ 1785 PROTOTYPE: $
1574 CODE: 1786 CODE:
… …
1585 RETVAL 1797 RETVAL
1586 1798
1587IV 1799IV
1588rss (Coro::State coro) 1800rss (Coro::State coro)
1589 PROTOTYPE: $ 1801 PROTOTYPE: $
1802 ALIAS:
1803 usecount = 1
1590 CODE: 1804 CODE:
1591 RETVAL = coro_rss (coro); 1805 switch (ix)
1806 {
1807 case 0: RETVAL = coro_rss (aTHX_ coro); break;
1808 case 1: RETVAL = coro->usecount; break;
1809 }
1592 OUTPUT: 1810 OUTPUT:
1593 RETVAL 1811 RETVAL
1594 1812
1595 1813
1596MODULE = Coro::State PACKAGE = Coro 1814MODULE = Coro::State PACKAGE = Coro
1597 1815
1598BOOT: 1816BOOT:
1599{ 1817{
1600 int i; 1818 int i;
1601 1819
1602 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1820 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1603 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1821 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1604 av_async_pool = get_av ("Coro::async_pool", TRUE); 1822 av_async_pool = coro_get_av ("Coro::async_pool", TRUE);
1605 1823
1606 coro_current = get_sv ("Coro::current", FALSE); 1824 coro_current = coro_get_sv ("Coro::current", FALSE);
1607 SvREADONLY_on (coro_current); 1825 SvREADONLY_on (coro_current);
1608 1826
1609 coro_stash = gv_stashpv ("Coro", TRUE); 1827 coro_stash = gv_stashpv ("Coro", TRUE);
1610 1828
1611 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1829 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1612 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1830 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1613 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1831 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1614 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1832 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
… …
1617 1835
1618 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1836 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1619 coro_ready[i] = newAV (); 1837 coro_ready[i] = newAV ();
1620 1838
1621 { 1839 {
1622 SV *sv = perl_get_sv("Coro::API", 1); 1840 SV *sv = perl_get_sv ("Coro::API", TRUE);
1841 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1623 1842
1624 coroapi.schedule = api_schedule; 1843 coroapi.schedule = api_schedule;
1625 coroapi.save = api_save;
1626 coroapi.cede = api_cede; 1844 coroapi.cede = api_cede;
1627 coroapi.cede_notself = api_cede_notself; 1845 coroapi.cede_notself = api_cede_notself;
1628 coroapi.ready = api_ready; 1846 coroapi.ready = api_ready;
1629 coroapi.is_ready = api_is_ready; 1847 coroapi.is_ready = api_is_ready;
1630 coroapi.nready = &coro_nready; 1848 coroapi.nready = &coro_nready;
… …
1679 CODE: 1897 CODE:
1680 RETVAL = coro_nready; 1898 RETVAL = coro_nready;
1681 OUTPUT: 1899 OUTPUT:
1682 RETVAL 1900 RETVAL
1683 1901
1902void
1903throw (Coro::State self, SV *throw = &PL_sv_undef)
1904 PROTOTYPE: $;$
1905 CODE:
1906 SvREFCNT_dec (self->throw);
1907 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1908
1684# for async_pool speedup 1909# for async_pool speedup
1685void 1910void
1686_pool_1 (SV *cb) 1911_pool_1 (SV *cb)
1687 CODE: 1912 CODE:
1688{ 1913{
1689 int i, len; 1914 struct coro *coro = SvSTATE (coro_current);
1690 HV *hv = (HV *)SvRV (coro_current); 1915 HV *hv = (HV *)SvRV (coro_current);
1691 AV *defav = GvAV (PL_defgv); 1916 AV *defav = GvAV (PL_defgv);
1692 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1917 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0);
1693 AV *invoke_av; 1918 AV *invoke_av;
1919 int i, len;
1694 1920
1695 if (!invoke) 1921 if (!invoke)
1696 croak ("\3terminate\2\n"); 1922 croak ("\3async_pool terminate\2\n");
1923
1924 SvREFCNT_dec (coro->saved_deffh);
1925 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1697 1926
1698 hv_store (hv, "desc", sizeof ("desc") - 1, 1927 hv_store (hv, "desc", sizeof ("desc") - 1,
1699 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1928 newSVpvn (strpair ("[async_pool]")), 0);
1700 1929
1701 invoke_av = (AV *)SvRV (invoke); 1930 invoke_av = (AV *)SvRV (invoke);
1702 len = av_len (invoke_av); 1931 len = av_len (invoke_av);
1703 1932
1704 sv_setsv (cb, AvARRAY (invoke_av)[0]); 1933 sv_setsv (cb, AvARRAY (invoke_av)[0]);
… …
1719{ 1948{
1720 struct coro *coro = SvSTATE (coro_current); 1949 struct coro *coro = SvSTATE (coro_current);
1721 1950
1722 sv_setsv (cb, &PL_sv_undef); 1951 sv_setsv (cb, &PL_sv_undef);
1723 1952
1953 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1954 coro->saved_deffh = 0;
1955
1724 if (coro_rss (coro) > SvIV (sv_pool_rss) 1956 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1725 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1957 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1726 croak ("\3terminate\2\n"); 1958 croak ("\3async_pool terminate\2\n");
1727 1959
1728 av_clear (GvAV (PL_defgv)); 1960 av_clear (GvAV (PL_defgv));
1729 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1961 hv_store ((HV *)SvRV (coro_current), strpair ("desc"),
1730 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1962 newSVpvn (strpair ("[async_pool idle]")), 0);
1731 coro->save = CORO_SAVE_DEF; 1963
1732 coro->prio = 0; 1964 coro->prio = 0;
1965
1966 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1967 api_trace (coro_current, 0);
1968
1733 av_push (av_async_pool, newSVsv (coro_current)); 1969 av_push (av_async_pool, newSVsv (coro_current));
1734} 1970}
1735 1971
1736 1972
1737MODULE = Coro::State PACKAGE = Coro::AIO 1973MODULE = Coro::State PACKAGE = Coro::AIO

Diff Legend

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