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

Diff Legend

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