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.182 by root, Wed Oct 3 18:37:48 2007 UTC vs.
Revision 1.223 by root, Wed Feb 13 15:46:00 2008 UTC

1#include "libcoro/coro.c" 1#include "libcoro/coro.c"
2 2
3#define PERL_NO_GET_CONTEXT 3#define PERL_NO_GET_CONTEXT
4#define PERL_EXT
4 5
5#include "EXTERN.h" 6#include "EXTERN.h"
6#include "perl.h" 7#include "perl.h"
7#include "XSUB.h" 8#include "XSUB.h"
8 9
9#include "patchlevel.h" 10#include "patchlevel.h"
10 11
11#include <stdio.h> 12#include <stdio.h>
12#include <errno.h> 13#include <errno.h>
13#include <assert.h> 14#include <assert.h>
15#include <inttypes.h> /* portable stdint.h */
14 16
15#ifdef HAVE_MMAP 17#ifdef HAVE_MMAP
16# include <unistd.h> 18# include <unistd.h>
17# include <sys/mman.h> 19# include <sys/mman.h>
18# ifndef MAP_ANONYMOUS 20# ifndef MAP_ANONYMOUS
70# ifndef IS_PADCONST 72# ifndef IS_PADCONST
71# define IS_PADCONST(v) 0 73# define IS_PADCONST(v) 0
72# endif 74# endif
73#endif 75#endif
74 76
77/* 5.8.8 */
78#ifndef GV_NOTQUAL
79# define GV_NOTQUAL 0
80#endif
81#ifndef newSV
82# define newSV(l) NEWSV(0,l)
83#endif
84
85/* 5.11 */
86#ifndef CxHASARGS
87# define CxHASARGS(cx) (cx)->blk_sub.hasargs
88#endif
89
75/* 5.8.7 */ 90/* 5.8.7 */
76#ifndef SvRV_set 91#ifndef SvRV_set
77# define SvRV_set(s,v) SvRV(s) = (v) 92# define SvRV_set(s,v) SvRV(s) = (v)
78#endif 93#endif
79 94
98#define IN_DESTRUCT (PL_main_cv == Nullcv) 113#define IN_DESTRUCT (PL_main_cv == Nullcv)
99 114
100#if __GNUC__ >= 3 115#if __GNUC__ >= 3
101# define attribute(x) __attribute__(x) 116# define attribute(x) __attribute__(x)
102# define BARRIER __asm__ __volatile__ ("" : : : "memory") 117# define BARRIER __asm__ __volatile__ ("" : : : "memory")
118# define expect(expr,value) __builtin_expect ((expr),(value))
103#else 119#else
104# define attribute(x) 120# define attribute(x)
105# define BARRIER 121# define BARRIER
122# define expect(expr,value) (expr)
106#endif 123#endif
124
125#define expect_false(expr) expect ((expr) != 0, 0)
126#define expect_true(expr) expect ((expr) != 0, 1)
107 127
108#define NOINLINE attribute ((noinline)) 128#define NOINLINE attribute ((noinline))
109 129
110#include "CoroAPI.h" 130#include "CoroAPI.h"
111 131
130static size_t coro_stacksize = CORO_STACKSIZE; 150static size_t coro_stacksize = CORO_STACKSIZE;
131static struct CoroAPI coroapi; 151static struct CoroAPI coroapi;
132static AV *main_mainstack; /* used to differentiate between $main and others */ 152static AV *main_mainstack; /* used to differentiate between $main and others */
133static JMPENV *main_top_env; 153static JMPENV *main_top_env;
134static HV *coro_state_stash, *coro_stash; 154static HV *coro_state_stash, *coro_stash;
135static SV *coro_mortal; /* will be freed after next transfer */ 155static volatile SV *coro_mortal; /* will be freed after next transfer */
136 156
137static GV *irsgv; /* $/ */ 157static GV *irsgv; /* $/ */
158static GV *stdoutgv; /* *STDOUT */
159static SV *rv_diehook;
160static SV *rv_warnhook;
161static HV *hv_sig; /* %SIG */
138 162
139/* async_pool helper stuff */ 163/* async_pool helper stuff */
140static SV *sv_pool_rss; 164static SV *sv_pool_rss;
141static SV *sv_pool_size; 165static SV *sv_pool_size;
142static AV *av_async_pool; 166static AV *av_async_pool;
178 CF_READY = 0x0002, /* coroutine is ready */ 202 CF_READY = 0x0002, /* coroutine is ready */
179 CF_NEW = 0x0004, /* has never been switched to */ 203 CF_NEW = 0x0004, /* has never been switched to */
180 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 204 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
181}; 205};
182 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
183/* this is a structure representing a perl-level coroutine */ 220/* this is a structure representing a perl-level coroutine */
184struct coro { 221struct coro {
185 /* the c coroutine allocated to this perl coroutine, if any */ 222 /* the c coroutine allocated to this perl coroutine, if any */
186 coro_cctx *cctx; 223 coro_cctx *cctx;
187 224
225 /* process data */
226 AV *mainstack;
227 perl_slots *slot; /* basically the saved sp */
228
188 /* data associated with this coroutine (initial args) */ 229 AV *args; /* data associated with this coroutine (initial args) */
189 AV *args; 230 int refcnt; /* coroutines are refcounted, yes */
190 int refcnt;
191 int flags; /* CF_ flags */ 231 int flags; /* CF_ flags */
192 232 HV *hv; /* the perl hash associated with this coro, if any */
193 /* optionally saved, might be zero */
194 AV *defav; /* @_ */
195 SV *defsv; /* $_ */
196 SV *errsv; /* $@ */
197 GV *deffh; /* default filehandle */
198 SV *irssv; /* $/ */
199 SV *irssv_sv; /* real $/ cache */
200
201#define VAR(name,type) type name;
202# include "state.h"
203#undef VAR
204 233
205 /* statistics */ 234 /* statistics */
206 int usecount; /* number of transfers to this coro */ 235 int usecount; /* number of transfers to this coro */
207 236
208 /* coro process data */ 237 /* coro process data */
209 int prio; 238 int prio;
210 //SV *throw; 239 SV *throw; /* exception to be thrown */
211 240
212 /* async_pool */ 241 /* async_pool */
213 GV *asp_deffh; 242 SV *saved_deffh;
214 243
215 /* linked list */ 244 /* linked list */
216 struct coro *next, *prev; 245 struct coro *next, *prev;
217 HV *hv; /* the perl hash associated with this coro, if any */
218}; 246};
219 247
220typedef struct coro *Coro__State; 248typedef struct coro *Coro__State;
221typedef struct coro *Coro__State_or_hashref; 249typedef struct coro *Coro__State_or_hashref;
222 250
234static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 262static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
235static int coro_nready; 263static int coro_nready;
236static struct coro *coro_first; 264static struct coro *coro_first;
237 265
238/** 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}
239 297
240static AV * 298static AV *
241coro_clone_padlist (pTHX_ CV *cv) 299coro_clone_padlist (pTHX_ CV *cv)
242{ 300{
243 AV *padlist = CvPADLIST (cv); 301 AV *padlist = CvPADLIST (cv);
291 349
292 /* casting is fun. */ 350 /* casting is fun. */
293 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 351 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
294 free_padlist (aTHX_ padlist); 352 free_padlist (aTHX_ padlist);
295 353
296 SvREFCNT_dec (av);
297
298 return 0; 354 return 0;
299} 355}
300 356
301#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
302 359
303static 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};
304 364
305#define CORO_MAGIC(cv) \ 365#define CORO_MAGIC(sv,type) \
306 SvMAGIC (cv) \ 366 SvMAGIC (sv) \
307 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 367 ? SvMAGIC (sv)->mg_type == type \
308 ? SvMAGIC (cv) \ 368 ? SvMAGIC (sv) \
309 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 369 : mg_find (sv, type) \
310 : 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)
311 374
312static struct coro * 375static struct coro *
313SvSTATE_ (pTHX_ SV *coro) 376SvSTATE_ (pTHX_ SV *coro)
314{ 377{
315 HV *stash; 378 HV *stash;
316 MAGIC *mg; 379 MAGIC *mg;
317 380
318 if (SvROK (coro)) 381 if (SvROK (coro))
319 coro = SvRV (coro); 382 coro = SvRV (coro);
320 383
321 if (SvTYPE (coro) != SVt_PVHV) 384 if (expect_false (SvTYPE (coro) != SVt_PVHV))
322 croak ("Coro::State object required"); 385 croak ("Coro::State object required");
323 386
324 stash = SvSTASH (coro); 387 stash = SvSTASH (coro);
325 if (stash != coro_stash && stash != coro_state_stash) 388 if (expect_false (stash != coro_stash && stash != coro_state_stash))
326 { 389 {
327 /* very slow, but rare, check */ 390 /* very slow, but rare, check */
328 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 391 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
329 croak ("Coro::State object required"); 392 croak ("Coro::State object required");
330 } 393 }
331 394
332 mg = CORO_MAGIC (coro); 395 mg = CORO_MAGIC_state (coro);
333 return (struct coro *)mg->mg_ptr; 396 return (struct coro *)mg->mg_ptr;
334} 397}
335 398
336#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 399#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
337 400
338/* the next two functions merely cache the padlists */ 401/* the next two functions merely cache the padlists */
339static void 402static void
340get_padlist (pTHX_ CV *cv) 403get_padlist (pTHX_ CV *cv)
341{ 404{
342 MAGIC *mg = CORO_MAGIC (cv); 405 MAGIC *mg = CORO_MAGIC_cv (cv);
343 AV *av; 406 AV *av;
344 407
345 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 408 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
346 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 409 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
347 else 410 else
348 { 411 {
349#if CORO_PREFER_PERL_FUNCTIONS 412#if CORO_PREFER_PERL_FUNCTIONS
350 /* this is probably cleaner, but also slower? */ 413 /* this is probably cleaner, but also slower? */
359} 422}
360 423
361static void 424static void
362put_padlist (pTHX_ CV *cv) 425put_padlist (pTHX_ CV *cv)
363{ 426{
364 MAGIC *mg = CORO_MAGIC (cv); 427 MAGIC *mg = CORO_MAGIC_cv (cv);
365 AV *av; 428 AV *av;
366 429
367 if (!mg) 430 if (expect_false (!mg))
368 { 431 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
369 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
370 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
371 mg->mg_virtual = &vtbl_coro;
372 mg->mg_obj = (SV *)newAV ();
373 }
374 432
375 av = (AV *)mg->mg_obj; 433 av = (AV *)mg->mg_obj;
376 434
377 if (AvFILLp (av) >= AvMAX (av)) 435 if (expect_false (AvFILLp (av) >= AvMAX (av)))
378 av_extend (av, AvMAX (av) + 1); 436 av_extend (av, AvMAX (av) + 1);
379 437
380 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 438 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
381} 439}
382 440
383/** load & save, init *******************************************************/ 441/** load & save, init *******************************************************/
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 GvSV (PL_defgv) = c->defsv;
393 GvAV (PL_defgv) = c->defav;
394 GvSV (PL_errgv) = c->errsv;
395 PL_defoutgv = c->deffh;
396 PL_rs = c->irssv;
397 GvSV (irsgv) = c->irssv_sv;
398 459
399 { 460 {
400 dSP; 461 dSP;
462
401 CV *cv; 463 CV *cv;
402 464
403 /* now do the ugly restore mess */ 465 /* now do the ugly restore mess */
404 while ((cv = (CV *)POPs)) 466 while (expect_true (cv = (CV *)POPs))
405 { 467 {
406 put_padlist (aTHX_ cv); /* mark this padlist as available */ 468 put_padlist (aTHX_ cv); /* mark this padlist as available */
407 CvDEPTH (cv) = PTR2IV (POPs); 469 CvDEPTH (cv) = PTR2IV (POPs);
408 CvPADLIST (cv) = (AV *)POPs; 470 CvPADLIST (cv) = (AV *)POPs;
409 } 471 }
428 490
429 XPUSHs (Nullsv); 491 XPUSHs (Nullsv);
430 /* this loop was inspired by pp_caller */ 492 /* this loop was inspired by pp_caller */
431 for (;;) 493 for (;;)
432 { 494 {
433 while (cxix >= 0) 495 while (expect_true (cxix >= 0))
434 { 496 {
435 PERL_CONTEXT *cx = &ccstk[cxix--]; 497 PERL_CONTEXT *cx = &ccstk[cxix--];
436 498
437 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 499 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
438 { 500 {
439 CV *cv = cx->blk_sub.cv; 501 CV *cv = cx->blk_sub.cv;
440 502
441 if (CvDEPTH (cv)) 503 if (expect_true (CvDEPTH (cv)))
442 { 504 {
443 EXTEND (SP, 3); 505 EXTEND (SP, 3);
444 PUSHs ((SV *)CvPADLIST (cv)); 506 PUSHs ((SV *)CvPADLIST (cv));
445 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 507 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
446 PUSHs ((SV *)cv); 508 PUSHs ((SV *)cv);
449 get_padlist (aTHX_ cv); 511 get_padlist (aTHX_ cv);
450 } 512 }
451 } 513 }
452 } 514 }
453 515
454 if (top_si->si_type == PERLSI_MAIN) 516 if (expect_true (top_si->si_type == PERLSI_MAIN))
455 break; 517 break;
456 518
457 top_si = top_si->si_prev; 519 top_si = top_si->si_prev;
458 ccstk = top_si->si_cxstack; 520 ccstk = top_si->si_cxstack;
459 cxix = top_si->si_cxix; 521 cxix = top_si->si_cxix;
460 } 522 }
461 523
462 PUTBACK; 524 PUTBACK;
463 } 525 }
464 526
527 /* allocate some space on the context stack for our purposes */
528 /* we manually unroll here, as usually 2 slots is enough */
529 if (SLOT_COUNT >= 1) CXINC;
530 if (SLOT_COUNT >= 2) CXINC;
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 */
538
539 c->mainstack = PL_mainstack;
540
541 {
542 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
543
465 c->defav = GvAV (PL_defgv); 544 slot->defav = GvAV (PL_defgv);
466 c->defsv = DEFSV; 545 slot->defsv = DEFSV;
467 c->errsv = ERRSV; 546 slot->errsv = ERRSV;
468 c->deffh = PL_defoutgv;
469 c->irssv = PL_rs;
470 c->irssv_sv = GvSV (irsgv); 547 slot->irsgv = GvSV (irsgv);
471 548
472#define VAR(name,type)c->name = PL_ ## name; 549 #define VAR(name,type) slot->name = PL_ ## name;
473# include "state.h" 550 # include "state.h"
474#undef VAR 551 #undef VAR
552 }
475} 553}
476 554
477/* 555/*
478 * allocate various perl stacks. This is an exact copy 556 * allocate various perl stacks. This is an exact copy
479 * of perl.c:init_stacks, except that it uses less memory 557 * of perl.c:init_stacks, except that it uses less memory
484# define coro_init_stacks init_stacks 562# define coro_init_stacks init_stacks
485#else 563#else
486static void 564static void
487coro_init_stacks (pTHX) 565coro_init_stacks (pTHX)
488{ 566{
489 PL_curstackinfo = new_stackinfo(64, 6); 567 PL_curstackinfo = new_stackinfo(32, 8);
490 PL_curstackinfo->si_type = PERLSI_MAIN; 568 PL_curstackinfo->si_type = PERLSI_MAIN;
491 PL_curstack = PL_curstackinfo->si_stack; 569 PL_curstack = PL_curstackinfo->si_stack;
492 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 570 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
493 571
494 PL_stack_base = AvARRAY(PL_curstack); 572 PL_stack_base = AvARRAY(PL_curstack);
495 PL_stack_sp = PL_stack_base; 573 PL_stack_sp = PL_stack_base;
496 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 574 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
497 575
498 New(50,PL_tmps_stack,64,SV*); 576 New(50,PL_tmps_stack,32,SV*);
499 PL_tmps_floor = -1; 577 PL_tmps_floor = -1;
500 PL_tmps_ix = -1; 578 PL_tmps_ix = -1;
501 PL_tmps_max = 64; 579 PL_tmps_max = 32;
502 580
503 New(54,PL_markstack,16,I32); 581 New(54,PL_markstack,16,I32);
504 PL_markstack_ptr = PL_markstack; 582 PL_markstack_ptr = PL_markstack;
505 PL_markstack_max = PL_markstack + 16; 583 PL_markstack_max = PL_markstack + 16;
506 584
507#ifdef SET_MARK_OFFSET 585#ifdef SET_MARK_OFFSET
508 SET_MARK_OFFSET; 586 SET_MARK_OFFSET;
509#endif 587#endif
510 588
511 New(54,PL_scopestack,16,I32); 589 New(54,PL_scopestack,8,I32);
512 PL_scopestack_ix = 0; 590 PL_scopestack_ix = 0;
513 PL_scopestack_max = 16; 591 PL_scopestack_max = 8;
514 592
515 New(54,PL_savestack,64,ANY); 593 New(54,PL_savestack,24,ANY);
516 PL_savestack_ix = 0; 594 PL_savestack_ix = 0;
517 PL_savestack_max = 64; 595 PL_savestack_max = 24;
518 596
519#if !PERL_VERSION_ATLEAST (5,9,0) 597#if !PERL_VERSION_ATLEAST (5,9,0)
520 New(54,PL_retstack,4,OP*); 598 New(54,PL_retstack,4,OP*);
521 PL_retstack_ix = 0; 599 PL_retstack_ix = 0;
522 PL_retstack_max = 4; 600 PL_retstack_max = 4;
555} 633}
556 634
557static size_t 635static size_t
558coro_rss (pTHX_ struct coro *coro) 636coro_rss (pTHX_ struct coro *coro)
559{ 637{
560 size_t rss = sizeof (coro); 638 size_t rss = sizeof (*coro);
561 639
562 if (coro->mainstack) 640 if (coro->mainstack)
563 { 641 {
642 perl_slots tmp_slot;
643 perl_slots *slot;
644
564 if (coro->flags & CF_RUNNING) 645 if (coro->flags & CF_RUNNING)
565 { 646 {
647 slot = &tmp_slot;
648
566 #define VAR(name,type)coro->name = PL_ ## name; 649 #define VAR(name,type) slot->name = PL_ ## name;
567 # include "state.h" 650 # include "state.h"
568 #undef VAR 651 #undef VAR
569 } 652 }
653 else
654 slot = coro->slot;
570 655
571 rss += sizeof (coro->curstackinfo); 656 rss += sizeof (slot->curstackinfo);
572 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
573 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 657 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
574 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 658 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
575 rss += coro->tmps_max * sizeof (SV *); 659 rss += slot->tmps_max * sizeof (SV *);
576 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 660 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
577 rss += coro->scopestack_max * sizeof (I32); 661 rss += slot->scopestack_max * sizeof (I32);
578 rss += coro->savestack_max * sizeof (ANY); 662 rss += slot->savestack_max * sizeof (ANY);
579 663
580#if !PERL_VERSION_ATLEAST (5,9,0) 664#if !PERL_VERSION_ATLEAST (5,9,0)
581 rss += coro->retstack_max * sizeof (OP *); 665 rss += slot->retstack_max * sizeof (OP *);
582#endif 666#endif
583 } 667 }
584 668
585 return rss; 669 return rss;
586} 670}
587 671
588/** coroutine stack handling ************************************************/ 672/** coroutine stack handling ************************************************/
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}
589 723
590static void 724static void
591coro_setup (pTHX_ struct coro *coro) 725coro_setup (pTHX_ struct coro *coro)
592{ 726{
593 /* 727 /*
598 PL_runops = RUNOPS_DEFAULT; 732 PL_runops = RUNOPS_DEFAULT;
599 PL_curcop = &PL_compiling; 733 PL_curcop = &PL_compiling;
600 PL_in_eval = EVAL_NULL; 734 PL_in_eval = EVAL_NULL;
601 PL_comppad = 0; 735 PL_comppad = 0;
602 PL_curpm = 0; 736 PL_curpm = 0;
737 PL_curpad = 0;
603 PL_localizing = 0; 738 PL_localizing = 0;
604 PL_dirty = 0; 739 PL_dirty = 0;
605 PL_restartop = 0; 740 PL_restartop = 0;
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);
606 745
607 GvSV (PL_defgv) = NEWSV (0, 0); 746 GvSV (PL_defgv) = newSV (0);
608 GvAV (PL_defgv) = coro->args; coro->args = 0; 747 GvAV (PL_defgv) = coro->args; coro->args = 0;
609 GvSV (PL_errgv) = NEWSV (0, 0); 748 GvSV (PL_errgv) = newSV (0);
610 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 749 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
611 PL_rs = newSVsv (GvSV (irsgv)); 750 PL_rs = newSVsv (GvSV (irsgv));
612 751 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
613 {
614 IO *io = newIO ();
615 PL_defoutgv = newGVgen ("Coro");
616 GvIOp(PL_defoutgv) = io;
617 IoTYPE (io) = IoTYPE_WRONLY;
618 IoOFP (io) = IoIFP (io) = PerlIO_stdout ();
619 IoFLAGS (io) |= IOf_FLUSH;
620 }
621 752
622 { 753 {
623 dSP; 754 dSP;
624 LOGOP myop; 755 LOGOP myop;
625 756
626 Zero (&myop, 1, LOGOP); 757 Zero (&myop, 1, LOGOP);
627 myop.op_next = Nullop; 758 myop.op_next = Nullop;
628 myop.op_flags = OPf_WANT_VOID; 759 myop.op_flags = OPf_WANT_VOID;
629 760
630 PUSHMARK (SP); 761 PUSHMARK (SP);
631 XPUSHs (av_shift (GvAV (PL_defgv))); 762 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
632 PUTBACK; 763 PUTBACK;
633 PL_op = (OP *)&myop; 764 PL_op = (OP *)&myop;
634 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 765 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
635 SPAGAIN; 766 SPAGAIN;
636 } 767 }
637 768
638 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;
639} 775}
640 776
641static void 777static void
642coro_destroy (pTHX_ struct coro *coro) 778coro_destroy (pTHX_ struct coro *coro)
643{ 779{
663 SvREFCNT_dec (GvSV (PL_errgv)); 799 SvREFCNT_dec (GvSV (PL_errgv));
664 SvREFCNT_dec (PL_defoutgv); 800 SvREFCNT_dec (PL_defoutgv);
665 SvREFCNT_dec (PL_rs); 801 SvREFCNT_dec (PL_rs);
666 SvREFCNT_dec (GvSV (irsgv)); 802 SvREFCNT_dec (GvSV (irsgv));
667 803
804 SvREFCNT_dec (PL_diehook);
805 SvREFCNT_dec (PL_warnhook);
806
668 SvREFCNT_dec (coro->asp_deffh); 807 SvREFCNT_dec (coro->saved_deffh);
669 //SvREFCNT_dec (coro->throw); 808 SvREFCNT_dec (coro->throw);
670 809
671 coro_destroy_stacks (aTHX); 810 coro_destroy_stacks (aTHX);
672} 811}
673 812
674static void 813static void
675free_coro_mortal (pTHX) 814free_coro_mortal (pTHX)
676{ 815{
677 if (coro_mortal) 816 if (expect_true (coro_mortal))
678 { 817 {
679 SvREFCNT_dec (coro_mortal); 818 SvREFCNT_dec (coro_mortal);
680 coro_mortal = 0; 819 coro_mortal = 0;
681 } 820 }
682} 821}
711 bot = PL_stack_base + cx->blk_oldsp + 1; 850 bot = PL_stack_base + cx->blk_oldsp + 1;
712 top = cx->blk_gimme == G_ARRAY ? SP + 1 851 top = cx->blk_gimme == G_ARRAY ? SP + 1
713 : cx->blk_gimme == G_SCALAR ? bot + 1 852 : cx->blk_gimme == G_SCALAR ? bot + 1
714 : bot; 853 : bot;
715 854
855 av_extend (av, top - bot);
716 while (bot < top) 856 while (bot < top)
717 av_push (av, SvREFCNT_inc (*bot++)); 857 av_push (av, SvREFCNT_inc (*bot++));
718 858
719 PL_runops = RUNOPS_DEFAULT; 859 PL_runops = RUNOPS_DEFAULT;
720 ENTER; 860 ENTER;
760 SAVETMPS; 900 SAVETMPS;
761 EXTEND (SP, 3); 901 EXTEND (SP, 3);
762 PUSHMARK (SP); 902 PUSHMARK (SP);
763 PUSHs (&PL_sv_yes); 903 PUSHs (&PL_sv_yes);
764 PUSHs (fullname); 904 PUSHs (fullname);
765 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 905 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
766 PUTBACK; 906 PUTBACK;
767 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 907 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
768 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 908 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
769 SPAGAIN; 909 SPAGAIN;
770 FREETMPS; 910 FREETMPS;
806 946
807/* 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 */
808/* _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 */
809/* during execution of a perl program */ 949/* during execution of a perl program */
810static void NOINLINE 950static void NOINLINE
811prepare_cctx (pTHX_ coro_cctx *cctx) 951cctx_prepare (pTHX_ coro_cctx *cctx)
812{ 952{
813 dSP; 953 dSP;
814 LOGOP myop; 954 LOGOP myop;
815 955
816 PL_top_env = &PL_start_env; 956 PL_top_env = &PL_start_env;
834 974
835/* 975/*
836 * this is a _very_ stripped down perl interpreter ;) 976 * this is a _very_ stripped down perl interpreter ;)
837 */ 977 */
838static void 978static void
839coro_run (void *arg) 979cctx_run (void *arg)
840{ 980{
841 dTHX; 981 dTHX;
842 982
843 /* coro_run is the alternative tail of transfer(), so unlock here. */ 983 /* cctx_run is the alternative tail of transfer(), so unlock here. */
844 UNLOCK; 984 UNLOCK;
845 985
846 /* we now skip the entersub that lead to transfer() */ 986 /* we now skip the entersub that lead to transfer() */
847 PL_op = PL_op->op_next; 987 PL_op = PL_op->op_next;
848 988
849 /* inject a fake subroutine call to cctx_init */ 989 /* inject a fake subroutine call to cctx_init */
850 prepare_cctx (aTHX_ (coro_cctx *)arg); 990 cctx_prepare (aTHX_ (coro_cctx *)arg);
851 991
852 /* 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 */
853 PL_restartop = PL_op; 993 PL_restartop = PL_op;
854 perl_run (PL_curinterp); 994 perl_run (PL_curinterp);
855 995
874 ++cctx_count; 1014 ++cctx_count;
875 1015
876 Newz (0, cctx, 1, coro_cctx); 1016 Newz (0, cctx, 1, coro_cctx);
877 1017
878#if HAVE_MMAP 1018#if HAVE_MMAP
879
880 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;
881 /* mmap supposedly does allocate-on-write for us */ 1020 /* mmap supposedly does allocate-on-write for us */
882 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);
883 1022
884 if (cctx->sptr != (void *)-1) 1023 if (cctx->sptr != (void *)-1)
905 stack_start = cctx->sptr; 1044 stack_start = cctx->sptr;
906 stack_size = cctx->ssize; 1045 stack_size = cctx->ssize;
907 } 1046 }
908 1047
909 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1048 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
910 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);
911 1050
912 return cctx; 1051 return cctx;
913} 1052}
914 1053
915static void 1054static void
932 Safefree (cctx->sptr); 1071 Safefree (cctx->sptr);
933 1072
934 Safefree (cctx); 1073 Safefree (cctx);
935} 1074}
936 1075
1076/* wether this cctx should be destructed */
1077#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1078
937static coro_cctx * 1079static coro_cctx *
938cctx_get (pTHX) 1080cctx_get (pTHX)
939{ 1081{
940 while (cctx_first) 1082 while (expect_true (cctx_first))
941 { 1083 {
942 coro_cctx *cctx = cctx_first; 1084 coro_cctx *cctx = cctx_first;
943 cctx_first = cctx->next; 1085 cctx_first = cctx->next;
944 --cctx_idle; 1086 --cctx_idle;
945 1087
946 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1088 if (expect_true (!CCTX_EXPIRED (cctx)))
947 return cctx; 1089 return cctx;
948 1090
949 cctx_destroy (cctx); 1091 cctx_destroy (cctx);
950 } 1092 }
951 1093
954 1096
955static void 1097static void
956cctx_put (coro_cctx *cctx) 1098cctx_put (coro_cctx *cctx)
957{ 1099{
958 /* free another cctx if overlimit */ 1100 /* free another cctx if overlimit */
959 if (cctx_idle >= MAX_IDLE_CCTX) 1101 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
960 { 1102 {
961 coro_cctx *first = cctx_first; 1103 coro_cctx *first = cctx_first;
962 cctx_first = first->next; 1104 cctx_first = first->next;
963 --cctx_idle; 1105 --cctx_idle;
964 1106
970 cctx_first = cctx; 1112 cctx_first = cctx;
971} 1113}
972 1114
973/** coroutine switching *****************************************************/ 1115/** coroutine switching *****************************************************/
974 1116
975static void NOINLINE 1117static void
976transfer_check (pTHX_ struct coro *prev, struct coro *next) 1118transfer_check (pTHX_ struct coro *prev, struct coro *next)
977{ 1119{
978 if (prev != next) 1120 if (expect_true (prev != next))
979 { 1121 {
980 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1122 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
981 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");
982 1124
983 if (next->flags & CF_RUNNING) 1125 if (expect_false (next->flags & CF_RUNNING))
984 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");
985 1127
986 if (next->flags & CF_DESTROYED) 1128 if (expect_false (next->flags & CF_DESTROYED))
987 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");
988 1130
1131 if (
1132#if PERL_VERSION_ATLEAST (5,9,0)
1133 expect_false (PL_parser && PL_parser->lex_state != LEX_NOTPARSING)
1134#else
989 if (PL_lex_state != LEX_NOTPARSING) 1135 expect_false (PL_lex_state != LEX_NOTPARSING)
1136#endif
1137 )
990 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");
991 } 1139 }
992} 1140}
993 1141
994/* always use the TRANSFER macro */ 1142/* always use the TRANSFER macro */
995static void NOINLINE 1143static void NOINLINE
996transfer (pTHX_ struct coro *prev, struct coro *next) 1144transfer (pTHX_ struct coro *prev, struct coro *next)
997{ 1145{
998 dSTACKLEVEL; 1146 dSTACKLEVEL;
1147 static volatile int has_throw;
999 1148
1000 /* sometimes transfer is only called to set idle_sp */ 1149 /* sometimes transfer is only called to set idle_sp */
1001 if (!next) 1150 if (expect_false (!next))
1002 { 1151 {
1003 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1152 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1004 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 */
1005 } 1154 }
1006 else if (prev != next) 1155 else if (expect_true (prev != next))
1007 { 1156 {
1008 coro_cctx *prev__cctx; 1157 coro_cctx *prev__cctx;
1009 1158
1010 if (prev->flags & CF_NEW) 1159 if (expect_false (prev->flags & CF_NEW))
1011 { 1160 {
1012 /* create a new empty context */ 1161 /* create a new empty context */
1013 Newz (0, prev->cctx, 1, coro_cctx); 1162 Newz (0, prev->cctx, 1, coro_cctx);
1014 prev->flags &= ~CF_NEW; 1163 prev->flags &= ~CF_NEW;
1015 prev->flags |= CF_RUNNING; 1164 prev->flags |= CF_RUNNING;
1018 prev->flags &= ~CF_RUNNING; 1167 prev->flags &= ~CF_RUNNING;
1019 next->flags |= CF_RUNNING; 1168 next->flags |= CF_RUNNING;
1020 1169
1021 LOCK; 1170 LOCK;
1022 1171
1172 /* first get rid of the old state */
1173 save_perl (aTHX_ prev);
1174
1023 if (next->flags & CF_NEW) 1175 if (expect_false (next->flags & CF_NEW))
1024 { 1176 {
1025 /* need to start coroutine */ 1177 /* need to start coroutine */
1026 next->flags &= ~CF_NEW; 1178 next->flags &= ~CF_NEW;
1027 /* first get rid of the old state */
1028 save_perl (aTHX_ prev);
1029 /* setup coroutine call */ 1179 /* setup coroutine call */
1030 coro_setup (aTHX_ next); 1180 coro_setup (aTHX_ next);
1031 } 1181 }
1032 else 1182 else
1033 {
1034 /* coroutine already started */
1035 save_perl (aTHX_ prev);
1036 load_perl (aTHX_ next); 1183 load_perl (aTHX_ next);
1037 }
1038 1184
1039 prev__cctx = prev->cctx; 1185 prev__cctx = prev->cctx;
1040 1186
1041 /* possibly "free" the cctx */ 1187 /* possibly "free" the cctx */
1042 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)))
1043 { 1189 {
1044 /* 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 */
1045 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));
1046 1192
1047 prev->cctx = 0; 1193 prev->cctx = 0;
1048 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
1049 cctx_put (prev__cctx); 1201 cctx_put (prev__cctx);
1050 } 1202 }
1051 1203
1052 ++next->usecount; 1204 ++next->usecount;
1053 1205
1054 if (!next->cctx) 1206 if (expect_true (!next->cctx))
1055 next->cctx = cctx_get (aTHX); 1207 next->cctx = cctx_get (aTHX);
1056 1208
1209 has_throw = !!next->throw;
1210
1057 if (prev__cctx != next->cctx) 1211 if (expect_false (prev__cctx != next->cctx))
1058 { 1212 {
1059 prev__cctx->top_env = PL_top_env; 1213 prev__cctx->top_env = PL_top_env;
1060 PL_top_env = next->cctx->top_env; 1214 PL_top_env = next->cctx->top_env;
1061 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1215 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1062 } 1216 }
1063 1217
1064 free_coro_mortal (aTHX); 1218 free_coro_mortal (aTHX);
1065 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 }
1066 } 1233 }
1067} 1234}
1068 1235
1069struct transfer_args 1236struct transfer_args
1070{ 1237{
1105 save_perl (aTHX_ &temp); 1272 save_perl (aTHX_ &temp);
1106 load_perl (aTHX_ coro); 1273 load_perl (aTHX_ coro);
1107 1274
1108 coro_destroy (aTHX_ coro); 1275 coro_destroy (aTHX_ coro);
1109 1276
1110 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1277 load_perl (aTHX_ &temp);
1111 1278
1112 coro->mainstack = 0; 1279 coro->slot = 0;
1113 } 1280 }
1114 1281
1115 cctx_destroy (coro->cctx); 1282 cctx_destroy (coro->cctx);
1116 SvREFCNT_dec (coro->args); 1283 SvREFCNT_dec (coro->args);
1117 1284
1185{ 1352{
1186 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);
1187} 1354}
1188 1355
1189static SV * 1356static SV *
1190coro_deq (pTHX_ int min_prio) 1357coro_deq (pTHX)
1191{ 1358{
1192 int prio = PRIO_MAX - PRIO_MIN; 1359 int prio;
1193 1360
1194 min_prio -= PRIO_MIN;
1195 if (min_prio < 0)
1196 min_prio = 0;
1197
1198 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1361 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1199 if (AvFILLp (coro_ready [prio]) >= 0) 1362 if (AvFILLp (coro_ready [prio]) >= 0)
1200 return av_shift (coro_ready [prio]); 1363 return av_shift (coro_ready [prio]);
1201 1364
1202 return 0; 1365 return 0;
1203} 1366}
1239 SV *prev_sv, *next_sv; 1402 SV *prev_sv, *next_sv;
1240 1403
1241 for (;;) 1404 for (;;)
1242 { 1405 {
1243 LOCK; 1406 LOCK;
1244 next_sv = coro_deq (aTHX_ PRIO_MIN); 1407 next_sv = coro_deq (aTHX);
1245 1408
1246 /* nothing to schedule: call the idle handler */ 1409 /* nothing to schedule: call the idle handler */
1247 if (!next_sv) 1410 if (expect_false (!next_sv))
1248 { 1411 {
1249 dSP; 1412 dSP;
1250 UNLOCK; 1413 UNLOCK;
1251 1414
1252 ENTER; 1415 ENTER;
1253 SAVETMPS; 1416 SAVETMPS;
1254 1417
1255 PUSHMARK (SP); 1418 PUSHMARK (SP);
1256 PUTBACK; 1419 PUTBACK;
1257 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1420 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1421 SPAGAIN;
1258 1422
1259 FREETMPS; 1423 FREETMPS;
1260 LEAVE; 1424 LEAVE;
1261 continue; 1425 continue;
1262 } 1426 }
1263 1427
1264 ta->next = SvSTATE (next_sv); 1428 ta->next = SvSTATE (next_sv);
1265 1429
1266 /* cannot transfer to destroyed coros, skip and look for next */ 1430 /* cannot transfer to destroyed coros, skip and look for next */
1267 if (ta->next->flags & CF_DESTROYED) 1431 if (expect_false (ta->next->flags & CF_DESTROYED))
1268 { 1432 {
1269 UNLOCK; 1433 UNLOCK;
1270 SvREFCNT_dec (next_sv); 1434 SvREFCNT_dec (next_sv);
1271 /* coro_nready is already taken care of by destroy */ 1435 /* coro_nready is already taken care of by destroy */
1272 continue; 1436 continue;
1328 dTHX; 1492 dTHX;
1329 struct transfer_args ta; 1493 struct transfer_args ta;
1330 1494
1331 prepare_cede (aTHX_ &ta); 1495 prepare_cede (aTHX_ &ta);
1332 1496
1333 if (ta.prev != ta.next) 1497 if (expect_true (ta.prev != ta.next))
1334 { 1498 {
1335 TRANSFER (ta); 1499 TRANSFER (ta);
1336 return 1; 1500 return 1;
1337 } 1501 }
1338 else 1502 else
1374 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1538 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1375 1539
1376 if (coro->flags & CF_RUNNING) 1540 if (coro->flags & CF_RUNNING)
1377 PL_runops = RUNOPS_DEFAULT; 1541 PL_runops = RUNOPS_DEFAULT;
1378 else 1542 else
1379 coro->runops = RUNOPS_DEFAULT; 1543 coro->slot->runops = RUNOPS_DEFAULT;
1380 } 1544 }
1381} 1545}
1382 1546
1383MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1547MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1384 1548
1389#ifdef USE_ITHREADS 1553#ifdef USE_ITHREADS
1390 MUTEX_INIT (&coro_mutex); 1554 MUTEX_INIT (&coro_mutex);
1391#endif 1555#endif
1392 BOOT_PAGESIZE; 1556 BOOT_PAGESIZE;
1393 1557
1394 irsgv = gv_fetchpv ("/", 1, SVt_PV); 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));
1395 1569
1396 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1570 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1397 1571
1398 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1572 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1399 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1573 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1405 1579
1406 while (main_top_env->je_prev) 1580 while (main_top_env->je_prev)
1407 main_top_env = main_top_env->je_prev; 1581 main_top_env = main_top_env->je_prev;
1408 1582
1409 coroapi.ver = CORO_API_VERSION; 1583 coroapi.ver = CORO_API_VERSION;
1584 coroapi.rev = CORO_API_REVISION;
1410 coroapi.transfer = api_transfer; 1585 coroapi.transfer = api_transfer;
1411 1586
1412 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1587 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1413} 1588}
1414 1589
1415SV * 1590SV *
1416new (char *klass, ...) 1591new (char *klass, ...)
1417 CODE: 1592 CODE:
1418{ 1593{
1419 struct coro *coro; 1594 struct coro *coro;
1595 MAGIC *mg;
1420 HV *hv; 1596 HV *hv;
1421 int i; 1597 int i;
1422 1598
1423 Newz (0, coro, 1, struct coro); 1599 Newz (0, coro, 1, struct coro);
1424 coro->args = newAV (); 1600 coro->args = newAV ();
1427 if (coro_first) coro_first->prev = coro; 1603 if (coro_first) coro_first->prev = coro;
1428 coro->next = coro_first; 1604 coro->next = coro_first;
1429 coro_first = coro; 1605 coro_first = coro;
1430 1606
1431 coro->hv = hv = newHV (); 1607 coro->hv = hv = newHV ();
1432 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;
1433 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1610 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1434 1611
1612 av_extend (coro->args, items - 1);
1435 for (i = 1; i < items; i++) 1613 for (i = 1; i < items; i++)
1436 av_push (coro->args, newSVsv (ST (i))); 1614 av_push (coro->args, newSVsv (ST (i)));
1437} 1615}
1438 OUTPUT: 1616 OUTPUT:
1439 RETVAL 1617 RETVAL
1450 Coro::cede_notself = 4 1628 Coro::cede_notself = 4
1451 CODE: 1629 CODE:
1452{ 1630{
1453 struct transfer_args ta; 1631 struct transfer_args ta;
1454 1632
1633 PUTBACK;
1455 switch (ix) 1634 switch (ix)
1456 { 1635 {
1457 case 0: 1636 case 0:
1458 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1637 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1459 ta.next = 0; 1638 ta.next = 0;
1478 if (!prepare_cede_notself (aTHX_ &ta)) 1657 if (!prepare_cede_notself (aTHX_ &ta))
1479 XSRETURN_EMPTY; 1658 XSRETURN_EMPTY;
1480 1659
1481 break; 1660 break;
1482 } 1661 }
1662 SPAGAIN;
1483 1663
1484 BARRIER; 1664 BARRIER;
1665 PUTBACK;
1485 TRANSFER (ta); 1666 TRANSFER (ta);
1486 1667 SPAGAIN; /* might be the sp of a different coroutine now */
1487 if (GIMME_V != G_VOID && ta.next != ta.prev) 1668 /* be extra careful not to ever do anything after TRANSFER */
1488 XSRETURN_YES;
1489} 1669}
1490 1670
1491bool 1671bool
1492_destroy (SV *coro_sv) 1672_destroy (SV *coro_sv)
1493 CODE: 1673 CODE:
1542 CODE: 1722 CODE:
1543{ 1723{
1544 if (coro->mainstack) 1724 if (coro->mainstack)
1545 { 1725 {
1546 struct coro temp; 1726 struct coro temp;
1547 Zero (&temp, 1, struct coro);
1548 1727
1549 if (!(coro->flags & CF_RUNNING)) 1728 if (!(coro->flags & CF_RUNNING))
1550 { 1729 {
1730 PUTBACK;
1551 save_perl (aTHX_ &temp); 1731 save_perl (aTHX_ &temp);
1552 load_perl (aTHX_ coro); 1732 load_perl (aTHX_ coro);
1553 } 1733 }
1554 1734
1555 { 1735 {
1556 dSP; 1736 dSP;
1557 ENTER; 1737 ENTER;
1558 SAVETMPS; 1738 SAVETMPS;
1739 PUTBACK;
1740 PUSHSTACK;
1559 PUSHMARK (SP); 1741 PUSHMARK (SP);
1560 PUTBACK; 1742
1561 if (ix) 1743 if (ix)
1562 eval_sv (coderef, 0); 1744 eval_sv (coderef, 0);
1563 else 1745 else
1564 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;
1565 SPAGAIN; 1749 SPAGAIN;
1566 FREETMPS; 1750 FREETMPS;
1567 LEAVE; 1751 LEAVE;
1568 PUTBACK; 1752 PUTBACK;
1569 } 1753 }
1570 1754
1571 if (!(coro->flags & CF_RUNNING)) 1755 if (!(coro->flags & CF_RUNNING))
1572 { 1756 {
1573 save_perl (aTHX_ coro); 1757 save_perl (aTHX_ coro);
1574 load_perl (aTHX_ &temp); 1758 load_perl (aTHX_ &temp);
1759 SPAGAIN;
1575 } 1760 }
1576 } 1761 }
1577} 1762}
1578 1763
1579SV * 1764SV *
1627 1812
1628BOOT: 1813BOOT:
1629{ 1814{
1630 int i; 1815 int i;
1631 1816
1632 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1817 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1633 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1818 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1634 av_async_pool = get_av ("Coro::async_pool", TRUE); 1819 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1635 1820
1636 coro_current = get_sv ("Coro::current", FALSE); 1821 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1637 SvREADONLY_on (coro_current); 1822 SvREADONLY_on (coro_current);
1638 1823
1639 coro_stash = gv_stashpv ("Coro", TRUE); 1824 coro_stash = gv_stashpv ("Coro", TRUE);
1640 1825
1641 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1826 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1642 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1827 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1643 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1828 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1644 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1829 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1647 1832
1648 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1833 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1649 coro_ready[i] = newAV (); 1834 coro_ready[i] = newAV ();
1650 1835
1651 { 1836 {
1652 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 */
1653 1839
1654 coroapi.schedule = api_schedule; 1840 coroapi.schedule = api_schedule;
1655 coroapi.cede = api_cede; 1841 coroapi.cede = api_cede;
1656 coroapi.cede_notself = api_cede_notself; 1842 coroapi.cede_notself = api_cede_notself;
1657 coroapi.ready = api_ready; 1843 coroapi.ready = api_ready;
1708 CODE: 1894 CODE:
1709 RETVAL = coro_nready; 1895 RETVAL = coro_nready;
1710 OUTPUT: 1896 OUTPUT:
1711 RETVAL 1897 RETVAL
1712 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
1713# for async_pool speedup 1906# for async_pool speedup
1714void 1907void
1715_pool_1 (SV *cb) 1908_pool_1 (SV *cb)
1716 CODE: 1909 CODE:
1717{ 1910{
1721 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1914 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1722 AV *invoke_av; 1915 AV *invoke_av;
1723 int i, len; 1916 int i, len;
1724 1917
1725 if (!invoke) 1918 if (!invoke)
1919 {
1920 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1726 croak ("\3terminate\2\n"); 1921 croak ("\3async_pool terminate\2\n");
1922 }
1727 1923
1728 SvREFCNT_dec (coro->asp_deffh); 1924 SvREFCNT_dec (coro->saved_deffh);
1729 coro->asp_deffh = SvREFCNT_inc (PL_defoutgv); 1925 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1730 1926
1731 hv_store (hv, "desc", sizeof ("desc") - 1, 1927 hv_store (hv, "desc", sizeof ("desc") - 1,
1732 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 1928 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1733 1929
1734 invoke_av = (AV *)SvRV (invoke); 1930 invoke_av = (AV *)SvRV (invoke);
1752{ 1948{
1753 struct coro *coro = SvSTATE (coro_current); 1949 struct coro *coro = SvSTATE (coro_current);
1754 1950
1755 sv_setsv (cb, &PL_sv_undef); 1951 sv_setsv (cb, &PL_sv_undef);
1756 1952
1757 SvREFCNT_dec (PL_defoutgv); PL_defoutgv = coro->asp_deffh; 1953 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1758 coro->asp_deffh = 0; 1954 coro->saved_deffh = 0;
1759 1955
1760 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1956 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1761 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1957 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1958 {
1959 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1762 croak ("\3terminate\2\n"); 1960 croak ("\3async_pool terminate\2\n");
1961 }
1763 1962
1764 av_clear (GvAV (PL_defgv)); 1963 av_clear (GvAV (PL_defgv));
1765 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1964 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1766 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1965 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1767 1966

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines