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.197 by root, Sat Oct 6 19:25:00 2007 UTC vs.
Revision 1.257 by root, Sun Nov 9 15:35:44 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"
9#include "perliol.h"
8 10
9#include "patchlevel.h" 11#include "patchlevel.h"
10 12
11#include <stdio.h> 13#include <stdio.h>
12#include <errno.h> 14#include <errno.h>
13#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
23# include <inttypes.h> /* most portable stdint.h */
24#endif
14 25
15#ifdef HAVE_MMAP 26#ifdef HAVE_MMAP
16# include <unistd.h> 27# include <unistd.h>
17# include <sys/mman.h> 28# include <sys/mman.h>
18# ifndef MAP_ANONYMOUS 29# ifndef MAP_ANONYMOUS
41#else 52#else
42# define REGISTER_STACK(cctx,start,end) 53# define REGISTER_STACK(cctx,start,end)
43#endif 54#endif
44 55
45/* the maximum number of idle cctx that will be pooled */ 56/* the maximum number of idle cctx that will be pooled */
46#define MAX_IDLE_CCTX 8 57static int cctx_max_idle = 4;
47 58
48#define PERL_VERSION_ATLEAST(a,b,c) \ 59#define PERL_VERSION_ATLEAST(a,b,c) \
49 (PERL_REVISION > (a) \ 60 (PERL_REVISION > (a) \
50 || (PERL_REVISION == (a) \ 61 || (PERL_REVISION == (a) \
51 && (PERL_VERSION > (b) \ 62 && (PERL_VERSION > (b) \
70# ifndef IS_PADCONST 81# ifndef IS_PADCONST
71# define IS_PADCONST(v) 0 82# define IS_PADCONST(v) 0
72# endif 83# endif
73#endif 84#endif
74 85
86/* 5.11 */
87#ifndef CxHASARGS
88# define CxHASARGS(cx) (cx)->blk_sub.hasargs
89#endif
90
91/* 5.10.0 */
92#ifndef SvREFCNT_inc_NN
93# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
94#endif
95
96/* 5.8.8 */
97#ifndef GV_NOTQUAL
98# define GV_NOTQUAL 0
99#endif
100#ifndef newSV
101# define newSV(l) NEWSV(0,l)
102#endif
103
75/* 5.8.7 */ 104/* 5.8.7 */
76#ifndef SvRV_set 105#ifndef SvRV_set
77# define SvRV_set(s,v) SvRV(s) = (v) 106# define SvRV_set(s,v) SvRV(s) = (v)
78#endif
79
80/* 5.8.8 */
81#ifndef GV_NOTQUAL
82# define GV_NOTQUAL 0
83#endif
84#ifndef newSV
85# define newSV(l) NEWSV(0,l)
86#endif 107#endif
87 108
88#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 109#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
89# undef CORO_STACKGUARD 110# undef CORO_STACKGUARD
90#endif 111#endif
121#define NOINLINE attribute ((noinline)) 142#define NOINLINE attribute ((noinline))
122 143
123#include "CoroAPI.h" 144#include "CoroAPI.h"
124 145
125#ifdef USE_ITHREADS 146#ifdef USE_ITHREADS
147
126static perl_mutex coro_mutex; 148static perl_mutex coro_lock;
127# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) 149# define LOCK do { MUTEX_LOCK (&coro_lock); } while (0)
128# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0) 150# define UNLOCK do { MUTEX_UNLOCK (&coro_lock); } while (0)
151# if CORO_PTHREAD
152static void *coro_thx;
153# endif
154
129#else 155#else
156
130# define LOCK (void)0 157# define LOCK (void)0
131# define UNLOCK (void)0 158# define UNLOCK (void)0
159
132#endif 160#endif
161
162# undef LOCK
163# define LOCK (void)0
164# undef UNLOCK
165# define UNLOCK (void)0
133 166
134/* helper storage struct for Coro::AIO */ 167/* helper storage struct for Coro::AIO */
135struct io_state 168struct io_state
136{ 169{
170 AV *res;
137 int errorno; 171 int errorno;
138 I32 laststype; 172 I32 laststype; /* U16 in 5.10.0 */
139 int laststatval; 173 int laststatval;
140 Stat_t statcache; 174 Stat_t statcache;
141}; 175};
142 176
177static double (*nvtime)(); /* so why doesn't it take void? */
178
179static U32 cctx_gen;
143static size_t coro_stacksize = CORO_STACKSIZE; 180static size_t cctx_stacksize = CORO_STACKSIZE;
144static struct CoroAPI coroapi; 181static struct CoroAPI coroapi;
145static AV *main_mainstack; /* used to differentiate between $main and others */ 182static AV *main_mainstack; /* used to differentiate between $main and others */
146static JMPENV *main_top_env; 183static JMPENV *main_top_env;
147static HV *coro_state_stash, *coro_stash; 184static HV *coro_state_stash, *coro_stash;
148static SV *coro_mortal; /* will be freed after next transfer */ 185static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
149 186
150static GV *irsgv; /* $/ */ 187static GV *irsgv; /* $/ */
151static GV *stdoutgv; /* *STDOUT */ 188static GV *stdoutgv; /* *STDOUT */
189static SV *rv_diehook;
190static SV *rv_warnhook;
191static HV *hv_sig; /* %SIG */
152 192
153/* async_pool helper stuff */ 193/* async_pool helper stuff */
154static SV *sv_pool_rss; 194static SV *sv_pool_rss;
155static SV *sv_pool_size; 195static SV *sv_pool_size;
156static AV *av_async_pool; 196static AV *av_async_pool;
197
198/* Coro::AnyEvent */
199static SV *sv_activity;
157 200
158static struct coro_cctx *cctx_first; 201static struct coro_cctx *cctx_first;
159static int cctx_count, cctx_idle; 202static int cctx_count, cctx_idle;
160 203
161enum { 204enum {
179 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 222 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
180 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 223 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */
181 JMPENV *top_env; 224 JMPENV *top_env;
182 coro_context cctx; 225 coro_context cctx;
183 226
227 U32 gen;
184#if CORO_USE_VALGRIND 228#if CORO_USE_VALGRIND
185 int valgrind_id; 229 int valgrind_id;
186#endif 230#endif
187 unsigned char flags; 231 unsigned char flags;
188} coro_cctx; 232} coro_cctx;
192 CF_READY = 0x0002, /* coroutine is ready */ 236 CF_READY = 0x0002, /* coroutine is ready */
193 CF_NEW = 0x0004, /* has never been switched to */ 237 CF_NEW = 0x0004, /* has never been switched to */
194 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 238 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
195}; 239};
196 240
241/* the structure where most of the perl state is stored, overlaid on the cxstack */
242typedef struct {
243 SV *defsv;
244 AV *defav;
245 SV *errsv;
246 SV *irsgv;
247#define VAR(name,type) type name;
248# include "state.h"
249#undef VAR
250} perl_slots;
251
252#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
253
197/* this is a structure representing a perl-level coroutine */ 254/* this is a structure representing a perl-level coroutine */
198struct coro { 255struct coro {
199 /* the c coroutine allocated to this perl coroutine, if any */ 256 /* the c coroutine allocated to this perl coroutine, if any */
200 coro_cctx *cctx; 257 coro_cctx *cctx;
201 258
259 /* process data */
260 AV *mainstack;
261 perl_slots *slot; /* basically the saved sp */
262
202 /* data associated with this coroutine (initial args) */ 263 AV *args; /* data associated with this coroutine (initial args) */
203 AV *args; 264 int refcnt; /* coroutines are refcounted, yes */
204 int refcnt;
205 int flags; /* CF_ flags */ 265 int flags; /* CF_ flags */
206 266 HV *hv; /* the perl hash associated with this coro, if any */
207 /* optionally saved, might be zero */
208 AV *defav; /* @_ */
209 SV *defsv; /* $_ */
210 SV *errsv; /* $@ */
211 SV *deffh; /* default filehandle */
212 SV *irssv; /* $/ */
213 SV *irssv_sv; /* real $/ cache */
214
215#define VAR(name,type) type name;
216# include "state.h"
217#undef VAR
218 267
219 /* statistics */ 268 /* statistics */
220 int usecount; /* number of transfers to this coro */ 269 int usecount; /* number of transfers to this coro */
221 270
222 /* coro process data */ 271 /* coro process data */
223 int prio; 272 int prio;
224 SV *throw; 273 SV *throw; /* exception to be thrown */
225 274
226 /* async_pool */ 275 /* async_pool */
227 SV *saved_deffh; 276 SV *saved_deffh;
228 277
229 /* linked list */ 278 /* linked list */
230 struct coro *next, *prev; 279 struct coro *next, *prev;
231 HV *hv; /* the perl hash associated with this coro, if any */
232}; 280};
233 281
234typedef struct coro *Coro__State; 282typedef struct coro *Coro__State;
235typedef struct coro *Coro__State_or_hashref; 283typedef struct coro *Coro__State_or_hashref;
236 284
243#define PRIO_IDLE -3 291#define PRIO_IDLE -3
244#define PRIO_MIN -4 292#define PRIO_MIN -4
245 293
246/* for Coro.pm */ 294/* for Coro.pm */
247static SV *coro_current; 295static SV *coro_current;
296static SV *coro_readyhook;
248static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 297static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
249static int coro_nready; 298static int coro_nready;
250static struct coro *coro_first; 299static struct coro *coro_first;
251 300
252/** lowlevel stuff **********************************************************/ 301/** lowlevel stuff **********************************************************/
253 302
303static SV *
304coro_get_sv (pTHX_ const char *name, int create)
305{
306#if PERL_VERSION_ATLEAST (5,10,0)
307 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
308 get_sv (name, create);
309#endif
310 return get_sv (name, create);
311}
312
313static AV *
314coro_get_av (pTHX_ const char *name, int create)
315{
316#if PERL_VERSION_ATLEAST (5,10,0)
317 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
318 get_av (name, create);
319#endif
320 return get_av (name, create);
321}
322
323static HV *
324coro_get_hv (pTHX_ const char *name, int create)
325{
326#if PERL_VERSION_ATLEAST (5,10,0)
327 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
328 get_hv (name, create);
329#endif
330 return get_hv (name, create);
331}
332
254static AV * 333static AV *
255coro_clone_padlist (pTHX_ CV *cv) 334coro_clone_padlist (pTHX_ CV *cv)
256{ 335{
257 AV *padlist = CvPADLIST (cv); 336 AV *padlist = CvPADLIST (cv);
258 AV *newpadlist, *newpad; 337 AV *newpadlist, *newpad;
259 338
260 newpadlist = newAV (); 339 newpadlist = newAV ();
261 AvREAL_off (newpadlist); 340 AvREAL_off (newpadlist);
262#if PERL_VERSION_ATLEAST (5,9,0) 341#if PERL_VERSION_ATLEAST (5,10,0)
263 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 342 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
264#else 343#else
265 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 344 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
266#endif 345#endif
267 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 346 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
268 --AvFILLp (padlist); 347 --AvFILLp (padlist);
269 348
270 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 349 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE)));
271 av_store (newpadlist, 1, (SV *)newpad); 350 av_store (newpadlist, 1, (SV *)newpad);
272 351
273 return newpadlist; 352 return newpadlist;
274} 353}
275 354
305 384
306 /* casting is fun. */ 385 /* casting is fun. */
307 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 386 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
308 free_padlist (aTHX_ padlist); 387 free_padlist (aTHX_ padlist);
309 388
310 SvREFCNT_dec (av); 389 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
311 390
312 return 0; 391 return 0;
313} 392}
314 393
315#define PERL_MAGIC_coro PERL_MAGIC_ext 394#define CORO_MAGIC_type_cv PERL_MAGIC_ext
395#define CORO_MAGIC_type_state PERL_MAGIC_ext
316 396
317static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 397static MGVTBL coro_cv_vtbl = {
398 0, 0, 0, 0,
399 coro_cv_free
400};
318 401
319#define CORO_MAGIC(cv) \ 402#define CORO_MAGIC(sv, type) \
320 SvMAGIC (cv) \ 403 SvMAGIC (sv) \
321 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 404 ? SvMAGIC (sv)->mg_type == type \
322 ? SvMAGIC (cv) \ 405 ? SvMAGIC (sv) \
323 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 406 : mg_find (sv, type) \
324 : 0 407 : 0
408
409#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
410#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
325 411
326static struct coro * 412static struct coro *
327SvSTATE_ (pTHX_ SV *coro) 413SvSTATE_ (pTHX_ SV *coro)
328{ 414{
329 HV *stash; 415 HV *stash;
341 /* very slow, but rare, check */ 427 /* very slow, but rare, check */
342 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 428 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
343 croak ("Coro::State object required"); 429 croak ("Coro::State object required");
344 } 430 }
345 431
346 mg = CORO_MAGIC (coro); 432 mg = CORO_MAGIC_state (coro);
347 return (struct coro *)mg->mg_ptr; 433 return (struct coro *)mg->mg_ptr;
348} 434}
349 435
350#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 436#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
351 437
352/* the next two functions merely cache the padlists */ 438/* the next two functions merely cache the padlists */
353static void 439static void
354get_padlist (pTHX_ CV *cv) 440get_padlist (pTHX_ CV *cv)
355{ 441{
356 MAGIC *mg = CORO_MAGIC (cv); 442 MAGIC *mg = CORO_MAGIC_cv (cv);
357 AV *av; 443 AV *av;
358 444
359 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 445 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
360 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 446 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
361 else 447 else
362 { 448 {
363#if CORO_PREFER_PERL_FUNCTIONS 449#if CORO_PREFER_PERL_FUNCTIONS
364 /* this is probably cleaner, but also slower? */ 450 /* this is probably cleaner? but also slower! */
451 /* in practise, it seems to be less stable */
365 CV *cp = Perl_cv_clone (cv); 452 CV *cp = Perl_cv_clone (cv);
366 CvPADLIST (cv) = CvPADLIST (cp); 453 CvPADLIST (cv) = CvPADLIST (cp);
367 CvPADLIST (cp) = 0; 454 CvPADLIST (cp) = 0;
368 SvREFCNT_dec (cp); 455 SvREFCNT_dec (cp);
369#else 456#else
373} 460}
374 461
375static void 462static void
376put_padlist (pTHX_ CV *cv) 463put_padlist (pTHX_ CV *cv)
377{ 464{
378 MAGIC *mg = CORO_MAGIC (cv); 465 MAGIC *mg = CORO_MAGIC_cv (cv);
379 AV *av; 466 AV *av;
380 467
381 if (expect_false (!mg)) 468 if (expect_false (!mg))
382 { 469 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
383 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
384 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
385 mg->mg_virtual = &vtbl_coro;
386 mg->mg_obj = (SV *)newAV ();
387 }
388 470
389 av = (AV *)mg->mg_obj; 471 av = (AV *)mg->mg_obj;
390 472
391 if (expect_false (AvFILLp (av) >= AvMAX (av))) 473 if (expect_false (AvFILLp (av) >= AvMAX (av)))
392 av_extend (av, AvMAX (av) + 1); 474 av_extend (av, AvMAX (av) + 1);
397/** load & save, init *******************************************************/ 479/** load & save, init *******************************************************/
398 480
399static void 481static void
400load_perl (pTHX_ Coro__State c) 482load_perl (pTHX_ Coro__State c)
401{ 483{
484 perl_slots *slot = c->slot;
485 c->slot = 0;
486
487 PL_mainstack = c->mainstack;
488
489 GvSV (PL_defgv) = slot->defsv;
490 GvAV (PL_defgv) = slot->defav;
491 GvSV (PL_errgv) = slot->errsv;
492 GvSV (irsgv) = slot->irsgv;
493
402#define VAR(name,type) PL_ ## name = c->name; 494 #define VAR(name,type) PL_ ## name = slot->name;
403# include "state.h" 495 # include "state.h"
404#undef VAR 496 #undef VAR
405
406 GvSV (PL_defgv) = c->defsv;
407 GvAV (PL_defgv) = c->defav;
408 GvSV (PL_errgv) = c->errsv;
409 GvSV (irsgv) = c->irssv_sv;
410 497
411 { 498 {
412 dSP; 499 dSP;
500
413 CV *cv; 501 CV *cv;
414 502
415 /* now do the ugly restore mess */ 503 /* now do the ugly restore mess */
416 while (expect_true (cv = (CV *)POPs)) 504 while (expect_true (cv = (CV *)POPs))
417 { 505 {
452 540
453 if (expect_true (CvDEPTH (cv))) 541 if (expect_true (CvDEPTH (cv)))
454 { 542 {
455 EXTEND (SP, 3); 543 EXTEND (SP, 3);
456 PUSHs ((SV *)CvPADLIST (cv)); 544 PUSHs ((SV *)CvPADLIST (cv));
457 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 545 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
458 PUSHs ((SV *)cv); 546 PUSHs ((SV *)cv);
459 547
460 CvDEPTH (cv) = 0; 548 CvDEPTH (cv) = 0;
461 get_padlist (aTHX_ cv); 549 get_padlist (aTHX_ cv);
462 } 550 }
472 } 560 }
473 561
474 PUTBACK; 562 PUTBACK;
475 } 563 }
476 564
565 /* allocate some space on the context stack for our purposes */
566 /* we manually unroll here, as usually 2 slots is enough */
567 if (SLOT_COUNT >= 1) CXINC;
568 if (SLOT_COUNT >= 2) CXINC;
569 if (SLOT_COUNT >= 3) CXINC;
570 {
571 int i;
572 for (i = 3; i < SLOT_COUNT; ++i)
573 CXINC;
574 }
575 cxstack_ix -= SLOT_COUNT; /* undo allocation */
576
577 c->mainstack = PL_mainstack;
578
579 {
580 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
581
477 c->defav = GvAV (PL_defgv); 582 slot->defav = GvAV (PL_defgv);
478 c->defsv = DEFSV; 583 slot->defsv = DEFSV;
479 c->errsv = ERRSV; 584 slot->errsv = ERRSV;
480 c->irssv_sv = GvSV (irsgv); 585 slot->irsgv = GvSV (irsgv);
481 586
482#define VAR(name,type)c->name = PL_ ## name; 587 #define VAR(name,type) slot->name = PL_ ## name;
483# include "state.h" 588 # include "state.h"
484#undef VAR 589 #undef VAR
590 }
485} 591}
486 592
487/* 593/*
488 * allocate various perl stacks. This is an exact copy 594 * allocate various perl stacks. This is an exact copy
489 * of perl.c:init_stacks, except that it uses less memory 595 * of perl.c:init_stacks, except that it uses less memory
494# define coro_init_stacks init_stacks 600# define coro_init_stacks init_stacks
495#else 601#else
496static void 602static void
497coro_init_stacks (pTHX) 603coro_init_stacks (pTHX)
498{ 604{
499 PL_curstackinfo = new_stackinfo(64, 6); 605 PL_curstackinfo = new_stackinfo(32, 8);
500 PL_curstackinfo->si_type = PERLSI_MAIN; 606 PL_curstackinfo->si_type = PERLSI_MAIN;
501 PL_curstack = PL_curstackinfo->si_stack; 607 PL_curstack = PL_curstackinfo->si_stack;
502 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 608 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
503 609
504 PL_stack_base = AvARRAY(PL_curstack); 610 PL_stack_base = AvARRAY(PL_curstack);
505 PL_stack_sp = PL_stack_base; 611 PL_stack_sp = PL_stack_base;
506 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 612 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
507 613
508 New(50,PL_tmps_stack,64,SV*); 614 New(50,PL_tmps_stack,32,SV*);
509 PL_tmps_floor = -1; 615 PL_tmps_floor = -1;
510 PL_tmps_ix = -1; 616 PL_tmps_ix = -1;
511 PL_tmps_max = 64; 617 PL_tmps_max = 32;
512 618
513 New(54,PL_markstack,16,I32); 619 New(54,PL_markstack,16,I32);
514 PL_markstack_ptr = PL_markstack; 620 PL_markstack_ptr = PL_markstack;
515 PL_markstack_max = PL_markstack + 16; 621 PL_markstack_max = PL_markstack + 16;
516 622
517#ifdef SET_MARK_OFFSET 623#ifdef SET_MARK_OFFSET
518 SET_MARK_OFFSET; 624 SET_MARK_OFFSET;
519#endif 625#endif
520 626
521 New(54,PL_scopestack,16,I32); 627 New(54,PL_scopestack,8,I32);
522 PL_scopestack_ix = 0; 628 PL_scopestack_ix = 0;
523 PL_scopestack_max = 16; 629 PL_scopestack_max = 8;
524 630
525 New(54,PL_savestack,64,ANY); 631 New(54,PL_savestack,24,ANY);
526 PL_savestack_ix = 0; 632 PL_savestack_ix = 0;
527 PL_savestack_max = 64; 633 PL_savestack_max = 24;
528 634
529#if !PERL_VERSION_ATLEAST (5,9,0) 635#if !PERL_VERSION_ATLEAST (5,10,0)
530 New(54,PL_retstack,4,OP*); 636 New(54,PL_retstack,4,OP*);
531 PL_retstack_ix = 0; 637 PL_retstack_ix = 0;
532 PL_retstack_max = 4; 638 PL_retstack_max = 4;
533#endif 639#endif
534} 640}
536 642
537/* 643/*
538 * destroy the stacks, the callchain etc... 644 * destroy the stacks, the callchain etc...
539 */ 645 */
540static void 646static void
541coro_destroy_stacks (pTHX) 647coro_destruct_stacks (pTHX)
542{ 648{
543 while (PL_curstackinfo->si_next) 649 while (PL_curstackinfo->si_next)
544 PL_curstackinfo = PL_curstackinfo->si_next; 650 PL_curstackinfo = PL_curstackinfo->si_next;
545 651
546 while (PL_curstackinfo) 652 while (PL_curstackinfo)
557 663
558 Safefree (PL_tmps_stack); 664 Safefree (PL_tmps_stack);
559 Safefree (PL_markstack); 665 Safefree (PL_markstack);
560 Safefree (PL_scopestack); 666 Safefree (PL_scopestack);
561 Safefree (PL_savestack); 667 Safefree (PL_savestack);
562#if !PERL_VERSION_ATLEAST (5,9,0) 668#if !PERL_VERSION_ATLEAST (5,10,0)
563 Safefree (PL_retstack); 669 Safefree (PL_retstack);
564#endif 670#endif
565} 671}
566 672
567static size_t 673static size_t
569{ 675{
570 size_t rss = sizeof (*coro); 676 size_t rss = sizeof (*coro);
571 677
572 if (coro->mainstack) 678 if (coro->mainstack)
573 { 679 {
680 perl_slots tmp_slot;
681 perl_slots *slot;
682
574 if (coro->flags & CF_RUNNING) 683 if (coro->flags & CF_RUNNING)
575 { 684 {
685 slot = &tmp_slot;
686
576 #define VAR(name,type)coro->name = PL_ ## name; 687 #define VAR(name,type) slot->name = PL_ ## name;
577 # include "state.h" 688 # include "state.h"
578 #undef VAR 689 #undef VAR
579 } 690 }
691 else
692 slot = coro->slot;
580 693
694 if (slot)
695 {
581 rss += sizeof (coro->curstackinfo); 696 rss += sizeof (slot->curstackinfo);
582 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
583 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 697 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
584 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 698 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
585 rss += coro->tmps_max * sizeof (SV *); 699 rss += slot->tmps_max * sizeof (SV *);
586 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 700 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
587 rss += coro->scopestack_max * sizeof (I32); 701 rss += slot->scopestack_max * sizeof (I32);
588 rss += coro->savestack_max * sizeof (ANY); 702 rss += slot->savestack_max * sizeof (ANY);
589 703
590#if !PERL_VERSION_ATLEAST (5,9,0) 704#if !PERL_VERSION_ATLEAST (5,10,0)
591 rss += coro->retstack_max * sizeof (OP *); 705 rss += slot->retstack_max * sizeof (OP *);
592#endif 706#endif
707 }
593 } 708 }
594 709
595 return rss; 710 return rss;
596} 711}
597 712
598/** coroutine stack handling ************************************************/ 713/** coroutine stack handling ************************************************/
714
715static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
716static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
717static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
718
719/* apparently < 5.8.8 */
720#ifndef MgPV_nolen_const
721#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
722 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
723 (const char*)(mg)->mg_ptr)
724#endif
725
726/*
727 * This overrides the default magic get method of %SIG elements.
728 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
729 * and instead of tryign to save and restore the hash elements, we just provide
730 * readback here.
731 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
732 * not expecting this to actually change the hook. This is a potential problem
733 * when a schedule happens then, but we ignore this.
734 */
735static int
736coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
737{
738 const char *s = MgPV_nolen_const (mg);
739
740 if (*s == '_')
741 {
742 SV **svp = 0;
743
744 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
745 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
746
747 if (svp)
748 {
749 sv_setsv (sv, *svp ? *svp : &PL_sv_undef);
750 return 0;
751 }
752 }
753
754 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
755}
756
757static int
758coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
759{
760 const char *s = MgPV_nolen_const (mg);
761
762 if (*s == '_')
763 {
764 SV **svp = 0;
765
766 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
767 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
768
769 if (svp)
770 {
771 SV *old = *svp;
772 *svp = 0;
773 SvREFCNT_dec (old);
774 return 0;
775 }
776 }
777
778 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
779}
780
781static int
782coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
783{
784 const char *s = MgPV_nolen_const (mg);
785
786 if (*s == '_')
787 {
788 SV **svp = 0;
789
790 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
791 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
792
793 if (svp)
794 {
795 SV *old = *svp;
796 *svp = newSVsv (sv);
797 SvREFCNT_dec (old);
798 return 0;
799 }
800 }
801
802 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
803}
599 804
600static void 805static void
601coro_setup (pTHX_ struct coro *coro) 806coro_setup (pTHX_ struct coro *coro)
602{ 807{
603 /* 808 /*
612 PL_curpm = 0; 817 PL_curpm = 0;
613 PL_curpad = 0; 818 PL_curpad = 0;
614 PL_localizing = 0; 819 PL_localizing = 0;
615 PL_dirty = 0; 820 PL_dirty = 0;
616 PL_restartop = 0; 821 PL_restartop = 0;
822#if PERL_VERSION_ATLEAST (5,10,0)
823 PL_parser = 0;
824#endif
825
826 /* recreate the die/warn hooks */
827 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
828 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
617 829
618 GvSV (PL_defgv) = newSV (0); 830 GvSV (PL_defgv) = newSV (0);
619 GvAV (PL_defgv) = coro->args; coro->args = 0; 831 GvAV (PL_defgv) = coro->args; coro->args = 0;
620 GvSV (PL_errgv) = newSV (0); 832 GvSV (PL_errgv) = newSV (0);
621 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 833 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
622 PL_rs = newSVsv (GvSV (irsgv)); 834 PL_rs = newSVsv (GvSV (irsgv));
623 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv); 835 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
624 836
625 { 837 {
626 dSP; 838 dSP;
627 LOGOP myop; 839 LOGOP myop;
628 840
636 PL_op = (OP *)&myop; 848 PL_op = (OP *)&myop;
637 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 849 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
638 SPAGAIN; 850 SPAGAIN;
639 } 851 }
640 852
641 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */ 853 /* this newly created coroutine might be run on an existing cctx which most
854 * likely was suspended in set_stacklevel, called from entersub.
855 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
856 * so we ENTER here for symmetry
857 */
858 ENTER;
642} 859}
643 860
644static void 861static void
645coro_destroy (pTHX_ struct coro *coro) 862coro_destruct (pTHX_ struct coro *coro)
646{ 863{
647 if (!IN_DESTRUCT) 864 if (!IN_DESTRUCT)
648 { 865 {
649 /* restore all saved variables and stuff */ 866 /* restore all saved variables and stuff */
650 LEAVE_SCOPE (0); 867 LEAVE_SCOPE (0);
666 SvREFCNT_dec (GvSV (PL_errgv)); 883 SvREFCNT_dec (GvSV (PL_errgv));
667 SvREFCNT_dec (PL_defoutgv); 884 SvREFCNT_dec (PL_defoutgv);
668 SvREFCNT_dec (PL_rs); 885 SvREFCNT_dec (PL_rs);
669 SvREFCNT_dec (GvSV (irsgv)); 886 SvREFCNT_dec (GvSV (irsgv));
670 887
888 SvREFCNT_dec (PL_diehook);
889 SvREFCNT_dec (PL_warnhook);
890
671 SvREFCNT_dec (coro->saved_deffh); 891 SvREFCNT_dec (coro->saved_deffh);
672 SvREFCNT_dec (coro->throw); 892 SvREFCNT_dec (coro->throw);
673 893
674 coro_destroy_stacks (aTHX); 894 coro_destruct_stacks (aTHX);
675} 895}
676 896
677static void 897static void
678free_coro_mortal (pTHX) 898free_coro_mortal (pTHX)
679{ 899{
716 : cx->blk_gimme == G_SCALAR ? bot + 1 936 : cx->blk_gimme == G_SCALAR ? bot + 1
717 : bot; 937 : bot;
718 938
719 av_extend (av, top - bot); 939 av_extend (av, top - bot);
720 while (bot < top) 940 while (bot < top)
721 av_push (av, SvREFCNT_inc (*bot++)); 941 av_push (av, SvREFCNT_inc_NN (*bot++));
722 942
723 PL_runops = RUNOPS_DEFAULT; 943 PL_runops = RUNOPS_DEFAULT;
724 ENTER; 944 ENTER;
725 SAVETMPS; 945 SAVETMPS;
726 EXTEND (SP, 3); 946 EXTEND (SP, 3);
764 SAVETMPS; 984 SAVETMPS;
765 EXTEND (SP, 3); 985 EXTEND (SP, 3);
766 PUSHMARK (SP); 986 PUSHMARK (SP);
767 PUSHs (&PL_sv_yes); 987 PUSHs (&PL_sv_yes);
768 PUSHs (fullname); 988 PUSHs (fullname);
769 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 989 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
770 PUTBACK; 990 PUTBACK;
771 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 991 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
772 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 992 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
773 SPAGAIN; 993 SPAGAIN;
774 FREETMPS; 994 FREETMPS;
810 1030
811/* inject a fake call to Coro::State::_cctx_init into the execution */ 1031/* inject a fake call to Coro::State::_cctx_init into the execution */
812/* _cctx_init should be careful, as it could be called at almost any time */ 1032/* _cctx_init should be careful, as it could be called at almost any time */
813/* during execution of a perl program */ 1033/* during execution of a perl program */
814static void NOINLINE 1034static void NOINLINE
815prepare_cctx (pTHX_ coro_cctx *cctx) 1035cctx_prepare (pTHX_ coro_cctx *cctx)
816{ 1036{
817 dSP; 1037 dSP;
818 LOGOP myop; 1038 LOGOP myop;
819 1039
820 PL_top_env = &PL_start_env; 1040 PL_top_env = &PL_start_env;
838 1058
839/* 1059/*
840 * this is a _very_ stripped down perl interpreter ;) 1060 * this is a _very_ stripped down perl interpreter ;)
841 */ 1061 */
842static void 1062static void
843coro_run (void *arg) 1063cctx_run (void *arg)
844{ 1064{
1065#ifdef USE_ITHREADS
1066# if CORO_PTHREAD
1067 PERL_SET_CONTEXT (coro_thx);
1068# endif
1069#endif
1070 {
845 dTHX; 1071 dTHX;
846 1072
847 /* coro_run is the alternative tail of transfer(), so unlock here. */ 1073 /* cctx_run is the alternative tail of transfer(), so unlock here. */
848 UNLOCK; 1074 UNLOCK;
849 1075
850 /* we now skip the entersub that lead to transfer() */ 1076 /* we now skip the entersub that lead to transfer() */
851 PL_op = PL_op->op_next; 1077 PL_op = PL_op->op_next;
852 1078
853 /* inject a fake subroutine call to cctx_init */ 1079 /* inject a fake subroutine call to cctx_init */
854 prepare_cctx (aTHX_ (coro_cctx *)arg); 1080 cctx_prepare (aTHX_ (coro_cctx *)arg);
855 1081
856 /* somebody or something will hit me for both perl_run and PL_restartop */ 1082 /* somebody or something will hit me for both perl_run and PL_restartop */
857 PL_restartop = PL_op; 1083 PL_restartop = PL_op;
858 perl_run (PL_curinterp); 1084 perl_run (PL_curinterp);
859 1085
860 /* 1086 /*
861 * If perl-run returns we assume exit() was being called or the coro 1087 * If perl-run returns we assume exit() was being called or the coro
862 * fell off the end, which seems to be the only valid (non-bug) 1088 * fell off the end, which seems to be the only valid (non-bug)
863 * reason for perl_run to return. We try to exit by jumping to the 1089 * reason for perl_run to return. We try to exit by jumping to the
864 * bootstrap-time "top" top_env, as we cannot restore the "main" 1090 * bootstrap-time "top" top_env, as we cannot restore the "main"
865 * coroutine as Coro has no such concept 1091 * coroutine as Coro has no such concept
866 */ 1092 */
867 PL_top_env = main_top_env; 1093 PL_top_env = main_top_env;
868 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1094 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1095 }
869} 1096}
870 1097
871static coro_cctx * 1098static coro_cctx *
872cctx_new () 1099cctx_new ()
873{ 1100{
874 coro_cctx *cctx; 1101 coro_cctx *cctx;
875 void *stack_start; 1102 void *stack_start;
876 size_t stack_size; 1103 size_t stack_size;
877 1104
878 ++cctx_count; 1105 ++cctx_count;
879
880 Newz (0, cctx, 1, coro_cctx); 1106 Newz (0, cctx, 1, coro_cctx);
881 1107
1108 cctx->gen = cctx_gen;
1109
882#if HAVE_MMAP 1110#if HAVE_MMAP
883
884 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1111 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
885 /* mmap supposedly does allocate-on-write for us */ 1112 /* mmap supposedly does allocate-on-write for us */
886 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1113 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
887 1114
888 if (cctx->sptr != (void *)-1) 1115 if (cctx->sptr != (void *)-1)
889 { 1116 {
895 cctx->flags |= CC_MAPPED; 1122 cctx->flags |= CC_MAPPED;
896 } 1123 }
897 else 1124 else
898#endif 1125#endif
899 { 1126 {
900 cctx->ssize = coro_stacksize * (long)sizeof (long); 1127 cctx->ssize = cctx_stacksize * (long)sizeof (long);
901 New (0, cctx->sptr, coro_stacksize, long); 1128 New (0, cctx->sptr, cctx_stacksize, long);
902 1129
903 if (!cctx->sptr) 1130 if (!cctx->sptr)
904 { 1131 {
905 perror ("FATAL: unable to allocate stack for coroutine"); 1132 perror ("FATAL: unable to allocate stack for coroutine");
906 _exit (EXIT_FAILURE); 1133 _exit (EXIT_FAILURE);
909 stack_start = cctx->sptr; 1136 stack_start = cctx->sptr;
910 stack_size = cctx->ssize; 1137 stack_size = cctx->ssize;
911 } 1138 }
912 1139
913 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1140 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
914 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1141 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
915 1142
916 return cctx; 1143 return cctx;
917} 1144}
918 1145
919static void 1146static void
921{ 1148{
922 if (!cctx) 1149 if (!cctx)
923 return; 1150 return;
924 1151
925 --cctx_count; 1152 --cctx_count;
1153 coro_destroy (&cctx->cctx);
926 1154
1155 /* coro_transfer creates new, empty cctx's */
1156 if (cctx->sptr)
1157 {
927#if CORO_USE_VALGRIND 1158#if CORO_USE_VALGRIND
928 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1159 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
929#endif 1160#endif
930 1161
931#if HAVE_MMAP 1162#if HAVE_MMAP
932 if (cctx->flags & CC_MAPPED) 1163 if (cctx->flags & CC_MAPPED)
933 munmap (cctx->sptr, cctx->ssize); 1164 munmap (cctx->sptr, cctx->ssize);
934 else 1165 else
935#endif 1166#endif
936 Safefree (cctx->sptr); 1167 Safefree (cctx->sptr);
1168 }
937 1169
938 Safefree (cctx); 1170 Safefree (cctx);
939} 1171}
940 1172
941/* wether this cctx should be destructed */ 1173/* wether this cctx should be destructed */
942#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE)) 1174#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
943 1175
944static coro_cctx * 1176static coro_cctx *
945cctx_get (pTHX) 1177cctx_get (pTHX)
946{ 1178{
947 while (expect_true (cctx_first)) 1179 while (expect_true (cctx_first))
960} 1192}
961 1193
962static void 1194static void
963cctx_put (coro_cctx *cctx) 1195cctx_put (coro_cctx *cctx)
964{ 1196{
1197 assert (("cctx_put called on non-initialised cctx", cctx->sptr));
1198
965 /* free another cctx if overlimit */ 1199 /* free another cctx if overlimit */
966 if (expect_false (cctx_idle >= MAX_IDLE_CCTX)) 1200 if (expect_false (cctx_idle >= cctx_max_idle))
967 { 1201 {
968 coro_cctx *first = cctx_first; 1202 coro_cctx *first = cctx_first;
969 cctx_first = first->next; 1203 cctx_first = first->next;
970 --cctx_idle; 1204 --cctx_idle;
971 1205
991 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1225 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
992 1226
993 if (expect_false (next->flags & CF_DESTROYED)) 1227 if (expect_false (next->flags & CF_DESTROYED))
994 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1228 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
995 1229
1230#if !PERL_VERSION_ATLEAST (5,10,0)
996 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1231 if (expect_false (PL_lex_state != LEX_NOTPARSING))
997 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1232 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1233#endif
998 } 1234 }
999} 1235}
1000 1236
1001/* always use the TRANSFER macro */ 1237/* always use the TRANSFER macro */
1002static void NOINLINE 1238static void NOINLINE
1003transfer (pTHX_ struct coro *prev, struct coro *next) 1239transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1004{ 1240{
1005 dSTACKLEVEL; 1241 dSTACKLEVEL;
1006 1242
1007 /* sometimes transfer is only called to set idle_sp */ 1243 /* sometimes transfer is only called to set idle_sp */
1008 if (expect_false (!next)) 1244 if (expect_false (!next))
1010 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1246 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1011 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1247 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1012 } 1248 }
1013 else if (expect_true (prev != next)) 1249 else if (expect_true (prev != next))
1014 { 1250 {
1251 static volatile int has_throw;
1015 coro_cctx *prev__cctx; 1252 coro_cctx *prev__cctx;
1016 1253
1017 if (expect_false (prev->flags & CF_NEW)) 1254 if (expect_false (prev->flags & CF_NEW))
1018 { 1255 {
1019 /* create a new empty context */ 1256 /* create a new empty/source context */
1257 ++cctx_count;
1020 Newz (0, prev->cctx, 1, coro_cctx); 1258 New (0, prev->cctx, 1, coro_cctx);
1259 prev->cctx->sptr = 0;
1260 coro_create (&prev->cctx->cctx, 0, 0, 0, 0);
1261
1021 prev->flags &= ~CF_NEW; 1262 prev->flags &= ~CF_NEW;
1022 prev->flags |= CF_RUNNING; 1263 prev->flags |= CF_RUNNING;
1023 } 1264 }
1024 1265
1025 prev->flags &= ~CF_RUNNING; 1266 prev->flags &= ~CF_RUNNING;
1026 next->flags |= CF_RUNNING; 1267 next->flags |= CF_RUNNING;
1027 1268
1028 LOCK; 1269 LOCK;
1270
1271 /* first get rid of the old state */
1272 save_perl (aTHX_ prev);
1029 1273
1030 if (expect_false (next->flags & CF_NEW)) 1274 if (expect_false (next->flags & CF_NEW))
1031 { 1275 {
1032 /* need to start coroutine */ 1276 /* need to start coroutine */
1033 next->flags &= ~CF_NEW; 1277 next->flags &= ~CF_NEW;
1034 /* first get rid of the old state */
1035 save_perl (aTHX_ prev);
1036 /* setup coroutine call */ 1278 /* setup coroutine call */
1037 coro_setup (aTHX_ next); 1279 coro_setup (aTHX_ next);
1038 } 1280 }
1039 else 1281 else
1040 {
1041 /* coroutine already started */
1042 save_perl (aTHX_ prev);
1043 load_perl (aTHX_ next); 1282 load_perl (aTHX_ next);
1044 }
1045 1283
1046 prev__cctx = prev->cctx; 1284 prev__cctx = prev->cctx;
1047 1285
1048 /* possibly "free" the cctx */ 1286 /* possibly "free" the cctx */
1049 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1287 if (expect_true (
1288 prev__cctx->idle_sp == STACKLEVEL
1289 && !(prev__cctx->flags & CC_TRACE)
1290 && !force_cctx
1291 ))
1050 { 1292 {
1051 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1293 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1052 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1294 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1053 1295
1054 prev->cctx = 0; 1296 prev->cctx = 0;
1055 1297
1056 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1298 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1057 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1299 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1058 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1300 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1301 if (!next->cctx)
1059 next->cctx = cctx_get (aTHX); 1302 next->cctx = cctx_get (aTHX);
1060 1303
1061 cctx_put (prev__cctx); 1304 cctx_put (prev__cctx);
1062 } 1305 }
1063 1306
1064 ++next->usecount; 1307 ++next->usecount;
1065 1308
1066 if (expect_true (!next->cctx)) 1309 if (expect_true (!next->cctx))
1067 next->cctx = cctx_get (aTHX); 1310 next->cctx = cctx_get (aTHX);
1311
1312 has_throw = !!next->throw;
1068 1313
1069 if (expect_false (prev__cctx != next->cctx)) 1314 if (expect_false (prev__cctx != next->cctx))
1070 { 1315 {
1071 prev__cctx->top_env = PL_top_env; 1316 prev__cctx->top_env = PL_top_env;
1072 PL_top_env = next->cctx->top_env; 1317 PL_top_env = next->cctx->top_env;
1074 } 1319 }
1075 1320
1076 free_coro_mortal (aTHX); 1321 free_coro_mortal (aTHX);
1077 UNLOCK; 1322 UNLOCK;
1078 1323
1079 if (expect_false (prev->throw || next->throw)) 1324 if (expect_false (has_throw))
1080 { 1325 {
1081 struct coro *coro = SvSTATE (coro_current); 1326 struct coro *coro = SvSTATE (coro_current);
1082 1327
1083 if (coro->throw) 1328 if (coro->throw)
1084 { 1329 {
1094struct transfer_args 1339struct transfer_args
1095{ 1340{
1096 struct coro *prev, *next; 1341 struct coro *prev, *next;
1097}; 1342};
1098 1343
1099#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1344#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1100#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1345#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1101 1346
1102/** high level stuff ********************************************************/ 1347/** high level stuff ********************************************************/
1103 1348
1104static int 1349static int
1128 croak ("FATAL: tried to destroy currently running coroutine"); 1373 croak ("FATAL: tried to destroy currently running coroutine");
1129 1374
1130 save_perl (aTHX_ &temp); 1375 save_perl (aTHX_ &temp);
1131 load_perl (aTHX_ coro); 1376 load_perl (aTHX_ coro);
1132 1377
1133 coro_destroy (aTHX_ coro); 1378 coro_destruct (aTHX_ coro);
1134 1379
1135 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1380 load_perl (aTHX_ &temp);
1136 1381
1137 coro->mainstack = 0; 1382 coro->slot = 0;
1138 } 1383 }
1139 1384
1140 cctx_destroy (coro->cctx); 1385 cctx_destroy (coro->cctx);
1141 SvREFCNT_dec (coro->args); 1386 SvREFCNT_dec (coro->args);
1142 1387
1198{ 1443{
1199 dTHX; 1444 dTHX;
1200 struct transfer_args ta; 1445 struct transfer_args ta;
1201 1446
1202 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1447 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1203 TRANSFER (ta); 1448 TRANSFER (ta, 1);
1204} 1449}
1205 1450
1206/** Coro ********************************************************************/ 1451/** Coro ********************************************************************/
1207 1452
1208static void 1453static void
1210{ 1455{
1211 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1456 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1212} 1457}
1213 1458
1214static SV * 1459static SV *
1215coro_deq (pTHX_ int min_prio) 1460coro_deq (pTHX)
1216{ 1461{
1217 int prio = PRIO_MAX - PRIO_MIN; 1462 int prio;
1218 1463
1219 min_prio -= PRIO_MIN;
1220 if (min_prio < 0)
1221 min_prio = 0;
1222
1223 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1464 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1224 if (AvFILLp (coro_ready [prio]) >= 0) 1465 if (AvFILLp (coro_ready [prio]) >= 0)
1225 return av_shift (coro_ready [prio]); 1466 return av_shift (coro_ready [prio]);
1226 1467
1227 return 0; 1468 return 0;
1228} 1469}
1230static int 1471static int
1231api_ready (SV *coro_sv) 1472api_ready (SV *coro_sv)
1232{ 1473{
1233 dTHX; 1474 dTHX;
1234 struct coro *coro; 1475 struct coro *coro;
1476 SV *sv_hook;
1477 void (*xs_hook)(void);
1235 1478
1236 if (SvROK (coro_sv)) 1479 if (SvROK (coro_sv))
1237 coro_sv = SvRV (coro_sv); 1480 coro_sv = SvRV (coro_sv);
1238 1481
1239 coro = SvSTATE (coro_sv); 1482 coro = SvSTATE (coro_sv);
1242 return 0; 1485 return 0;
1243 1486
1244 coro->flags |= CF_READY; 1487 coro->flags |= CF_READY;
1245 1488
1246 LOCK; 1489 LOCK;
1490
1491 sv_hook = coro_nready ? 0 : coro_readyhook;
1492 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1493
1247 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1494 coro_enq (aTHX_ SvREFCNT_inc_NN (coro_sv));
1248 ++coro_nready; 1495 ++coro_nready;
1496
1249 UNLOCK; 1497 UNLOCK;
1498
1499 if (sv_hook)
1500 {
1501 dSP;
1502
1503 ENTER;
1504 SAVETMPS;
1505
1506 PUSHMARK (SP);
1507 PUTBACK;
1508 call_sv (sv_hook, G_DISCARD);
1509 SPAGAIN;
1510
1511 FREETMPS;
1512 LEAVE;
1513 }
1514
1515 if (xs_hook)
1516 xs_hook ();
1250 1517
1251 return 1; 1518 return 1;
1252} 1519}
1253 1520
1254static int 1521static int
1264 SV *prev_sv, *next_sv; 1531 SV *prev_sv, *next_sv;
1265 1532
1266 for (;;) 1533 for (;;)
1267 { 1534 {
1268 LOCK; 1535 LOCK;
1269 next_sv = coro_deq (aTHX_ PRIO_MIN); 1536 next_sv = coro_deq (aTHX);
1270 1537
1271 /* nothing to schedule: call the idle handler */ 1538 /* nothing to schedule: call the idle handler */
1272 if (expect_false (!next_sv)) 1539 if (expect_false (!next_sv))
1273 { 1540 {
1274 dSP; 1541 dSP;
1278 SAVETMPS; 1545 SAVETMPS;
1279 1546
1280 PUSHMARK (SP); 1547 PUSHMARK (SP);
1281 PUTBACK; 1548 PUTBACK;
1282 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1549 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1550 SPAGAIN;
1283 1551
1284 FREETMPS; 1552 FREETMPS;
1285 LEAVE; 1553 LEAVE;
1286 continue; 1554 continue;
1287 } 1555 }
1342{ 1610{
1343 dTHX; 1611 dTHX;
1344 struct transfer_args ta; 1612 struct transfer_args ta;
1345 1613
1346 prepare_schedule (aTHX_ &ta); 1614 prepare_schedule (aTHX_ &ta);
1347 TRANSFER (ta); 1615 TRANSFER (ta, 1);
1348} 1616}
1349 1617
1350static int 1618static int
1351api_cede (void) 1619api_cede (void)
1352{ 1620{
1355 1623
1356 prepare_cede (aTHX_ &ta); 1624 prepare_cede (aTHX_ &ta);
1357 1625
1358 if (expect_true (ta.prev != ta.next)) 1626 if (expect_true (ta.prev != ta.next))
1359 { 1627 {
1360 TRANSFER (ta); 1628 TRANSFER (ta, 1);
1361 return 1; 1629 return 1;
1362 } 1630 }
1363 else 1631 else
1364 return 0; 1632 return 0;
1365} 1633}
1370 dTHX; 1638 dTHX;
1371 struct transfer_args ta; 1639 struct transfer_args ta;
1372 1640
1373 if (prepare_cede_notself (aTHX_ &ta)) 1641 if (prepare_cede_notself (aTHX_ &ta))
1374 { 1642 {
1375 TRANSFER (ta); 1643 TRANSFER (ta, 1);
1376 return 1; 1644 return 1;
1377 } 1645 }
1378 else 1646 else
1379 return 0; 1647 return 0;
1380} 1648}
1399 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1667 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1400 1668
1401 if (coro->flags & CF_RUNNING) 1669 if (coro->flags & CF_RUNNING)
1402 PL_runops = RUNOPS_DEFAULT; 1670 PL_runops = RUNOPS_DEFAULT;
1403 else 1671 else
1404 coro->runops = RUNOPS_DEFAULT; 1672 coro->slot->runops = RUNOPS_DEFAULT;
1673 }
1674}
1675
1676#if 0
1677static int
1678coro_gensub_free (pTHX_ SV *sv, MAGIC *mg)
1679{
1680 AV *padlist;
1681 AV *av = (AV *)mg->mg_obj;
1682
1683 abort ();
1684
1685 return 0;
1686}
1687
1688static MGVTBL coro_gensub_vtbl = {
1689 0, 0, 0, 0,
1690 coro_gensub_free
1691};
1692#endif
1693
1694/*****************************************************************************/
1695/* PerlIO::cede */
1696
1697typedef struct
1698{
1699 PerlIOBuf base;
1700 NV next, every;
1701} PerlIOCede;
1702
1703static IV
1704PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
1705{
1706 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1707
1708 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
1709 self->next = nvtime () + self->every;
1710
1711 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
1712}
1713
1714static SV *
1715PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
1716{
1717 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1718
1719 return newSVnv (self->every);
1720}
1721
1722static IV
1723PerlIOCede_flush (pTHX_ PerlIO *f)
1724{
1725 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1726 double now = nvtime ();
1727
1728 if (now >= self->next)
1405 } 1729 {
1730 api_cede ();
1731 self->next = now + self->every;
1732 }
1733
1734 return PerlIOBuf_flush (aTHX_ f);
1406} 1735}
1736
1737static PerlIO_funcs PerlIO_cede =
1738{
1739 sizeof(PerlIO_funcs),
1740 "cede",
1741 sizeof(PerlIOCede),
1742 PERLIO_K_DESTRUCT | PERLIO_K_RAW,
1743 PerlIOCede_pushed,
1744 PerlIOBuf_popped,
1745 PerlIOBuf_open,
1746 PerlIOBase_binmode,
1747 PerlIOCede_getarg,
1748 PerlIOBase_fileno,
1749 PerlIOBuf_dup,
1750 PerlIOBuf_read,
1751 PerlIOBuf_unread,
1752 PerlIOBuf_write,
1753 PerlIOBuf_seek,
1754 PerlIOBuf_tell,
1755 PerlIOBuf_close,
1756 PerlIOCede_flush,
1757 PerlIOBuf_fill,
1758 PerlIOBase_eof,
1759 PerlIOBase_error,
1760 PerlIOBase_clearerr,
1761 PerlIOBase_setlinebuf,
1762 PerlIOBuf_get_base,
1763 PerlIOBuf_bufsiz,
1764 PerlIOBuf_get_ptr,
1765 PerlIOBuf_get_cnt,
1766 PerlIOBuf_set_ptrcnt,
1767};
1768
1407 1769
1408MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1770MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1409 1771
1410PROTOTYPES: DISABLE 1772PROTOTYPES: DISABLE
1411 1773
1412BOOT: 1774BOOT:
1413{ 1775{
1414#ifdef USE_ITHREADS 1776#ifdef USE_ITHREADS
1415 MUTEX_INIT (&coro_mutex); 1777 MUTEX_INIT (&coro_lock);
1778# if CORO_PTHREAD
1779 coro_thx = PERL_GET_CONTEXT;
1780# endif
1416#endif 1781#endif
1417 BOOT_PAGESIZE; 1782 BOOT_PAGESIZE;
1418 1783
1419 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1784 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1420 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1785 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1786
1787 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1788 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1789 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1790
1791 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1792 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1793 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1421 1794
1422 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1795 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1423 1796
1424 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1797 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1425 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1798 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1430 main_top_env = PL_top_env; 1803 main_top_env = PL_top_env;
1431 1804
1432 while (main_top_env->je_prev) 1805 while (main_top_env->je_prev)
1433 main_top_env = main_top_env->je_prev; 1806 main_top_env = main_top_env->je_prev;
1434 1807
1435 coroapi.ver = CORO_API_VERSION; 1808 coroapi.ver = CORO_API_VERSION;
1809 coroapi.rev = CORO_API_REVISION;
1436 coroapi.transfer = api_transfer; 1810 coroapi.transfer = api_transfer;
1811
1812 {
1813 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
1814
1815 if (!svp) croak ("Time::HiRes is required");
1816 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
1817
1818 nvtime = INT2PTR (double (*)(), SvIV (*svp));
1819 }
1437 1820
1438 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1821 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1439} 1822}
1440 1823
1441SV * 1824SV *
1442new (char *klass, ...) 1825new (char *klass, ...)
1443 CODE: 1826 CODE:
1444{ 1827{
1445 struct coro *coro; 1828 struct coro *coro;
1829 MAGIC *mg;
1446 HV *hv; 1830 HV *hv;
1447 int i; 1831 int i;
1448 1832
1449 Newz (0, coro, 1, struct coro); 1833 Newz (0, coro, 1, struct coro);
1450 coro->args = newAV (); 1834 coro->args = newAV ();
1453 if (coro_first) coro_first->prev = coro; 1837 if (coro_first) coro_first->prev = coro;
1454 coro->next = coro_first; 1838 coro->next = coro_first;
1455 coro_first = coro; 1839 coro_first = coro;
1456 1840
1457 coro->hv = hv = newHV (); 1841 coro->hv = hv = newHV ();
1458 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1842 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1843 mg->mg_flags |= MGf_DUP;
1459 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1844 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1460 1845
1461 av_extend (coro->args, items - 1); 1846 av_extend (coro->args, items - 1);
1462 for (i = 1; i < items; i++) 1847 for (i = 1; i < items; i++)
1463 av_push (coro->args, newSVsv (ST (i))); 1848 av_push (coro->args, newSVsv (ST (i)));
1477 Coro::cede_notself = 4 1862 Coro::cede_notself = 4
1478 CODE: 1863 CODE:
1479{ 1864{
1480 struct transfer_args ta; 1865 struct transfer_args ta;
1481 1866
1867 PUTBACK;
1482 switch (ix) 1868 switch (ix)
1483 { 1869 {
1484 case 0: 1870 case 0:
1485 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1871 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1486 ta.next = 0; 1872 ta.next = 0;
1487 break; 1873 break;
1488 1874
1489 case 1: 1875 case 1:
1490 if (items != 2) 1876 if (items != 2)
1491 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items); 1877 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d", items);
1492 1878
1493 prepare_transfer (aTHX_ &ta, ST (0), ST (1)); 1879 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1494 break; 1880 break;
1495 1881
1496 case 2: 1882 case 2:
1505 if (!prepare_cede_notself (aTHX_ &ta)) 1891 if (!prepare_cede_notself (aTHX_ &ta))
1506 XSRETURN_EMPTY; 1892 XSRETURN_EMPTY;
1507 1893
1508 break; 1894 break;
1509 } 1895 }
1896 SPAGAIN;
1510 1897
1511 BARRIER; 1898 BARRIER;
1899 PUTBACK;
1512 TRANSFER (ta); 1900 TRANSFER (ta, 0);
1513 1901 SPAGAIN; /* might be the sp of a different coroutine now */
1514 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev)) 1902 /* be extra careful not to ever do anything after TRANSFER */
1515 XSRETURN_YES;
1516} 1903}
1517 1904
1518bool 1905bool
1519_destroy (SV *coro_sv) 1906_destroy (SV *coro_sv)
1520 CODE: 1907 CODE:
1521 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 1908 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1522 OUTPUT: 1909 OUTPUT:
1523 RETVAL 1910 RETVAL
1524 1911
1525void 1912void
1526_exit (code) 1913_exit (int code)
1527 int code
1528 PROTOTYPE: $ 1914 PROTOTYPE: $
1529 CODE: 1915 CODE:
1530 _exit (code); 1916 _exit (code);
1531 1917
1532int 1918int
1533cctx_stacksize (int new_stacksize = 0) 1919cctx_stacksize (int new_stacksize = 0)
1534 CODE: 1920 CODE:
1535 RETVAL = coro_stacksize; 1921 RETVAL = cctx_stacksize;
1536 if (new_stacksize) 1922 if (new_stacksize)
1923 {
1537 coro_stacksize = new_stacksize; 1924 cctx_stacksize = new_stacksize;
1925 ++cctx_gen;
1926 }
1927 OUTPUT:
1928 RETVAL
1929
1930int
1931cctx_max_idle (int max_idle = 0)
1932 CODE:
1933 RETVAL = cctx_max_idle;
1934 if (max_idle > 1)
1935 cctx_max_idle = max_idle;
1538 OUTPUT: 1936 OUTPUT:
1539 RETVAL 1937 RETVAL
1540 1938
1541int 1939int
1542cctx_count () 1940cctx_count ()
1566call (Coro::State coro, SV *coderef) 1964call (Coro::State coro, SV *coderef)
1567 ALIAS: 1965 ALIAS:
1568 eval = 1 1966 eval = 1
1569 CODE: 1967 CODE:
1570{ 1968{
1571 if (coro->mainstack) 1969 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
1572 { 1970 {
1573 struct coro temp; 1971 struct coro temp;
1574 Zero (&temp, 1, struct coro);
1575 1972
1576 if (!(coro->flags & CF_RUNNING)) 1973 if (!(coro->flags & CF_RUNNING))
1577 { 1974 {
1975 PUTBACK;
1578 save_perl (aTHX_ &temp); 1976 save_perl (aTHX_ &temp);
1579 load_perl (aTHX_ coro); 1977 load_perl (aTHX_ coro);
1580 } 1978 }
1581 1979
1582 { 1980 {
1583 dSP; 1981 dSP;
1584 ENTER; 1982 ENTER;
1585 SAVETMPS; 1983 SAVETMPS;
1984 PUTBACK;
1985 PUSHSTACK;
1586 PUSHMARK (SP); 1986 PUSHMARK (SP);
1587 PUTBACK; 1987
1588 if (ix) 1988 if (ix)
1589 eval_sv (coderef, 0); 1989 eval_sv (coderef, 0);
1590 else 1990 else
1591 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1991 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1992
1993 POPSTACK;
1592 SPAGAIN; 1994 SPAGAIN;
1593 FREETMPS; 1995 FREETMPS;
1594 LEAVE; 1996 LEAVE;
1595 PUTBACK; 1997 PUTBACK;
1596 } 1998 }
1597 1999
1598 if (!(coro->flags & CF_RUNNING)) 2000 if (!(coro->flags & CF_RUNNING))
1599 { 2001 {
1600 save_perl (aTHX_ coro); 2002 save_perl (aTHX_ coro);
1601 load_perl (aTHX_ &temp); 2003 load_perl (aTHX_ &temp);
2004 SPAGAIN;
1602 } 2005 }
1603 } 2006 }
1604} 2007}
1605 2008
1606SV * 2009SV *
1618 2021
1619void 2022void
1620api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 2023api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1621 2024
1622SV * 2025SV *
1623has_stack (Coro::State coro) 2026has_cctx (Coro::State coro)
1624 PROTOTYPE: $ 2027 PROTOTYPE: $
1625 CODE: 2028 CODE:
1626 RETVAL = boolSV (!!coro->cctx); 2029 RETVAL = boolSV (!!coro->cctx);
1627 OUTPUT: 2030 OUTPUT:
1628 RETVAL 2031 RETVAL
1633 CODE: 2036 CODE:
1634 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL; 2037 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1635 OUTPUT: 2038 OUTPUT:
1636 RETVAL 2039 RETVAL
1637 2040
1638IV 2041UV
1639rss (Coro::State coro) 2042rss (Coro::State coro)
1640 PROTOTYPE: $ 2043 PROTOTYPE: $
1641 ALIAS: 2044 ALIAS:
1642 usecount = 1 2045 usecount = 1
1643 CODE: 2046 CODE:
1647 case 1: RETVAL = coro->usecount; break; 2050 case 1: RETVAL = coro->usecount; break;
1648 } 2051 }
1649 OUTPUT: 2052 OUTPUT:
1650 RETVAL 2053 RETVAL
1651 2054
2055void
2056force_cctx ()
2057 CODE:
2058 struct coro *coro = SvSTATE (coro_current);
2059 coro->cctx->idle_sp = 0;
2060
2061void
2062swap_defsv (Coro::State self)
2063 PROTOTYPE: $
2064 ALIAS:
2065 swap_defav = 1
2066 CODE:
2067 if (!self->slot)
2068 croak ("cannot swap state with coroutine that has no saved state");
2069 else
2070 {
2071 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
2072 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2073
2074 SV *tmp = *src; *src = *dst; *dst = tmp;
2075 }
1652 2076
1653MODULE = Coro::State PACKAGE = Coro 2077MODULE = Coro::State PACKAGE = Coro
1654 2078
1655BOOT: 2079BOOT:
1656{ 2080{
1657 int i; 2081 int i;
1658 2082
1659 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1660 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1661 av_async_pool = get_av ("Coro::async_pool", TRUE); 2083 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2084 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2085 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1662 2086
1663 coro_current = get_sv ("Coro::current", FALSE); 2087 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1664 SvREADONLY_on (coro_current); 2088 SvREADONLY_on (coro_current);
1665 2089
1666 coro_stash = gv_stashpv ("Coro", TRUE); 2090 coro_stash = gv_stashpv ("Coro", TRUE);
1667 2091
1668 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 2092 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1669 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 2093 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1670 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 2094 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1671 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 2095 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1674 2098
1675 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2099 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1676 coro_ready[i] = newAV (); 2100 coro_ready[i] = newAV ();
1677 2101
1678 { 2102 {
1679 SV *sv = perl_get_sv("Coro::API", 1); 2103 SV *sv = perl_get_sv ("Coro::API", TRUE);
2104 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1680 2105
1681 coroapi.schedule = api_schedule; 2106 coroapi.schedule = api_schedule;
1682 coroapi.cede = api_cede; 2107 coroapi.cede = api_cede;
1683 coroapi.cede_notself = api_cede_notself; 2108 coroapi.cede_notself = api_cede_notself;
1684 coroapi.ready = api_ready; 2109 coroapi.ready = api_ready;
1695void 2120void
1696_set_current (SV *current) 2121_set_current (SV *current)
1697 PROTOTYPE: $ 2122 PROTOTYPE: $
1698 CODE: 2123 CODE:
1699 SvREFCNT_dec (SvRV (coro_current)); 2124 SvREFCNT_dec (SvRV (coro_current));
1700 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 2125 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
2126
2127void
2128_set_readyhook (SV *hook)
2129 PROTOTYPE: $
2130 CODE:
2131 LOCK;
2132 SvREFCNT_dec (coro_readyhook);
2133 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
2134 UNLOCK;
1701 2135
1702int 2136int
1703prio (Coro::State coro, int newprio = 0) 2137prio (Coro::State coro, int newprio = 0)
1704 ALIAS: 2138 ALIAS:
1705 nice = 1 2139 nice = 1
1755 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 2189 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1756 AV *invoke_av; 2190 AV *invoke_av;
1757 int i, len; 2191 int i, len;
1758 2192
1759 if (!invoke) 2193 if (!invoke)
2194 {
2195 SV *old = PL_diehook;
2196 PL_diehook = 0;
2197 SvREFCNT_dec (old);
1760 croak ("\3async_pool terminate\2\n"); 2198 croak ("\3async_pool terminate\2\n");
2199 }
1761 2200
1762 SvREFCNT_dec (coro->saved_deffh); 2201 SvREFCNT_dec (coro->saved_deffh);
1763 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2202 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1764 2203
1765 hv_store (hv, "desc", sizeof ("desc") - 1, 2204 hv_store (hv, "desc", sizeof ("desc") - 1,
1766 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 2205 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1767 2206
1768 invoke_av = (AV *)SvRV (invoke); 2207 invoke_av = (AV *)SvRV (invoke);
1772 2211
1773 if (len > 0) 2212 if (len > 0)
1774 { 2213 {
1775 av_fill (defav, len - 1); 2214 av_fill (defav, len - 1);
1776 for (i = 0; i < len; ++i) 2215 for (i = 0; i < len; ++i)
1777 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 2216 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));
1778 } 2217 }
1779 2218
1780 SvREFCNT_dec (invoke); 2219 SvREFCNT_dec (invoke);
1781} 2220}
1782 2221
1789 sv_setsv (cb, &PL_sv_undef); 2228 sv_setsv (cb, &PL_sv_undef);
1790 2229
1791 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2230 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1792 coro->saved_deffh = 0; 2231 coro->saved_deffh = 0;
1793 2232
1794 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2233 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1795 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2234 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2235 {
2236 SV *old = PL_diehook;
2237 PL_diehook = 0;
2238 SvREFCNT_dec (old);
1796 croak ("\3async_pool terminate\2\n"); 2239 croak ("\3async_pool terminate\2\n");
2240 }
1797 2241
1798 av_clear (GvAV (PL_defgv)); 2242 av_clear (GvAV (PL_defgv));
1799 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2243 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1800 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2244 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1801 2245
1805 api_trace (coro_current, 0); 2249 api_trace (coro_current, 0);
1806 2250
1807 av_push (av_async_pool, newSVsv (coro_current)); 2251 av_push (av_async_pool, newSVsv (coro_current));
1808} 2252}
1809 2253
2254#if 0
2255
2256void
2257_generator_call (...)
2258 PROTOTYPE: @
2259 PPCODE:
2260 fprintf (stderr, "call %p\n", CvXSUBANY(cv).any_ptr);
2261 xxxx
2262 abort ();
2263
2264SV *
2265gensub (SV *sub, ...)
2266 PROTOTYPE: &;@
2267 CODE:
2268{
2269 struct coro *coro;
2270 MAGIC *mg;
2271 CV *xcv;
2272 CV *ncv = (CV *)newSV_type (SVt_PVCV);
2273 int i;
2274
2275 CvGV (ncv) = CvGV (cv);
2276 CvFILE (ncv) = CvFILE (cv);
2277
2278 Newz (0, coro, 1, struct coro);
2279 coro->args = newAV ();
2280 coro->flags = CF_NEW;
2281
2282 av_extend (coro->args, items - 1);
2283 for (i = 1; i < items; i++)
2284 av_push (coro->args, newSVsv (ST (i)));
2285
2286 CvISXSUB_on (ncv);
2287 CvXSUBANY (ncv).any_ptr = (void *)coro;
2288
2289 xcv = GvCV (gv_fetchpv ("Coro::_generator_call", 0, SVt_PVCV));
2290
2291 CvXSUB (ncv) = CvXSUB (xcv);
2292 CvANON_on (ncv);
2293
2294 mg = sv_magicext ((SV *)ncv, 0, CORO_MAGIC_type_state, &coro_gensub_vtbl, (char *)coro, 0);
2295 RETVAL = newRV_noinc ((SV *)ncv);
2296}
2297 OUTPUT:
2298 RETVAL
2299
2300#endif
2301
1810 2302
1811MODULE = Coro::State PACKAGE = Coro::AIO 2303MODULE = Coro::State PACKAGE = Coro::AIO
1812 2304
1813SV * 2305void
1814_get_state () 2306_get_state (SV *self)
1815 CODE: 2307 PPCODE:
1816{ 2308{
1817 struct io_state *data; 2309 AV *defav = GvAV (PL_defgv);
1818 2310 AV *av = newAV ();
2311 int i;
1819 RETVAL = newSV (sizeof (struct io_state)); 2312 SV *data_sv = newSV (sizeof (struct io_state));
1820 data = (struct io_state *)SvPVX (RETVAL); 2313 struct io_state *data = (struct io_state *)SvPVX (data_sv);
1821 SvCUR_set (RETVAL, sizeof (struct io_state)); 2314 SvCUR_set (data_sv, sizeof (struct io_state));
1822 SvPOK_only (RETVAL); 2315 SvPOK_only (data_sv);
1823 2316
1824 data->errorno = errno; 2317 data->errorno = errno;
1825 data->laststype = PL_laststype; 2318 data->laststype = PL_laststype;
1826 data->laststatval = PL_laststatval; 2319 data->laststatval = PL_laststatval;
1827 data->statcache = PL_statcache; 2320 data->statcache = PL_statcache;
2321
2322 av_extend (av, AvFILLp (defav) + 1 + 1);
2323
2324 for (i = 0; i <= AvFILLp (defav); ++i)
2325 av_push (av, SvREFCNT_inc_NN (AvARRAY (defav)[i]));
2326
2327 av_push (av, data_sv);
2328
2329 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2330
2331 api_ready (self);
1828} 2332}
1829 OUTPUT:
1830 RETVAL
1831 2333
1832void 2334void
1833_set_state (char *data_) 2335_set_state (SV *state)
1834 PROTOTYPE: $ 2336 PROTOTYPE: $
1835 CODE: 2337 PPCODE:
1836{ 2338{
1837 struct io_state *data = (void *)data_; 2339 AV *av = (AV *)SvRV (state);
2340 struct io_state *data = (struct io_state *)SvPVX (AvARRAY (av)[AvFILLp (av)]);
2341 int i;
1838 2342
1839 errno = data->errorno; 2343 errno = data->errorno;
1840 PL_laststype = data->laststype; 2344 PL_laststype = data->laststype;
1841 PL_laststatval = data->laststatval; 2345 PL_laststatval = data->laststatval;
1842 PL_statcache = data->statcache; 2346 PL_statcache = data->statcache;
1843}
1844 2347
2348 EXTEND (SP, AvFILLp (av));
2349 for (i = 0; i < AvFILLp (av); ++i)
2350 PUSHs (sv_2mortal (SvREFCNT_inc_NN (AvARRAY (av)[i])));
2351}
2352
2353
2354MODULE = Coro::State PACKAGE = Coro::AnyEvent
2355
2356BOOT:
2357 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2358
2359SV *
2360_schedule (...)
2361 PROTOTYPE: @
2362 CODE:
2363{
2364 static int incede;
2365
2366 api_cede_notself ();
2367
2368 ++incede;
2369 while (coro_nready >= incede && api_cede ())
2370 ;
2371
2372 sv_setsv (sv_activity, &PL_sv_undef);
2373 if (coro_nready >= incede)
2374 {
2375 PUSHMARK (SP);
2376 PUTBACK;
2377 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2378 SPAGAIN;
2379 }
2380
2381 --incede;
2382}
2383
2384
2385MODULE = Coro::State PACKAGE = PerlIO::cede
2386
2387BOOT:
2388 PerlIO_define_layer (aTHX_ &PerlIO_cede);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines