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

Diff Legend

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