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.168 by root, Thu Sep 27 16:10:48 2007 UTC vs.
Revision 1.223 by root, Wed Feb 13 15:46:00 2008 UTC

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

Diff Legend

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