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.180 by root, Wed Oct 3 17:12:20 2007 UTC vs.
Revision 1.226 by root, Fri Apr 4 20:07:35 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines