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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines