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

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

Diff Legend

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