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.166 by root, Wed Sep 26 21:11:28 2007 UTC vs.
Revision 1.227 by root, Sat Apr 5 22:29:54 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;
141 167
142static struct coro_cctx *cctx_first; 168static struct coro_cctx *cctx_first;
143static int cctx_count, cctx_idle; 169static int cctx_count, cctx_idle;
144 170
145enum { 171enum {
146 CC_MAPPED = 0x01, 172 CC_MAPPED = 0x01,
147 CC_TRACE = 0x02,
148 CC_NOREUSE = 0x04, /* throw this away after tracing */ 173 CC_NOREUSE = 0x02, /* throw this away after tracing */
174 CC_TRACE = 0x04,
175 CC_TRACE_SUB = 0x08, /* trace sub calls */
176 CC_TRACE_LINE = 0x10, /* trace each statement */
177 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE,
149}; 178};
150 179
151/* this is a structure representing a c-level coroutine */ 180/* this is a structure representing a c-level coroutine */
152typedef struct coro_cctx { 181typedef struct coro_cctx {
153 struct coro_cctx *next; 182 struct coro_cctx *next;
… …
173 CF_READY = 0x0002, /* coroutine is ready */ 202 CF_READY = 0x0002, /* coroutine is ready */
174 CF_NEW = 0x0004, /* has never been switched to */ 203 CF_NEW = 0x0004, /* has never been switched to */
175 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 204 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
176}; 205};
177 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
178/* this is a structure representing a perl-level coroutine */ 220/* this is a structure representing a perl-level coroutine */
179struct coro { 221struct coro {
180 /* the c coroutine allocated to this perl coroutine, if any */ 222 /* the c coroutine allocated to this perl coroutine, if any */
181 coro_cctx *cctx; 223 coro_cctx *cctx;
182 224
225 /* process data */
226 AV *mainstack;
227 perl_slots *slot; /* basically the saved sp */
228
183 /* data associated with this coroutine (initial args) */ 229 AV *args; /* data associated with this coroutine (initial args) */
184 AV *args; 230 int refcnt; /* coroutines are refcounted, yes */
185 int refcnt;
186 int save; /* CORO_SAVE flags */
187 int flags; /* CF_ flags */ 231 int flags; /* CF_ flags */
232 HV *hv; /* the perl hash associated with this coro, if any */
188 233
189 /* optionally saved, might be zero */ 234 /* statistics */
190 AV *defav; /* @_ */ 235 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 236
201 /* coro process data */ 237 /* coro process data */
202 int prio; 238 int prio;
239 SV *throw; /* exception to be thrown */
240
241 /* async_pool */
242 SV *saved_deffh;
203 243
204 /* linked list */ 244 /* linked list */
205 struct coro *next, *prev; 245 struct coro *next, *prev;
206 HV *hv; /* the perl hash associated with this coro, if any */
207}; 246};
208 247
209typedef struct coro *Coro__State; 248typedef struct coro *Coro__State;
210typedef struct coro *Coro__State_or_hashref; 249typedef struct coro *Coro__State_or_hashref;
211 250
… …
223static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 262static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
224static int coro_nready; 263static int coro_nready;
225static struct coro *coro_first; 264static struct coro *coro_first;
226 265
227/** 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}
228 297
229static AV * 298static AV *
230coro_clone_padlist (pTHX_ CV *cv) 299coro_clone_padlist (pTHX_ CV *cv)
231{ 300{
232 AV *padlist = CvPADLIST (cv); 301 AV *padlist = CvPADLIST (cv);
… …
280 349
281 /* casting is fun. */ 350 /* casting is fun. */
282 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 351 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
283 free_padlist (aTHX_ padlist); 352 free_padlist (aTHX_ padlist);
284 353
285 SvREFCNT_dec (av);
286
287 return 0; 354 return 0;
288} 355}
289 356
290#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
291 359
292static 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};
293 364
294#define CORO_MAGIC(cv) \ 365#define CORO_MAGIC(sv,type) \
295 SvMAGIC (cv) \ 366 SvMAGIC (sv) \
296 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 367 ? SvMAGIC (sv)->mg_type == type \
297 ? SvMAGIC (cv) \ 368 ? SvMAGIC (sv) \
298 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 369 : mg_find (sv, type) \
299 : 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))
300 400
301/* the next two functions merely cache the padlists */ 401/* the next two functions merely cache the padlists */
302static void 402static void
303get_padlist (pTHX_ CV *cv) 403get_padlist (pTHX_ CV *cv)
304{ 404{
305 MAGIC *mg = CORO_MAGIC (cv); 405 MAGIC *mg = CORO_MAGIC_cv (cv);
306 AV *av; 406 AV *av;
307 407
308 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 408 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
309 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 409 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
310 else 410 else
311 { 411 {
312#if CORO_PREFER_PERL_FUNCTIONS 412#if CORO_PREFER_PERL_FUNCTIONS
313 /* this is probably cleaner, but also slower? */ 413 /* this is probably cleaner, but also slower? */
… …
322} 422}
323 423
324static void 424static void
325put_padlist (pTHX_ CV *cv) 425put_padlist (pTHX_ CV *cv)
326{ 426{
327 MAGIC *mg = CORO_MAGIC (cv); 427 MAGIC *mg = CORO_MAGIC_cv (cv);
328 AV *av; 428 AV *av;
329 429
330 if (!mg) 430 if (expect_false (!mg))
331 { 431 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 432
338 av = (AV *)mg->mg_obj; 433 av = (AV *)mg->mg_obj;
339 434
340 if (AvFILLp (av) >= AvMAX (av)) 435 if (expect_false (AvFILLp (av) >= AvMAX (av)))
341 av_extend (av, AvMAX (av) + 1); 436 av_extend (av, AvMAX (av) + 1);
342 437
343 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 438 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
344} 439}
345 440
346/** load & save, init *******************************************************/ 441/** load & save, init *******************************************************/
347
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 442
353static void 443static void
354load_perl (pTHX_ Coro__State c) 444load_perl (pTHX_ Coro__State c)
355{ 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
356#define VAR(name,type) PL_ ## name = c->name; 456 #define VAR(name,type) PL_ ## name = slot->name;
357# include "state.h" 457 # include "state.h"
358#undef VAR 458 #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 459
380 { 460 {
381 dSP; 461 dSP;
462
382 CV *cv; 463 CV *cv;
383 464
384 /* now do the ugly restore mess */ 465 /* now do the ugly restore mess */
385 while ((cv = (CV *)POPs)) 466 while (expect_true (cv = (CV *)POPs))
386 { 467 {
387 put_padlist (aTHX_ cv); /* mark this padlist as available */ 468 put_padlist (aTHX_ cv); /* mark this padlist as available */
388 CvDEPTH (cv) = PTR2IV (POPs); 469 CvDEPTH (cv) = PTR2IV (POPs);
389 CvPADLIST (cv) = (AV *)POPs; 470 CvPADLIST (cv) = (AV *)POPs;
390 } 471 }
… …
409 490
410 XPUSHs (Nullsv); 491 XPUSHs (Nullsv);
411 /* this loop was inspired by pp_caller */ 492 /* this loop was inspired by pp_caller */
412 for (;;) 493 for (;;)
413 { 494 {
414 while (cxix >= 0) 495 while (expect_true (cxix >= 0))
415 { 496 {
416 PERL_CONTEXT *cx = &ccstk[cxix--]; 497 PERL_CONTEXT *cx = &ccstk[cxix--];
417 498
418 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 499 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
419 { 500 {
420 CV *cv = cx->blk_sub.cv; 501 CV *cv = cx->blk_sub.cv;
421 502
422 if (CvDEPTH (cv)) 503 if (expect_true (CvDEPTH (cv)))
423 { 504 {
424 EXTEND (SP, 3); 505 EXTEND (SP, 3);
425 PUSHs ((SV *)CvPADLIST (cv)); 506 PUSHs ((SV *)CvPADLIST (cv));
426 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 507 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
427 PUSHs ((SV *)cv); 508 PUSHs ((SV *)cv);
… …
430 get_padlist (aTHX_ cv); 511 get_padlist (aTHX_ cv);
431 } 512 }
432 } 513 }
433 } 514 }
434 515
435 if (top_si->si_type == PERLSI_MAIN) 516 if (expect_true (top_si->si_type == PERLSI_MAIN))
436 break; 517 break;
437 518
438 top_si = top_si->si_prev; 519 top_si = top_si->si_prev;
439 ccstk = top_si->si_cxstack; 520 ccstk = top_si->si_cxstack;
440 cxix = top_si->si_cxix; 521 cxix = top_si->si_cxix;
441 } 522 }
442 523
443 PUTBACK; 524 PUTBACK;
444 } 525 }
445 526
446 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 */
447 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 528 /* we manually unroll here, as usually 2 slots is enough */
448 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 529 if (SLOT_COUNT >= 1) CXINC;
449 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 530 if (SLOT_COUNT >= 2) CXINC;
450 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 */
451 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
452#define VAR(name,type)c->name = PL_ ## name; 549 #define VAR(name,type) slot->name = PL_ ## name;
453# include "state.h" 550 # include "state.h"
454#undef VAR 551 #undef VAR
552 }
455} 553}
456 554
457/* 555/*
458 * allocate various perl stacks. This is an exact copy 556 * allocate various perl stacks. This is an exact copy
459 * of perl.c:init_stacks, except that it uses less memory 557 * of perl.c:init_stacks, except that it uses less memory
… …
464# define coro_init_stacks init_stacks 562# define coro_init_stacks init_stacks
465#else 563#else
466static void 564static void
467coro_init_stacks (pTHX) 565coro_init_stacks (pTHX)
468{ 566{
469 PL_curstackinfo = new_stackinfo(64, 6); 567 PL_curstackinfo = new_stackinfo(32, 8);
470 PL_curstackinfo->si_type = PERLSI_MAIN; 568 PL_curstackinfo->si_type = PERLSI_MAIN;
471 PL_curstack = PL_curstackinfo->si_stack; 569 PL_curstack = PL_curstackinfo->si_stack;
472 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 570 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
473 571
474 PL_stack_base = AvARRAY(PL_curstack); 572 PL_stack_base = AvARRAY(PL_curstack);
475 PL_stack_sp = PL_stack_base; 573 PL_stack_sp = PL_stack_base;
476 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 574 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
477 575
478 New(50,PL_tmps_stack,64,SV*); 576 New(50,PL_tmps_stack,32,SV*);
479 PL_tmps_floor = -1; 577 PL_tmps_floor = -1;
480 PL_tmps_ix = -1; 578 PL_tmps_ix = -1;
481 PL_tmps_max = 64; 579 PL_tmps_max = 32;
482 580
483 New(54,PL_markstack,16,I32); 581 New(54,PL_markstack,16,I32);
484 PL_markstack_ptr = PL_markstack; 582 PL_markstack_ptr = PL_markstack;
485 PL_markstack_max = PL_markstack + 16; 583 PL_markstack_max = PL_markstack + 16;
486 584
487#ifdef SET_MARK_OFFSET 585#ifdef SET_MARK_OFFSET
488 SET_MARK_OFFSET; 586 SET_MARK_OFFSET;
489#endif 587#endif
490 588
491 New(54,PL_scopestack,16,I32); 589 New(54,PL_scopestack,8,I32);
492 PL_scopestack_ix = 0; 590 PL_scopestack_ix = 0;
493 PL_scopestack_max = 16; 591 PL_scopestack_max = 8;
494 592
495 New(54,PL_savestack,64,ANY); 593 New(54,PL_savestack,24,ANY);
496 PL_savestack_ix = 0; 594 PL_savestack_ix = 0;
497 PL_savestack_max = 64; 595 PL_savestack_max = 24;
498 596
499#if !PERL_VERSION_ATLEAST (5,9,0) 597#if !PERL_VERSION_ATLEAST (5,9,0)
500 New(54,PL_retstack,4,OP*); 598 New(54,PL_retstack,4,OP*);
501 PL_retstack_ix = 0; 599 PL_retstack_ix = 0;
502 PL_retstack_max = 4; 600 PL_retstack_max = 4;
… …
508 * destroy the stacks, the callchain etc... 606 * destroy the stacks, the callchain etc...
509 */ 607 */
510static void 608static void
511coro_destroy_stacks (pTHX) 609coro_destroy_stacks (pTHX)
512{ 610{
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) 611 while (PL_curstackinfo->si_next)
531 PL_curstackinfo = PL_curstackinfo->si_next; 612 PL_curstackinfo = PL_curstackinfo->si_next;
532 613
533 while (PL_curstackinfo) 614 while (PL_curstackinfo)
534 { 615 {
… …
550 Safefree (PL_retstack); 631 Safefree (PL_retstack);
551#endif 632#endif
552} 633}
553 634
554static size_t 635static size_t
555coro_rss (struct coro *coro) 636coro_rss (pTHX_ struct coro *coro)
556{ 637{
557 size_t rss = sizeof (coro); 638 size_t rss = sizeof (*coro);
558 639
559 if (coro->mainstack) 640 if (coro->mainstack)
560 { 641 {
642 perl_slots tmp_slot;
643 perl_slots *slot;
644
561 if (coro->flags & CF_RUNNING) 645 if (coro->flags & CF_RUNNING)
562 { 646 {
647 slot = &tmp_slot;
648
563 #define VAR(name,type)coro->name = PL_ ## name; 649 #define VAR(name,type) slot->name = PL_ ## name;
564 # include "state.h" 650 # include "state.h"
565 #undef VAR 651 #undef VAR
566 } 652 }
653 else
654 slot = coro->slot;
567 655
568 rss += sizeof (coro->curstackinfo); 656 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); 657 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
571 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 658 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
572 rss += coro->tmps_max * sizeof (SV *); 659 rss += slot->tmps_max * sizeof (SV *);
573 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 660 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
574 rss += coro->scopestack_max * sizeof (I32); 661 rss += slot->scopestack_max * sizeof (I32);
575 rss += coro->savestack_max * sizeof (ANY); 662 rss += slot->savestack_max * sizeof (ANY);
576 663
577#if !PERL_VERSION_ATLEAST (5,9,0) 664#if !PERL_VERSION_ATLEAST (5,9,0)
578 rss += coro->retstack_max * sizeof (OP *); 665 rss += slot->retstack_max * sizeof (OP *);
579#endif 666#endif
580 } 667 }
581 668
582 return rss; 669 return rss;
583} 670}
584 671
585/** coroutine stack handling ************************************************/ 672/** coroutine stack handling ************************************************/
586 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
587static void 724static void
588setup_coro (pTHX_ struct coro *coro) 725coro_setup (pTHX_ struct coro *coro)
589{ 726{
590 /* 727 /*
591 * emulate part of the perl startup here. 728 * emulate part of the perl startup here.
592 */ 729 */
593 coro_init_stacks (aTHX); 730 coro_init_stacks (aTHX);
594 731
732 PL_runops = RUNOPS_DEFAULT;
595 PL_curcop = &PL_compiling; 733 PL_curcop = &PL_compiling;
596 PL_in_eval = EVAL_NULL; 734 PL_in_eval = EVAL_NULL;
597 PL_comppad = 0; 735 PL_comppad = 0;
598 PL_curpm = 0; 736 PL_curpm = 0;
737 PL_curpad = 0;
599 PL_localizing = 0; 738 PL_localizing = 0;
600 PL_dirty = 0; 739 PL_dirty = 0;
601 PL_restartop = 0; 740 PL_restartop = 0;
602 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
603 { 753 {
604 dSP; 754 dSP;
605 LOGOP myop; 755 LOGOP myop;
606 756
607 SvREFCNT_dec (GvAV (PL_defgv));
608 GvAV (PL_defgv) = coro->args; coro->args = 0;
609
610 Zero (&myop, 1, LOGOP); 757 Zero (&myop, 1, LOGOP);
611 myop.op_next = Nullop; 758 myop.op_next = Nullop;
612 myop.op_flags = OPf_WANT_VOID; 759 myop.op_flags = OPf_WANT_VOID;
613 760
614 PUSHMARK (SP); 761 PUSHMARK (SP);
615 XPUSHs (av_shift (GvAV (PL_defgv))); 762 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
616 PUTBACK; 763 PUTBACK;
617 PL_op = (OP *)&myop; 764 PL_op = (OP *)&myop;
618 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 765 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
619 SPAGAIN; 766 SPAGAIN;
620 } 767 }
621 768
622 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);
623} 811}
624 812
625static void 813static void
626free_coro_mortal (pTHX) 814free_coro_mortal (pTHX)
627{ 815{
628 if (coro_mortal) 816 if (expect_true (coro_mortal))
629 { 817 {
630 SvREFCNT_dec (coro_mortal); 818 SvREFCNT_dec (coro_mortal);
631 coro_mortal = 0; 819 coro_mortal = 0;
632 } 820 }
633} 821}
634 822
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 823static int
657runops_coro (pTHX) 824runops_trace (pTHX)
658{ 825{
659 COP *oldcop = 0; 826 COP *oldcop = 0;
827 int oldcxix = -2;
828 struct coro *coro = SvSTATE (coro_current); /* trace cctx is tied to specific coro */
829 coro_cctx *cctx = coro->cctx;
660 830
661 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 831 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
662 { 832 {
663 PERL_ASYNC_CHECK (); 833 PERL_ASYNC_CHECK ();
664 834
665 if (oldcop != PL_curcop) 835 if (cctx->flags & CC_TRACE_ALL)
666 { 836 {
837 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB)
838 {
839 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
840 SV **bot, **top;
841 AV *av = newAV (); /* return values */
842 SV **cb;
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;
860 ENTER;
861 SAVETMPS;
862 EXTEND (SP, 3);
863 PUSHMARK (SP);
864 PUSHs (&PL_sv_no);
865 PUSHs (fullname);
866 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
867 PUTBACK;
868 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
869 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
870 SPAGAIN;
871 FREETMPS;
872 LEAVE;
873 PL_runops = runops_trace;
874 }
875
876 if (oldcop != PL_curcop)
877 {
667 oldcop = PL_curcop; 878 oldcop = PL_curcop;
668 do_trace (aTHX); 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 }
939 }
669 } 940 }
670 } 941 }
671 942
672 TAINT_NOT; 943 TAINT_NOT;
673 return 0; 944 return 0;
… …
675 946
676/* 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 */
677/* _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 */
678/* during execution of a perl program */ 949/* during execution of a perl program */
679static void NOINLINE 950static void NOINLINE
680prepare_cctx (pTHX_ coro_cctx *cctx) 951cctx_prepare (pTHX_ coro_cctx *cctx)
681{ 952{
682 dSP; 953 dSP;
683 LOGOP myop; 954 LOGOP myop;
684 955
685 PL_top_env = &PL_start_env; 956 PL_top_env = &PL_start_env;
686 957
687 if (cctx->flags & CC_TRACE) 958 if (cctx->flags & CC_TRACE)
688 PL_runops = runops_coro; 959 PL_runops = runops_trace;
689 960
690 Zero (&myop, 1, LOGOP); 961 Zero (&myop, 1, LOGOP);
691 myop.op_next = PL_op; 962 myop.op_next = PL_op;
692 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 963 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
693 964
… …
703 974
704/* 975/*
705 * this is a _very_ stripped down perl interpreter ;) 976 * this is a _very_ stripped down perl interpreter ;)
706 */ 977 */
707static void 978static void
708coro_run (void *arg) 979cctx_run (void *arg)
709{ 980{
710 dTHX; 981 dTHX;
711 982
712 /* coro_run is the alternative tail of transfer(), so unlock here. */ 983 /* cctx_run is the alternative tail of transfer(), so unlock here. */
713 UNLOCK; 984 UNLOCK;
714 985
715 /* we now skip the entersub that lead to transfer() */ 986 /* we now skip the entersub that lead to transfer() */
716 PL_op = PL_op->op_next; 987 PL_op = PL_op->op_next;
717 988
718 /* inject a fake subroutine call to cctx_init */ 989 /* inject a fake subroutine call to cctx_init */
719 prepare_cctx (aTHX_ (coro_cctx *)arg); 990 cctx_prepare (aTHX_ (coro_cctx *)arg);
720 991
721 /* 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 */
722 PL_restartop = PL_op; 993 PL_restartop = PL_op;
723 perl_run (PL_curinterp); 994 perl_run (PL_curinterp);
724 995
… …
743 ++cctx_count; 1014 ++cctx_count;
744 1015
745 Newz (0, cctx, 1, coro_cctx); 1016 Newz (0, cctx, 1, coro_cctx);
746 1017
747#if HAVE_MMAP 1018#if HAVE_MMAP
748
749 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;
750 /* mmap supposedly does allocate-on-write for us */ 1020 /* 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); 1021 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
752 1022
753 if (cctx->sptr != (void *)-1) 1023 if (cctx->sptr != (void *)-1)
… …
774 stack_start = cctx->sptr; 1044 stack_start = cctx->sptr;
775 stack_size = cctx->ssize; 1045 stack_size = cctx->ssize;
776 } 1046 }
777 1047
778 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1048 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
779 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);
780 1050
781 return cctx; 1051 return cctx;
782} 1052}
783 1053
784static void 1054static void
… …
801 Safefree (cctx->sptr); 1071 Safefree (cctx->sptr);
802 1072
803 Safefree (cctx); 1073 Safefree (cctx);
804} 1074}
805 1075
1076/* wether this cctx should be destructed */
1077#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1078
806static coro_cctx * 1079static coro_cctx *
807cctx_get (pTHX) 1080cctx_get (pTHX)
808{ 1081{
809 while (cctx_first) 1082 while (expect_true (cctx_first))
810 { 1083 {
811 coro_cctx *cctx = cctx_first; 1084 coro_cctx *cctx = cctx_first;
812 cctx_first = cctx->next; 1085 cctx_first = cctx->next;
813 --cctx_idle; 1086 --cctx_idle;
814 1087
815 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1088 if (expect_true (!CCTX_EXPIRED (cctx)))
816 return cctx; 1089 return cctx;
817 1090
818 cctx_destroy (cctx); 1091 cctx_destroy (cctx);
819 } 1092 }
820 1093
… …
823 1096
824static void 1097static void
825cctx_put (coro_cctx *cctx) 1098cctx_put (coro_cctx *cctx)
826{ 1099{
827 /* free another cctx if overlimit */ 1100 /* free another cctx if overlimit */
828 if (cctx_idle >= MAX_IDLE_CCTX) 1101 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
829 { 1102 {
830 coro_cctx *first = cctx_first; 1103 coro_cctx *first = cctx_first;
831 cctx_first = first->next; 1104 cctx_first = first->next;
832 --cctx_idle; 1105 --cctx_idle;
833 1106
… …
839 cctx_first = cctx; 1112 cctx_first = cctx;
840} 1113}
841 1114
842/** coroutine switching *****************************************************/ 1115/** coroutine switching *****************************************************/
843 1116
844/* 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 */
845static void NOINLINE 1143static void NOINLINE
846transfer (pTHX_ struct coro *prev, struct coro *next) 1144transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
847{ 1145{
848 dSTACKLEVEL; 1146 dSTACKLEVEL;
1147 static volatile int has_throw;
849 1148
850 /* sometimes transfer is only called to set idle_sp */ 1149 /* sometimes transfer is only called to set idle_sp */
851 if (!next) 1150 if (expect_false (!next))
852 { 1151 {
853 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1152 ((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 */ 1153 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
855 } 1154 }
856 else if (prev != next) 1155 else if (expect_true (prev != next))
857 { 1156 {
858 coro_cctx *prev__cctx; 1157 coro_cctx *prev__cctx;
859 1158
860 if (prev->flags & CF_NEW) 1159 if (expect_false (prev->flags & CF_NEW))
861 { 1160 {
862 /* create a new empty context */ 1161 /* create a new empty context */
863 Newz (0, prev->cctx, 1, coro_cctx); 1162 Newz (0, prev->cctx, 1, coro_cctx);
864 prev->flags &= ~CF_NEW; 1163 prev->flags &= ~CF_NEW;
865 prev->flags |= CF_RUNNING; 1164 prev->flags |= CF_RUNNING;
866 } 1165 }
867 1166
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; 1167 prev->flags &= ~CF_RUNNING;
879 next->flags |= CF_RUNNING; 1168 next->flags |= CF_RUNNING;
880 1169
881 LOCK; 1170 LOCK;
882 1171
1172 /* first get rid of the old state */
1173 save_perl (aTHX_ prev);
1174
883 if (next->flags & CF_NEW) 1175 if (expect_false (next->flags & CF_NEW))
884 { 1176 {
885 /* need to start coroutine */ 1177 /* need to start coroutine */
886 next->flags &= ~CF_NEW; 1178 next->flags &= ~CF_NEW;
887 /* first get rid of the old state */
888 save_perl (aTHX_ prev);
889 /* setup coroutine call */ 1179 /* setup coroutine call */
890 setup_coro (aTHX_ next); 1180 coro_setup (aTHX_ next);
891 } 1181 }
892 else 1182 else
893 {
894 /* coroutine already started */
895 save_perl (aTHX_ prev);
896 load_perl (aTHX_ next); 1183 load_perl (aTHX_ next);
897 }
898 1184
899 prev__cctx = prev->cctx; 1185 prev__cctx = prev->cctx;
900 1186
901 /* possibly "free" the cctx */ 1187 /* possibly "free" the cctx */
1188 if (expect_true (
902 if (prev__cctx->idle_sp == STACKLEVEL) 1189 prev__cctx->idle_sp == STACKLEVEL
1190 && !(prev__cctx->flags & CC_TRACE)
1191 && !force_cctx
1192 ))
903 { 1193 {
904 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1194 /* 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)); 1195 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
906 1196
907 prev->cctx = 0; 1197 prev->cctx = 0;
908 1198
1199 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1200 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1201 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1202 if (!next->cctx)
1203 next->cctx = cctx_get (aTHX);
1204
909 cctx_put (prev__cctx); 1205 cctx_put (prev__cctx);
910 } 1206 }
911 1207
1208 ++next->usecount;
1209
912 if (!next->cctx) 1210 if (expect_true (!next->cctx))
913 next->cctx = cctx_get (aTHX); 1211 next->cctx = cctx_get (aTHX);
914 1212
1213 has_throw = !!next->throw;
1214
915 if (prev__cctx != next->cctx) 1215 if (expect_false (prev__cctx != next->cctx))
916 { 1216 {
917 prev__cctx->top_env = PL_top_env; 1217 prev__cctx->top_env = PL_top_env;
918 PL_top_env = next->cctx->top_env; 1218 PL_top_env = next->cctx->top_env;
919 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1219 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
920 } 1220 }
921 1221
922 free_coro_mortal (aTHX); 1222 free_coro_mortal (aTHX);
923 UNLOCK; 1223 UNLOCK;
1224
1225 if (expect_false (has_throw))
1226 {
1227 struct coro *coro = SvSTATE (coro_current);
1228
1229 if (coro->throw)
1230 {
1231 SV *exception = coro->throw;
1232 coro->throw = 0;
1233 sv_setsv (ERRSV, exception);
1234 croak (0);
1235 }
1236 }
924 } 1237 }
925} 1238}
926 1239
927struct transfer_args 1240struct transfer_args
928{ 1241{
929 struct coro *prev, *next; 1242 struct coro *prev, *next;
930}; 1243};
931 1244
1245#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
932#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1246#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
933 1247
934/** high level stuff ********************************************************/ 1248/** high level stuff ********************************************************/
935 1249
936static int 1250static int
937coro_state_destroy (pTHX_ struct coro *coro) 1251coro_state_destroy (pTHX_ struct coro *coro)
… …
954 1268
955 if (coro->mainstack && coro->mainstack != main_mainstack) 1269 if (coro->mainstack && coro->mainstack != main_mainstack)
956 { 1270 {
957 struct coro temp; 1271 struct coro temp;
958 1272
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) 1273 if (coro->flags & CF_RUNNING)
965 croak ("FATAL: tried to destroy currently running coroutine"); 1274 croak ("FATAL: tried to destroy currently running coroutine");
966 1275
967 save_perl (aTHX_ &temp); 1276 save_perl (aTHX_ &temp);
968 load_perl (aTHX_ coro); 1277 load_perl (aTHX_ coro);
969 1278
970 coro_destroy_stacks (aTHX); 1279 coro_destroy (aTHX_ coro);
971 1280
972 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1281 load_perl (aTHX_ &temp);
973 1282
974 coro->mainstack = 0; 1283 coro->slot = 0;
975 } 1284 }
976 1285
977 cctx_destroy (coro->cctx); 1286 cctx_destroy (coro->cctx);
978 SvREFCNT_dec (coro->args); 1287 SvREFCNT_dec (coro->args);
979 1288
… …
1020#else 1329#else
1021# define MGf_DUP 0 1330# define MGf_DUP 0
1022#endif 1331#endif
1023}; 1332};
1024 1333
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 1334static void
1049prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1335prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
1050{ 1336{
1051 ta->prev = SvSTATE (prev_sv); 1337 ta->prev = SvSTATE (prev_sv);
1052 ta->next = SvSTATE (next_sv); 1338 ta->next = SvSTATE (next_sv);
1339 TRANSFER_CHECK (*ta);
1053} 1340}
1054 1341
1055static void 1342static void
1056api_transfer (SV *prev_sv, SV *next_sv) 1343api_transfer (SV *prev_sv, SV *next_sv)
1057{ 1344{
1058 dTHX; 1345 dTHX;
1059 struct transfer_args ta; 1346 struct transfer_args ta;
1060 1347
1061 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1348 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1062 TRANSFER (ta); 1349 TRANSFER (ta, 1);
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} 1350}
1077 1351
1078/** Coro ********************************************************************/ 1352/** Coro ********************************************************************/
1079 1353
1080static void 1354static void
… …
1082{ 1356{
1083 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1357 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1084} 1358}
1085 1359
1086static SV * 1360static SV *
1087coro_deq (pTHX_ int min_prio) 1361coro_deq (pTHX)
1088{ 1362{
1089 int prio = PRIO_MAX - PRIO_MIN; 1363 int prio;
1090 1364
1091 min_prio -= PRIO_MIN;
1092 if (min_prio < 0)
1093 min_prio = 0;
1094
1095 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1365 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1096 if (AvFILLp (coro_ready [prio]) >= 0) 1366 if (AvFILLp (coro_ready [prio]) >= 0)
1097 return av_shift (coro_ready [prio]); 1367 return av_shift (coro_ready [prio]);
1098 1368
1099 return 0; 1369 return 0;
1100} 1370}
… …
1136 SV *prev_sv, *next_sv; 1406 SV *prev_sv, *next_sv;
1137 1407
1138 for (;;) 1408 for (;;)
1139 { 1409 {
1140 LOCK; 1410 LOCK;
1141 next_sv = coro_deq (aTHX_ PRIO_MIN); 1411 next_sv = coro_deq (aTHX);
1142 1412
1143 /* nothing to schedule: call the idle handler */ 1413 /* nothing to schedule: call the idle handler */
1144 if (!next_sv) 1414 if (expect_false (!next_sv))
1145 { 1415 {
1146 dSP; 1416 dSP;
1147 UNLOCK; 1417 UNLOCK;
1148 1418
1149 ENTER; 1419 ENTER;
1150 SAVETMPS; 1420 SAVETMPS;
1151 1421
1152 PUSHMARK (SP); 1422 PUSHMARK (SP);
1153 PUTBACK; 1423 PUTBACK;
1154 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1424 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1425 SPAGAIN;
1155 1426
1156 FREETMPS; 1427 FREETMPS;
1157 LEAVE; 1428 LEAVE;
1158 continue; 1429 continue;
1159 } 1430 }
1160 1431
1161 ta->next = SvSTATE (next_sv); 1432 ta->next = SvSTATE (next_sv);
1162 1433
1163 /* cannot transfer to destroyed coros, skip and look for next */ 1434 /* cannot transfer to destroyed coros, skip and look for next */
1164 if (ta->next->flags & CF_DESTROYED) 1435 if (expect_false (ta->next->flags & CF_DESTROYED))
1165 { 1436 {
1166 UNLOCK; 1437 UNLOCK;
1167 SvREFCNT_dec (next_sv); 1438 SvREFCNT_dec (next_sv);
1168 /* coro_nready is already taken care of by destroy */ 1439 /* coro_nready is already taken care of by destroy */
1169 continue; 1440 continue;
… …
1174 break; 1445 break;
1175 } 1446 }
1176 1447
1177 /* free this only after the transfer */ 1448 /* free this only after the transfer */
1178 prev_sv = SvRV (coro_current); 1449 prev_sv = SvRV (coro_current);
1179 SvRV_set (coro_current, next_sv);
1180 ta->prev = SvSTATE (prev_sv); 1450 ta->prev = SvSTATE (prev_sv);
1181 1451 TRANSFER_CHECK (*ta);
1182 assert (ta->next->flags & CF_READY); 1452 assert (ta->next->flags & CF_READY);
1183 ta->next->flags &= ~CF_READY; 1453 ta->next->flags &= ~CF_READY;
1454 SvRV_set (coro_current, next_sv);
1184 1455
1185 LOCK; 1456 LOCK;
1186 free_coro_mortal (aTHX); 1457 free_coro_mortal (aTHX);
1187 coro_mortal = prev_sv; 1458 coro_mortal = prev_sv;
1188 UNLOCK; 1459 UNLOCK;
… …
1214{ 1485{
1215 dTHX; 1486 dTHX;
1216 struct transfer_args ta; 1487 struct transfer_args ta;
1217 1488
1218 prepare_schedule (aTHX_ &ta); 1489 prepare_schedule (aTHX_ &ta);
1219 TRANSFER (ta); 1490 TRANSFER (ta, 1);
1220} 1491}
1221 1492
1222static int 1493static int
1223api_cede (void) 1494api_cede (void)
1224{ 1495{
1225 dTHX; 1496 dTHX;
1226 struct transfer_args ta; 1497 struct transfer_args ta;
1227 1498
1228 prepare_cede (aTHX_ &ta); 1499 prepare_cede (aTHX_ &ta);
1229 1500
1230 if (ta.prev != ta.next) 1501 if (expect_true (ta.prev != ta.next))
1231 { 1502 {
1232 TRANSFER (ta); 1503 TRANSFER (ta, 1);
1233 return 1; 1504 return 1;
1234 } 1505 }
1235 else 1506 else
1236 return 0; 1507 return 0;
1237} 1508}
… …
1242 dTHX; 1513 dTHX;
1243 struct transfer_args ta; 1514 struct transfer_args ta;
1244 1515
1245 if (prepare_cede_notself (aTHX_ &ta)) 1516 if (prepare_cede_notself (aTHX_ &ta))
1246 { 1517 {
1247 TRANSFER (ta); 1518 TRANSFER (ta, 1);
1248 return 1; 1519 return 1;
1249 } 1520 }
1250 else 1521 else
1251 return 0; 1522 return 0;
1252} 1523}
1253 1524
1525static void
1526api_trace (SV *coro_sv, int flags)
1527{
1528 dTHX;
1529 struct coro *coro = SvSTATE (coro_sv);
1530
1531 if (flags & CC_TRACE)
1532 {
1533 if (!coro->cctx)
1534 coro->cctx = cctx_new ();
1535 else if (!(coro->cctx->flags & CC_TRACE))
1536 croak ("cannot enable tracing on coroutine with custom stack");
1537
1538 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1539 }
1540 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1541 {
1542 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1543
1544 if (coro->flags & CF_RUNNING)
1545 PL_runops = RUNOPS_DEFAULT;
1546 else
1547 coro->slot->runops = RUNOPS_DEFAULT;
1548 }
1549}
1550
1254MODULE = Coro::State PACKAGE = Coro::State 1551MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1255 1552
1256PROTOTYPES: DISABLE 1553PROTOTYPES: DISABLE
1257 1554
1258BOOT: 1555BOOT:
1259{ 1556{
1260#ifdef USE_ITHREADS 1557#ifdef USE_ITHREADS
1261 MUTEX_INIT (&coro_mutex); 1558 MUTEX_INIT (&coro_mutex);
1262#endif 1559#endif
1263 BOOT_PAGESIZE; 1560 BOOT_PAGESIZE;
1264 1561
1562 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1563 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1564
1565 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1566 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1567 orig_sigelem_set = PL_vtbl_sigelem.svt_set;
1568 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1569
1570 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1571 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1572 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1573
1265 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1574 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1266 1575
1267 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV)); 1576 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1268 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV)); 1577 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)); 1578 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1273 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL)); 1579 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1274 1580
1275 main_mainstack = PL_mainstack; 1581 main_mainstack = PL_mainstack;
1276 main_top_env = PL_top_env; 1582 main_top_env = PL_top_env;
1277 1583
1278 while (main_top_env->je_prev) 1584 while (main_top_env->je_prev)
1279 main_top_env = main_top_env->je_prev; 1585 main_top_env = main_top_env->je_prev;
1280 1586
1281 coroapi.ver = CORO_API_VERSION; 1587 coroapi.ver = CORO_API_VERSION;
1588 coroapi.rev = CORO_API_REVISION;
1282 coroapi.transfer = api_transfer; 1589 coroapi.transfer = api_transfer;
1283 1590
1284 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1591 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1285} 1592}
1286 1593
1287SV * 1594SV *
1288new (char *klass, ...) 1595new (char *klass, ...)
1289 CODE: 1596 CODE:
1290{ 1597{
1291 struct coro *coro; 1598 struct coro *coro;
1599 MAGIC *mg;
1292 HV *hv; 1600 HV *hv;
1293 int i; 1601 int i;
1294 1602
1295 Newz (0, coro, 1, struct coro); 1603 Newz (0, coro, 1, struct coro);
1296 coro->args = newAV (); 1604 coro->args = newAV ();
1297 coro->save = CORO_SAVE_DEF;
1298 coro->flags = CF_NEW; 1605 coro->flags = CF_NEW;
1299 1606
1300 if (coro_first) coro_first->prev = coro; 1607 if (coro_first) coro_first->prev = coro;
1301 coro->next = coro_first; 1608 coro->next = coro_first;
1302 coro_first = coro; 1609 coro_first = coro;
1303 1610
1304 coro->hv = hv = newHV (); 1611 coro->hv = hv = newHV ();
1305 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1612 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1613 mg->mg_flags |= MGf_DUP;
1306 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1614 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1307 1615
1616 av_extend (coro->args, items - 1);
1308 for (i = 1; i < items; i++) 1617 for (i = 1; i < items; i++)
1309 av_push (coro->args, newSVsv (ST (i))); 1618 av_push (coro->args, newSVsv (ST (i)));
1310} 1619}
1311 OUTPUT: 1620 OUTPUT:
1312 RETVAL 1621 RETVAL
1313 1622
1314int 1623# these not obviously related functions are all rolled into the same xs
1315save (SV *coro, int new_save = -1) 1624# function to increase chances that they all will call transfer with the same
1316 CODE: 1625# 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 1626void
1333_set_stacklevel (...) 1627_set_stacklevel (...)
1334 ALIAS: 1628 ALIAS:
1335 Coro::State::transfer = 1 1629 Coro::State::transfer = 1
1336 Coro::schedule = 2 1630 Coro::schedule = 2
… …
1338 Coro::cede_notself = 4 1632 Coro::cede_notself = 4
1339 CODE: 1633 CODE:
1340{ 1634{
1341 struct transfer_args ta; 1635 struct transfer_args ta;
1342 1636
1637 PUTBACK;
1343 switch (ix) 1638 switch (ix)
1344 { 1639 {
1345 case 0: 1640 case 0:
1346 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1641 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1347 ta.next = 0; 1642 ta.next = 0;
… …
1366 if (!prepare_cede_notself (aTHX_ &ta)) 1661 if (!prepare_cede_notself (aTHX_ &ta))
1367 XSRETURN_EMPTY; 1662 XSRETURN_EMPTY;
1368 1663
1369 break; 1664 break;
1370 } 1665 }
1666 SPAGAIN;
1371 1667
1372 BARRIER; 1668 BARRIER;
1669 PUTBACK;
1373 TRANSFER (ta); 1670 TRANSFER (ta, 0);
1374 1671 SPAGAIN; /* might be the sp of a different coroutine now */
1375 if (GIMME_V != G_VOID && ta.next != ta.prev) 1672 /* be extra careful not to ever do anything after TRANSFER */
1376 XSRETURN_YES;
1377} 1673}
1378 1674
1379bool 1675bool
1380_destroy (SV *coro_sv) 1676_destroy (SV *coro_sv)
1381 CODE: 1677 CODE:
… …
1430 CODE: 1726 CODE:
1431{ 1727{
1432 if (coro->mainstack) 1728 if (coro->mainstack)
1433 { 1729 {
1434 struct coro temp; 1730 struct coro temp;
1435 Zero (&temp, 1, struct coro);
1436 temp.save = CORO_SAVE_ALL;
1437 1731
1438 if (!(coro->flags & CF_RUNNING)) 1732 if (!(coro->flags & CF_RUNNING))
1439 { 1733 {
1734 PUTBACK;
1440 save_perl (aTHX_ &temp); 1735 save_perl (aTHX_ &temp);
1441 load_perl (aTHX_ coro); 1736 load_perl (aTHX_ coro);
1442 } 1737 }
1443 1738
1444 { 1739 {
1445 dSP; 1740 dSP;
1446 ENTER; 1741 ENTER;
1447 SAVETMPS; 1742 SAVETMPS;
1743 PUTBACK;
1744 PUSHSTACK;
1448 PUSHMARK (SP); 1745 PUSHMARK (SP);
1449 PUTBACK; 1746
1450 if (ix) 1747 if (ix)
1451 eval_sv (coderef, 0); 1748 eval_sv (coderef, 0);
1452 else 1749 else
1453 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1750 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1751
1752 POPSTACK;
1454 SPAGAIN; 1753 SPAGAIN;
1455 FREETMPS; 1754 FREETMPS;
1456 LEAVE; 1755 LEAVE;
1457 PUTBACK; 1756 PUTBACK;
1458 } 1757 }
1459 1758
1460 if (!(coro->flags & CF_RUNNING)) 1759 if (!(coro->flags & CF_RUNNING))
1461 { 1760 {
1462 save_perl (aTHX_ coro); 1761 save_perl (aTHX_ coro);
1463 load_perl (aTHX_ &temp); 1762 load_perl (aTHX_ &temp);
1763 SPAGAIN;
1464 } 1764 }
1465 } 1765 }
1466} 1766}
1467 1767
1468SV * 1768SV *
1469is_ready (Coro::State coro) 1769is_ready (Coro::State coro)
1470 PROTOTYPE: $ 1770 PROTOTYPE: $
1471 ALIAS: 1771 ALIAS:
1472 is_ready = CF_READY 1772 is_ready = CF_READY
… …
1477 RETVAL = boolSV (coro->flags & ix); 1777 RETVAL = boolSV (coro->flags & ix);
1478 OUTPUT: 1778 OUTPUT:
1479 RETVAL 1779 RETVAL
1480 1780
1481void 1781void
1482trace (Coro::State coro, int enable = 0) 1782api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1483 CODE:
1484 if (enable)
1485 {
1486 if (coro->cctx && coro->cctx->flags & CC_TRACE)
1487 XSRETURN_EMPTY;
1488
1489 if (coro->flags & CF_RUNNING)
1490 croak ("cannot enable tracing on running coroutine");
1491
1492 if (coro->cctx)
1493 croak ("cannot enable tracing on coroutine with custom stack");
1494
1495 coro->cctx = cctx_new ();
1496 coro->cctx->flags |= CC_TRACE;
1497 }
1498 else
1499 if (coro->cctx && coro->cctx->flags & CC_TRACE)
1500 {
1501 coro->cctx->flags &= ~CC_TRACE;
1502 coro->cctx->flags |= CC_NOREUSE;
1503 }
1504 1783
1505SV * 1784SV *
1506has_stack (Coro::State coro) 1785has_stack (Coro::State coro)
1507 PROTOTYPE: $ 1786 PROTOTYPE: $
1508 CODE: 1787 CODE:
1509 RETVAL = boolSV (!!coro->cctx); 1788 RETVAL = boolSV (!!coro->cctx);
1510 OUTPUT: 1789 OUTPUT:
1511 RETVAL 1790 RETVAL
1512 1791
1792int
1793is_traced (Coro::State coro)
1794 PROTOTYPE: $
1795 CODE:
1796 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1797 OUTPUT:
1798 RETVAL
1799
1513IV 1800IV
1514rss (Coro::State coro) 1801rss (Coro::State coro)
1515 PROTOTYPE: $ 1802 PROTOTYPE: $
1803 ALIAS:
1804 usecount = 1
1516 CODE: 1805 CODE:
1517 RETVAL = coro_rss (coro); 1806 switch (ix)
1807 {
1808 case 0: RETVAL = coro_rss (aTHX_ coro); break;
1809 case 1: RETVAL = coro->usecount; break;
1810 }
1518 OUTPUT: 1811 OUTPUT:
1519 RETVAL 1812 RETVAL
1520 1813
1814void
1815force_cctx ()
1816 CODE:
1817 struct coro *coro = SvSTATE (coro_current);
1818 coro->cctx->idle_sp = 0;
1521 1819
1522MODULE = Coro::State PACKAGE = Coro 1820MODULE = Coro::State PACKAGE = Coro
1523 1821
1524BOOT: 1822BOOT:
1525{ 1823{
1526 int i; 1824 int i;
1527 1825
1528 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1826 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1529 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1827 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1530 av_async_pool = get_av ("Coro::async_pool", TRUE); 1828 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1531 1829
1532 coro_current = get_sv ("Coro::current", FALSE); 1830 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1533 SvREADONLY_on (coro_current); 1831 SvREADONLY_on (coro_current);
1534 1832
1535 coro_stash = gv_stashpv ("Coro", TRUE); 1833 coro_stash = gv_stashpv ("Coro", TRUE);
1536 1834
1537 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1835 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1538 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1836 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1539 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1837 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1540 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1838 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
… …
1543 1841
1544 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1842 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1545 coro_ready[i] = newAV (); 1843 coro_ready[i] = newAV ();
1546 1844
1547 { 1845 {
1548 SV *sv = perl_get_sv("Coro::API", 1); 1846 SV *sv = perl_get_sv ("Coro::API", TRUE);
1847 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1549 1848
1550 coroapi.schedule = api_schedule; 1849 coroapi.schedule = api_schedule;
1551 coroapi.save = api_save;
1552 coroapi.cede = api_cede; 1850 coroapi.cede = api_cede;
1553 coroapi.cede_notself = api_cede_notself; 1851 coroapi.cede_notself = api_cede_notself;
1554 coroapi.ready = api_ready; 1852 coroapi.ready = api_ready;
1555 coroapi.is_ready = api_is_ready; 1853 coroapi.is_ready = api_is_ready;
1556 coroapi.nready = &coro_nready; 1854 coroapi.nready = &coro_nready;
… …
1605 CODE: 1903 CODE:
1606 RETVAL = coro_nready; 1904 RETVAL = coro_nready;
1607 OUTPUT: 1905 OUTPUT:
1608 RETVAL 1906 RETVAL
1609 1907
1908void
1909throw (Coro::State self, SV *throw = &PL_sv_undef)
1910 PROTOTYPE: $;$
1911 CODE:
1912 SvREFCNT_dec (self->throw);
1913 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1914
1915void
1916swap_defsv (Coro::State self)
1917 PROTOTYPE: $
1918 ALIAS:
1919 swap_defav = 1
1920 CODE:
1921 if (!self->slot)
1922 croak ("cannot swap state with coroutine that has no saved state");
1923 else
1924 {
1925 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1926 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1927
1928 SV *tmp = *src; *src = *dst; *dst = tmp;
1929 }
1930
1610# for async_pool speedup 1931# for async_pool speedup
1611void 1932void
1612_pool_1 (SV *cb) 1933_pool_1 (SV *cb)
1613 CODE: 1934 CODE:
1614{ 1935{
1615 int i, len; 1936 struct coro *coro = SvSTATE (coro_current);
1616 HV *hv = (HV *)SvRV (coro_current); 1937 HV *hv = (HV *)SvRV (coro_current);
1617 AV *defav = GvAV (PL_defgv); 1938 AV *defav = GvAV (PL_defgv);
1618 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1939 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1619 AV *invoke_av; 1940 AV *invoke_av;
1941 int i, len;
1620 1942
1621 if (!invoke) 1943 if (!invoke)
1944 {
1945 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1622 croak ("\3terminate\2\n"); 1946 croak ("\3async_pool terminate\2\n");
1947 }
1948
1949 SvREFCNT_dec (coro->saved_deffh);
1950 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1623 1951
1624 hv_store (hv, "desc", sizeof ("desc") - 1, 1952 hv_store (hv, "desc", sizeof ("desc") - 1,
1625 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1953 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1626 1954
1627 invoke_av = (AV *)SvRV (invoke); 1955 invoke_av = (AV *)SvRV (invoke);
… …
1645{ 1973{
1646 struct coro *coro = SvSTATE (coro_current); 1974 struct coro *coro = SvSTATE (coro_current);
1647 1975
1648 sv_setsv (cb, &PL_sv_undef); 1976 sv_setsv (cb, &PL_sv_undef);
1649 1977
1978 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1979 coro->saved_deffh = 0;
1980
1650 if (coro_rss (coro) > SvIV (sv_pool_rss) 1981 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1651 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1982 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1983 {
1984 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1652 croak ("\3terminate\2\n"); 1985 croak ("\3async_pool terminate\2\n");
1986 }
1653 1987
1654 av_clear (GvAV (PL_defgv)); 1988 av_clear (GvAV (PL_defgv));
1655 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1989 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1656 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1990 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1657 coro->save = CORO_SAVE_DEF; 1991
1658 coro->prio = 0; 1992 coro->prio = 0;
1993
1994 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1995 api_trace (coro_current, 0);
1996
1659 av_push (av_async_pool, newSVsv (coro_current)); 1997 av_push (av_async_pool, newSVsv (coro_current));
1660} 1998}
1661 1999
1662 2000
1663MODULE = Coro::State PACKAGE = Coro::AIO 2001MODULE = Coro::State PACKAGE = Coro::AIO

Diff Legend

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