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

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

Diff Legend

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