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.258 by root, Sun Nov 9 23:08:49 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 /*
608 PL_runops = RUNOPS_DEFAULT; 813 PL_runops = RUNOPS_DEFAULT;
609 PL_curcop = &PL_compiling; 814 PL_curcop = &PL_compiling;
610 PL_in_eval = EVAL_NULL; 815 PL_in_eval = EVAL_NULL;
611 PL_comppad = 0; 816 PL_comppad = 0;
612 PL_curpm = 0; 817 PL_curpm = 0;
613 PL_curpad = 1; 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 = 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;
1102
1103 ++cctx_count;
1104 New (0, cctx, 1, coro_cctx);
1105
1106 cctx->gen = cctx_gen;
1107 cctx->flags = 0;
1108
1109 return cctx;
1110}
1111
1112/* create a new cctx only suitable as source */
1113static coro_cctx *
1114cctx_new_empty ()
1115{
1116 coro_cctx *cctx = cctx_new ();
1117
1118 cctx->sptr = 0;
1119 cctx->idle_sp = 0; /* should never be a valid address */
1120 coro_create (&cctx->cctx, 0, 0, 0, 0);
1121
1122 return cctx;
1123}
1124
1125/* create a new cctx suitable as destination/running a perl interpreter */
1126static coro_cctx *
1127cctx_new_run ()
1128{
1129 coro_cctx *cctx = cctx_new ();
875 void *stack_start; 1130 void *stack_start;
876 size_t stack_size; 1131 size_t stack_size;
877 1132
878 ++cctx_count;
879
880 Newz (0, cctx, 1, coro_cctx);
881
882#if HAVE_MMAP 1133#if HAVE_MMAP
883
884 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1134 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
885 /* mmap supposedly does allocate-on-write for us */ 1135 /* 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); 1136 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
887 1137
888 if (cctx->sptr != (void *)-1) 1138 if (cctx->sptr != (void *)-1)
889 { 1139 {
895 cctx->flags |= CC_MAPPED; 1145 cctx->flags |= CC_MAPPED;
896 } 1146 }
897 else 1147 else
898#endif 1148#endif
899 { 1149 {
900 cctx->ssize = coro_stacksize * (long)sizeof (long); 1150 cctx->ssize = cctx_stacksize * (long)sizeof (long);
901 New (0, cctx->sptr, coro_stacksize, long); 1151 New (0, cctx->sptr, cctx_stacksize, long);
902 1152
903 if (!cctx->sptr) 1153 if (!cctx->sptr)
904 { 1154 {
905 perror ("FATAL: unable to allocate stack for coroutine"); 1155 perror ("FATAL: unable to allocate stack for coroutine");
906 _exit (EXIT_FAILURE); 1156 _exit (EXIT_FAILURE);
909 stack_start = cctx->sptr; 1159 stack_start = cctx->sptr;
910 stack_size = cctx->ssize; 1160 stack_size = cctx->ssize;
911 } 1161 }
912 1162
913 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1163 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
914 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1164 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
915 1165
916 return cctx; 1166 return cctx;
917} 1167}
918 1168
919static void 1169static void
921{ 1171{
922 if (!cctx) 1172 if (!cctx)
923 return; 1173 return;
924 1174
925 --cctx_count; 1175 --cctx_count;
1176 coro_destroy (&cctx->cctx);
926 1177
1178 /* coro_transfer creates new, empty cctx's */
1179 if (cctx->sptr)
1180 {
927#if CORO_USE_VALGRIND 1181#if CORO_USE_VALGRIND
928 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1182 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
929#endif 1183#endif
930 1184
931#if HAVE_MMAP 1185#if HAVE_MMAP
932 if (cctx->flags & CC_MAPPED) 1186 if (cctx->flags & CC_MAPPED)
933 munmap (cctx->sptr, cctx->ssize); 1187 munmap (cctx->sptr, cctx->ssize);
934 else 1188 else
935#endif 1189#endif
936 Safefree (cctx->sptr); 1190 Safefree (cctx->sptr);
1191 }
937 1192
938 Safefree (cctx); 1193 Safefree (cctx);
939} 1194}
940 1195
941/* wether this cctx should be destructed */ 1196/* wether this cctx should be destructed */
942#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE)) 1197#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
943 1198
944static coro_cctx * 1199static coro_cctx *
945cctx_get (pTHX) 1200cctx_get (pTHX)
946{ 1201{
947 while (expect_true (cctx_first)) 1202 while (expect_true (cctx_first))
954 return cctx; 1209 return cctx;
955 1210
956 cctx_destroy (cctx); 1211 cctx_destroy (cctx);
957 } 1212 }
958 1213
959 return cctx_new (); 1214 return cctx_new_run ();
960} 1215}
961 1216
962static void 1217static void
963cctx_put (coro_cctx *cctx) 1218cctx_put (coro_cctx *cctx)
964{ 1219{
1220 assert (("cctx_put called on non-initialised cctx", cctx->sptr));
1221
965 /* free another cctx if overlimit */ 1222 /* free another cctx if overlimit */
966 if (expect_false (cctx_idle >= MAX_IDLE_CCTX)) 1223 if (expect_false (cctx_idle >= cctx_max_idle))
967 { 1224 {
968 coro_cctx *first = cctx_first; 1225 coro_cctx *first = cctx_first;
969 cctx_first = first->next; 1226 cctx_first = first->next;
970 --cctx_idle; 1227 --cctx_idle;
971 1228
991 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1248 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
992 1249
993 if (expect_false (next->flags & CF_DESTROYED)) 1250 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"); 1251 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
995 1252
1253#if !PERL_VERSION_ATLEAST (5,10,0)
996 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1254 if (expect_false (PL_lex_state != LEX_NOTPARSING))
997 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1255 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1256#endif
998 } 1257 }
999} 1258}
1000 1259
1001/* always use the TRANSFER macro */ 1260/* always use the TRANSFER macro */
1002static void NOINLINE 1261static void NOINLINE
1003transfer (pTHX_ struct coro *prev, struct coro *next) 1262transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1004{ 1263{
1005 dSTACKLEVEL; 1264 dSTACKLEVEL;
1006 1265
1007 /* sometimes transfer is only called to set idle_sp */ 1266 /* sometimes transfer is only called to set idle_sp */
1008 if (expect_false (!next)) 1267 if (expect_false (!next))
1010 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1269 ((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 */ 1270 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1012 } 1271 }
1013 else if (expect_true (prev != next)) 1272 else if (expect_true (prev != next))
1014 { 1273 {
1274 static volatile int has_throw;
1015 coro_cctx *prev__cctx; 1275 coro_cctx *prev__cctx;
1016 1276
1017 if (expect_false (prev->flags & CF_NEW)) 1277 if (expect_false (prev->flags & CF_NEW))
1018 { 1278 {
1019 /* create a new empty context */ 1279 /* create a new empty/source context */
1020 Newz (0, prev->cctx, 1, coro_cctx); 1280 prev->cctx = cctx_new_empty ();
1021 prev->flags &= ~CF_NEW; 1281 prev->flags &= ~CF_NEW;
1022 prev->flags |= CF_RUNNING; 1282 prev->flags |= CF_RUNNING;
1023 } 1283 }
1024 1284
1025 prev->flags &= ~CF_RUNNING; 1285 prev->flags &= ~CF_RUNNING;
1026 next->flags |= CF_RUNNING; 1286 next->flags |= CF_RUNNING;
1027 1287
1028 LOCK; 1288 LOCK;
1289
1290 /* first get rid of the old state */
1291 save_perl (aTHX_ prev);
1029 1292
1030 if (expect_false (next->flags & CF_NEW)) 1293 if (expect_false (next->flags & CF_NEW))
1031 { 1294 {
1032 /* need to start coroutine */ 1295 /* need to start coroutine */
1033 next->flags &= ~CF_NEW; 1296 next->flags &= ~CF_NEW;
1034 /* first get rid of the old state */
1035 save_perl (aTHX_ prev);
1036 /* setup coroutine call */ 1297 /* setup coroutine call */
1037 coro_setup (aTHX_ next); 1298 coro_setup (aTHX_ next);
1038 } 1299 }
1039 else 1300 else
1040 {
1041 /* coroutine already started */
1042 save_perl (aTHX_ prev);
1043 load_perl (aTHX_ next); 1301 load_perl (aTHX_ next);
1044 }
1045 1302
1046 prev__cctx = prev->cctx; 1303 prev__cctx = prev->cctx;
1047 1304
1048 /* possibly "free" the cctx */ 1305 /* possibly "free" the cctx */
1049 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE))) 1306 if (expect_true (
1307 prev__cctx->idle_sp == STACKLEVEL
1308 && !(prev__cctx->flags & CC_TRACE)
1309 && !force_cctx
1310 ))
1050 { 1311 {
1051 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1312 /* 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)); 1313 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1053 1314
1054 prev->cctx = 0; 1315 prev->cctx = 0;
1055 1316
1056 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1317 /* 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 */ 1318 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1058 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1319 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1320 if (!next->cctx)
1059 next->cctx = cctx_get (aTHX); 1321 next->cctx = cctx_get (aTHX);
1060 1322
1061 cctx_put (prev__cctx); 1323 cctx_put (prev__cctx);
1062 } 1324 }
1063 1325
1064 ++next->usecount; 1326 ++next->usecount;
1065 1327
1066 if (expect_true (!next->cctx)) 1328 if (expect_true (!next->cctx))
1067 next->cctx = cctx_get (aTHX); 1329 next->cctx = cctx_get (aTHX);
1330
1331 has_throw = !!next->throw;
1068 1332
1069 if (expect_false (prev__cctx != next->cctx)) 1333 if (expect_false (prev__cctx != next->cctx))
1070 { 1334 {
1071 prev__cctx->top_env = PL_top_env; 1335 prev__cctx->top_env = PL_top_env;
1072 PL_top_env = next->cctx->top_env; 1336 PL_top_env = next->cctx->top_env;
1073 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1337 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1074 } 1338 }
1075 1339
1076 free_coro_mortal (aTHX); 1340 free_coro_mortal (aTHX);
1077 UNLOCK; 1341 UNLOCK;
1342
1343 if (expect_false (has_throw))
1344 {
1345 struct coro *coro = SvSTATE (coro_current);
1346
1347 if (coro->throw)
1348 {
1349 SV *exception = coro->throw;
1350 coro->throw = 0;
1351 sv_setsv (ERRSV, exception);
1352 croak (0);
1353 }
1354 }
1078 } 1355 }
1079} 1356}
1080 1357
1081struct transfer_args 1358struct transfer_args
1082{ 1359{
1083 struct coro *prev, *next; 1360 struct coro *prev, *next;
1084}; 1361};
1085 1362
1086#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1363#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) 1364#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1088 1365
1089/** high level stuff ********************************************************/ 1366/** high level stuff ********************************************************/
1090 1367
1091static int 1368static int
1115 croak ("FATAL: tried to destroy currently running coroutine"); 1392 croak ("FATAL: tried to destroy currently running coroutine");
1116 1393
1117 save_perl (aTHX_ &temp); 1394 save_perl (aTHX_ &temp);
1118 load_perl (aTHX_ coro); 1395 load_perl (aTHX_ coro);
1119 1396
1120 coro_destroy (aTHX_ coro); 1397 coro_destruct (aTHX_ coro);
1121 1398
1122 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1399 load_perl (aTHX_ &temp);
1123 1400
1124 coro->mainstack = 0; 1401 coro->slot = 0;
1125 } 1402 }
1126 1403
1127 cctx_destroy (coro->cctx); 1404 cctx_destroy (coro->cctx);
1128 SvREFCNT_dec (coro->args); 1405 SvREFCNT_dec (coro->args);
1129 1406
1185{ 1462{
1186 dTHX; 1463 dTHX;
1187 struct transfer_args ta; 1464 struct transfer_args ta;
1188 1465
1189 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1466 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1190 TRANSFER (ta); 1467 TRANSFER (ta, 1);
1191} 1468}
1192 1469
1193/** Coro ********************************************************************/ 1470/** Coro ********************************************************************/
1194 1471
1195static void 1472static void
1197{ 1474{
1198 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1475 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1199} 1476}
1200 1477
1201static SV * 1478static SV *
1202coro_deq (pTHX_ int min_prio) 1479coro_deq (pTHX)
1203{ 1480{
1204 int prio = PRIO_MAX - PRIO_MIN; 1481 int prio;
1205 1482
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; ) 1483 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1211 if (AvFILLp (coro_ready [prio]) >= 0) 1484 if (AvFILLp (coro_ready [prio]) >= 0)
1212 return av_shift (coro_ready [prio]); 1485 return av_shift (coro_ready [prio]);
1213 1486
1214 return 0; 1487 return 0;
1215} 1488}
1217static int 1490static int
1218api_ready (SV *coro_sv) 1491api_ready (SV *coro_sv)
1219{ 1492{
1220 dTHX; 1493 dTHX;
1221 struct coro *coro; 1494 struct coro *coro;
1495 SV *sv_hook;
1496 void (*xs_hook)(void);
1222 1497
1223 if (SvROK (coro_sv)) 1498 if (SvROK (coro_sv))
1224 coro_sv = SvRV (coro_sv); 1499 coro_sv = SvRV (coro_sv);
1225 1500
1226 coro = SvSTATE (coro_sv); 1501 coro = SvSTATE (coro_sv);
1229 return 0; 1504 return 0;
1230 1505
1231 coro->flags |= CF_READY; 1506 coro->flags |= CF_READY;
1232 1507
1233 LOCK; 1508 LOCK;
1509
1510 sv_hook = coro_nready ? 0 : coro_readyhook;
1511 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1512
1234 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1513 coro_enq (aTHX_ SvREFCNT_inc_NN (coro_sv));
1235 ++coro_nready; 1514 ++coro_nready;
1515
1236 UNLOCK; 1516 UNLOCK;
1517
1518 if (sv_hook)
1519 {
1520 dSP;
1521
1522 ENTER;
1523 SAVETMPS;
1524
1525 PUSHMARK (SP);
1526 PUTBACK;
1527 call_sv (sv_hook, G_DISCARD);
1528 SPAGAIN;
1529
1530 FREETMPS;
1531 LEAVE;
1532 }
1533
1534 if (xs_hook)
1535 xs_hook ();
1237 1536
1238 return 1; 1537 return 1;
1239} 1538}
1240 1539
1241static int 1540static int
1251 SV *prev_sv, *next_sv; 1550 SV *prev_sv, *next_sv;
1252 1551
1253 for (;;) 1552 for (;;)
1254 { 1553 {
1255 LOCK; 1554 LOCK;
1256 next_sv = coro_deq (aTHX_ PRIO_MIN); 1555 next_sv = coro_deq (aTHX);
1257 1556
1258 /* nothing to schedule: call the idle handler */ 1557 /* nothing to schedule: call the idle handler */
1259 if (expect_false (!next_sv)) 1558 if (expect_false (!next_sv))
1260 { 1559 {
1261 dSP; 1560 dSP;
1265 SAVETMPS; 1564 SAVETMPS;
1266 1565
1267 PUSHMARK (SP); 1566 PUSHMARK (SP);
1268 PUTBACK; 1567 PUTBACK;
1269 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1568 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1569 SPAGAIN;
1270 1570
1271 FREETMPS; 1571 FREETMPS;
1272 LEAVE; 1572 LEAVE;
1273 continue; 1573 continue;
1274 } 1574 }
1329{ 1629{
1330 dTHX; 1630 dTHX;
1331 struct transfer_args ta; 1631 struct transfer_args ta;
1332 1632
1333 prepare_schedule (aTHX_ &ta); 1633 prepare_schedule (aTHX_ &ta);
1334 TRANSFER (ta); 1634 TRANSFER (ta, 1);
1335} 1635}
1336 1636
1337static int 1637static int
1338api_cede (void) 1638api_cede (void)
1339{ 1639{
1342 1642
1343 prepare_cede (aTHX_ &ta); 1643 prepare_cede (aTHX_ &ta);
1344 1644
1345 if (expect_true (ta.prev != ta.next)) 1645 if (expect_true (ta.prev != ta.next))
1346 { 1646 {
1347 TRANSFER (ta); 1647 TRANSFER (ta, 1);
1348 return 1; 1648 return 1;
1349 } 1649 }
1350 else 1650 else
1351 return 0; 1651 return 0;
1352} 1652}
1357 dTHX; 1657 dTHX;
1358 struct transfer_args ta; 1658 struct transfer_args ta;
1359 1659
1360 if (prepare_cede_notself (aTHX_ &ta)) 1660 if (prepare_cede_notself (aTHX_ &ta))
1361 { 1661 {
1362 TRANSFER (ta); 1662 TRANSFER (ta, 1);
1363 return 1; 1663 return 1;
1364 } 1664 }
1365 else 1665 else
1366 return 0; 1666 return 0;
1367} 1667}
1373 struct coro *coro = SvSTATE (coro_sv); 1673 struct coro *coro = SvSTATE (coro_sv);
1374 1674
1375 if (flags & CC_TRACE) 1675 if (flags & CC_TRACE)
1376 { 1676 {
1377 if (!coro->cctx) 1677 if (!coro->cctx)
1378 coro->cctx = cctx_new (); 1678 coro->cctx = cctx_new_run ();
1379 else if (!(coro->cctx->flags & CC_TRACE)) 1679 else if (!(coro->cctx->flags & CC_TRACE))
1380 croak ("cannot enable tracing on coroutine with custom stack"); 1680 croak ("cannot enable tracing on coroutine with custom stack");
1381 1681
1382 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1682 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1383 } 1683 }
1386 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1686 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1387 1687
1388 if (coro->flags & CF_RUNNING) 1688 if (coro->flags & CF_RUNNING)
1389 PL_runops = RUNOPS_DEFAULT; 1689 PL_runops = RUNOPS_DEFAULT;
1390 else 1690 else
1391 coro->runops = RUNOPS_DEFAULT; 1691 coro->slot->runops = RUNOPS_DEFAULT;
1692 }
1693}
1694
1695#if 0
1696static int
1697coro_gensub_free (pTHX_ SV *sv, MAGIC *mg)
1698{
1699 AV *padlist;
1700 AV *av = (AV *)mg->mg_obj;
1701
1702 abort ();
1703
1704 return 0;
1705}
1706
1707static MGVTBL coro_gensub_vtbl = {
1708 0, 0, 0, 0,
1709 coro_gensub_free
1710};
1711#endif
1712
1713/*****************************************************************************/
1714/* PerlIO::cede */
1715
1716typedef struct
1717{
1718 PerlIOBuf base;
1719 NV next, every;
1720} PerlIOCede;
1721
1722static IV
1723PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
1724{
1725 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1726
1727 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
1728 self->next = nvtime () + self->every;
1729
1730 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
1731}
1732
1733static SV *
1734PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
1735{
1736 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1737
1738 return newSVnv (self->every);
1739}
1740
1741static IV
1742PerlIOCede_flush (pTHX_ PerlIO *f)
1743{
1744 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1745 double now = nvtime ();
1746
1747 if (now >= self->next)
1392 } 1748 {
1749 api_cede ();
1750 self->next = now + self->every;
1751 }
1752
1753 return PerlIOBuf_flush (aTHX_ f);
1393} 1754}
1755
1756static PerlIO_funcs PerlIO_cede =
1757{
1758 sizeof(PerlIO_funcs),
1759 "cede",
1760 sizeof(PerlIOCede),
1761 PERLIO_K_DESTRUCT | PERLIO_K_RAW,
1762 PerlIOCede_pushed,
1763 PerlIOBuf_popped,
1764 PerlIOBuf_open,
1765 PerlIOBase_binmode,
1766 PerlIOCede_getarg,
1767 PerlIOBase_fileno,
1768 PerlIOBuf_dup,
1769 PerlIOBuf_read,
1770 PerlIOBuf_unread,
1771 PerlIOBuf_write,
1772 PerlIOBuf_seek,
1773 PerlIOBuf_tell,
1774 PerlIOBuf_close,
1775 PerlIOCede_flush,
1776 PerlIOBuf_fill,
1777 PerlIOBase_eof,
1778 PerlIOBase_error,
1779 PerlIOBase_clearerr,
1780 PerlIOBase_setlinebuf,
1781 PerlIOBuf_get_base,
1782 PerlIOBuf_bufsiz,
1783 PerlIOBuf_get_ptr,
1784 PerlIOBuf_get_cnt,
1785 PerlIOBuf_set_ptrcnt,
1786};
1787
1394 1788
1395MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1789MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1396 1790
1397PROTOTYPES: DISABLE 1791PROTOTYPES: DISABLE
1398 1792
1399BOOT: 1793BOOT:
1400{ 1794{
1401#ifdef USE_ITHREADS 1795#ifdef USE_ITHREADS
1402 MUTEX_INIT (&coro_mutex); 1796 MUTEX_INIT (&coro_lock);
1797# if CORO_PTHREAD
1798 coro_thx = PERL_GET_CONTEXT;
1799# endif
1403#endif 1800#endif
1404 BOOT_PAGESIZE; 1801 BOOT_PAGESIZE;
1405 1802
1406 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1803 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1407 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1804 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1805
1806 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1807 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1808 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1809
1810 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1811 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1812 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1408 1813
1409 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1814 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1410 1815
1411 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1816 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1412 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1817 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1417 main_top_env = PL_top_env; 1822 main_top_env = PL_top_env;
1418 1823
1419 while (main_top_env->je_prev) 1824 while (main_top_env->je_prev)
1420 main_top_env = main_top_env->je_prev; 1825 main_top_env = main_top_env->je_prev;
1421 1826
1422 coroapi.ver = CORO_API_VERSION; 1827 coroapi.ver = CORO_API_VERSION;
1828 coroapi.rev = CORO_API_REVISION;
1423 coroapi.transfer = api_transfer; 1829 coroapi.transfer = api_transfer;
1830
1831 {
1832 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
1833
1834 if (!svp) croak ("Time::HiRes is required");
1835 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
1836
1837 nvtime = INT2PTR (double (*)(), SvIV (*svp));
1838 }
1424 1839
1425 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1840 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1426} 1841}
1427 1842
1428SV * 1843SV *
1429new (char *klass, ...) 1844new (char *klass, ...)
1430 CODE: 1845 CODE:
1431{ 1846{
1432 struct coro *coro; 1847 struct coro *coro;
1848 MAGIC *mg;
1433 HV *hv; 1849 HV *hv;
1434 int i; 1850 int i;
1435 1851
1436 Newz (0, coro, 1, struct coro); 1852 Newz (0, coro, 1, struct coro);
1437 coro->args = newAV (); 1853 coro->args = newAV ();
1440 if (coro_first) coro_first->prev = coro; 1856 if (coro_first) coro_first->prev = coro;
1441 coro->next = coro_first; 1857 coro->next = coro_first;
1442 coro_first = coro; 1858 coro_first = coro;
1443 1859
1444 coro->hv = hv = newHV (); 1860 coro->hv = hv = newHV ();
1445 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1861 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1862 mg->mg_flags |= MGf_DUP;
1446 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1863 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1447 1864
1448 av_extend (coro->args, items - 1); 1865 av_extend (coro->args, items - 1);
1449 for (i = 1; i < items; i++) 1866 for (i = 1; i < items; i++)
1450 av_push (coro->args, newSVsv (ST (i))); 1867 av_push (coro->args, newSVsv (ST (i)));
1464 Coro::cede_notself = 4 1881 Coro::cede_notself = 4
1465 CODE: 1882 CODE:
1466{ 1883{
1467 struct transfer_args ta; 1884 struct transfer_args ta;
1468 1885
1886 PUTBACK;
1469 switch (ix) 1887 switch (ix)
1470 { 1888 {
1471 case 0: 1889 case 0:
1472 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1890 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1473 ta.next = 0; 1891 ta.next = 0;
1474 break; 1892 break;
1475 1893
1476 case 1: 1894 case 1:
1477 if (items != 2) 1895 if (items != 2)
1478 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items); 1896 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d", items);
1479 1897
1480 prepare_transfer (aTHX_ &ta, ST (0), ST (1)); 1898 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1481 break; 1899 break;
1482 1900
1483 case 2: 1901 case 2:
1492 if (!prepare_cede_notself (aTHX_ &ta)) 1910 if (!prepare_cede_notself (aTHX_ &ta))
1493 XSRETURN_EMPTY; 1911 XSRETURN_EMPTY;
1494 1912
1495 break; 1913 break;
1496 } 1914 }
1915 SPAGAIN;
1497 1916
1498 BARRIER; 1917 BARRIER;
1918 PUTBACK;
1499 TRANSFER (ta); 1919 TRANSFER (ta, 0);
1500 1920 SPAGAIN; /* might be the sp of a different coroutine now */
1501 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev)) 1921 /* be extra careful not to ever do anything after TRANSFER */
1502 XSRETURN_YES;
1503} 1922}
1504 1923
1505bool 1924bool
1506_destroy (SV *coro_sv) 1925_destroy (SV *coro_sv)
1507 CODE: 1926 CODE:
1508 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 1927 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1509 OUTPUT: 1928 OUTPUT:
1510 RETVAL 1929 RETVAL
1511 1930
1512void 1931void
1513_exit (code) 1932_exit (int code)
1514 int code
1515 PROTOTYPE: $ 1933 PROTOTYPE: $
1516 CODE: 1934 CODE:
1517 _exit (code); 1935 _exit (code);
1518 1936
1519int 1937int
1520cctx_stacksize (int new_stacksize = 0) 1938cctx_stacksize (int new_stacksize = 0)
1521 CODE: 1939 CODE:
1522 RETVAL = coro_stacksize; 1940 RETVAL = cctx_stacksize;
1523 if (new_stacksize) 1941 if (new_stacksize)
1942 {
1524 coro_stacksize = new_stacksize; 1943 cctx_stacksize = new_stacksize;
1944 ++cctx_gen;
1945 }
1946 OUTPUT:
1947 RETVAL
1948
1949int
1950cctx_max_idle (int max_idle = 0)
1951 CODE:
1952 RETVAL = cctx_max_idle;
1953 if (max_idle > 1)
1954 cctx_max_idle = max_idle;
1525 OUTPUT: 1955 OUTPUT:
1526 RETVAL 1956 RETVAL
1527 1957
1528int 1958int
1529cctx_count () 1959cctx_count ()
1553call (Coro::State coro, SV *coderef) 1983call (Coro::State coro, SV *coderef)
1554 ALIAS: 1984 ALIAS:
1555 eval = 1 1985 eval = 1
1556 CODE: 1986 CODE:
1557{ 1987{
1558 if (coro->mainstack) 1988 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
1559 { 1989 {
1560 struct coro temp; 1990 struct coro temp;
1561 Zero (&temp, 1, struct coro);
1562 1991
1563 if (!(coro->flags & CF_RUNNING)) 1992 if (!(coro->flags & CF_RUNNING))
1564 { 1993 {
1994 PUTBACK;
1565 save_perl (aTHX_ &temp); 1995 save_perl (aTHX_ &temp);
1566 load_perl (aTHX_ coro); 1996 load_perl (aTHX_ coro);
1567 } 1997 }
1568 1998
1569 { 1999 {
1570 dSP; 2000 dSP;
1571 ENTER; 2001 ENTER;
1572 SAVETMPS; 2002 SAVETMPS;
2003 PUTBACK;
2004 PUSHSTACK;
1573 PUSHMARK (SP); 2005 PUSHMARK (SP);
1574 PUTBACK; 2006
1575 if (ix) 2007 if (ix)
1576 eval_sv (coderef, 0); 2008 eval_sv (coderef, 0);
1577 else 2009 else
1578 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 2010 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2011
2012 POPSTACK;
1579 SPAGAIN; 2013 SPAGAIN;
1580 FREETMPS; 2014 FREETMPS;
1581 LEAVE; 2015 LEAVE;
1582 PUTBACK; 2016 PUTBACK;
1583 } 2017 }
1584 2018
1585 if (!(coro->flags & CF_RUNNING)) 2019 if (!(coro->flags & CF_RUNNING))
1586 { 2020 {
1587 save_perl (aTHX_ coro); 2021 save_perl (aTHX_ coro);
1588 load_perl (aTHX_ &temp); 2022 load_perl (aTHX_ &temp);
2023 SPAGAIN;
1589 } 2024 }
1590 } 2025 }
1591} 2026}
1592 2027
1593SV * 2028SV *
1605 2040
1606void 2041void
1607api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 2042api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1608 2043
1609SV * 2044SV *
1610has_stack (Coro::State coro) 2045has_cctx (Coro::State coro)
1611 PROTOTYPE: $ 2046 PROTOTYPE: $
1612 CODE: 2047 CODE:
1613 RETVAL = boolSV (!!coro->cctx); 2048 RETVAL = boolSV (!!coro->cctx);
1614 OUTPUT: 2049 OUTPUT:
1615 RETVAL 2050 RETVAL
1620 CODE: 2055 CODE:
1621 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL; 2056 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1622 OUTPUT: 2057 OUTPUT:
1623 RETVAL 2058 RETVAL
1624 2059
1625IV 2060UV
1626rss (Coro::State coro) 2061rss (Coro::State coro)
1627 PROTOTYPE: $ 2062 PROTOTYPE: $
1628 ALIAS: 2063 ALIAS:
1629 usecount = 1 2064 usecount = 1
1630 CODE: 2065 CODE:
1634 case 1: RETVAL = coro->usecount; break; 2069 case 1: RETVAL = coro->usecount; break;
1635 } 2070 }
1636 OUTPUT: 2071 OUTPUT:
1637 RETVAL 2072 RETVAL
1638 2073
2074void
2075force_cctx ()
2076 CODE:
2077 struct coro *coro = SvSTATE (coro_current);
2078 coro->cctx->idle_sp = 0;
2079
2080void
2081swap_defsv (Coro::State self)
2082 PROTOTYPE: $
2083 ALIAS:
2084 swap_defav = 1
2085 CODE:
2086 if (!self->slot)
2087 croak ("cannot swap state with coroutine that has no saved state");
2088 else
2089 {
2090 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
2091 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2092
2093 SV *tmp = *src; *src = *dst; *dst = tmp;
2094 }
1639 2095
1640MODULE = Coro::State PACKAGE = Coro 2096MODULE = Coro::State PACKAGE = Coro
1641 2097
1642BOOT: 2098BOOT:
1643{ 2099{
1644 int i; 2100 int i;
1645 2101
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); 2102 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2103 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2104 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1649 2105
1650 coro_current = get_sv ("Coro::current", FALSE); 2106 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1651 SvREADONLY_on (coro_current); 2107 SvREADONLY_on (coro_current);
1652 2108
1653 coro_stash = gv_stashpv ("Coro", TRUE); 2109 coro_stash = gv_stashpv ("Coro", TRUE);
1654 2110
1655 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 2111 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1656 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 2112 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1657 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 2113 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1658 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 2114 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1661 2117
1662 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2118 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1663 coro_ready[i] = newAV (); 2119 coro_ready[i] = newAV ();
1664 2120
1665 { 2121 {
1666 SV *sv = perl_get_sv("Coro::API", 1); 2122 SV *sv = perl_get_sv ("Coro::API", TRUE);
2123 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1667 2124
1668 coroapi.schedule = api_schedule; 2125 coroapi.schedule = api_schedule;
1669 coroapi.cede = api_cede; 2126 coroapi.cede = api_cede;
1670 coroapi.cede_notself = api_cede_notself; 2127 coroapi.cede_notself = api_cede_notself;
1671 coroapi.ready = api_ready; 2128 coroapi.ready = api_ready;
1682void 2139void
1683_set_current (SV *current) 2140_set_current (SV *current)
1684 PROTOTYPE: $ 2141 PROTOTYPE: $
1685 CODE: 2142 CODE:
1686 SvREFCNT_dec (SvRV (coro_current)); 2143 SvREFCNT_dec (SvRV (coro_current));
1687 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 2144 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
2145
2146void
2147_set_readyhook (SV *hook)
2148 PROTOTYPE: $
2149 CODE:
2150 LOCK;
2151 SvREFCNT_dec (coro_readyhook);
2152 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
2153 UNLOCK;
1688 2154
1689int 2155int
1690prio (Coro::State coro, int newprio = 0) 2156prio (Coro::State coro, int newprio = 0)
1691 ALIAS: 2157 ALIAS:
1692 nice = 1 2158 nice = 1
1722 CODE: 2188 CODE:
1723 RETVAL = coro_nready; 2189 RETVAL = coro_nready;
1724 OUTPUT: 2190 OUTPUT:
1725 RETVAL 2191 RETVAL
1726 2192
2193void
2194throw (Coro::State self, SV *throw = &PL_sv_undef)
2195 PROTOTYPE: $;$
2196 CODE:
2197 SvREFCNT_dec (self->throw);
2198 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2199
1727# for async_pool speedup 2200# for async_pool speedup
1728void 2201void
1729_pool_1 (SV *cb) 2202_pool_1 (SV *cb)
1730 CODE: 2203 CODE:
1731{ 2204{
1735 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 2208 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1736 AV *invoke_av; 2209 AV *invoke_av;
1737 int i, len; 2210 int i, len;
1738 2211
1739 if (!invoke) 2212 if (!invoke)
2213 {
2214 SV *old = PL_diehook;
2215 PL_diehook = 0;
2216 SvREFCNT_dec (old);
1740 croak ("\3terminate\2\n"); 2217 croak ("\3async_pool terminate\2\n");
2218 }
1741 2219
1742 SvREFCNT_dec (coro->saved_deffh); 2220 SvREFCNT_dec (coro->saved_deffh);
1743 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2221 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1744 2222
1745 hv_store (hv, "desc", sizeof ("desc") - 1, 2223 hv_store (hv, "desc", sizeof ("desc") - 1,
1746 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 2224 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1747 2225
1748 invoke_av = (AV *)SvRV (invoke); 2226 invoke_av = (AV *)SvRV (invoke);
1752 2230
1753 if (len > 0) 2231 if (len > 0)
1754 { 2232 {
1755 av_fill (defav, len - 1); 2233 av_fill (defav, len - 1);
1756 for (i = 0; i < len; ++i) 2234 for (i = 0; i < len; ++i)
1757 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 2235 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));
1758 } 2236 }
1759 2237
1760 SvREFCNT_dec (invoke); 2238 SvREFCNT_dec (invoke);
1761} 2239}
1762 2240
1769 sv_setsv (cb, &PL_sv_undef); 2247 sv_setsv (cb, &PL_sv_undef);
1770 2248
1771 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2249 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1772 coro->saved_deffh = 0; 2250 coro->saved_deffh = 0;
1773 2251
1774 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2252 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1775 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2253 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2254 {
2255 SV *old = PL_diehook;
2256 PL_diehook = 0;
2257 SvREFCNT_dec (old);
1776 croak ("\3terminate\2\n"); 2258 croak ("\3async_pool terminate\2\n");
2259 }
1777 2260
1778 av_clear (GvAV (PL_defgv)); 2261 av_clear (GvAV (PL_defgv));
1779 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2262 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1780 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2263 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1781 2264
1785 api_trace (coro_current, 0); 2268 api_trace (coro_current, 0);
1786 2269
1787 av_push (av_async_pool, newSVsv (coro_current)); 2270 av_push (av_async_pool, newSVsv (coro_current));
1788} 2271}
1789 2272
2273#if 0
2274
2275void
2276_generator_call (...)
2277 PROTOTYPE: @
2278 PPCODE:
2279 fprintf (stderr, "call %p\n", CvXSUBANY(cv).any_ptr);
2280 xxxx
2281 abort ();
2282
2283SV *
2284gensub (SV *sub, ...)
2285 PROTOTYPE: &;@
2286 CODE:
2287{
2288 struct coro *coro;
2289 MAGIC *mg;
2290 CV *xcv;
2291 CV *ncv = (CV *)newSV_type (SVt_PVCV);
2292 int i;
2293
2294 CvGV (ncv) = CvGV (cv);
2295 CvFILE (ncv) = CvFILE (cv);
2296
2297 Newz (0, coro, 1, struct coro);
2298 coro->args = newAV ();
2299 coro->flags = CF_NEW;
2300
2301 av_extend (coro->args, items - 1);
2302 for (i = 1; i < items; i++)
2303 av_push (coro->args, newSVsv (ST (i)));
2304
2305 CvISXSUB_on (ncv);
2306 CvXSUBANY (ncv).any_ptr = (void *)coro;
2307
2308 xcv = GvCV (gv_fetchpv ("Coro::_generator_call", 0, SVt_PVCV));
2309
2310 CvXSUB (ncv) = CvXSUB (xcv);
2311 CvANON_on (ncv);
2312
2313 mg = sv_magicext ((SV *)ncv, 0, CORO_MAGIC_type_state, &coro_gensub_vtbl, (char *)coro, 0);
2314 RETVAL = newRV_noinc ((SV *)ncv);
2315}
2316 OUTPUT:
2317 RETVAL
2318
2319#endif
2320
1790 2321
1791MODULE = Coro::State PACKAGE = Coro::AIO 2322MODULE = Coro::State PACKAGE = Coro::AIO
1792 2323
1793SV * 2324void
1794_get_state () 2325_get_state (SV *self)
1795 CODE: 2326 PPCODE:
1796{ 2327{
1797 struct io_state *data; 2328 AV *defav = GvAV (PL_defgv);
1798 2329 AV *av = newAV ();
2330 int i;
1799 RETVAL = newSV (sizeof (struct io_state)); 2331 SV *data_sv = newSV (sizeof (struct io_state));
1800 data = (struct io_state *)SvPVX (RETVAL); 2332 struct io_state *data = (struct io_state *)SvPVX (data_sv);
1801 SvCUR_set (RETVAL, sizeof (struct io_state)); 2333 SvCUR_set (data_sv, sizeof (struct io_state));
1802 SvPOK_only (RETVAL); 2334 SvPOK_only (data_sv);
1803 2335
1804 data->errorno = errno; 2336 data->errorno = errno;
1805 data->laststype = PL_laststype; 2337 data->laststype = PL_laststype;
1806 data->laststatval = PL_laststatval; 2338 data->laststatval = PL_laststatval;
1807 data->statcache = PL_statcache; 2339 data->statcache = PL_statcache;
2340
2341 av_extend (av, AvFILLp (defav) + 1 + 1);
2342
2343 for (i = 0; i <= AvFILLp (defav); ++i)
2344 av_push (av, SvREFCNT_inc_NN (AvARRAY (defav)[i]));
2345
2346 av_push (av, data_sv);
2347
2348 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2349
2350 api_ready (self);
1808} 2351}
1809 OUTPUT:
1810 RETVAL
1811 2352
1812void 2353void
1813_set_state (char *data_) 2354_set_state (SV *state)
1814 PROTOTYPE: $ 2355 PROTOTYPE: $
1815 CODE: 2356 PPCODE:
1816{ 2357{
1817 struct io_state *data = (void *)data_; 2358 AV *av = (AV *)SvRV (state);
2359 struct io_state *data = (struct io_state *)SvPVX (AvARRAY (av)[AvFILLp (av)]);
2360 int i;
1818 2361
1819 errno = data->errorno; 2362 errno = data->errorno;
1820 PL_laststype = data->laststype; 2363 PL_laststype = data->laststype;
1821 PL_laststatval = data->laststatval; 2364 PL_laststatval = data->laststatval;
1822 PL_statcache = data->statcache; 2365 PL_statcache = data->statcache;
1823}
1824 2366
2367 EXTEND (SP, AvFILLp (av));
2368 for (i = 0; i < AvFILLp (av); ++i)
2369 PUSHs (sv_2mortal (SvREFCNT_inc_NN (AvARRAY (av)[i])));
2370}
2371
2372
2373MODULE = Coro::State PACKAGE = Coro::AnyEvent
2374
2375BOOT:
2376 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2377
2378SV *
2379_schedule (...)
2380 PROTOTYPE: @
2381 CODE:
2382{
2383 static int incede;
2384
2385 api_cede_notself ();
2386
2387 ++incede;
2388 while (coro_nready >= incede && api_cede ())
2389 ;
2390
2391 sv_setsv (sv_activity, &PL_sv_undef);
2392 if (coro_nready >= incede)
2393 {
2394 PUSHMARK (SP);
2395 PUTBACK;
2396 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2397 SPAGAIN;
2398 }
2399
2400 --incede;
2401}
2402
2403
2404MODULE = Coro::State PACKAGE = PerlIO::cede
2405
2406BOOT:
2407 PerlIO_define_layer (aTHX_ &PerlIO_cede);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines