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.212 by root, Wed Oct 10 04:21:33 2007 UTC vs.
Revision 1.263 by root, Wed Nov 12 04:49:06 2008 UTC

4#define PERL_EXT 4#define PERL_EXT
5 5
6#include "EXTERN.h" 6#include "EXTERN.h"
7#include "perl.h" 7#include "perl.h"
8#include "XSUB.h" 8#include "XSUB.h"
9#include "perliol.h"
9 10
10#include "patchlevel.h" 11#include "patchlevel.h"
11 12
12#include <stdio.h> 13#include <stdio.h>
13#include <errno.h> 14#include <errno.h>
14#include <assert.h> 15#include <assert.h>
16
17#ifdef WIN32
18# undef setjmp
19# undef longjmp
20# undef _exit
21# define setjmp _setjmp // deep magic, don't ask
22#else
15#include <inttypes.h> /* portable stdint.h */ 23# include <inttypes.h> /* most portable stdint.h */
24#endif
16 25
17#ifdef HAVE_MMAP 26#ifdef HAVE_MMAP
18# include <unistd.h> 27# include <unistd.h>
19# include <sys/mman.h> 28# include <sys/mman.h>
20# ifndef MAP_ANONYMOUS 29# ifndef MAP_ANONYMOUS
37# define BOOT_PAGESIZE (void)0 46# define BOOT_PAGESIZE (void)0
38#endif 47#endif
39 48
40#if CORO_USE_VALGRIND 49#if CORO_USE_VALGRIND
41# include <valgrind/valgrind.h> 50# include <valgrind/valgrind.h>
42# define REGISTER_STACK(cctx,start,end) (cctx)->valgrind_id = VALGRIND_STACK_REGISTER ((start), (end))
43#else
44# define REGISTER_STACK(cctx,start,end)
45#endif 51#endif
46 52
47/* the maximum number of idle cctx that will be pooled */ 53/* the maximum number of idle cctx that will be pooled */
48#define MAX_IDLE_CCTX 8 54static int cctx_max_idle = 4;
49 55
50#define PERL_VERSION_ATLEAST(a,b,c) \ 56#define PERL_VERSION_ATLEAST(a,b,c) \
51 (PERL_REVISION > (a) \ 57 (PERL_REVISION > (a) \
52 || (PERL_REVISION == (a) \ 58 || (PERL_REVISION == (a) \
53 && (PERL_VERSION > (b) \ 59 && (PERL_VERSION > (b) \
72# ifndef IS_PADCONST 78# ifndef IS_PADCONST
73# define IS_PADCONST(v) 0 79# define IS_PADCONST(v) 0
74# endif 80# endif
75#endif 81#endif
76 82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100
77/* 5.8.7 */ 101/* 5.8.7 */
78#ifndef SvRV_set 102#ifndef SvRV_set
79# define SvRV_set(s,v) SvRV(s) = (v) 103# define SvRV_set(s,v) SvRV(s) = (v)
80#endif
81
82/* 5.8.8 */
83#ifndef GV_NOTQUAL
84# define GV_NOTQUAL 0
85#endif
86#ifndef newSV
87# define newSV(l) NEWSV(0,l)
88#endif 104#endif
89 105
90#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 106#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
91# undef CORO_STACKGUARD 107# undef CORO_STACKGUARD
92#endif 108#endif
109 125
110#if __GNUC__ >= 3 126#if __GNUC__ >= 3
111# define attribute(x) __attribute__(x) 127# define attribute(x) __attribute__(x)
112# define BARRIER __asm__ __volatile__ ("" : : : "memory") 128# define BARRIER __asm__ __volatile__ ("" : : : "memory")
113# define expect(expr,value) __builtin_expect ((expr),(value)) 129# define expect(expr,value) __builtin_expect ((expr),(value))
130# define INLINE static inline
114#else 131#else
115# define attribute(x) 132# define attribute(x)
116# define BARRIER 133# define BARRIER
117# define expect(expr,value) (expr) 134# define expect(expr,value) (expr)
135# define INLINE static
118#endif 136#endif
119 137
120#define expect_false(expr) expect ((expr) != 0, 0) 138#define expect_false(expr) expect ((expr) != 0, 0)
121#define expect_true(expr) expect ((expr) != 0, 1) 139#define expect_true(expr) expect ((expr) != 0, 1)
122 140
123#define NOINLINE attribute ((noinline)) 141#define NOINLINE attribute ((noinline))
124 142
125#include "CoroAPI.h" 143#include "CoroAPI.h"
126 144
127#ifdef USE_ITHREADS 145#ifdef USE_ITHREADS
146
128static perl_mutex coro_mutex; 147static perl_mutex coro_lock;
129# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) 148# define LOCK do { MUTEX_LOCK (&coro_lock); } while (0)
130# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0) 149# define UNLOCK do { MUTEX_UNLOCK (&coro_lock); } while (0)
150# if CORO_PTHREAD
151static void *coro_thx;
152# endif
153
131#else 154#else
155
132# define LOCK (void)0 156# define LOCK (void)0
133# define UNLOCK (void)0 157# define UNLOCK (void)0
158
134#endif 159#endif
160
161# undef LOCK
162# define LOCK (void)0
163# undef UNLOCK
164# define UNLOCK (void)0
135 165
136/* helper storage struct for Coro::AIO */ 166/* helper storage struct for Coro::AIO */
137struct io_state 167struct io_state
138{ 168{
169 AV *res;
139 int errorno; 170 int errorno;
140 I32 laststype; 171 I32 laststype; /* U16 in 5.10.0 */
141 int laststatval; 172 int laststatval;
142 Stat_t statcache; 173 Stat_t statcache;
143}; 174};
144 175
176static double (*nvtime)(); /* so why doesn't it take void? */
177
178static U32 cctx_gen;
145static size_t coro_stacksize = CORO_STACKSIZE; 179static size_t cctx_stacksize = CORO_STACKSIZE;
146static struct CoroAPI coroapi; 180static struct CoroAPI coroapi;
147static AV *main_mainstack; /* used to differentiate between $main and others */ 181static AV *main_mainstack; /* used to differentiate between $main and others */
148static JMPENV *main_top_env; 182static JMPENV *main_top_env;
149static HV *coro_state_stash, *coro_stash; 183static HV *coro_state_stash, *coro_stash;
150static SV *coro_mortal; /* will be freed after next transfer */ 184static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
185static volatile struct coro *transfer_next;
186
187struct transfer_args
188{
189 struct coro *prev, *next;
190};
151 191
152static GV *irsgv; /* $/ */ 192static GV *irsgv; /* $/ */
153static GV *stdoutgv; /* *STDOUT */ 193static GV *stdoutgv; /* *STDOUT */
154 194static SV *rv_diehook;
195static SV *rv_warnhook;
155static HV *hv_sig; /* %SIG */ 196static HV *hv_sig; /* %SIG */
156static SV *sv_diehook;
157static SV *sv_warnhook;
158 197
159/* async_pool helper stuff */ 198/* async_pool helper stuff */
160static SV *sv_pool_rss; 199static SV *sv_pool_rss;
161static SV *sv_pool_size; 200static SV *sv_pool_size;
162static AV *av_async_pool; 201static AV *av_async_pool;
202
203/* Coro::AnyEvent */
204static SV *sv_activity;
163 205
164static struct coro_cctx *cctx_first; 206static struct coro_cctx *cctx_first;
165static int cctx_count, cctx_idle; 207static int cctx_count, cctx_idle;
166 208
167enum { 209enum {
185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 227 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
186 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 228 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */
187 JMPENV *top_env; 229 JMPENV *top_env;
188 coro_context cctx; 230 coro_context cctx;
189 231
232 U32 gen;
190#if CORO_USE_VALGRIND 233#if CORO_USE_VALGRIND
191 int valgrind_id; 234 int valgrind_id;
192#endif 235#endif
193 unsigned char flags; 236 unsigned char flags;
194} coro_cctx; 237} coro_cctx;
253#define PRIO_IDLE -3 296#define PRIO_IDLE -3
254#define PRIO_MIN -4 297#define PRIO_MIN -4
255 298
256/* for Coro.pm */ 299/* for Coro.pm */
257static SV *coro_current; 300static SV *coro_current;
301static SV *coro_readyhook;
258static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 302static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
259static int coro_nready; 303static int coro_nready;
260static struct coro *coro_first; 304static struct coro *coro_first;
261 305
262/** lowlevel stuff **********************************************************/ 306/** lowlevel stuff **********************************************************/
263 307
264static SV * 308static SV *
265coro_get_sv (const char *name, int create) 309coro_get_sv (pTHX_ const char *name, int create)
266{ 310{
267#if PERL_VERSION_ATLEAST (5,9,0) 311#if PERL_VERSION_ATLEAST (5,10,0)
268 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 312 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
269 get_sv (name, create); 313 get_sv (name, create);
270#endif 314#endif
271 return get_sv (name, create); 315 return get_sv (name, create);
272} 316}
273 317
274static AV * 318static AV *
275coro_get_av (const char *name, int create) 319coro_get_av (pTHX_ const char *name, int create)
276{ 320{
277#if PERL_VERSION_ATLEAST (5,9,0) 321#if PERL_VERSION_ATLEAST (5,10,0)
278 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 322 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
279 get_av (name, create); 323 get_av (name, create);
280#endif 324#endif
281 return get_av (name, create); 325 return get_av (name, create);
282} 326}
283 327
284static HV * 328static HV *
285coro_get_hv (const char *name, int create) 329coro_get_hv (pTHX_ const char *name, int create)
286{ 330{
287#if PERL_VERSION_ATLEAST (5,9,0) 331#if PERL_VERSION_ATLEAST (5,10,0)
288 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 332 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
289 get_hv (name, create); 333 get_hv (name, create);
290#endif 334#endif
291 return get_hv (name, create); 335 return get_hv (name, create);
292} 336}
297 AV *padlist = CvPADLIST (cv); 341 AV *padlist = CvPADLIST (cv);
298 AV *newpadlist, *newpad; 342 AV *newpadlist, *newpad;
299 343
300 newpadlist = newAV (); 344 newpadlist = newAV ();
301 AvREAL_off (newpadlist); 345 AvREAL_off (newpadlist);
302#if PERL_VERSION_ATLEAST (5,9,0) 346#if PERL_VERSION_ATLEAST (5,10,0)
303 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 347 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
304#else 348#else
305 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 349 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
306#endif 350#endif
307 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 351 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
308 --AvFILLp (padlist); 352 --AvFILLp (padlist);
309 353
310 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 354 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE)));
311 av_store (newpadlist, 1, (SV *)newpad); 355 av_store (newpadlist, 1, (SV *)newpad);
312 356
313 return newpadlist; 357 return newpadlist;
314} 358}
315 359
345 389
346 /* casting is fun. */ 390 /* casting is fun. */
347 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 391 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
348 free_padlist (aTHX_ padlist); 392 free_padlist (aTHX_ padlist);
349 393
350 SvREFCNT_dec (av); 394 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
351 395
352 return 0; 396 return 0;
353} 397}
354 398
355#define PERL_MAGIC_coro PERL_MAGIC_ext 399#define CORO_MAGIC_type_cv PERL_MAGIC_ext
400#define CORO_MAGIC_type_state PERL_MAGIC_ext
356 401
357static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 402static MGVTBL coro_cv_vtbl = {
403 0, 0, 0, 0,
404 coro_cv_free
405};
358 406
359#define CORO_MAGIC(cv) \ 407#define CORO_MAGIC(sv, type) \
360 SvMAGIC (cv) \ 408 SvMAGIC (sv) \
361 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 409 ? SvMAGIC (sv)->mg_type == type \
362 ? SvMAGIC (cv) \ 410 ? SvMAGIC (sv) \
363 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 411 : mg_find (sv, type) \
364 : 0 412 : 0
365 413
366static struct coro * 414#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
415#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
416
417INLINE struct coro *
367SvSTATE_ (pTHX_ SV *coro) 418SvSTATE_ (pTHX_ SV *coro)
368{ 419{
369 HV *stash; 420 HV *stash;
370 MAGIC *mg; 421 MAGIC *mg;
371 422
381 /* very slow, but rare, check */ 432 /* very slow, but rare, check */
382 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 433 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
383 croak ("Coro::State object required"); 434 croak ("Coro::State object required");
384 } 435 }
385 436
386 mg = CORO_MAGIC (coro); 437 mg = CORO_MAGIC_state (coro);
387 return (struct coro *)mg->mg_ptr; 438 return (struct coro *)mg->mg_ptr;
388} 439}
389 440
390#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 441#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
391 442
392/* the next two functions merely cache the padlists */ 443/* the next two functions merely cache the padlists */
393static void 444static void
394get_padlist (pTHX_ CV *cv) 445get_padlist (pTHX_ CV *cv)
395{ 446{
396 MAGIC *mg = CORO_MAGIC (cv); 447 MAGIC *mg = CORO_MAGIC_cv (cv);
397 AV *av; 448 AV *av;
398 449
399 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 450 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
400 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 451 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
401 else 452 else
402 { 453 {
403#if CORO_PREFER_PERL_FUNCTIONS 454#if CORO_PREFER_PERL_FUNCTIONS
404 /* this is probably cleaner, but also slower? */ 455 /* this is probably cleaner? but also slower! */
456 /* in practise, it seems to be less stable */
405 CV *cp = Perl_cv_clone (cv); 457 CV *cp = Perl_cv_clone (cv);
406 CvPADLIST (cv) = CvPADLIST (cp); 458 CvPADLIST (cv) = CvPADLIST (cp);
407 CvPADLIST (cp) = 0; 459 CvPADLIST (cp) = 0;
408 SvREFCNT_dec (cp); 460 SvREFCNT_dec (cp);
409#else 461#else
413} 465}
414 466
415static void 467static void
416put_padlist (pTHX_ CV *cv) 468put_padlist (pTHX_ CV *cv)
417{ 469{
418 MAGIC *mg = CORO_MAGIC (cv); 470 MAGIC *mg = CORO_MAGIC_cv (cv);
419 AV *av; 471 AV *av;
420 472
421 if (expect_false (!mg)) 473 if (expect_false (!mg))
422 { 474 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
423 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
424 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
425 mg->mg_virtual = &vtbl_coro;
426 mg->mg_obj = (SV *)newAV ();
427 }
428 475
429 av = (AV *)mg->mg_obj; 476 av = (AV *)mg->mg_obj;
430 477
431 if (expect_false (AvFILLp (av) >= AvMAX (av))) 478 if (expect_false (AvFILLp (av) >= AvMAX (av)))
432 av_extend (av, AvMAX (av) + 1); 479 av_extend (av, AvMAX (av) + 1);
450 GvSV (irsgv) = slot->irsgv; 497 GvSV (irsgv) = slot->irsgv;
451 498
452 #define VAR(name,type) PL_ ## name = slot->name; 499 #define VAR(name,type) PL_ ## name = slot->name;
453 # include "state.h" 500 # include "state.h"
454 #undef VAR 501 #undef VAR
455
456 /*hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0);*/
457 /*hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0);*/
458 502
459 { 503 {
460 dSP; 504 dSP;
461 505
462 CV *cv; 506 CV *cv;
501 545
502 if (expect_true (CvDEPTH (cv))) 546 if (expect_true (CvDEPTH (cv)))
503 { 547 {
504 EXTEND (SP, 3); 548 EXTEND (SP, 3);
505 PUSHs ((SV *)CvPADLIST (cv)); 549 PUSHs ((SV *)CvPADLIST (cv));
506 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 550 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
507 PUSHs ((SV *)cv); 551 PUSHs ((SV *)cv);
508 552
509 CvDEPTH (cv) = 0; 553 CvDEPTH (cv) = 0;
510 get_padlist (aTHX_ cv); 554 get_padlist (aTHX_ cv);
511 } 555 }
591 635
592 New(54,PL_savestack,24,ANY); 636 New(54,PL_savestack,24,ANY);
593 PL_savestack_ix = 0; 637 PL_savestack_ix = 0;
594 PL_savestack_max = 24; 638 PL_savestack_max = 24;
595 639
596#if !PERL_VERSION_ATLEAST (5,9,0) 640#if !PERL_VERSION_ATLEAST (5,10,0)
597 New(54,PL_retstack,4,OP*); 641 New(54,PL_retstack,4,OP*);
598 PL_retstack_ix = 0; 642 PL_retstack_ix = 0;
599 PL_retstack_max = 4; 643 PL_retstack_max = 4;
600#endif 644#endif
601} 645}
603 647
604/* 648/*
605 * destroy the stacks, the callchain etc... 649 * destroy the stacks, the callchain etc...
606 */ 650 */
607static void 651static void
608coro_destroy_stacks (pTHX) 652coro_destruct_stacks (pTHX)
609{ 653{
610 while (PL_curstackinfo->si_next) 654 while (PL_curstackinfo->si_next)
611 PL_curstackinfo = PL_curstackinfo->si_next; 655 PL_curstackinfo = PL_curstackinfo->si_next;
612 656
613 while (PL_curstackinfo) 657 while (PL_curstackinfo)
624 668
625 Safefree (PL_tmps_stack); 669 Safefree (PL_tmps_stack);
626 Safefree (PL_markstack); 670 Safefree (PL_markstack);
627 Safefree (PL_scopestack); 671 Safefree (PL_scopestack);
628 Safefree (PL_savestack); 672 Safefree (PL_savestack);
629#if !PERL_VERSION_ATLEAST (5,9,0) 673#if !PERL_VERSION_ATLEAST (5,10,0)
630 Safefree (PL_retstack); 674 Safefree (PL_retstack);
631#endif 675#endif
632} 676}
633 677
634static size_t 678static size_t
650 #undef VAR 694 #undef VAR
651 } 695 }
652 else 696 else
653 slot = coro->slot; 697 slot = coro->slot;
654 698
699 if (slot)
700 {
655 rss += sizeof (slot->curstackinfo); 701 rss += sizeof (slot->curstackinfo);
656 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 702 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
657 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 703 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
658 rss += slot->tmps_max * sizeof (SV *); 704 rss += slot->tmps_max * sizeof (SV *);
659 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 705 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
660 rss += slot->scopestack_max * sizeof (I32); 706 rss += slot->scopestack_max * sizeof (I32);
661 rss += slot->savestack_max * sizeof (ANY); 707 rss += slot->savestack_max * sizeof (ANY);
662 708
663#if !PERL_VERSION_ATLEAST (5,9,0) 709#if !PERL_VERSION_ATLEAST (5,10,0)
664 rss += slot->retstack_max * sizeof (OP *); 710 rss += slot->retstack_max * sizeof (OP *);
665#endif 711#endif
712 }
666 } 713 }
667 714
668 return rss; 715 return rss;
669} 716}
670 717
671/** coroutine stack handling ************************************************/ 718/** coroutine stack handling ************************************************/
719
720static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
721static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
722static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
723
724/* apparently < 5.8.8 */
725#ifndef MgPV_nolen_const
726#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
727 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
728 (const char*)(mg)->mg_ptr)
729#endif
730
731/* we sometimes need to create the effect of entersub calling us */
732#define ENTERSUB_HEAD ENTER; SAVETMPS
733/* we somtimes need to create the effect of leaving via entersub */
734#define ENTERSUB_TAIL LEAVE
735
736/*
737 * This overrides the default magic get method of %SIG elements.
738 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
739 * and instead of tryign to save and restore the hash elements, we just provide
740 * readback here.
741 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
742 * not expecting this to actually change the hook. This is a potential problem
743 * when a schedule happens then, but we ignore this.
744 */
745static int
746coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
747{
748 const char *s = MgPV_nolen_const (mg);
749
750 if (*s == '_')
751 {
752 SV **svp = 0;
753
754 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
755 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
756
757 if (svp)
758 {
759 sv_setsv (sv, *svp ? *svp : &PL_sv_undef);
760 return 0;
761 }
762 }
763
764 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
765}
766
767static int
768coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
769{
770 const char *s = MgPV_nolen_const (mg);
771
772 if (*s == '_')
773 {
774 SV **svp = 0;
775
776 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
777 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
778
779 if (svp)
780 {
781 SV *old = *svp;
782 *svp = 0;
783 SvREFCNT_dec (old);
784 return 0;
785 }
786 }
787
788 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
789}
790
791static int
792coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
793{
794 const char *s = MgPV_nolen_const (mg);
795
796 if (*s == '_')
797 {
798 SV **svp = 0;
799
800 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
801 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
802
803 if (svp)
804 {
805 SV *old = *svp;
806 *svp = newSVsv (sv);
807 SvREFCNT_dec (old);
808 return 0;
809 }
810 }
811
812 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
813}
672 814
673static void 815static void
674coro_setup (pTHX_ struct coro *coro) 816coro_setup (pTHX_ struct coro *coro)
675{ 817{
676 /* 818 /*
685 PL_curpm = 0; 827 PL_curpm = 0;
686 PL_curpad = 0; 828 PL_curpad = 0;
687 PL_localizing = 0; 829 PL_localizing = 0;
688 PL_dirty = 0; 830 PL_dirty = 0;
689 PL_restartop = 0; 831 PL_restartop = 0;
832#if PERL_VERSION_ATLEAST (5,10,0)
833 PL_parser = 0;
834#endif
835
836 /* recreate the die/warn hooks */
690 PL_diehook = 0; hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0); 837 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
691 PL_warnhook = 0; hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0); 838 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
692 839
693 GvSV (PL_defgv) = newSV (0); 840 GvSV (PL_defgv) = newSV (0);
694 GvAV (PL_defgv) = coro->args; coro->args = 0; 841 GvAV (PL_defgv) = coro->args; coro->args = 0;
695 GvSV (PL_errgv) = newSV (0); 842 GvSV (PL_errgv) = newSV (0);
696 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 843 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
697 PL_rs = newSVsv (GvSV (irsgv)); 844 PL_rs = newSVsv (GvSV (irsgv));
698 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv); 845 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
699 846
700 { 847 {
701 dSP; 848 dSP;
702 LOGOP myop; 849 UNOP myop;
703 850
704 Zero (&myop, 1, LOGOP); 851 Zero (&myop, 1, UNOP);
705 myop.op_next = Nullop; 852 myop.op_next = Nullop;
706 myop.op_flags = OPf_WANT_VOID; 853 myop.op_flags = OPf_WANT_VOID;
707 854
708 PUSHMARK (SP); 855 PUSHMARK (SP);
709 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 856 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
713 SPAGAIN; 860 SPAGAIN;
714 } 861 }
715 862
716 /* this newly created coroutine might be run on an existing cctx which most 863 /* this newly created coroutine might be run on an existing cctx which most
717 * likely was suspended in set_stacklevel, called from entersub. 864 * likely was suspended in set_stacklevel, called from entersub.
718 * set_stacklevl doesn't do anything on return, but entersub does LEAVE, 865 * set_stacklevel doesn't do anything on return, but entersub does LEAVE,
719 * so we ENTER here for symmetry 866 * so we ENTER here for symmetry.
720 */ 867 */
721 ENTER; 868 ENTERSUB_HEAD;
722} 869}
723 870
724static void 871static void
725coro_destroy (pTHX_ struct coro *coro) 872coro_destruct (pTHX_ struct coro *coro)
726{ 873{
727 if (!IN_DESTRUCT) 874 if (!IN_DESTRUCT)
728 { 875 {
729 /* restore all saved variables and stuff */ 876 /* restore all saved variables and stuff */
730 LEAVE_SCOPE (0); 877 LEAVE_SCOPE (0);
752 SvREFCNT_dec (PL_warnhook); 899 SvREFCNT_dec (PL_warnhook);
753 900
754 SvREFCNT_dec (coro->saved_deffh); 901 SvREFCNT_dec (coro->saved_deffh);
755 SvREFCNT_dec (coro->throw); 902 SvREFCNT_dec (coro->throw);
756 903
757 coro_destroy_stacks (aTHX); 904 coro_destruct_stacks (aTHX);
758} 905}
759 906
760static void 907INLINE void
761free_coro_mortal (pTHX) 908free_coro_mortal (pTHX)
762{ 909{
763 if (expect_true (coro_mortal)) 910 if (expect_true (coro_mortal))
764 { 911 {
765 SvREFCNT_dec (coro_mortal); 912 SvREFCNT_dec (coro_mortal);
799 : cx->blk_gimme == G_SCALAR ? bot + 1 946 : cx->blk_gimme == G_SCALAR ? bot + 1
800 : bot; 947 : bot;
801 948
802 av_extend (av, top - bot); 949 av_extend (av, top - bot);
803 while (bot < top) 950 while (bot < top)
804 av_push (av, SvREFCNT_inc (*bot++)); 951 av_push (av, SvREFCNT_inc_NN (*bot++));
805 952
806 PL_runops = RUNOPS_DEFAULT; 953 PL_runops = RUNOPS_DEFAULT;
807 ENTER; 954 ENTER;
808 SAVETMPS; 955 SAVETMPS;
809 EXTEND (SP, 3); 956 EXTEND (SP, 3);
847 SAVETMPS; 994 SAVETMPS;
848 EXTEND (SP, 3); 995 EXTEND (SP, 3);
849 PUSHMARK (SP); 996 PUSHMARK (SP);
850 PUSHs (&PL_sv_yes); 997 PUSHs (&PL_sv_yes);
851 PUSHs (fullname); 998 PUSHs (fullname);
852 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 999 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
853 PUTBACK; 1000 PUTBACK;
854 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1001 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
855 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1002 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
856 SPAGAIN; 1003 SPAGAIN;
857 FREETMPS; 1004 FREETMPS;
889 1036
890 TAINT_NOT; 1037 TAINT_NOT;
891 return 0; 1038 return 0;
892} 1039}
893 1040
1041static void
1042prepare_set_stacklevel (struct transfer_args *ta, struct coro_cctx *cctx)
1043{
1044 ta->prev = (struct coro *)cctx;
1045 ta->next = 0;
1046}
1047
894/* inject a fake call to Coro::State::_cctx_init into the execution */ 1048/* inject a fake call to Coro::State::_cctx_init into the execution */
895/* _cctx_init should be careful, as it could be called at almost any time */ 1049/* _cctx_init should be careful, as it could be called at almost any time */
896/* during execution of a perl program */ 1050/* during execution of a perl program */
1051/* also initialises PL_top_env */
897static void NOINLINE 1052static void NOINLINE
898cctx_prepare (pTHX_ coro_cctx *cctx) 1053cctx_prepare (pTHX_ coro_cctx *cctx)
899{ 1054{
900 dSP; 1055 dSP;
901 LOGOP myop; 1056 UNOP myop;
902 1057
903 PL_top_env = &PL_start_env; 1058 PL_top_env = &PL_start_env;
904 1059
905 if (cctx->flags & CC_TRACE) 1060 if (cctx->flags & CC_TRACE)
906 PL_runops = runops_trace; 1061 PL_runops = runops_trace;
907 1062
908 Zero (&myop, 1, LOGOP); 1063 Zero (&myop, 1, UNOP);
909 myop.op_next = PL_op; 1064 myop.op_next = PL_op;
910 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1065 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
911 1066
912 PUSHMARK (SP); 1067 PUSHMARK (SP);
913 EXTEND (SP, 2); 1068 EXTEND (SP, 2);
914 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx)))); 1069 PUSHs (sv_2mortal (newSViv ((IV)cctx)));
915 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1070 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
916 PUTBACK; 1071 PUTBACK;
917 PL_op = (OP *)&myop; 1072 PL_op = (OP *)&myop;
918 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1073 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
919 SPAGAIN; 1074 SPAGAIN;
920} 1075}
921 1076
1077/* the tail of transfer: execute stuff we can only do after a transfer */
1078INLINE void
1079transfer_tail (pTHX)
1080{
1081 struct coro *next = (struct coro *)transfer_next;
1082 assert (!(transfer_next = 0)); /* just used for the side effect when asserts are enabled */
1083 assert (("FATAL: transfer_next was zero in transfer_tail (please report)", next));
1084
1085 free_coro_mortal (aTHX);
1086 UNLOCK;
1087
1088 if (expect_false (next->throw))
1089 {
1090 SV *exception = sv_2mortal (next->throw);
1091
1092 next->throw = 0;
1093 sv_setsv (ERRSV, exception);
1094 croak (0);
1095 }
1096}
1097
922/* 1098/*
923 * this is a _very_ stripped down perl interpreter ;) 1099 * this is a _very_ stripped down perl interpreter ;)
924 */ 1100 */
925static void 1101static void
926cctx_run (void *arg) 1102cctx_run (void *arg)
927{ 1103{
1104#ifdef USE_ITHREADS
1105# if CORO_PTHREAD
1106 PERL_SET_CONTEXT (coro_thx);
1107# endif
1108#endif
1109 {
928 dTHX; 1110 dTHX;
929 1111
930 /* cctx_run is the alternative tail of transfer(), so unlock here. */ 1112 /* entersub called ENTER, but we never 'returned', undo that here */
931 UNLOCK; 1113 ENTERSUB_TAIL;
932 1114
933 /* we now skip the entersub that lead to transfer() */ 1115 /* we now skip the entersub that did lead to transfer() */
934 PL_op = PL_op->op_next; 1116 PL_op = PL_op->op_next;
935 1117
936 /* inject a fake subroutine call to cctx_init */ 1118 /* inject a fake subroutine call to cctx_init */
937 cctx_prepare (aTHX_ (coro_cctx *)arg); 1119 cctx_prepare (aTHX_ (coro_cctx *)arg);
938 1120
1121 /* cctx_run is the alternative tail of transfer() */
1122 transfer_tail (aTHX);
1123
939 /* somebody or something will hit me for both perl_run and PL_restartop */ 1124 /* somebody or something will hit me for both perl_run and PL_restartop */
940 PL_restartop = PL_op; 1125 PL_restartop = PL_op;
941 perl_run (PL_curinterp); 1126 perl_run (PL_curinterp);
942 1127
943 /* 1128 /*
944 * If perl-run returns we assume exit() was being called or the coro 1129 * If perl-run returns we assume exit() was being called or the coro
945 * fell off the end, which seems to be the only valid (non-bug) 1130 * fell off the end, which seems to be the only valid (non-bug)
946 * reason for perl_run to return. We try to exit by jumping to the 1131 * reason for perl_run to return. We try to exit by jumping to the
947 * bootstrap-time "top" top_env, as we cannot restore the "main" 1132 * bootstrap-time "top" top_env, as we cannot restore the "main"
948 * coroutine as Coro has no such concept 1133 * coroutine as Coro has no such concept
949 */ 1134 */
950 PL_top_env = main_top_env; 1135 PL_top_env = main_top_env;
951 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1136 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1137 }
952} 1138}
953 1139
954static coro_cctx * 1140static coro_cctx *
955cctx_new () 1141cctx_new ()
956{ 1142{
957 coro_cctx *cctx; 1143 coro_cctx *cctx;
1144
1145 ++cctx_count;
1146 New (0, cctx, 1, coro_cctx);
1147
1148 cctx->gen = cctx_gen;
1149 cctx->flags = 0;
1150 cctx->idle_sp = 0; /* can be accessed by transfer between cctx_run and set_stacklevel, on throw */
1151
1152 return cctx;
1153}
1154
1155/* create a new cctx only suitable as source */
1156static coro_cctx *
1157cctx_new_empty ()
1158{
1159 coro_cctx *cctx = cctx_new ();
1160
1161 cctx->sptr = 0;
1162 coro_create (&cctx->cctx, 0, 0, 0, 0);
1163
1164 return cctx;
1165}
1166
1167/* create a new cctx suitable as destination/running a perl interpreter */
1168static coro_cctx *
1169cctx_new_run ()
1170{
1171 coro_cctx *cctx = cctx_new ();
958 void *stack_start; 1172 void *stack_start;
959 size_t stack_size; 1173 size_t stack_size;
960 1174
961 ++cctx_count;
962
963 Newz (0, cctx, 1, coro_cctx);
964
965#if HAVE_MMAP 1175#if HAVE_MMAP
966 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1176 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
967 /* mmap supposedly does allocate-on-write for us */ 1177 /* mmap supposedly does allocate-on-write for us */
968 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1178 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
969 1179
970 if (cctx->sptr != (void *)-1) 1180 if (cctx->sptr != (void *)-1)
971 { 1181 {
972# if CORO_STACKGUARD 1182 #if CORO_STACKGUARD
973 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1183 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
974# endif 1184 #endif
975 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 1185 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
976 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1186 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
977 cctx->flags |= CC_MAPPED; 1187 cctx->flags |= CC_MAPPED;
978 } 1188 }
979 else 1189 else
980#endif 1190#endif
981 { 1191 {
982 cctx->ssize = coro_stacksize * (long)sizeof (long); 1192 cctx->ssize = cctx_stacksize * (long)sizeof (long);
983 New (0, cctx->sptr, coro_stacksize, long); 1193 New (0, cctx->sptr, cctx_stacksize, long);
984 1194
985 if (!cctx->sptr) 1195 if (!cctx->sptr)
986 { 1196 {
987 perror ("FATAL: unable to allocate stack for coroutine"); 1197 perror ("FATAL: unable to allocate stack for coroutine");
988 _exit (EXIT_FAILURE); 1198 _exit (EXIT_FAILURE);
990 1200
991 stack_start = cctx->sptr; 1201 stack_start = cctx->sptr;
992 stack_size = cctx->ssize; 1202 stack_size = cctx->ssize;
993 } 1203 }
994 1204
995 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1205 #if CORO_USE_VALGRIND
1206 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1207 #endif
1208
996 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1209 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
997 1210
998 return cctx; 1211 return cctx;
999} 1212}
1000 1213
1003{ 1216{
1004 if (!cctx) 1217 if (!cctx)
1005 return; 1218 return;
1006 1219
1007 --cctx_count; 1220 --cctx_count;
1221 coro_destroy (&cctx->cctx);
1008 1222
1223 /* coro_transfer creates new, empty cctx's */
1224 if (cctx->sptr)
1225 {
1009#if CORO_USE_VALGRIND 1226 #if CORO_USE_VALGRIND
1010 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1227 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1011#endif 1228 #endif
1012 1229
1013#if HAVE_MMAP 1230#if HAVE_MMAP
1014 if (cctx->flags & CC_MAPPED) 1231 if (cctx->flags & CC_MAPPED)
1015 munmap (cctx->sptr, cctx->ssize); 1232 munmap (cctx->sptr, cctx->ssize);
1016 else 1233 else
1017#endif 1234#endif
1018 Safefree (cctx->sptr); 1235 Safefree (cctx->sptr);
1236 }
1019 1237
1020 Safefree (cctx); 1238 Safefree (cctx);
1021} 1239}
1022 1240
1023/* wether this cctx should be destructed */ 1241/* wether this cctx should be destructed */
1024#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE)) 1242#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1025 1243
1026static coro_cctx * 1244static coro_cctx *
1027cctx_get (pTHX) 1245cctx_get (pTHX)
1028{ 1246{
1029 while (expect_true (cctx_first)) 1247 while (expect_true (cctx_first))
1036 return cctx; 1254 return cctx;
1037 1255
1038 cctx_destroy (cctx); 1256 cctx_destroy (cctx);
1039 } 1257 }
1040 1258
1041 return cctx_new (); 1259 return cctx_new_run ();
1042} 1260}
1043 1261
1044static void 1262static void
1045cctx_put (coro_cctx *cctx) 1263cctx_put (coro_cctx *cctx)
1046{ 1264{
1265 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1266
1047 /* free another cctx if overlimit */ 1267 /* free another cctx if overlimit */
1048 if (expect_false (cctx_idle >= MAX_IDLE_CCTX)) 1268 if (expect_false (cctx_idle >= cctx_max_idle))
1049 { 1269 {
1050 coro_cctx *first = cctx_first; 1270 coro_cctx *first = cctx_first;
1051 cctx_first = first->next; 1271 cctx_first = first->next;
1052 --cctx_idle; 1272 --cctx_idle;
1053 1273
1073 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1293 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
1074 1294
1075 if (expect_false (next->flags & CF_DESTROYED)) 1295 if (expect_false (next->flags & CF_DESTROYED))
1076 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1296 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1077 1297
1078 if (
1079#if PERL_VERSION_ATLEAST (5,9,0) 1298#if !PERL_VERSION_ATLEAST (5,10,0)
1080 expect_false (PL_parser)
1081#else
1082 expect_false (PL_lex_state != LEX_NOTPARSING) 1299 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1083#endif
1084 )
1085 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1300 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1301#endif
1086 } 1302 }
1087} 1303}
1088 1304
1089/* always use the TRANSFER macro */ 1305/* always use the TRANSFER macro */
1090static void NOINLINE 1306static void NOINLINE
1091transfer (pTHX_ struct coro *prev, struct coro *next) 1307transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1092{ 1308{
1093 dSTACKLEVEL; 1309 dSTACKLEVEL;
1094 1310
1095 /* sometimes transfer is only called to set idle_sp */ 1311 /* sometimes transfer is only called to set idle_sp */
1096 if (expect_false (!next)) 1312 if (expect_false (!next))
1102 { 1318 {
1103 coro_cctx *prev__cctx; 1319 coro_cctx *prev__cctx;
1104 1320
1105 if (expect_false (prev->flags & CF_NEW)) 1321 if (expect_false (prev->flags & CF_NEW))
1106 { 1322 {
1107 /* create a new empty context */ 1323 /* create a new empty/source context */
1108 Newz (0, prev->cctx, 1, coro_cctx); 1324 prev->cctx = cctx_new_empty ();
1109 prev->flags &= ~CF_NEW; 1325 prev->flags &= ~CF_NEW;
1110 prev->flags |= CF_RUNNING; 1326 prev->flags |= CF_RUNNING;
1111 } 1327 }
1112 1328
1113 prev->flags &= ~CF_RUNNING; 1329 prev->flags &= ~CF_RUNNING;
1114 next->flags |= CF_RUNNING; 1330 next->flags |= CF_RUNNING;
1115 1331
1116 LOCK; 1332 LOCK;
1333
1334 /* first get rid of the old state */
1335 save_perl (aTHX_ prev);
1117 1336
1118 if (expect_false (next->flags & CF_NEW)) 1337 if (expect_false (next->flags & CF_NEW))
1119 { 1338 {
1120 /* need to start coroutine */ 1339 /* need to start coroutine */
1121 next->flags &= ~CF_NEW; 1340 next->flags &= ~CF_NEW;
1122 /* first get rid of the old state */
1123 save_perl (aTHX_ prev);
1124 /* setup coroutine call */ 1341 /* setup coroutine call */
1125 coro_setup (aTHX_ next); 1342 coro_setup (aTHX_ next);
1126 } 1343 }
1127 else 1344 else
1128 {
1129 /* coroutine already started */
1130 save_perl (aTHX_ prev);
1131 load_perl (aTHX_ next); 1345 load_perl (aTHX_ next);
1132 }
1133 1346
1134 prev__cctx = prev->cctx; 1347 prev__cctx = prev->cctx;
1135 1348
1136 /* possibly "free" the cctx */ 1349 /* possibly untie and reuse the cctx */
1137 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1350 if (expect_true (
1351 prev__cctx->idle_sp == STACKLEVEL
1352 && !(prev__cctx->flags & CC_TRACE)
1353 && !force_cctx
1354 ))
1138 { 1355 {
1139 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1356 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1140 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1357 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te));
1141 1358
1142 prev->cctx = 0; 1359 prev->cctx = 0;
1143 1360
1144 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1361 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1145 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1362 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1152 1369
1153 ++next->usecount; 1370 ++next->usecount;
1154 1371
1155 if (expect_true (!next->cctx)) 1372 if (expect_true (!next->cctx))
1156 next->cctx = cctx_get (aTHX); 1373 next->cctx = cctx_get (aTHX);
1374
1375 assert (("FATAL: transfer_next already nonzero in Coro (please report)", !transfer_next));
1376 transfer_next = next;
1157 1377
1158 if (expect_false (prev__cctx != next->cctx)) 1378 if (expect_false (prev__cctx != next->cctx))
1159 { 1379 {
1160 prev__cctx->top_env = PL_top_env; 1380 prev__cctx->top_env = PL_top_env;
1161 PL_top_env = next->cctx->top_env; 1381 PL_top_env = next->cctx->top_env;
1162 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1382 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1163 } 1383 }
1164 1384
1165 free_coro_mortal (aTHX); 1385 transfer_tail (aTHX);
1166 UNLOCK;
1167
1168 if (expect_false (prev->throw || next->throw))
1169 {
1170 struct coro *coro = SvSTATE (coro_current);
1171
1172 if (coro->throw)
1173 {
1174 SV *exception = coro->throw;
1175 coro->throw = 0;
1176 sv_setsv (ERRSV, exception);
1177 croak (0);
1178 }
1179 }
1180 } 1386 }
1181} 1387}
1182 1388
1183struct transfer_args
1184{
1185 struct coro *prev, *next;
1186};
1187
1188#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1389#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1189#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1390#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1190 1391
1191/** high level stuff ********************************************************/ 1392/** high level stuff ********************************************************/
1192 1393
1193static int 1394static int
1217 croak ("FATAL: tried to destroy currently running coroutine"); 1418 croak ("FATAL: tried to destroy currently running coroutine");
1218 1419
1219 save_perl (aTHX_ &temp); 1420 save_perl (aTHX_ &temp);
1220 load_perl (aTHX_ coro); 1421 load_perl (aTHX_ coro);
1221 1422
1222 coro_destroy (aTHX_ coro); 1423 coro_destruct (aTHX_ coro);
1223 1424
1224 load_perl (aTHX_ &temp); 1425 load_perl (aTHX_ &temp);
1225 1426
1226 coro->slot = 0; 1427 coro->slot = 0;
1227 } 1428 }
1287{ 1488{
1288 dTHX; 1489 dTHX;
1289 struct transfer_args ta; 1490 struct transfer_args ta;
1290 1491
1291 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1492 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1292 TRANSFER (ta); 1493 TRANSFER (ta, 1);
1293} 1494}
1294 1495
1295/** Coro ********************************************************************/ 1496/** Coro ********************************************************************/
1296 1497
1297static void 1498static void
1299{ 1500{
1300 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1501 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1301} 1502}
1302 1503
1303static SV * 1504static SV *
1304coro_deq (pTHX_ int min_prio) 1505coro_deq (pTHX)
1305{ 1506{
1306 int prio = PRIO_MAX - PRIO_MIN; 1507 int prio;
1307 1508
1308 min_prio -= PRIO_MIN;
1309 if (min_prio < 0)
1310 min_prio = 0;
1311
1312 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1509 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1313 if (AvFILLp (coro_ready [prio]) >= 0) 1510 if (AvFILLp (coro_ready [prio]) >= 0)
1314 return av_shift (coro_ready [prio]); 1511 return av_shift (coro_ready [prio]);
1315 1512
1316 return 0; 1513 return 0;
1317} 1514}
1319static int 1516static int
1320api_ready (SV *coro_sv) 1517api_ready (SV *coro_sv)
1321{ 1518{
1322 dTHX; 1519 dTHX;
1323 struct coro *coro; 1520 struct coro *coro;
1521 SV *sv_hook;
1522 void (*xs_hook)(void);
1324 1523
1325 if (SvROK (coro_sv)) 1524 if (SvROK (coro_sv))
1326 coro_sv = SvRV (coro_sv); 1525 coro_sv = SvRV (coro_sv);
1327 1526
1328 coro = SvSTATE (coro_sv); 1527 coro = SvSTATE (coro_sv);
1331 return 0; 1530 return 0;
1332 1531
1333 coro->flags |= CF_READY; 1532 coro->flags |= CF_READY;
1334 1533
1335 LOCK; 1534 LOCK;
1535
1536 sv_hook = coro_nready ? 0 : coro_readyhook;
1537 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1538
1336 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1539 coro_enq (aTHX_ SvREFCNT_inc_NN (coro_sv));
1337 ++coro_nready; 1540 ++coro_nready;
1541
1338 UNLOCK; 1542 UNLOCK;
1543
1544 if (sv_hook)
1545 {
1546 dSP;
1547
1548 ENTER;
1549 SAVETMPS;
1550
1551 PUSHMARK (SP);
1552 PUTBACK;
1553 call_sv (sv_hook, G_DISCARD);
1554 SPAGAIN;
1555
1556 FREETMPS;
1557 LEAVE;
1558 }
1559
1560 if (xs_hook)
1561 xs_hook ();
1339 1562
1340 return 1; 1563 return 1;
1341} 1564}
1342 1565
1343static int 1566static int
1344api_is_ready (SV *coro_sv) 1567api_is_ready (SV *coro_sv)
1345{ 1568{
1346 dTHX; 1569 dTHX;
1570
1347 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1571 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1348} 1572}
1349 1573
1350static void 1574INLINE void
1351prepare_schedule (pTHX_ struct transfer_args *ta) 1575prepare_schedule (pTHX_ struct transfer_args *ta)
1352{ 1576{
1353 SV *prev_sv, *next_sv; 1577 SV *prev_sv, *next_sv;
1354 1578
1355 for (;;) 1579 for (;;)
1356 { 1580 {
1357 LOCK; 1581 LOCK;
1358 next_sv = coro_deq (aTHX_ PRIO_MIN); 1582 next_sv = coro_deq (aTHX);
1359 1583
1360 /* nothing to schedule: call the idle handler */ 1584 /* nothing to schedule: call the idle handler */
1361 if (expect_false (!next_sv)) 1585 if (expect_false (!next_sv))
1362 { 1586 {
1363 dSP; 1587 dSP;
1367 SAVETMPS; 1591 SAVETMPS;
1368 1592
1369 PUSHMARK (SP); 1593 PUSHMARK (SP);
1370 PUTBACK; 1594 PUTBACK;
1371 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1595 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1596 SPAGAIN;
1372 1597
1373 FREETMPS; 1598 FREETMPS;
1374 LEAVE; 1599 LEAVE;
1375 continue; 1600 continue;
1376 } 1601 }
1380 /* cannot transfer to destroyed coros, skip and look for next */ 1605 /* cannot transfer to destroyed coros, skip and look for next */
1381 if (expect_false (ta->next->flags & CF_DESTROYED)) 1606 if (expect_false (ta->next->flags & CF_DESTROYED))
1382 { 1607 {
1383 UNLOCK; 1608 UNLOCK;
1384 SvREFCNT_dec (next_sv); 1609 SvREFCNT_dec (next_sv);
1385 /* coro_nready is already taken care of by destroy */ 1610 /* coro_nready has already been taken care of by destroy */
1386 continue; 1611 continue;
1387 } 1612 }
1388 1613
1389 --coro_nready; 1614 --coro_nready;
1390 UNLOCK; 1615 UNLOCK;
1393 1618
1394 /* free this only after the transfer */ 1619 /* free this only after the transfer */
1395 prev_sv = SvRV (coro_current); 1620 prev_sv = SvRV (coro_current);
1396 ta->prev = SvSTATE (prev_sv); 1621 ta->prev = SvSTATE (prev_sv);
1397 TRANSFER_CHECK (*ta); 1622 TRANSFER_CHECK (*ta);
1398 assert (ta->next->flags & CF_READY); 1623 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY));
1399 ta->next->flags &= ~CF_READY; 1624 ta->next->flags &= ~CF_READY;
1400 SvRV_set (coro_current, next_sv); 1625 SvRV_set (coro_current, next_sv);
1401 1626
1402 LOCK; 1627 LOCK;
1403 free_coro_mortal (aTHX); 1628 free_coro_mortal (aTHX);
1404 coro_mortal = prev_sv; 1629 coro_mortal = prev_sv;
1405 UNLOCK; 1630 UNLOCK;
1406} 1631}
1407 1632
1408static void 1633INLINE void
1409prepare_cede (pTHX_ struct transfer_args *ta) 1634prepare_cede (pTHX_ struct transfer_args *ta)
1410{ 1635{
1411 api_ready (coro_current); 1636 api_ready (coro_current);
1412 prepare_schedule (aTHX_ ta); 1637 prepare_schedule (aTHX_ ta);
1413} 1638}
1431{ 1656{
1432 dTHX; 1657 dTHX;
1433 struct transfer_args ta; 1658 struct transfer_args ta;
1434 1659
1435 prepare_schedule (aTHX_ &ta); 1660 prepare_schedule (aTHX_ &ta);
1436 TRANSFER (ta); 1661 TRANSFER (ta, 1);
1437} 1662}
1438 1663
1439static int 1664static int
1440api_cede (void) 1665api_cede (void)
1441{ 1666{
1444 1669
1445 prepare_cede (aTHX_ &ta); 1670 prepare_cede (aTHX_ &ta);
1446 1671
1447 if (expect_true (ta.prev != ta.next)) 1672 if (expect_true (ta.prev != ta.next))
1448 { 1673 {
1449 TRANSFER (ta); 1674 TRANSFER (ta, 1);
1450 return 1; 1675 return 1;
1451 } 1676 }
1452 else 1677 else
1453 return 0; 1678 return 0;
1454} 1679}
1459 dTHX; 1684 dTHX;
1460 struct transfer_args ta; 1685 struct transfer_args ta;
1461 1686
1462 if (prepare_cede_notself (aTHX_ &ta)) 1687 if (prepare_cede_notself (aTHX_ &ta))
1463 { 1688 {
1464 TRANSFER (ta); 1689 TRANSFER (ta, 1);
1465 return 1; 1690 return 1;
1466 } 1691 }
1467 else 1692 else
1468 return 0; 1693 return 0;
1469} 1694}
1475 struct coro *coro = SvSTATE (coro_sv); 1700 struct coro *coro = SvSTATE (coro_sv);
1476 1701
1477 if (flags & CC_TRACE) 1702 if (flags & CC_TRACE)
1478 { 1703 {
1479 if (!coro->cctx) 1704 if (!coro->cctx)
1480 coro->cctx = cctx_new (); 1705 coro->cctx = cctx_new_run ();
1481 else if (!(coro->cctx->flags & CC_TRACE)) 1706 else if (!(coro->cctx->flags & CC_TRACE))
1482 croak ("cannot enable tracing on coroutine with custom stack"); 1707 croak ("cannot enable tracing on coroutine with custom stack");
1483 1708
1484 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1709 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1485 } 1710 }
1492 else 1717 else
1493 coro->slot->runops = RUNOPS_DEFAULT; 1718 coro->slot->runops = RUNOPS_DEFAULT;
1494 } 1719 }
1495} 1720}
1496 1721
1722#if 0
1723static int
1724coro_gensub_free (pTHX_ SV *sv, MAGIC *mg)
1725{
1726 AV *padlist;
1727 AV *av = (AV *)mg->mg_obj;
1728
1729 abort ();
1730
1731 return 0;
1732}
1733
1734static MGVTBL coro_gensub_vtbl = {
1735 0, 0, 0, 0,
1736 coro_gensub_free
1737};
1738#endif
1739
1740/*****************************************************************************/
1741/* PerlIO::cede */
1742
1743typedef struct
1744{
1745 PerlIOBuf base;
1746 NV next, every;
1747} PerlIOCede;
1748
1749static IV
1750PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
1751{
1752 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1753
1754 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
1755 self->next = nvtime () + self->every;
1756
1757 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
1758}
1759
1760static SV *
1761PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
1762{
1763 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1764
1765 return newSVnv (self->every);
1766}
1767
1768static IV
1769PerlIOCede_flush (pTHX_ PerlIO *f)
1770{
1771 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1772 double now = nvtime ();
1773
1774 if (now >= self->next)
1775 {
1776 api_cede ();
1777 self->next = now + self->every;
1778 }
1779
1780 return PerlIOBuf_flush (aTHX_ f);
1781}
1782
1783static PerlIO_funcs PerlIO_cede =
1784{
1785 sizeof(PerlIO_funcs),
1786 "cede",
1787 sizeof(PerlIOCede),
1788 PERLIO_K_DESTRUCT | PERLIO_K_RAW,
1789 PerlIOCede_pushed,
1790 PerlIOBuf_popped,
1791 PerlIOBuf_open,
1792 PerlIOBase_binmode,
1793 PerlIOCede_getarg,
1794 PerlIOBase_fileno,
1795 PerlIOBuf_dup,
1796 PerlIOBuf_read,
1797 PerlIOBuf_unread,
1798 PerlIOBuf_write,
1799 PerlIOBuf_seek,
1800 PerlIOBuf_tell,
1801 PerlIOBuf_close,
1802 PerlIOCede_flush,
1803 PerlIOBuf_fill,
1804 PerlIOBase_eof,
1805 PerlIOBase_error,
1806 PerlIOBase_clearerr,
1807 PerlIOBase_setlinebuf,
1808 PerlIOBuf_get_base,
1809 PerlIOBuf_bufsiz,
1810 PerlIOBuf_get_ptr,
1811 PerlIOBuf_get_cnt,
1812 PerlIOBuf_set_ptrcnt,
1813};
1814
1815
1497MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1816MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1498 1817
1499PROTOTYPES: DISABLE 1818PROTOTYPES: DISABLE
1500 1819
1501BOOT: 1820BOOT:
1502{ 1821{
1503#ifdef USE_ITHREADS 1822#ifdef USE_ITHREADS
1504 MUTEX_INIT (&coro_mutex); 1823 MUTEX_INIT (&coro_lock);
1824# if CORO_PTHREAD
1825 coro_thx = PERL_GET_CONTEXT;
1826# endif
1505#endif 1827#endif
1506 BOOT_PAGESIZE; 1828 BOOT_PAGESIZE;
1507 1829
1508 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1830 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1509 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1831 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1510 1832
1833 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1834 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1835 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1836
1511 hv_sig = coro_get_hv ("SIG", TRUE); 1837 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1512 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE); 1838 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1513 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE); 1839 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1514
1515 if (!PL_diehook ) hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0);
1516 if (!PL_warnhook) hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0);
1517 1840
1518 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1841 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1519 1842
1520 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1843 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1521 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1844 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1526 main_top_env = PL_top_env; 1849 main_top_env = PL_top_env;
1527 1850
1528 while (main_top_env->je_prev) 1851 while (main_top_env->je_prev)
1529 main_top_env = main_top_env->je_prev; 1852 main_top_env = main_top_env->je_prev;
1530 1853
1531 coroapi.ver = CORO_API_VERSION; 1854 coroapi.ver = CORO_API_VERSION;
1532 coroapi.rev = CORO_API_REVISION; 1855 coroapi.rev = CORO_API_REVISION;
1533 coroapi.transfer = api_transfer; 1856 coroapi.transfer = api_transfer;
1857
1858 {
1859 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
1860
1861 if (!svp) croak ("Time::HiRes is required");
1862 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
1863
1864 nvtime = INT2PTR (double (*)(), SvIV (*svp));
1865 }
1534 1866
1535 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1867 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1536} 1868}
1537 1869
1538SV * 1870SV *
1539new (char *klass, ...) 1871new (char *klass, ...)
1540 CODE: 1872 CODE:
1541{ 1873{
1542 struct coro *coro; 1874 struct coro *coro;
1875 MAGIC *mg;
1543 HV *hv; 1876 HV *hv;
1544 int i; 1877 int i;
1545 1878
1546 Newz (0, coro, 1, struct coro); 1879 Newz (0, coro, 1, struct coro);
1547 coro->args = newAV (); 1880 coro->args = newAV ();
1550 if (coro_first) coro_first->prev = coro; 1883 if (coro_first) coro_first->prev = coro;
1551 coro->next = coro_first; 1884 coro->next = coro_first;
1552 coro_first = coro; 1885 coro_first = coro;
1553 1886
1554 coro->hv = hv = newHV (); 1887 coro->hv = hv = newHV ();
1555 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1888 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1889 mg->mg_flags |= MGf_DUP;
1556 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1890 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1557 1891
1558 av_extend (coro->args, items - 1); 1892 av_extend (coro->args, items - 1);
1559 for (i = 1; i < items; i++) 1893 for (i = 1; i < items; i++)
1560 av_push (coro->args, newSVsv (ST (i))); 1894 av_push (coro->args, newSVsv (ST (i)));
1574 Coro::cede_notself = 4 1908 Coro::cede_notself = 4
1575 CODE: 1909 CODE:
1576{ 1910{
1577 struct transfer_args ta; 1911 struct transfer_args ta;
1578 1912
1913 PUTBACK;
1579 switch (ix) 1914 switch (ix)
1580 { 1915 {
1581 case 0: 1916 case 0:
1582 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1917 prepare_set_stacklevel (&ta, (struct coro_cctx *)SvIV (ST (0)));
1583 ta.next = 0;
1584 break; 1918 break;
1585 1919
1586 case 1: 1920 case 1:
1587 if (items != 2) 1921 if (items != 2)
1588 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items); 1922 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d", items);
1589 1923
1590 prepare_transfer (aTHX_ &ta, ST (0), ST (1)); 1924 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1591 break; 1925 break;
1592 1926
1593 case 2: 1927 case 2:
1602 if (!prepare_cede_notself (aTHX_ &ta)) 1936 if (!prepare_cede_notself (aTHX_ &ta))
1603 XSRETURN_EMPTY; 1937 XSRETURN_EMPTY;
1604 1938
1605 break; 1939 break;
1606 } 1940 }
1941 SPAGAIN;
1607 1942
1608 BARRIER; 1943 BARRIER;
1609 PUTBACK; 1944 PUTBACK;
1610 TRANSFER (ta); 1945 TRANSFER (ta, 0);
1611 SPAGAIN; /* might be the sp of a different coroutine now */ 1946 SPAGAIN; /* might be the sp of a different coroutine now */
1612 /* be extra careful not to ever do anything after TRANSFER */ 1947 /* be extra careful not to ever do anything after TRANSFER */
1613} 1948}
1614 1949
1615bool 1950bool
1618 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 1953 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1619 OUTPUT: 1954 OUTPUT:
1620 RETVAL 1955 RETVAL
1621 1956
1622void 1957void
1623_exit (code) 1958_exit (int code)
1624 int code
1625 PROTOTYPE: $ 1959 PROTOTYPE: $
1626 CODE: 1960 CODE:
1627 _exit (code); 1961 _exit (code);
1628 1962
1629int 1963int
1630cctx_stacksize (int new_stacksize = 0) 1964cctx_stacksize (int new_stacksize = 0)
1631 CODE: 1965 CODE:
1632 RETVAL = coro_stacksize; 1966 RETVAL = cctx_stacksize;
1633 if (new_stacksize) 1967 if (new_stacksize)
1968 {
1634 coro_stacksize = new_stacksize; 1969 cctx_stacksize = new_stacksize;
1970 ++cctx_gen;
1971 }
1972 OUTPUT:
1973 RETVAL
1974
1975int
1976cctx_max_idle (int max_idle = 0)
1977 CODE:
1978 RETVAL = cctx_max_idle;
1979 if (max_idle > 1)
1980 cctx_max_idle = max_idle;
1635 OUTPUT: 1981 OUTPUT:
1636 RETVAL 1982 RETVAL
1637 1983
1638int 1984int
1639cctx_count () 1985cctx_count ()
1663call (Coro::State coro, SV *coderef) 2009call (Coro::State coro, SV *coderef)
1664 ALIAS: 2010 ALIAS:
1665 eval = 1 2011 eval = 1
1666 CODE: 2012 CODE:
1667{ 2013{
1668 if (coro->mainstack) 2014 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
1669 { 2015 {
1670 struct coro temp; 2016 struct coro temp;
1671 2017
1672 if (!(coro->flags & CF_RUNNING)) 2018 if (!(coro->flags & CF_RUNNING))
1673 { 2019 {
2020 PUTBACK;
1674 save_perl (aTHX_ &temp); 2021 save_perl (aTHX_ &temp);
1675 load_perl (aTHX_ coro); 2022 load_perl (aTHX_ coro);
1676 } 2023 }
1677 2024
1678 { 2025 {
1697 2044
1698 if (!(coro->flags & CF_RUNNING)) 2045 if (!(coro->flags & CF_RUNNING))
1699 { 2046 {
1700 save_perl (aTHX_ coro); 2047 save_perl (aTHX_ coro);
1701 load_perl (aTHX_ &temp); 2048 load_perl (aTHX_ &temp);
2049 SPAGAIN;
1702 } 2050 }
1703 } 2051 }
1704} 2052}
1705 2053
1706SV * 2054SV *
1715 RETVAL = boolSV (coro->flags & ix); 2063 RETVAL = boolSV (coro->flags & ix);
1716 OUTPUT: 2064 OUTPUT:
1717 RETVAL 2065 RETVAL
1718 2066
1719void 2067void
2068throw (Coro::State self, SV *throw = &PL_sv_undef)
2069 PROTOTYPE: $;$
2070 CODE:
2071 SvREFCNT_dec (self->throw);
2072 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2073
2074void
1720api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 2075api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1721 2076
1722SV * 2077SV *
1723has_stack (Coro::State coro) 2078has_cctx (Coro::State coro)
1724 PROTOTYPE: $ 2079 PROTOTYPE: $
1725 CODE: 2080 CODE:
1726 RETVAL = boolSV (!!coro->cctx); 2081 RETVAL = boolSV (!!coro->cctx);
1727 OUTPUT: 2082 OUTPUT:
1728 RETVAL 2083 RETVAL
1733 CODE: 2088 CODE:
1734 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL; 2089 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1735 OUTPUT: 2090 OUTPUT:
1736 RETVAL 2091 RETVAL
1737 2092
1738IV 2093UV
1739rss (Coro::State coro) 2094rss (Coro::State coro)
1740 PROTOTYPE: $ 2095 PROTOTYPE: $
1741 ALIAS: 2096 ALIAS:
1742 usecount = 1 2097 usecount = 1
1743 CODE: 2098 CODE:
1747 case 1: RETVAL = coro->usecount; break; 2102 case 1: RETVAL = coro->usecount; break;
1748 } 2103 }
1749 OUTPUT: 2104 OUTPUT:
1750 RETVAL 2105 RETVAL
1751 2106
2107void
2108force_cctx ()
2109 CODE:
2110 struct coro *coro = SvSTATE (coro_current);
2111 coro->cctx->idle_sp = 0;
2112
2113void
2114swap_defsv (Coro::State self)
2115 PROTOTYPE: $
2116 ALIAS:
2117 swap_defav = 1
2118 CODE:
2119 if (!self->slot)
2120 croak ("cannot swap state with coroutine that has no saved state");
2121 else
2122 {
2123 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
2124 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2125
2126 SV *tmp = *src; *src = *dst; *dst = tmp;
2127 }
1752 2128
1753MODULE = Coro::State PACKAGE = Coro 2129MODULE = Coro::State PACKAGE = Coro
1754 2130
1755BOOT: 2131BOOT:
1756{ 2132{
1757 int i; 2133 int i;
1758 2134
1759 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1760 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1761 av_async_pool = coro_get_av ("Coro::async_pool", TRUE); 2135 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2136 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2137 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1762 2138
1763 coro_current = coro_get_sv ("Coro::current", FALSE); 2139 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1764 SvREADONLY_on (coro_current); 2140 SvREADONLY_on (coro_current);
1765 2141
1766 coro_stash = gv_stashpv ("Coro", TRUE); 2142 coro_stash = gv_stashpv ("Coro", TRUE);
1767 2143
1768 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 2144 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1774 2150
1775 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2151 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1776 coro_ready[i] = newAV (); 2152 coro_ready[i] = newAV ();
1777 2153
1778 { 2154 {
1779 SV *sv = perl_get_sv ("Coro::API", TRUE); 2155 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
1780 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1781 2156
1782 coroapi.schedule = api_schedule; 2157 coroapi.schedule = api_schedule;
1783 coroapi.cede = api_cede; 2158 coroapi.cede = api_cede;
1784 coroapi.cede_notself = api_cede_notself; 2159 coroapi.cede_notself = api_cede_notself;
1785 coroapi.ready = api_ready; 2160 coroapi.ready = api_ready;
1796void 2171void
1797_set_current (SV *current) 2172_set_current (SV *current)
1798 PROTOTYPE: $ 2173 PROTOTYPE: $
1799 CODE: 2174 CODE:
1800 SvREFCNT_dec (SvRV (coro_current)); 2175 SvREFCNT_dec (SvRV (coro_current));
1801 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 2176 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
2177
2178void
2179_set_readyhook (SV *hook)
2180 PROTOTYPE: $
2181 CODE:
2182 LOCK;
2183 SvREFCNT_dec (coro_readyhook);
2184 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
2185 UNLOCK;
1802 2186
1803int 2187int
1804prio (Coro::State coro, int newprio = 0) 2188prio (Coro::State coro, int newprio = 0)
1805 ALIAS: 2189 ALIAS:
1806 nice = 1 2190 nice = 1
1836 CODE: 2220 CODE:
1837 RETVAL = coro_nready; 2221 RETVAL = coro_nready;
1838 OUTPUT: 2222 OUTPUT:
1839 RETVAL 2223 RETVAL
1840 2224
1841void
1842throw (Coro::State self, SV *throw = &PL_sv_undef)
1843 PROTOTYPE: $;$
1844 CODE:
1845 SvREFCNT_dec (self->throw);
1846 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1847
1848# for async_pool speedup 2225# for async_pool speedup
1849void 2226void
1850_pool_1 (SV *cb) 2227_pool_1 (SV *cb)
1851 CODE: 2228 CODE:
1852{ 2229{
1856 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 2233 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1857 AV *invoke_av; 2234 AV *invoke_av;
1858 int i, len; 2235 int i, len;
1859 2236
1860 if (!invoke) 2237 if (!invoke)
2238 {
2239 SV *old = PL_diehook;
2240 PL_diehook = 0;
2241 SvREFCNT_dec (old);
1861 croak ("\3async_pool terminate\2\n"); 2242 croak ("\3async_pool terminate\2\n");
2243 }
1862 2244
1863 SvREFCNT_dec (coro->saved_deffh); 2245 SvREFCNT_dec (coro->saved_deffh);
1864 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2246 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1865 2247
1866 hv_store (hv, "desc", sizeof ("desc") - 1, 2248 hv_store (hv, "desc", sizeof ("desc") - 1,
1867 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 2249 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1868 2250
1869 invoke_av = (AV *)SvRV (invoke); 2251 invoke_av = (AV *)SvRV (invoke);
1873 2255
1874 if (len > 0) 2256 if (len > 0)
1875 { 2257 {
1876 av_fill (defav, len - 1); 2258 av_fill (defav, len - 1);
1877 for (i = 0; i < len; ++i) 2259 for (i = 0; i < len; ++i)
1878 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 2260 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));
1879 } 2261 }
1880 2262
1881 SvREFCNT_dec (invoke); 2263 SvREFCNT_dec (invoke);
1882} 2264}
1883 2265
1890 sv_setsv (cb, &PL_sv_undef); 2272 sv_setsv (cb, &PL_sv_undef);
1891 2273
1892 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2274 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1893 coro->saved_deffh = 0; 2275 coro->saved_deffh = 0;
1894 2276
1895 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2277 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1896 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2278 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2279 {
2280 SV *old = PL_diehook;
2281 PL_diehook = 0;
2282 SvREFCNT_dec (old);
1897 croak ("\3async_pool terminate\2\n"); 2283 croak ("\3async_pool terminate\2\n");
2284 }
1898 2285
1899 av_clear (GvAV (PL_defgv)); 2286 av_clear (GvAV (PL_defgv));
1900 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2287 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1901 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2288 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1902 2289
1906 api_trace (coro_current, 0); 2293 api_trace (coro_current, 0);
1907 2294
1908 av_push (av_async_pool, newSVsv (coro_current)); 2295 av_push (av_async_pool, newSVsv (coro_current));
1909} 2296}
1910 2297
2298#if 0
2299
2300void
2301_generator_call (...)
2302 PROTOTYPE: @
2303 PPCODE:
2304 fprintf (stderr, "call %p\n", CvXSUBANY(cv).any_ptr);
2305 xxxx
2306 abort ();
2307
2308SV *
2309gensub (SV *sub, ...)
2310 PROTOTYPE: &;@
2311 CODE:
2312{
2313 struct coro *coro;
2314 MAGIC *mg;
2315 CV *xcv;
2316 CV *ncv = (CV *)newSV_type (SVt_PVCV);
2317 int i;
2318
2319 CvGV (ncv) = CvGV (cv);
2320 CvFILE (ncv) = CvFILE (cv);
2321
2322 Newz (0, coro, 1, struct coro);
2323 coro->args = newAV ();
2324 coro->flags = CF_NEW;
2325
2326 av_extend (coro->args, items - 1);
2327 for (i = 1; i < items; i++)
2328 av_push (coro->args, newSVsv (ST (i)));
2329
2330 CvISXSUB_on (ncv);
2331 CvXSUBANY (ncv).any_ptr = (void *)coro;
2332
2333 xcv = GvCV (gv_fetchpv ("Coro::_generator_call", 0, SVt_PVCV));
2334
2335 CvXSUB (ncv) = CvXSUB (xcv);
2336 CvANON_on (ncv);
2337
2338 mg = sv_magicext ((SV *)ncv, 0, CORO_MAGIC_type_state, &coro_gensub_vtbl, (char *)coro, 0);
2339 RETVAL = newRV_noinc ((SV *)ncv);
2340}
2341 OUTPUT:
2342 RETVAL
2343
2344#endif
2345
1911 2346
1912MODULE = Coro::State PACKAGE = Coro::AIO 2347MODULE = Coro::State PACKAGE = Coro::AIO
1913 2348
1914SV * 2349void
1915_get_state () 2350_get_state (SV *self)
1916 CODE: 2351 PPCODE:
1917{ 2352{
1918 struct io_state *data; 2353 AV *defav = GvAV (PL_defgv);
1919 2354 AV *av = newAV ();
2355 int i;
1920 RETVAL = newSV (sizeof (struct io_state)); 2356 SV *data_sv = newSV (sizeof (struct io_state));
1921 data = (struct io_state *)SvPVX (RETVAL); 2357 struct io_state *data = (struct io_state *)SvPVX (data_sv);
1922 SvCUR_set (RETVAL, sizeof (struct io_state)); 2358 SvCUR_set (data_sv, sizeof (struct io_state));
1923 SvPOK_only (RETVAL); 2359 SvPOK_only (data_sv);
1924 2360
1925 data->errorno = errno; 2361 data->errorno = errno;
1926 data->laststype = PL_laststype; 2362 data->laststype = PL_laststype;
1927 data->laststatval = PL_laststatval; 2363 data->laststatval = PL_laststatval;
1928 data->statcache = PL_statcache; 2364 data->statcache = PL_statcache;
2365
2366 av_extend (av, AvFILLp (defav) + 1 + 1);
2367
2368 for (i = 0; i <= AvFILLp (defav); ++i)
2369 av_push (av, SvREFCNT_inc_NN (AvARRAY (defav)[i]));
2370
2371 av_push (av, data_sv);
2372
2373 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2374
2375 api_ready (self);
1929} 2376}
1930 OUTPUT:
1931 RETVAL
1932 2377
1933void 2378void
1934_set_state (char *data_) 2379_set_state (SV *state)
1935 PROTOTYPE: $ 2380 PROTOTYPE: $
1936 CODE: 2381 PPCODE:
1937{ 2382{
1938 struct io_state *data = (void *)data_; 2383 AV *av = (AV *)SvRV (state);
2384 struct io_state *data = (struct io_state *)SvPVX (AvARRAY (av)[AvFILLp (av)]);
2385 int i;
1939 2386
1940 errno = data->errorno; 2387 errno = data->errorno;
1941 PL_laststype = data->laststype; 2388 PL_laststype = data->laststype;
1942 PL_laststatval = data->laststatval; 2389 PL_laststatval = data->laststatval;
1943 PL_statcache = data->statcache; 2390 PL_statcache = data->statcache;
1944}
1945 2391
2392 EXTEND (SP, AvFILLp (av));
2393 for (i = 0; i < AvFILLp (av); ++i)
2394 PUSHs (sv_2mortal (SvREFCNT_inc_NN (AvARRAY (av)[i])));
2395}
2396
2397
2398MODULE = Coro::State PACKAGE = Coro::AnyEvent
2399
2400BOOT:
2401 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2402
2403SV *
2404_schedule (...)
2405 PROTOTYPE: @
2406 CODE:
2407{
2408 static int incede;
2409
2410 api_cede_notself ();
2411
2412 ++incede;
2413 while (coro_nready >= incede && api_cede ())
2414 ;
2415
2416 sv_setsv (sv_activity, &PL_sv_undef);
2417 if (coro_nready >= incede)
2418 {
2419 PUSHMARK (SP);
2420 PUTBACK;
2421 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2422 SPAGAIN;
2423 }
2424
2425 --incede;
2426}
2427
2428
2429MODULE = Coro::State PACKAGE = PerlIO::cede
2430
2431BOOT:
2432 PerlIO_define_layer (aTHX_ &PerlIO_cede);
2433

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines