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.172 by root, Sun Sep 30 13:15:01 2007 UTC vs.
Revision 1.214 by root, Sat Oct 13 23:19:10 2007 UTC

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

Diff Legend

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