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.170 by root, Thu Sep 27 20:14:49 2007 UTC vs.
Revision 1.219 by root, Tue Dec 4 19:33:45 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
… …
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
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)
303 369
304static struct coro * 370static struct coro *
305SvSTATE_ (pTHX_ SV *coro) 371SvSTATE_ (pTHX_ SV *coro)
306{ 372{
307 HV *stash; 373 HV *stash;
308 MAGIC *mg; 374 MAGIC *mg;
309 375
310 if (SvROK (coro)) 376 if (SvROK (coro))
311 coro = SvRV (coro); 377 coro = SvRV (coro);
312 378
379 if (expect_false (SvTYPE (coro) != SVt_PVHV))
380 croak ("Coro::State object required");
381
313 stash = SvSTASH (coro); 382 stash = SvSTASH (coro);
314 if (stash != coro_stash && stash != coro_state_stash) 383 if (expect_false (stash != coro_stash && stash != coro_state_stash))
315 { 384 {
316 /* very slow, but rare, check */ 385 /* very slow, but rare, check */
317 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 386 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
318 croak ("Coro::State object required"); 387 croak ("Coro::State object required");
319 } 388 }
320 389
321 mg = CORO_MAGIC (coro); 390 mg = CORO_MAGIC_state (coro);
322 return (struct coro *)mg->mg_ptr; 391 return (struct coro *)mg->mg_ptr;
323} 392}
324 393
325#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 394#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
326 395
327/* the next two functions merely cache the padlists */ 396/* the next two functions merely cache the padlists */
328static void 397static void
329get_padlist (pTHX_ CV *cv) 398get_padlist (pTHX_ CV *cv)
330{ 399{
331 MAGIC *mg = CORO_MAGIC (cv); 400 MAGIC *mg = CORO_MAGIC_cv (cv);
332 AV *av; 401 AV *av;
333 402
334 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 403 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
335 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 404 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
336 else 405 else
337 { 406 {
338#if CORO_PREFER_PERL_FUNCTIONS 407#if CORO_PREFER_PERL_FUNCTIONS
339 /* this is probably cleaner, but also slower? */ 408 /* this is probably cleaner, but also slower? */
… …
348} 417}
349 418
350static void 419static void
351put_padlist (pTHX_ CV *cv) 420put_padlist (pTHX_ CV *cv)
352{ 421{
353 MAGIC *mg = CORO_MAGIC (cv); 422 MAGIC *mg = CORO_MAGIC_cv (cv);
354 AV *av; 423 AV *av;
355 424
356 if (!mg) 425 if (expect_false (!mg))
357 { 426 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
358 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
359 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
360 mg->mg_virtual = &vtbl_coro;
361 mg->mg_obj = (SV *)newAV ();
362 }
363 427
364 av = (AV *)mg->mg_obj; 428 av = (AV *)mg->mg_obj;
365 429
366 if (AvFILLp (av) >= AvMAX (av)) 430 if (expect_false (AvFILLp (av) >= AvMAX (av)))
367 av_extend (av, AvMAX (av) + 1); 431 av_extend (av, AvMAX (av) + 1);
368 432
369 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 433 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
370} 434}
371 435
372/** load & save, init *******************************************************/ 436/** load & save, init *******************************************************/
373 437
374#define SB do {
375#define SE } while (0)
376
377#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
378
379static void 438static void
380load_perl (pTHX_ Coro__State c) 439load_perl (pTHX_ Coro__State c)
381{ 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
382#define VAR(name,type) PL_ ## name = c->name; 451 #define VAR(name,type) PL_ ## name = slot->name;
383# include "state.h" 452 # include "state.h"
384#undef VAR 453 #undef VAR
385
386 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
387 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
388 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
389 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh);
390
391 if (c->irssv)
392 {
393 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
394 {
395 SvREFCNT_dec (c->irssv);
396 c->irssv = 0;
397 }
398 else
399 {
400 REPLACE_SV (PL_rs, c->irssv);
401 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
402 sv_setsv (c->irssv_sv, PL_rs);
403 }
404 }
405 454
406 { 455 {
407 dSP; 456 dSP;
457
408 CV *cv; 458 CV *cv;
409 459
410 /* now do the ugly restore mess */ 460 /* now do the ugly restore mess */
411 while ((cv = (CV *)POPs)) 461 while (expect_true (cv = (CV *)POPs))
412 { 462 {
413 put_padlist (aTHX_ cv); /* mark this padlist as available */ 463 put_padlist (aTHX_ cv); /* mark this padlist as available */
414 CvDEPTH (cv) = PTR2IV (POPs); 464 CvDEPTH (cv) = PTR2IV (POPs);
415 CvPADLIST (cv) = (AV *)POPs; 465 CvPADLIST (cv) = (AV *)POPs;
416 } 466 }
… …
435 485
436 XPUSHs (Nullsv); 486 XPUSHs (Nullsv);
437 /* this loop was inspired by pp_caller */ 487 /* this loop was inspired by pp_caller */
438 for (;;) 488 for (;;)
439 { 489 {
440 while (cxix >= 0) 490 while (expect_true (cxix >= 0))
441 { 491 {
442 PERL_CONTEXT *cx = &ccstk[cxix--]; 492 PERL_CONTEXT *cx = &ccstk[cxix--];
443 493
444 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 494 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
445 { 495 {
446 CV *cv = cx->blk_sub.cv; 496 CV *cv = cx->blk_sub.cv;
447 497
448 if (CvDEPTH (cv)) 498 if (expect_true (CvDEPTH (cv)))
449 { 499 {
450 EXTEND (SP, 3); 500 EXTEND (SP, 3);
451 PUSHs ((SV *)CvPADLIST (cv)); 501 PUSHs ((SV *)CvPADLIST (cv));
452 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 502 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
453 PUSHs ((SV *)cv); 503 PUSHs ((SV *)cv);
… …
456 get_padlist (aTHX_ cv); 506 get_padlist (aTHX_ cv);
457 } 507 }
458 } 508 }
459 } 509 }
460 510
461 if (top_si->si_type == PERLSI_MAIN) 511 if (expect_true (top_si->si_type == PERLSI_MAIN))
462 break; 512 break;
463 513
464 top_si = top_si->si_prev; 514 top_si = top_si->si_prev;
465 ccstk = top_si->si_cxstack; 515 ccstk = top_si->si_cxstack;
466 cxix = top_si->si_cxix; 516 cxix = top_si->si_cxix;
467 } 517 }
468 518
469 PUTBACK; 519 PUTBACK;
470 } 520 }
471 521
472 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 */
473 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 523 /* we manually unroll here, as usually 2 slots is enough */
474 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 524 if (SLOT_COUNT >= 1) CXINC;
475 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 525 if (SLOT_COUNT >= 2) CXINC;
476 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 */
477 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
478#define VAR(name,type)c->name = PL_ ## name; 544 #define VAR(name,type) slot->name = PL_ ## name;
479# include "state.h" 545 # include "state.h"
480#undef VAR 546 #undef VAR
547 }
481} 548}
482 549
483/* 550/*
484 * allocate various perl stacks. This is an exact copy 551 * allocate various perl stacks. This is an exact copy
485 * of perl.c:init_stacks, except that it uses less memory 552 * of perl.c:init_stacks, except that it uses less memory
… …
490# define coro_init_stacks init_stacks 557# define coro_init_stacks init_stacks
491#else 558#else
492static void 559static void
493coro_init_stacks (pTHX) 560coro_init_stacks (pTHX)
494{ 561{
495 PL_curstackinfo = new_stackinfo(64, 6); 562 PL_curstackinfo = new_stackinfo(32, 8);
496 PL_curstackinfo->si_type = PERLSI_MAIN; 563 PL_curstackinfo->si_type = PERLSI_MAIN;
497 PL_curstack = PL_curstackinfo->si_stack; 564 PL_curstack = PL_curstackinfo->si_stack;
498 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 565 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
499 566
500 PL_stack_base = AvARRAY(PL_curstack); 567 PL_stack_base = AvARRAY(PL_curstack);
501 PL_stack_sp = PL_stack_base; 568 PL_stack_sp = PL_stack_base;
502 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 569 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
503 570
504 New(50,PL_tmps_stack,64,SV*); 571 New(50,PL_tmps_stack,32,SV*);
505 PL_tmps_floor = -1; 572 PL_tmps_floor = -1;
506 PL_tmps_ix = -1; 573 PL_tmps_ix = -1;
507 PL_tmps_max = 64; 574 PL_tmps_max = 32;
508 575
509 New(54,PL_markstack,16,I32); 576 New(54,PL_markstack,16,I32);
510 PL_markstack_ptr = PL_markstack; 577 PL_markstack_ptr = PL_markstack;
511 PL_markstack_max = PL_markstack + 16; 578 PL_markstack_max = PL_markstack + 16;
512 579
513#ifdef SET_MARK_OFFSET 580#ifdef SET_MARK_OFFSET
514 SET_MARK_OFFSET; 581 SET_MARK_OFFSET;
515#endif 582#endif
516 583
517 New(54,PL_scopestack,16,I32); 584 New(54,PL_scopestack,8,I32);
518 PL_scopestack_ix = 0; 585 PL_scopestack_ix = 0;
519 PL_scopestack_max = 16; 586 PL_scopestack_max = 8;
520 587
521 New(54,PL_savestack,64,ANY); 588 New(54,PL_savestack,24,ANY);
522 PL_savestack_ix = 0; 589 PL_savestack_ix = 0;
523 PL_savestack_max = 64; 590 PL_savestack_max = 24;
524 591
525#if !PERL_VERSION_ATLEAST (5,9,0) 592#if !PERL_VERSION_ATLEAST (5,9,0)
526 New(54,PL_retstack,4,OP*); 593 New(54,PL_retstack,4,OP*);
527 PL_retstack_ix = 0; 594 PL_retstack_ix = 0;
528 PL_retstack_max = 4; 595 PL_retstack_max = 4;
… …
534 * destroy the stacks, the callchain etc... 601 * destroy the stacks, the callchain etc...
535 */ 602 */
536static void 603static void
537coro_destroy_stacks (pTHX) 604coro_destroy_stacks (pTHX)
538{ 605{
539 if (!IN_DESTRUCT)
540 {
541 /* restore all saved variables and stuff */
542 LEAVE_SCOPE (0);
543 assert (PL_tmps_floor == -1);
544
545 /* free all temporaries */
546 FREETMPS;
547 assert (PL_tmps_ix == -1);
548
549 /* unwind all extra stacks */
550 POPSTACK_TO (PL_mainstack);
551
552 /* unwind main stack */
553 dounwind (-1);
554 }
555
556 while (PL_curstackinfo->si_next) 606 while (PL_curstackinfo->si_next)
557 PL_curstackinfo = PL_curstackinfo->si_next; 607 PL_curstackinfo = PL_curstackinfo->si_next;
558 608
559 while (PL_curstackinfo) 609 while (PL_curstackinfo)
560 { 610 {
… …
576 Safefree (PL_retstack); 626 Safefree (PL_retstack);
577#endif 627#endif
578} 628}
579 629
580static size_t 630static size_t
581coro_rss (struct coro *coro) 631coro_rss (pTHX_ struct coro *coro)
582{ 632{
583 size_t rss = sizeof (coro); 633 size_t rss = sizeof (*coro);
584 634
585 if (coro->mainstack) 635 if (coro->mainstack)
586 { 636 {
637 perl_slots tmp_slot;
638 perl_slots *slot;
639
587 if (coro->flags & CF_RUNNING) 640 if (coro->flags & CF_RUNNING)
588 { 641 {
642 slot = &tmp_slot;
643
589 #define VAR(name,type)coro->name = PL_ ## name; 644 #define VAR(name,type) slot->name = PL_ ## name;
590 # include "state.h" 645 # include "state.h"
591 #undef VAR 646 #undef VAR
592 } 647 }
648 else
649 slot = coro->slot;
593 650
594 rss += sizeof (coro->curstackinfo); 651 rss += sizeof (slot->curstackinfo);
595 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
596 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 652 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
597 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 653 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
598 rss += coro->tmps_max * sizeof (SV *); 654 rss += slot->tmps_max * sizeof (SV *);
599 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 655 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
600 rss += coro->scopestack_max * sizeof (I32); 656 rss += slot->scopestack_max * sizeof (I32);
601 rss += coro->savestack_max * sizeof (ANY); 657 rss += slot->savestack_max * sizeof (ANY);
602 658
603#if !PERL_VERSION_ATLEAST (5,9,0) 659#if !PERL_VERSION_ATLEAST (5,9,0)
604 rss += coro->retstack_max * sizeof (OP *); 660 rss += slot->retstack_max * sizeof (OP *);
605#endif 661#endif
606 } 662 }
607 663
608 return rss; 664 return rss;
609} 665}
610 666
611/** coroutine stack handling ************************************************/ 667/** coroutine stack handling ************************************************/
612 668
669#if 0
670static int (*orig_sigelem_get) (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 */
613static void 681static int
682coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
683{
684 return orig_sigelem_get (aTHX_ sv, mg);
685 const char *s = MgPV_nolen_const (mg);
686
687 if (*s == '_')
688 {
689 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;
690 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
691 }
692
693 return orig_sigelem_get (aTHX_ sv, mg);
694}
695#endif
696
697static void
614setup_coro (pTHX_ struct coro *coro) 698coro_setup (pTHX_ struct coro *coro)
615{ 699{
616 /* 700 /*
617 * emulate part of the perl startup here. 701 * emulate part of the perl startup here.
618 */ 702 */
619 coro_init_stacks (aTHX); 703 coro_init_stacks (aTHX);
… …
621 PL_runops = RUNOPS_DEFAULT; 705 PL_runops = RUNOPS_DEFAULT;
622 PL_curcop = &PL_compiling; 706 PL_curcop = &PL_compiling;
623 PL_in_eval = EVAL_NULL; 707 PL_in_eval = EVAL_NULL;
624 PL_comppad = 0; 708 PL_comppad = 0;
625 PL_curpm = 0; 709 PL_curpm = 0;
710 PL_curpad = 0;
626 PL_localizing = 0; 711 PL_localizing = 0;
627 PL_dirty = 0; 712 PL_dirty = 0;
628 PL_restartop = 0; 713 PL_restartop = 0;
629 714
715 /* recreate the die/warn hooks */
716 PL_diehook = 0;
717 hv_store (hv_sig, "__DIE__", sizeof ("__DIE__") - 1, newSV (0), 0);
718 PL_diehook = SvREFCNT_inc (rv_diehook);
719
720 PL_warnhook = 0;
721 hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, newSV (0), 0);
722 PL_warnhook = SvREFCNT_inc (rv_warnhook);
723
724 GvSV (PL_defgv) = newSV (0);
725 GvAV (PL_defgv) = coro->args; coro->args = 0;
726 GvSV (PL_errgv) = newSV (0);
727 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
728 PL_rs = newSVsv (GvSV (irsgv));
729 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
730
630 { 731 {
631 dSP; 732 dSP;
632 LOGOP myop; 733 LOGOP myop;
633 734
634 SvREFCNT_dec (GvAV (PL_defgv));
635 GvAV (PL_defgv) = coro->args; coro->args = 0;
636
637 Zero (&myop, 1, LOGOP); 735 Zero (&myop, 1, LOGOP);
638 myop.op_next = Nullop; 736 myop.op_next = Nullop;
639 myop.op_flags = OPf_WANT_VOID; 737 myop.op_flags = OPf_WANT_VOID;
640 738
641 PUSHMARK (SP); 739 PUSHMARK (SP);
642 XPUSHs (av_shift (GvAV (PL_defgv))); 740 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
643 PUTBACK; 741 PUTBACK;
644 PL_op = (OP *)&myop; 742 PL_op = (OP *)&myop;
645 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 743 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
646 SPAGAIN; 744 SPAGAIN;
647 } 745 }
648 746
649 ENTER; /* necessary e.g. for dounwind */ 747 /* this newly created coroutine might be run on an existing cctx which most
748 * likely was suspended in set_stacklevel, called from entersub.
749 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
750 * so we ENTER here for symmetry
751 */
752 ENTER;
753}
754
755static void
756coro_destroy (pTHX_ struct coro *coro)
757{
758 if (!IN_DESTRUCT)
759 {
760 /* restore all saved variables and stuff */
761 LEAVE_SCOPE (0);
762 assert (PL_tmps_floor == -1);
763
764 /* free all temporaries */
765 FREETMPS;
766 assert (PL_tmps_ix == -1);
767
768 /* unwind all extra stacks */
769 POPSTACK_TO (PL_mainstack);
770
771 /* unwind main stack */
772 dounwind (-1);
773 }
774
775 SvREFCNT_dec (GvSV (PL_defgv));
776 SvREFCNT_dec (GvAV (PL_defgv));
777 SvREFCNT_dec (GvSV (PL_errgv));
778 SvREFCNT_dec (PL_defoutgv);
779 SvREFCNT_dec (PL_rs);
780 SvREFCNT_dec (GvSV (irsgv));
781
782 SvREFCNT_dec (PL_diehook);
783 SvREFCNT_dec (PL_warnhook);
784
785 SvREFCNT_dec (coro->saved_deffh);
786 SvREFCNT_dec (coro->throw);
787
788 coro_destroy_stacks (aTHX);
650} 789}
651 790
652static void 791static void
653free_coro_mortal (pTHX) 792free_coro_mortal (pTHX)
654{ 793{
655 if (coro_mortal) 794 if (expect_true (coro_mortal))
656 { 795 {
657 SvREFCNT_dec (coro_mortal); 796 SvREFCNT_dec (coro_mortal);
658 coro_mortal = 0; 797 coro_mortal = 0;
659 } 798 }
660} 799}
… …
669 808
670 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 809 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
671 { 810 {
672 PERL_ASYNC_CHECK (); 811 PERL_ASYNC_CHECK ();
673 812
674 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 813 if (cctx->flags & CC_TRACE_ALL)
675 { 814 {
676 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 815 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB)
677 SV **bot, **top;
678 AV *av = newAV (); /* return values */
679 SV **cb;
680 runops_proc_t old_runops = PL_runops;
681 dSP;
682 ENTER;
683 SAVETMPS;
684 EXTEND (SP, 3);
685 PL_runops = RUNOPS_DEFAULT;
686
687 GV *gv = CvGV (cx->blk_sub.cv);
688 SV *fullname = sv_2mortal (newSV (0));
689 if (isGV (gv))
690 gv_efullname3 (fullname, gv, 0);
691
692 bot = PL_stack_base + cx->blk_oldsp + 1;
693 top = cx->blk_gimme == G_ARRAY ? SP + 1
694 : cx->blk_gimme == G_SCALAR ? bot + 1
695 : bot;
696
697 while (bot < top)
698 av_push (av, SvREFCNT_inc (*bot++));
699
700 PUSHMARK (SP);
701 PUSHs (&PL_sv_no);
702 PUSHs (fullname);
703 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
704 PUTBACK;
705 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
706 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
707 SPAGAIN;
708
709 FREETMPS;
710 LEAVE;
711 PL_runops = old_runops;
712 }
713
714 if (oldcop != PL_curcop)
715 {
716 oldcop = PL_curcop;
717
718 if (PL_curcop != &PL_compiling)
719 { 816 {
817 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
818 SV **bot, **top;
819 AV *av = newAV (); /* return values */
720 SV **cb; 820 SV **cb;
721 runops_proc_t old_runops = PL_runops;
722 dSP; 821 dSP;
822
823 GV *gv = CvGV (cx->blk_sub.cv);
824 SV *fullname = sv_2mortal (newSV (0));
825 if (isGV (gv))
826 gv_efullname3 (fullname, gv, 0);
827
828 bot = PL_stack_base + cx->blk_oldsp + 1;
829 top = cx->blk_gimme == G_ARRAY ? SP + 1
830 : cx->blk_gimme == G_SCALAR ? bot + 1
831 : bot;
832
833 av_extend (av, top - bot);
834 while (bot < top)
835 av_push (av, SvREFCNT_inc (*bot++));
836
837 PL_runops = RUNOPS_DEFAULT;
723 ENTER; 838 ENTER;
724 SAVETMPS; 839 SAVETMPS;
725 EXTEND (SP, 3); 840 EXTEND (SP, 3);
726 PL_runops = RUNOPS_DEFAULT; 841 PUSHMARK (SP);
842 PUSHs (&PL_sv_no);
843 PUSHs (fullname);
844 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
845 PUTBACK;
846 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
847 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
848 SPAGAIN;
849 FREETMPS;
850 LEAVE;
851 PL_runops = runops_trace;
852 }
727 853
728 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 854 if (oldcop != PL_curcop)
855 {
856 oldcop = PL_curcop;
857
858 if (PL_curcop != &PL_compiling)
729 { 859 {
730 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 860 SV **cb;
731 861
732 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 862 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB)
733 { 863 {
864 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
865
866 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
867 {
868 runops_proc_t old_runops = PL_runops;
869 dSP;
734 GV *gv = CvGV (cx->blk_sub.cv); 870 GV *gv = CvGV (cx->blk_sub.cv);
735 SV *fullname = sv_2mortal (newSV (0)); 871 SV *fullname = sv_2mortal (newSV (0));
872
736 if (isGV (gv)) 873 if (isGV (gv))
737 gv_efullname3 (fullname, gv, 0); 874 gv_efullname3 (fullname, gv, 0);
738 875
876 PL_runops = RUNOPS_DEFAULT;
877 ENTER;
878 SAVETMPS;
879 EXTEND (SP, 3);
880 PUSHMARK (SP);
881 PUSHs (&PL_sv_yes);
882 PUSHs (fullname);
883 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
884 PUTBACK;
885 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
886 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
887 SPAGAIN;
888 FREETMPS;
889 LEAVE;
890 PL_runops = runops_trace;
891 }
892
893 oldcxix = cxstack_ix;
894 }
895
896 if (cctx->flags & CC_TRACE_LINE)
897 {
898 dSP;
899
900 PL_runops = RUNOPS_DEFAULT;
901 ENTER;
902 SAVETMPS;
903 EXTEND (SP, 3);
904 PL_runops = RUNOPS_DEFAULT;
739 PUSHMARK (SP); 905 PUSHMARK (SP);
740 PUSHs (&PL_sv_yes); 906 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
741 PUSHs (fullname); 907 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
742 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
743 PUTBACK; 908 PUTBACK;
744 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 909 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
745 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 910 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
746 SPAGAIN; 911 SPAGAIN;
912 FREETMPS;
913 LEAVE;
914 PL_runops = runops_trace;
747 } 915 }
748
749 oldcxix = cxstack_ix;
750 } 916 }
751
752 if (cctx->flags & CC_TRACE_LINE)
753 {
754 PUSHMARK (SP);
755 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
756 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
757 PUTBACK;
758 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
759 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
760 SPAGAIN;
761 }
762
763 FREETMPS;
764 LEAVE;
765 PL_runops = old_runops;
766 } 917 }
767 } 918 }
768 } 919 }
769 920
770 TAINT_NOT; 921 TAINT_NOT;
… …
773 924
774/* inject a fake call to Coro::State::_cctx_init into the execution */ 925/* inject a fake call to Coro::State::_cctx_init into the execution */
775/* _cctx_init should be careful, as it could be called at almost any time */ 926/* _cctx_init should be careful, as it could be called at almost any time */
776/* during execution of a perl program */ 927/* during execution of a perl program */
777static void NOINLINE 928static void NOINLINE
778prepare_cctx (pTHX_ coro_cctx *cctx) 929cctx_prepare (pTHX_ coro_cctx *cctx)
779{ 930{
780 dSP; 931 dSP;
781 LOGOP myop; 932 LOGOP myop;
782 933
783 PL_top_env = &PL_start_env; 934 PL_top_env = &PL_start_env;
… …
801 952
802/* 953/*
803 * this is a _very_ stripped down perl interpreter ;) 954 * this is a _very_ stripped down perl interpreter ;)
804 */ 955 */
805static void 956static void
806coro_run (void *arg) 957cctx_run (void *arg)
807{ 958{
808 dTHX; 959 dTHX;
809 960
810 /* coro_run is the alternative tail of transfer(), so unlock here. */ 961 /* cctx_run is the alternative tail of transfer(), so unlock here. */
811 UNLOCK; 962 UNLOCK;
812 963
813 /* we now skip the entersub that lead to transfer() */ 964 /* we now skip the entersub that lead to transfer() */
814 PL_op = PL_op->op_next; 965 PL_op = PL_op->op_next;
815 966
816 /* inject a fake subroutine call to cctx_init */ 967 /* inject a fake subroutine call to cctx_init */
817 prepare_cctx (aTHX_ (coro_cctx *)arg); 968 cctx_prepare (aTHX_ (coro_cctx *)arg);
818 969
819 /* somebody or something will hit me for both perl_run and PL_restartop */ 970 /* somebody or something will hit me for both perl_run and PL_restartop */
820 PL_restartop = PL_op; 971 PL_restartop = PL_op;
821 perl_run (PL_curinterp); 972 perl_run (PL_curinterp);
822 973
… …
841 ++cctx_count; 992 ++cctx_count;
842 993
843 Newz (0, cctx, 1, coro_cctx); 994 Newz (0, cctx, 1, coro_cctx);
844 995
845#if HAVE_MMAP 996#if HAVE_MMAP
846
847 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 997 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
848 /* mmap supposedly does allocate-on-write for us */ 998 /* mmap supposedly does allocate-on-write for us */
849 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 999 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
850 1000
851 if (cctx->sptr != (void *)-1) 1001 if (cctx->sptr != (void *)-1)
… …
872 stack_start = cctx->sptr; 1022 stack_start = cctx->sptr;
873 stack_size = cctx->ssize; 1023 stack_size = cctx->ssize;
874 } 1024 }
875 1025
876 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1026 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
877 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1027 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
878 1028
879 return cctx; 1029 return cctx;
880} 1030}
881 1031
882static void 1032static void
… …
899 Safefree (cctx->sptr); 1049 Safefree (cctx->sptr);
900 1050
901 Safefree (cctx); 1051 Safefree (cctx);
902} 1052}
903 1053
1054/* wether this cctx should be destructed */
1055#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1056
904static coro_cctx * 1057static coro_cctx *
905cctx_get (pTHX) 1058cctx_get (pTHX)
906{ 1059{
907 while (cctx_first) 1060 while (expect_true (cctx_first))
908 { 1061 {
909 coro_cctx *cctx = cctx_first; 1062 coro_cctx *cctx = cctx_first;
910 cctx_first = cctx->next; 1063 cctx_first = cctx->next;
911 --cctx_idle; 1064 --cctx_idle;
912 1065
913 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1066 if (expect_true (!CCTX_EXPIRED (cctx)))
914 return cctx; 1067 return cctx;
915 1068
916 cctx_destroy (cctx); 1069 cctx_destroy (cctx);
917 } 1070 }
918 1071
… …
921 1074
922static void 1075static void
923cctx_put (coro_cctx *cctx) 1076cctx_put (coro_cctx *cctx)
924{ 1077{
925 /* free another cctx if overlimit */ 1078 /* free another cctx if overlimit */
926 if (cctx_idle >= MAX_IDLE_CCTX) 1079 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
927 { 1080 {
928 coro_cctx *first = cctx_first; 1081 coro_cctx *first = cctx_first;
929 cctx_first = first->next; 1082 cctx_first = first->next;
930 --cctx_idle; 1083 --cctx_idle;
931 1084
… …
937 cctx_first = cctx; 1090 cctx_first = cctx;
938} 1091}
939 1092
940/** coroutine switching *****************************************************/ 1093/** coroutine switching *****************************************************/
941 1094
942static void NOINLINE 1095static void
943transfer_check (pTHX_ struct coro *prev, struct coro *next) 1096transfer_check (pTHX_ struct coro *prev, struct coro *next)
944{ 1097{
945 if (prev != next) 1098 if (expect_true (prev != next))
946 { 1099 {
947 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1100 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
948 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1101 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
949 1102
950 if (next->flags & CF_RUNNING) 1103 if (expect_false (next->flags & CF_RUNNING))
951 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1104 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
952 1105
953 if (next->flags & CF_DESTROYED) 1106 if (expect_false (next->flags & CF_DESTROYED))
954 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1107 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
955 1108
1109 if (
1110#if PERL_VERSION_ATLEAST (5,9,0)
1111 expect_false (PL_parser)
1112#else
956 if (PL_lex_state != LEX_NOTPARSING) 1113 expect_false (PL_lex_state != LEX_NOTPARSING)
1114#endif
1115 )
957 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1116 croak ("Coro::State::transfer called while parsing, but this is not supported");
958 } 1117 }
959} 1118}
960 1119
961/* always use the TRANSFER macro */ 1120/* always use the TRANSFER macro */
962static void NOINLINE 1121static void NOINLINE
963transfer (pTHX_ struct coro *prev, struct coro *next) 1122transfer (pTHX_ struct coro *prev, struct coro *next)
964{ 1123{
965 dSTACKLEVEL; 1124 dSTACKLEVEL;
1125 static volatile int has_throw;
966 1126
967 /* sometimes transfer is only called to set idle_sp */ 1127 /* sometimes transfer is only called to set idle_sp */
968 if (!next) 1128 if (expect_false (!next))
969 { 1129 {
970 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1130 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
971 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1131 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
972 } 1132 }
973 else if (prev != next) 1133 else if (expect_true (prev != next))
974 { 1134 {
975 coro_cctx *prev__cctx; 1135 coro_cctx *prev__cctx;
976 1136
977 if (prev->flags & CF_NEW) 1137 if (expect_false (prev->flags & CF_NEW))
978 { 1138 {
979 /* create a new empty context */ 1139 /* create a new empty context */
980 Newz (0, prev->cctx, 1, coro_cctx); 1140 Newz (0, prev->cctx, 1, coro_cctx);
981 prev->flags &= ~CF_NEW; 1141 prev->flags &= ~CF_NEW;
982 prev->flags |= CF_RUNNING; 1142 prev->flags |= CF_RUNNING;
… …
985 prev->flags &= ~CF_RUNNING; 1145 prev->flags &= ~CF_RUNNING;
986 next->flags |= CF_RUNNING; 1146 next->flags |= CF_RUNNING;
987 1147
988 LOCK; 1148 LOCK;
989 1149
1150 /* first get rid of the old state */
1151 save_perl (aTHX_ prev);
1152
990 if (next->flags & CF_NEW) 1153 if (expect_false (next->flags & CF_NEW))
991 { 1154 {
992 /* need to start coroutine */ 1155 /* need to start coroutine */
993 next->flags &= ~CF_NEW; 1156 next->flags &= ~CF_NEW;
994 /* first get rid of the old state */
995 save_perl (aTHX_ prev);
996 /* setup coroutine call */ 1157 /* setup coroutine call */
997 setup_coro (aTHX_ next); 1158 coro_setup (aTHX_ next);
998 } 1159 }
999 else 1160 else
1000 {
1001 /* coroutine already started */
1002 save_perl (aTHX_ prev);
1003 load_perl (aTHX_ next); 1161 load_perl (aTHX_ next);
1004 }
1005 1162
1006 prev__cctx = prev->cctx; 1163 prev__cctx = prev->cctx;
1007 1164
1008 /* possibly "free" the cctx */ 1165 /* possibly "free" the cctx */
1009 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1166 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1010 { 1167 {
1011 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1168 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1012 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1169 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1013 1170
1014 prev->cctx = 0; 1171 prev->cctx = 0;
1015 1172
1173 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1174 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1175 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1176 if (!next->cctx)
1177 next->cctx = cctx_get (aTHX);
1178
1016 cctx_put (prev__cctx); 1179 cctx_put (prev__cctx);
1017 } 1180 }
1018 1181
1182 ++next->usecount;
1183
1019 if (!next->cctx) 1184 if (expect_true (!next->cctx))
1020 next->cctx = cctx_get (aTHX); 1185 next->cctx = cctx_get (aTHX);
1021 1186
1187 has_throw = !!next->throw;
1188
1022 if (prev__cctx != next->cctx) 1189 if (expect_false (prev__cctx != next->cctx))
1023 { 1190 {
1024 prev__cctx->top_env = PL_top_env; 1191 prev__cctx->top_env = PL_top_env;
1025 PL_top_env = next->cctx->top_env; 1192 PL_top_env = next->cctx->top_env;
1026 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1193 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1027 } 1194 }
1028 1195
1029 free_coro_mortal (aTHX); 1196 free_coro_mortal (aTHX);
1030 UNLOCK; 1197 UNLOCK;
1198
1199 if (expect_false (has_throw))
1200 {
1201 struct coro *coro = SvSTATE (coro_current);
1202
1203 if (coro->throw)
1204 {
1205 SV *exception = coro->throw;
1206 coro->throw = 0;
1207 sv_setsv (ERRSV, exception);
1208 croak (0);
1209 }
1210 }
1031 } 1211 }
1032} 1212}
1033 1213
1034struct transfer_args 1214struct transfer_args
1035{ 1215{
… …
1062 1242
1063 if (coro->mainstack && coro->mainstack != main_mainstack) 1243 if (coro->mainstack && coro->mainstack != main_mainstack)
1064 { 1244 {
1065 struct coro temp; 1245 struct coro temp;
1066 1246
1067 assert (!(coro->flags & CF_RUNNING));
1068
1069 Zero (&temp, 1, struct coro);
1070 temp.save = CORO_SAVE_ALL;
1071
1072 if (coro->flags & CF_RUNNING) 1247 if (coro->flags & CF_RUNNING)
1073 croak ("FATAL: tried to destroy currently running coroutine"); 1248 croak ("FATAL: tried to destroy currently running coroutine");
1074 1249
1075 save_perl (aTHX_ &temp); 1250 save_perl (aTHX_ &temp);
1076 load_perl (aTHX_ coro); 1251 load_perl (aTHX_ coro);
1077 1252
1078 coro_destroy_stacks (aTHX); 1253 coro_destroy (aTHX_ coro);
1079 1254
1080 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1255 load_perl (aTHX_ &temp);
1081 1256
1082 coro->mainstack = 0; 1257 coro->slot = 0;
1083 } 1258 }
1084 1259
1085 cctx_destroy (coro->cctx); 1260 cctx_destroy (coro->cctx);
1086 SvREFCNT_dec (coro->args); 1261 SvREFCNT_dec (coro->args);
1087 1262
… …
1146 1321
1147 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1322 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1148 TRANSFER (ta); 1323 TRANSFER (ta);
1149} 1324}
1150 1325
1151static int
1152api_save (SV *coro_sv, int new_save)
1153{
1154 dTHX;
1155 struct coro *coro = SvSTATE (coro_sv);
1156 int old_save = coro->save;
1157
1158 if (new_save >= 0)
1159 coro->save = new_save;
1160
1161 return old_save;
1162}
1163
1164/** Coro ********************************************************************/ 1326/** Coro ********************************************************************/
1165 1327
1166static void 1328static void
1167coro_enq (pTHX_ SV *coro_sv) 1329coro_enq (pTHX_ SV *coro_sv)
1168{ 1330{
1169 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1331 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1170} 1332}
1171 1333
1172static SV * 1334static SV *
1173coro_deq (pTHX_ int min_prio) 1335coro_deq (pTHX)
1174{ 1336{
1175 int prio = PRIO_MAX - PRIO_MIN; 1337 int prio;
1176 1338
1177 min_prio -= PRIO_MIN;
1178 if (min_prio < 0)
1179 min_prio = 0;
1180
1181 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1339 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1182 if (AvFILLp (coro_ready [prio]) >= 0) 1340 if (AvFILLp (coro_ready [prio]) >= 0)
1183 return av_shift (coro_ready [prio]); 1341 return av_shift (coro_ready [prio]);
1184 1342
1185 return 0; 1343 return 0;
1186} 1344}
… …
1222 SV *prev_sv, *next_sv; 1380 SV *prev_sv, *next_sv;
1223 1381
1224 for (;;) 1382 for (;;)
1225 { 1383 {
1226 LOCK; 1384 LOCK;
1227 next_sv = coro_deq (aTHX_ PRIO_MIN); 1385 next_sv = coro_deq (aTHX);
1228 1386
1229 /* nothing to schedule: call the idle handler */ 1387 /* nothing to schedule: call the idle handler */
1230 if (!next_sv) 1388 if (expect_false (!next_sv))
1231 { 1389 {
1232 dSP; 1390 dSP;
1233 UNLOCK; 1391 UNLOCK;
1234 1392
1235 ENTER; 1393 ENTER;
1236 SAVETMPS; 1394 SAVETMPS;
1237 1395
1238 PUSHMARK (SP); 1396 PUSHMARK (SP);
1239 PUTBACK; 1397 PUTBACK;
1240 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1398 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1399 SPAGAIN;
1241 1400
1242 FREETMPS; 1401 FREETMPS;
1243 LEAVE; 1402 LEAVE;
1244 continue; 1403 continue;
1245 } 1404 }
1246 1405
1247 ta->next = SvSTATE (next_sv); 1406 ta->next = SvSTATE (next_sv);
1248 1407
1249 /* cannot transfer to destroyed coros, skip and look for next */ 1408 /* cannot transfer to destroyed coros, skip and look for next */
1250 if (ta->next->flags & CF_DESTROYED) 1409 if (expect_false (ta->next->flags & CF_DESTROYED))
1251 { 1410 {
1252 UNLOCK; 1411 UNLOCK;
1253 SvREFCNT_dec (next_sv); 1412 SvREFCNT_dec (next_sv);
1254 /* coro_nready is already taken care of by destroy */ 1413 /* coro_nready is already taken care of by destroy */
1255 continue; 1414 continue;
… …
1311 dTHX; 1470 dTHX;
1312 struct transfer_args ta; 1471 struct transfer_args ta;
1313 1472
1314 prepare_cede (aTHX_ &ta); 1473 prepare_cede (aTHX_ &ta);
1315 1474
1316 if (ta.prev != ta.next) 1475 if (expect_true (ta.prev != ta.next))
1317 { 1476 {
1318 TRANSFER (ta); 1477 TRANSFER (ta);
1319 return 1; 1478 return 1;
1320 } 1479 }
1321 else 1480 else
… …
1335 } 1494 }
1336 else 1495 else
1337 return 0; 1496 return 0;
1338} 1497}
1339 1498
1499static void
1500api_trace (SV *coro_sv, int flags)
1501{
1502 dTHX;
1503 struct coro *coro = SvSTATE (coro_sv);
1504
1505 if (flags & CC_TRACE)
1506 {
1507 if (!coro->cctx)
1508 coro->cctx = cctx_new ();
1509 else if (!(coro->cctx->flags & CC_TRACE))
1510 croak ("cannot enable tracing on coroutine with custom stack");
1511
1512 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1513 }
1514 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1515 {
1516 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1517
1518 if (coro->flags & CF_RUNNING)
1519 PL_runops = RUNOPS_DEFAULT;
1520 else
1521 coro->slot->runops = RUNOPS_DEFAULT;
1522 }
1523}
1524
1340MODULE = Coro::State PACKAGE = Coro::State 1525MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1341 1526
1342PROTOTYPES: DISABLE 1527PROTOTYPES: DISABLE
1343 1528
1344BOOT: 1529BOOT:
1345{ 1530{
1346#ifdef USE_ITHREADS 1531#ifdef USE_ITHREADS
1347 MUTEX_INIT (&coro_mutex); 1532 MUTEX_INIT (&coro_mutex);
1348#endif 1533#endif
1349 BOOT_PAGESIZE; 1534 BOOT_PAGESIZE;
1535
1536 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1537 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1538#if 0
1539 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1540 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1541#endif
1542 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1543 rv_diehook = SvREFCNT_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1544 rv_warnhook = SvREFCNT_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1350 1545
1351 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1546 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1352 1547
1353 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1548 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1354 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1549 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1355 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1550 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1356 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1551 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1357 1552
1358 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1359 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1360 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1361 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1362 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1363 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1364 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1365
1366 main_mainstack = PL_mainstack; 1553 main_mainstack = PL_mainstack;
1367 main_top_env = PL_top_env; 1554 main_top_env = PL_top_env;
1368 1555
1369 while (main_top_env->je_prev) 1556 while (main_top_env->je_prev)
1370 main_top_env = main_top_env->je_prev; 1557 main_top_env = main_top_env->je_prev;
1371 1558
1372 coroapi.ver = CORO_API_VERSION; 1559 coroapi.ver = CORO_API_VERSION;
1560 coroapi.rev = CORO_API_REVISION;
1373 coroapi.transfer = api_transfer; 1561 coroapi.transfer = api_transfer;
1374 1562
1375 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1563 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1376} 1564}
1377 1565
1378SV * 1566SV *
1379new (char *klass, ...) 1567new (char *klass, ...)
1380 CODE: 1568 CODE:
1381{ 1569{
1382 struct coro *coro; 1570 struct coro *coro;
1571 MAGIC *mg;
1383 HV *hv; 1572 HV *hv;
1384 int i; 1573 int i;
1385 1574
1386 Newz (0, coro, 1, struct coro); 1575 Newz (0, coro, 1, struct coro);
1387 coro->args = newAV (); 1576 coro->args = newAV ();
1388 coro->save = CORO_SAVE_DEF;
1389 coro->flags = CF_NEW; 1577 coro->flags = CF_NEW;
1390 1578
1391 if (coro_first) coro_first->prev = coro; 1579 if (coro_first) coro_first->prev = coro;
1392 coro->next = coro_first; 1580 coro->next = coro_first;
1393 coro_first = coro; 1581 coro_first = coro;
1394 1582
1395 coro->hv = hv = newHV (); 1583 coro->hv = hv = newHV ();
1396 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1584 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1585 mg->mg_flags |= MGf_DUP;
1397 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1586 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1398 1587
1588 av_extend (coro->args, items - 1);
1399 for (i = 1; i < items; i++) 1589 for (i = 1; i < items; i++)
1400 av_push (coro->args, newSVsv (ST (i))); 1590 av_push (coro->args, newSVsv (ST (i)));
1401} 1591}
1402 OUTPUT: 1592 OUTPUT:
1403 RETVAL 1593 RETVAL
1404 1594
1405int 1595# these not obviously related functions are all rolled into the same xs
1406save (SV *coro, int new_save = -1) 1596# function to increase chances that they all will call transfer with the same
1407 CODE: 1597# stack offset
1408 RETVAL = api_save (coro, new_save);
1409 OUTPUT:
1410 RETVAL
1411
1412int
1413save_also (SV *coro_sv, int save_also)
1414 CODE:
1415{
1416 struct coro *coro = SvSTATE (coro_sv);
1417 RETVAL = coro->save;
1418 coro->save |= save_also;
1419}
1420 OUTPUT:
1421 RETVAL
1422
1423void 1598void
1424_set_stacklevel (...) 1599_set_stacklevel (...)
1425 ALIAS: 1600 ALIAS:
1426 Coro::State::transfer = 1 1601 Coro::State::transfer = 1
1427 Coro::schedule = 2 1602 Coro::schedule = 2
… …
1429 Coro::cede_notself = 4 1604 Coro::cede_notself = 4
1430 CODE: 1605 CODE:
1431{ 1606{
1432 struct transfer_args ta; 1607 struct transfer_args ta;
1433 1608
1609 PUTBACK;
1434 switch (ix) 1610 switch (ix)
1435 { 1611 {
1436 case 0: 1612 case 0:
1437 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1613 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1438 ta.next = 0; 1614 ta.next = 0;
… …
1457 if (!prepare_cede_notself (aTHX_ &ta)) 1633 if (!prepare_cede_notself (aTHX_ &ta))
1458 XSRETURN_EMPTY; 1634 XSRETURN_EMPTY;
1459 1635
1460 break; 1636 break;
1461 } 1637 }
1638 SPAGAIN;
1462 1639
1463 BARRIER; 1640 BARRIER;
1641 PUTBACK;
1464 TRANSFER (ta); 1642 TRANSFER (ta);
1465 1643 SPAGAIN; /* might be the sp of a different coroutine now */
1466 if (GIMME_V != G_VOID && ta.next != ta.prev) 1644 /* be extra careful not to ever do anything after TRANSFER */
1467 XSRETURN_YES;
1468} 1645}
1469 1646
1470bool 1647bool
1471_destroy (SV *coro_sv) 1648_destroy (SV *coro_sv)
1472 CODE: 1649 CODE:
… …
1521 CODE: 1698 CODE:
1522{ 1699{
1523 if (coro->mainstack) 1700 if (coro->mainstack)
1524 { 1701 {
1525 struct coro temp; 1702 struct coro temp;
1526 Zero (&temp, 1, struct coro);
1527 temp.save = CORO_SAVE_ALL;
1528 1703
1529 if (!(coro->flags & CF_RUNNING)) 1704 if (!(coro->flags & CF_RUNNING))
1530 { 1705 {
1706 PUTBACK;
1531 save_perl (aTHX_ &temp); 1707 save_perl (aTHX_ &temp);
1532 load_perl (aTHX_ coro); 1708 load_perl (aTHX_ coro);
1533 } 1709 }
1534 1710
1535 { 1711 {
1536 dSP; 1712 dSP;
1537 ENTER; 1713 ENTER;
1538 SAVETMPS; 1714 SAVETMPS;
1715 PUTBACK;
1716 PUSHSTACK;
1539 PUSHMARK (SP); 1717 PUSHMARK (SP);
1540 PUTBACK; 1718
1541 if (ix) 1719 if (ix)
1542 eval_sv (coderef, 0); 1720 eval_sv (coderef, 0);
1543 else 1721 else
1544 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1722 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1723
1724 POPSTACK;
1545 SPAGAIN; 1725 SPAGAIN;
1546 FREETMPS; 1726 FREETMPS;
1547 LEAVE; 1727 LEAVE;
1548 PUTBACK; 1728 PUTBACK;
1549 } 1729 }
1550 1730
1551 if (!(coro->flags & CF_RUNNING)) 1731 if (!(coro->flags & CF_RUNNING))
1552 { 1732 {
1553 save_perl (aTHX_ coro); 1733 save_perl (aTHX_ coro);
1554 load_perl (aTHX_ &temp); 1734 load_perl (aTHX_ &temp);
1735 SPAGAIN;
1555 } 1736 }
1556 } 1737 }
1557} 1738}
1558 1739
1559SV * 1740SV *
1560is_ready (Coro::State coro) 1741is_ready (Coro::State coro)
1561 PROTOTYPE: $ 1742 PROTOTYPE: $
1562 ALIAS: 1743 ALIAS:
1563 is_ready = CF_READY 1744 is_ready = CF_READY
… …
1568 RETVAL = boolSV (coro->flags & ix); 1749 RETVAL = boolSV (coro->flags & ix);
1569 OUTPUT: 1750 OUTPUT:
1570 RETVAL 1751 RETVAL
1571 1752
1572void 1753void
1573trace (Coro::State coro, int flags = CC_TRACE | CC_TRACE_SUB) 1754api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1574 CODE:
1575 if (flags & CC_TRACE)
1576 {
1577 if (!coro->cctx)
1578 coro->cctx = cctx_new ();
1579 else if (!(coro->cctx->flags & CC_TRACE))
1580 croak ("cannot enable tracing on coroutine with custom stack");
1581
1582 coro->cctx->flags |= flags & (CC_TRACE | CC_TRACE_ALL);
1583 }
1584 else
1585 if (coro->cctx && coro->cctx->flags & CC_TRACE)
1586 {
1587 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1588 coro->cctx->flags |= CC_NOREUSE;
1589
1590 if (coro->flags & CF_RUNNING)
1591 PL_runops = RUNOPS_DEFAULT;
1592 else
1593 coro->runops = RUNOPS_DEFAULT;
1594 }
1595 1755
1596SV * 1756SV *
1597has_stack (Coro::State coro) 1757has_stack (Coro::State coro)
1598 PROTOTYPE: $ 1758 PROTOTYPE: $
1599 CODE: 1759 CODE:
… …
1610 RETVAL 1770 RETVAL
1611 1771
1612IV 1772IV
1613rss (Coro::State coro) 1773rss (Coro::State coro)
1614 PROTOTYPE: $ 1774 PROTOTYPE: $
1775 ALIAS:
1776 usecount = 1
1615 CODE: 1777 CODE:
1616 RETVAL = coro_rss (coro); 1778 switch (ix)
1779 {
1780 case 0: RETVAL = coro_rss (aTHX_ coro); break;
1781 case 1: RETVAL = coro->usecount; break;
1782 }
1617 OUTPUT: 1783 OUTPUT:
1618 RETVAL 1784 RETVAL
1619 1785
1620 1786
1621MODULE = Coro::State PACKAGE = Coro 1787MODULE = Coro::State PACKAGE = Coro
1622 1788
1623BOOT: 1789BOOT:
1624{ 1790{
1625 int i; 1791 int i;
1626 1792
1627 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1793 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1628 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1794 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1629 av_async_pool = get_av ("Coro::async_pool", TRUE); 1795 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1630 1796
1631 coro_current = get_sv ("Coro::current", FALSE); 1797 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1632 SvREADONLY_on (coro_current); 1798 SvREADONLY_on (coro_current);
1633 1799
1634 coro_stash = gv_stashpv ("Coro", TRUE); 1800 coro_stash = gv_stashpv ("Coro", TRUE);
1635 1801
1636 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1802 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1637 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1803 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1638 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1804 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1639 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1805 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
… …
1642 1808
1643 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1809 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1644 coro_ready[i] = newAV (); 1810 coro_ready[i] = newAV ();
1645 1811
1646 { 1812 {
1647 SV *sv = perl_get_sv("Coro::API", 1); 1813 SV *sv = perl_get_sv ("Coro::API", TRUE);
1814 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1648 1815
1649 coroapi.schedule = api_schedule; 1816 coroapi.schedule = api_schedule;
1650 coroapi.save = api_save;
1651 coroapi.cede = api_cede; 1817 coroapi.cede = api_cede;
1652 coroapi.cede_notself = api_cede_notself; 1818 coroapi.cede_notself = api_cede_notself;
1653 coroapi.ready = api_ready; 1819 coroapi.ready = api_ready;
1654 coroapi.is_ready = api_is_ready; 1820 coroapi.is_ready = api_is_ready;
1655 coroapi.nready = &coro_nready; 1821 coroapi.nready = &coro_nready;
… …
1704 CODE: 1870 CODE:
1705 RETVAL = coro_nready; 1871 RETVAL = coro_nready;
1706 OUTPUT: 1872 OUTPUT:
1707 RETVAL 1873 RETVAL
1708 1874
1875void
1876throw (Coro::State self, SV *throw = &PL_sv_undef)
1877 PROTOTYPE: $;$
1878 CODE:
1879 SvREFCNT_dec (self->throw);
1880 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1881
1709# for async_pool speedup 1882# for async_pool speedup
1710void 1883void
1711_pool_1 (SV *cb) 1884_pool_1 (SV *cb)
1712 CODE: 1885 CODE:
1713{ 1886{
1714 int i, len; 1887 struct coro *coro = SvSTATE (coro_current);
1715 HV *hv = (HV *)SvRV (coro_current); 1888 HV *hv = (HV *)SvRV (coro_current);
1716 AV *defav = GvAV (PL_defgv); 1889 AV *defav = GvAV (PL_defgv);
1717 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1890 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1718 AV *invoke_av; 1891 AV *invoke_av;
1892 int i, len;
1719 1893
1720 if (!invoke) 1894 if (!invoke)
1721 croak ("\3terminate\2\n"); 1895 croak ("\3async_pool terminate\2\n");
1896
1897 SvREFCNT_dec (coro->saved_deffh);
1898 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1722 1899
1723 hv_store (hv, "desc", sizeof ("desc") - 1, 1900 hv_store (hv, "desc", sizeof ("desc") - 1,
1724 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1901 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1725 1902
1726 invoke_av = (AV *)SvRV (invoke); 1903 invoke_av = (AV *)SvRV (invoke);
… …
1744{ 1921{
1745 struct coro *coro = SvSTATE (coro_current); 1922 struct coro *coro = SvSTATE (coro_current);
1746 1923
1747 sv_setsv (cb, &PL_sv_undef); 1924 sv_setsv (cb, &PL_sv_undef);
1748 1925
1926 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1927 coro->saved_deffh = 0;
1928
1749 if (coro_rss (coro) > SvIV (sv_pool_rss) 1929 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1750 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1930 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1751 croak ("\3terminate\2\n"); 1931 croak ("\3async_pool terminate\2\n");
1752 1932
1753 av_clear (GvAV (PL_defgv)); 1933 av_clear (GvAV (PL_defgv));
1754 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1934 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1755 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1935 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1756 coro->save = CORO_SAVE_DEF; 1936
1757 coro->prio = 0; 1937 coro->prio = 0;
1938
1939 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1940 api_trace (coro_current, 0);
1941
1758 av_push (av_async_pool, newSVsv (coro_current)); 1942 av_push (av_async_pool, newSVsv (coro_current));
1759} 1943}
1760 1944
1761 1945
1762MODULE = Coro::State PACKAGE = Coro::AIO 1946MODULE = Coro::State PACKAGE = Coro::AIO

Diff Legend

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