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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines