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.111 by root, Thu Nov 30 18:21:14 2006 UTC vs.
Revision 1.148 by root, Fri Apr 13 12:56:55 2007 UTC

1#include "libcoro/coro.c" 1#include "libcoro/coro.c"
2
3#define PERL_NO_GET_CONTEXT
2 4
3#include "EXTERN.h" 5#include "EXTERN.h"
4#include "perl.h" 6#include "perl.h"
5#include "XSUB.h" 7#include "XSUB.h"
6 8
7#include "patchlevel.h" 9#include "patchlevel.h"
8 10
9#if USE_VALGRIND
10# include <valgrind/valgrind.h>
11#endif
12
13#define PERL_VERSION_ATLEAST(a,b,c) \
14 (PERL_REVISION > (a) \
15 || (PERL_REVISION == (a) \
16 && (PERL_VERSION > (b) \
17 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c)))))
18
19#if !PERL_VERSION_ATLEAST (5,6,0)
20# ifndef PL_ppaddr
21# define PL_ppaddr ppaddr
22# endif
23# ifndef call_sv
24# define call_sv perl_call_sv
25# endif
26# ifndef get_sv
27# define get_sv perl_get_sv
28# endif
29# ifndef get_cv
30# define get_cv perl_get_cv
31# endif
32# ifndef IS_PADGV
33# define IS_PADGV(v) 0
34# endif
35# ifndef IS_PADCONST
36# define IS_PADCONST(v) 0
37# endif
38#endif
39
40#include <stdio.h> 11#include <stdio.h>
41#include <errno.h> 12#include <errno.h>
42 13#include <assert.h>
43#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
44# undef STACKGUARD
45#endif
46
47#ifndef STACKGUARD
48# define STACKGUARD 0
49#endif
50 14
51#ifdef HAVE_MMAP 15#ifdef HAVE_MMAP
52# include <unistd.h> 16# include <unistd.h>
53# include <sys/mman.h> 17# include <sys/mman.h>
54# ifndef MAP_ANONYMOUS 18# ifndef MAP_ANONYMOUS
69#else 33#else
70# define PAGESIZE 0 34# define PAGESIZE 0
71# define BOOT_PAGESIZE (void)0 35# define BOOT_PAGESIZE (void)0
72#endif 36#endif
73 37
38#if CORO_USE_VALGRIND
39# include <valgrind/valgrind.h>
40# define REGISTER_STACK(cctx,start,end) (cctx)->valgrind_id = VALGRIND_STACK_REGISTER ((start), (end))
41#else
42# define REGISTER_STACK(cctx,start,end)
43#endif
44
45/* the maximum number of idle cctx that will be pooled */
46#define MAX_IDLE_CCTX 8
47
48#define PERL_VERSION_ATLEAST(a,b,c) \
49 (PERL_REVISION > (a) \
50 || (PERL_REVISION == (a) \
51 && (PERL_VERSION > (b) \
52 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c)))))
53
54#if !PERL_VERSION_ATLEAST (5,6,0)
55# ifndef PL_ppaddr
56# define PL_ppaddr ppaddr
57# endif
58# ifndef call_sv
59# define call_sv perl_call_sv
60# endif
61# ifndef get_sv
62# define get_sv perl_get_sv
63# endif
64# ifndef get_cv
65# define get_cv perl_get_cv
66# endif
67# ifndef IS_PADGV
68# define IS_PADGV(v) 0
69# endif
70# ifndef IS_PADCONST
71# define IS_PADCONST(v) 0
72# endif
73#endif
74
75/* 5.8.7 */
76#ifndef SvRV_set
77# define SvRV_set(s,v) SvRV(s) = (v)
78#endif
79
80#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
81# undef CORO_STACKGUARD
82#endif
83
84#ifndef CORO_STACKGUARD
85# define CORO_STACKGUARD 0
86#endif
87
88/* prefer perl internal functions over our own? */
89#ifndef CORO_PREFER_PERL_FUNCTIONS
90# define CORO_PREFER_PERL_FUNCTIONS 0
91#endif
92
74/* The next macro should declare a variable stacklevel that contains and approximation 93/* The next macro should declare a variable stacklevel that contains and approximation
75 * to the current C stack pointer. Its property is that it changes with each call 94 * to the current C stack pointer. Its property is that it changes with each call
76 * and should be unique. */ 95 * and should be unique. */
77#define dSTACKLEVEL int stacklevel 96#define dSTACKLEVEL int stacklevel
78#define STACKLEVEL ((void *)&stacklevel) 97#define STACKLEVEL ((void *)&stacklevel)
79 98
80#define IN_DESTRUCT (PL_main_cv == Nullcv) 99#define IN_DESTRUCT (PL_main_cv == Nullcv)
81 100
82#if __GNUC__ >= 3 101#if __GNUC__ >= 3
83# define attribute(x) __attribute__(x) 102# define attribute(x) __attribute__(x)
103# define BARRIER __asm__ __volatile__ ("" : : : "memory")
84#else 104#else
85# define attribute(x) 105# define attribute(x)
106# define BARRIER
86#endif 107#endif
87 108
88#define NOINLINE attribute ((noinline)) 109#define NOINLINE attribute ((noinline))
89 110
90#include "CoroAPI.h" 111#include "CoroAPI.h"
91
92#define TRANSFER_SET_STACKLEVEL 0x8bfbfbfb /* magic cookie */
93 112
94#ifdef USE_ITHREADS 113#ifdef USE_ITHREADS
95static perl_mutex coro_mutex; 114static perl_mutex coro_mutex;
96# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) 115# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0)
97# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0) 116# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0)
98#else 117#else
99# define LOCK (void)0 118# define LOCK (void)0
100# define UNLOCK (void)0 119# define UNLOCK (void)0
101#endif 120#endif
102 121
122/* helper storage struct for Coro::AIO */
123struct io_state
124{
125 int errorno;
126 I32 laststype;
127 int laststatval;
128 Stat_t statcache;
129};
130
131static size_t coro_stacksize = CORO_STACKSIZE;
103static struct CoroAPI coroapi; 132static struct CoroAPI coroapi;
104static AV *main_mainstack; /* used to differentiate between $main and others */ 133static AV *main_mainstack; /* used to differentiate between $main and others */
134static JMPENV *main_top_env;
105static HV *coro_state_stash, *coro_stash; 135static HV *coro_state_stash, *coro_stash;
106static SV *coro_mortal; /* will be freed after next transfer */ 136static SV *coro_mortal; /* will be freed after next transfer */
107 137
108static struct coro_cctx *cctx_first; 138static struct coro_cctx *cctx_first;
109static int cctx_count, cctx_idle; 139static int cctx_count, cctx_idle;
112typedef struct coro_cctx { 142typedef struct coro_cctx {
113 struct coro_cctx *next; 143 struct coro_cctx *next;
114 144
115 /* the stack */ 145 /* the stack */
116 void *sptr; 146 void *sptr;
117 long ssize; /* positive == mmap, otherwise malloc */ 147 size_t ssize;
118 148
119 /* cpu state */ 149 /* cpu state */
120 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 150 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
151 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */
121 JMPENV *top_env; 152 JMPENV *top_env;
122 coro_context cctx; 153 coro_context cctx;
123 154
124 int inuse;
125
126#if USE_VALGRIND 155#if CORO_USE_VALGRIND
127 int valgrind_id; 156 int valgrind_id;
128#endif 157#endif
158 char inuse, mapped;
129} coro_cctx; 159} coro_cctx;
130 160
131enum { 161enum {
132 CF_RUNNING, /* coroutine is running */ 162 CF_RUNNING = 0x0001, /* coroutine is running */
133 CF_READY, /* coroutine is ready */ 163 CF_READY = 0x0002, /* coroutine is ready */
164 CF_NEW = 0x0004, /* has never been switched to */
165 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
134}; 166};
135 167
136/* this is a structure representing a perl-level coroutine */ 168/* this is a structure representing a perl-level coroutine */
137struct coro { 169struct coro {
138 /* the c coroutine allocated to this perl coroutine, if any */ 170 /* the c coroutine allocated to this perl coroutine, if any */
139 coro_cctx *cctx; 171 coro_cctx *cctx;
140 172
141 /* data associated with this coroutine (initial args) */ 173 /* data associated with this coroutine (initial args) */
142 AV *args; 174 AV *args;
143 int refcnt; 175 int refcnt;
144 int flags; 176 int save; /* CORO_SAVE flags */
177 int flags; /* CF_ flags */
145 178
146 /* optionally saved, might be zero */ 179 /* optionally saved, might be zero */
147 AV *defav; 180 AV *defav; /* @_ */
148 SV *defsv; 181 SV *defsv; /* $_ */
149 SV *errsv; 182 SV *errsv; /* $@ */
183 GV *deffh; /* default filehandle */
184 SV *irssv; /* $/ */
185 SV *irssv_sv; /* real $/ cache */
150 186
151#define VAR(name,type) type name; 187#define VAR(name,type) type name;
152# include "state.h" 188# include "state.h"
153#undef VAR 189#undef VAR
154 190
157}; 193};
158 194
159typedef struct coro *Coro__State; 195typedef struct coro *Coro__State;
160typedef struct coro *Coro__State_or_hashref; 196typedef struct coro *Coro__State_or_hashref;
161 197
198/** Coro ********************************************************************/
199
200#define PRIO_MAX 3
201#define PRIO_HIGH 1
202#define PRIO_NORMAL 0
203#define PRIO_LOW -1
204#define PRIO_IDLE -3
205#define PRIO_MIN -4
206
207/* for Coro.pm */
208static SV *coro_current;
209static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
210static int coro_nready;
211
212/** lowlevel stuff **********************************************************/
213
162static AV * 214static AV *
163coro_clone_padlist (CV *cv) 215coro_clone_padlist (pTHX_ CV *cv)
164{ 216{
165 AV *padlist = CvPADLIST (cv); 217 AV *padlist = CvPADLIST (cv);
166 AV *newpadlist, *newpad; 218 AV *newpadlist, *newpad;
167 219
168 newpadlist = newAV (); 220 newpadlist = newAV ();
180 232
181 return newpadlist; 233 return newpadlist;
182} 234}
183 235
184static void 236static void
185free_padlist (AV *padlist) 237free_padlist (pTHX_ AV *padlist)
186{ 238{
187 /* may be during global destruction */ 239 /* may be during global destruction */
188 if (SvREFCNT (padlist)) 240 if (SvREFCNT (padlist))
189 { 241 {
190 I32 i = AvFILLp (padlist); 242 I32 i = AvFILLp (padlist);
211 AV *padlist; 263 AV *padlist;
212 AV *av = (AV *)mg->mg_obj; 264 AV *av = (AV *)mg->mg_obj;
213 265
214 /* casting is fun. */ 266 /* casting is fun. */
215 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 267 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
216 free_padlist (padlist); 268 free_padlist (aTHX_ padlist);
217 269
218 SvREFCNT_dec (av); 270 SvREFCNT_dec (av);
219 271
220 return 0; 272 return 0;
221} 273}
231 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 283 : mg_find ((SV *)cv, PERL_MAGIC_coro) \
232 : 0 284 : 0
233 285
234/* the next two functions merely cache the padlists */ 286/* the next two functions merely cache the padlists */
235static void 287static void
236get_padlist (CV *cv) 288get_padlist (pTHX_ CV *cv)
237{ 289{
238 MAGIC *mg = CORO_MAGIC (cv); 290 MAGIC *mg = CORO_MAGIC (cv);
239 AV *av; 291 AV *av;
240 292
241 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 293 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)
242 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 294 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
243 else 295 else
244 { 296 {
245#if 0 297#if CORO_PREFER_PERL_FUNCTIONS
246 /* this is probably cleaner, but also slower? */ 298 /* this is probably cleaner, but also slower? */
247 CV *cp = Perl_cv_clone (cv); 299 CV *cp = Perl_cv_clone (cv);
248 CvPADLIST (cv) = CvPADLIST (cp); 300 CvPADLIST (cv) = CvPADLIST (cp);
249 CvPADLIST (cp) = 0; 301 CvPADLIST (cp) = 0;
250 SvREFCNT_dec (cp); 302 SvREFCNT_dec (cp);
251#else 303#else
252 CvPADLIST (cv) = coro_clone_padlist (cv); 304 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
253#endif 305#endif
254 } 306 }
255} 307}
256 308
257static void 309static void
258put_padlist (CV *cv) 310put_padlist (pTHX_ CV *cv)
259{ 311{
260 MAGIC *mg = CORO_MAGIC (cv); 312 MAGIC *mg = CORO_MAGIC (cv);
261 AV *av; 313 AV *av;
262 314
263 if (!mg) 315 if (!mg)
274 av_extend (av, AvMAX (av) + 1); 326 av_extend (av, AvMAX (av) + 1);
275 327
276 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 328 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
277} 329}
278 330
331/** load & save, init *******************************************************/
332
279#define SB do { 333#define SB do {
280#define SE } while (0) 334#define SE } while (0)
281 335
282#define LOAD(state) load_state((state));
283#define SAVE(state,flags) save_state((state),(flags));
284
285#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE 336#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
286 337
287static void 338static void
288load_state(Coro__State c) 339load_perl (pTHX_ Coro__State c)
289{ 340{
290#define VAR(name,type) PL_ ## name = c->name; 341#define VAR(name,type) PL_ ## name = c->name;
291# include "state.h" 342# include "state.h"
292#undef VAR 343#undef VAR
293 344
294 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 345 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
295 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 346 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
296 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 347 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
348 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh);
349
350 if (c->irssv)
351 {
352 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
353 {
354 SvREFCNT_dec (c->irssv);
355 c->irssv = 0;
356 }
357 else
358 {
359 REPLACE_SV (PL_rs, c->irssv);
360 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
361 sv_setsv (c->irssv_sv, PL_rs);
362 }
363 }
297 364
298 { 365 {
299 dSP; 366 dSP;
300 CV *cv; 367 CV *cv;
301 368
302 /* now do the ugly restore mess */ 369 /* now do the ugly restore mess */
303 while ((cv = (CV *)POPs)) 370 while ((cv = (CV *)POPs))
304 { 371 {
305 put_padlist (cv); /* mark this padlist as available */ 372 put_padlist (aTHX_ cv); /* mark this padlist as available */
306 CvDEPTH (cv) = PTR2IV (POPs); 373 CvDEPTH (cv) = PTR2IV (POPs);
307 CvPADLIST (cv) = (AV *)POPs; 374 CvPADLIST (cv) = (AV *)POPs;
308 } 375 }
309 376
310 PUTBACK; 377 PUTBACK;
311 } 378 }
379 assert (!PL_comppad || AvARRAY (PL_comppad));//D
312} 380}
313 381
314static void 382static void
315save_state(Coro__State c, int flags) 383save_perl (pTHX_ Coro__State c)
316{ 384{
385 assert (!PL_comppad || AvARRAY (PL_comppad));//D
317 { 386 {
318 dSP; 387 dSP;
319 I32 cxix = cxstack_ix; 388 I32 cxix = cxstack_ix;
320 PERL_CONTEXT *ccstk = cxstack; 389 PERL_CONTEXT *ccstk = cxstack;
321 PERL_SI *top_si = PL_curstackinfo; 390 PERL_SI *top_si = PL_curstackinfo;
323 /* 392 /*
324 * the worst thing you can imagine happens first - we have to save 393 * the worst thing you can imagine happens first - we have to save
325 * (and reinitialize) all cv's in the whole callchain :( 394 * (and reinitialize) all cv's in the whole callchain :(
326 */ 395 */
327 396
397 EXTEND (SP, 3 + 1);
328 PUSHs (Nullsv); 398 PUSHs (Nullsv);
329 /* this loop was inspired by pp_caller */ 399 /* this loop was inspired by pp_caller */
330 for (;;) 400 for (;;)
331 { 401 {
332 while (cxix >= 0) 402 while (cxix >= 0)
333 { 403 {
334 PERL_CONTEXT *cx = &ccstk[cxix--]; 404 PERL_CONTEXT *cx = &ccstk[cxix--];
335 405
336 if (CxTYPE(cx) == CXt_SUB) 406 if (CxTYPE (cx) == CXt_SUB)
337 { 407 {
338 CV *cv = cx->blk_sub.cv; 408 CV *cv = cx->blk_sub.cv;
339 409
340 if (CvDEPTH (cv)) 410 if (CvDEPTH (cv))
341 { 411 {
342 EXTEND (SP, 3); 412 EXTEND (SP, 3);
343
344 PUSHs ((SV *)CvPADLIST(cv)); 413 PUSHs ((SV *)CvPADLIST (cv));
345 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 414 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
346 PUSHs ((SV *)cv); 415 PUSHs ((SV *)cv);
347 416
348 CvDEPTH (cv) = 0; 417 CvDEPTH (cv) = 0;
349 get_padlist (cv); 418 get_padlist (aTHX_ cv);
350 } 419 }
351 } 420 }
352#ifdef CXt_FORMAT
353 else if (CxTYPE(cx) == CXt_FORMAT)
354 {
355 /* I never used formats, so how should I know how these are implemented? */
356 /* my bold guess is as a simple, plain sub... */
357 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
358 }
359#endif
360 } 421 }
361 422
362 if (top_si->si_type == PERLSI_MAIN) 423 if (top_si->si_type == PERLSI_MAIN)
363 break; 424 break;
364 425
368 } 429 }
369 430
370 PUTBACK; 431 PUTBACK;
371 } 432 }
372 433
373 c->defav = flags & TRANSFER_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 434 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0;
374 c->defsv = flags & TRANSFER_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 435 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0;
375 c->errsv = flags & TRANSFER_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 436 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0;
437 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0;
438 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0;
376 439
377#define VAR(name,type)c->name = PL_ ## name; 440#define VAR(name,type)c->name = PL_ ## name;
378# include "state.h" 441# include "state.h"
379#undef VAR 442#undef VAR
380} 443}
383 * allocate various perl stacks. This is an exact copy 446 * allocate various perl stacks. This is an exact copy
384 * of perl.c:init_stacks, except that it uses less memory 447 * of perl.c:init_stacks, except that it uses less memory
385 * on the (sometimes correct) assumption that coroutines do 448 * on the (sometimes correct) assumption that coroutines do
386 * not usually need a lot of stackspace. 449 * not usually need a lot of stackspace.
387 */ 450 */
451#if CORO_PREFER_PERL_FUNCTIONS
452# define coro_init_stacks init_stacks
453#else
388static void 454static void
389coro_init_stacks () 455coro_init_stacks (pTHX)
390{ 456{
391 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 457 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT));
392 PL_curstackinfo->si_type = PERLSI_MAIN; 458 PL_curstackinfo->si_type = PERLSI_MAIN;
393 PL_curstack = PL_curstackinfo->si_stack; 459 PL_curstack = PL_curstackinfo->si_stack;
394 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 460 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
395 461
396 PL_stack_base = AvARRAY(PL_curstack); 462 PL_stack_base = AvARRAY(PL_curstack);
397 PL_stack_sp = PL_stack_base; 463 PL_stack_sp = PL_stack_base;
398 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 464 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
399 465
400 New(50,PL_tmps_stack,96,SV*); 466 New(50,PL_tmps_stack,128,SV*);
401 PL_tmps_floor = -1; 467 PL_tmps_floor = -1;
402 PL_tmps_ix = -1; 468 PL_tmps_ix = -1;
403 PL_tmps_max = 96; 469 PL_tmps_max = 128;
404 470
405 New(54,PL_markstack,16,I32); 471 New(54,PL_markstack,32,I32);
406 PL_markstack_ptr = PL_markstack; 472 PL_markstack_ptr = PL_markstack;
407 PL_markstack_max = PL_markstack + 16; 473 PL_markstack_max = PL_markstack + 32;
408 474
409#ifdef SET_MARK_OFFSET 475#ifdef SET_MARK_OFFSET
410 SET_MARK_OFFSET; 476 SET_MARK_OFFSET;
411#endif 477#endif
412 478
413 New(54,PL_scopestack,16,I32); 479 New(54,PL_scopestack,32,I32);
414 PL_scopestack_ix = 0; 480 PL_scopestack_ix = 0;
415 PL_scopestack_max = 16; 481 PL_scopestack_max = 32;
416 482
417 New(54,PL_savestack,96,ANY); 483 New(54,PL_savestack,64,ANY);
418 PL_savestack_ix = 0; 484 PL_savestack_ix = 0;
419 PL_savestack_max = 96; 485 PL_savestack_max = 64;
420 486
421#if !PERL_VERSION_ATLEAST (5,9,0) 487#if !PERL_VERSION_ATLEAST (5,9,0)
422 New(54,PL_retstack,8,OP*); 488 New(54,PL_retstack,16,OP*);
423 PL_retstack_ix = 0; 489 PL_retstack_ix = 0;
424 PL_retstack_max = 8; 490 PL_retstack_max = 16;
425#endif 491#endif
426} 492}
493#endif
427 494
428/* 495/*
429 * destroy the stacks, the callchain etc... 496 * destroy the stacks, the callchain etc...
430 */ 497 */
431static void 498static void
432coro_destroy_stacks () 499coro_destroy_stacks (pTHX)
433{ 500{
434 if (!IN_DESTRUCT) 501 if (!IN_DESTRUCT)
435 { 502 {
436 /* is this ugly, I ask? */ 503 /* restore all saved variables and stuff */
437 LEAVE_SCOPE (0); 504 LEAVE_SCOPE (0);
505 assert (PL_tmps_floor == -1);
438 506
439 /* sure it is, but more important: is it correct?? :/ */ 507 /* free all temporaries */
440 FREETMPS; 508 FREETMPS;
509 assert (PL_tmps_ix == -1);
441 510
511 /* unwind all extra stacks */
442 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/ 512 POPSTACK_TO (PL_mainstack);
513
514 /* unwind main stack */
515 dounwind (-1);
443 } 516 }
444 517
445 while (PL_curstackinfo->si_next) 518 while (PL_curstackinfo->si_next)
446 PL_curstackinfo = PL_curstackinfo->si_next; 519 PL_curstackinfo = PL_curstackinfo->si_next;
447 520
448 while (PL_curstackinfo) 521 while (PL_curstackinfo)
449 { 522 {
450 PERL_SI *p = PL_curstackinfo->si_prev; 523 PERL_SI *p = PL_curstackinfo->si_prev;
451 524
452 { /*D*//*remove*/
453 dSP;
454 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
455 PUTBACK; /* possibly superfluous */
456 }
457
458 if (!IN_DESTRUCT) 525 if (!IN_DESTRUCT)
459 {
460 dounwind (-1);/*D*//*remove*/
461 SvREFCNT_dec (PL_curstackinfo->si_stack); 526 SvREFCNT_dec (PL_curstackinfo->si_stack);
462 }
463 527
464 Safefree (PL_curstackinfo->si_cxstack); 528 Safefree (PL_curstackinfo->si_cxstack);
465 Safefree (PL_curstackinfo); 529 Safefree (PL_curstackinfo);
466 PL_curstackinfo = p; 530 PL_curstackinfo = p;
467 } 531 }
473#if !PERL_VERSION_ATLEAST (5,9,0) 537#if !PERL_VERSION_ATLEAST (5,9,0)
474 Safefree (PL_retstack); 538 Safefree (PL_retstack);
475#endif 539#endif
476} 540}
477 541
542/** coroutine stack handling ************************************************/
543
478static void 544static void
479setup_coro (struct coro *coro) 545setup_coro (pTHX_ struct coro *coro)
480{ 546{
481 /* 547 /*
482 * emulate part of the perl startup here. 548 * emulate part of the perl startup here.
483 */ 549 */
484
485 coro_init_stacks (); 550 coro_init_stacks (aTHX);
486 551
552 PL_curcop = &PL_compiling;
553 PL_in_eval = EVAL_NULL;
487 PL_curcop = 0; 554 PL_comppad = 0;
488 PL_in_eval = 0;
489 PL_curpm = 0; 555 PL_curpm = 0;
556 PL_localizing = 0;
557 PL_dirty = 0;
558 PL_restartop = 0;
490 559
491 { 560 {
492 dSP; 561 dSP;
493 LOGOP myop; 562 LOGOP myop;
494 563
495 /* I have no idea why this is needed, but it is */
496 PUSHMARK (SP);
497
498 SvREFCNT_dec (GvAV (PL_defgv)); 564 SvREFCNT_dec (GvAV (PL_defgv));
499 GvAV (PL_defgv) = coro->args; coro->args = 0; 565 GvAV (PL_defgv) = coro->args; coro->args = 0;
500 566
501 Zero (&myop, 1, LOGOP); 567 Zero (&myop, 1, LOGOP);
502 myop.op_next = Nullop; 568 myop.op_next = Nullop;
503 myop.op_flags = OPf_WANT_VOID; 569 myop.op_flags = OPf_WANT_VOID;
504 570
505 PL_op = (OP *)&myop;
506
507 PUSHMARK (SP); 571 PUSHMARK (SP);
508 XPUSHs ((SV *)get_cv ("Coro::State::_coro_init", FALSE)); 572 XPUSHs ((SV *)get_cv ("Coro::State::_coro_init", FALSE));
509 PUTBACK; 573 PUTBACK;
574 PL_op = (OP *)&myop;
510 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 575 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
511 SPAGAIN; 576 SPAGAIN;
512
513 ENTER; /* necessary e.g. for dounwind */
514 } 577 }
515}
516 578
579 ENTER; /* necessary e.g. for dounwind */
580}
581
517static void 582static void
518free_coro_mortal () 583free_coro_mortal (pTHX)
519{ 584{
520 if (coro_mortal) 585 if (coro_mortal)
521 { 586 {
522 SvREFCNT_dec (coro_mortal); 587 SvREFCNT_dec (coro_mortal);
523 coro_mortal = 0; 588 coro_mortal = 0;
524 } 589 }
525} 590}
526 591
592/* inject a fake call to Coro::State::_cctx_init into the execution */
593/* _cctx_init shoukld be careful, as it could be called at almost any time */
594/* during execution of a pelr program */
527static void NOINLINE 595static void NOINLINE
528prepare_cctx (coro_cctx *cctx) 596prepare_cctx (pTHX_ coro_cctx *cctx)
529{ 597{
530 dSP; 598 dSP;
531 LOGOP myop; 599 LOGOP myop;
532 600
533 Zero (&myop, 1, LOGOP); 601 Zero (&myop, 1, LOGOP);
534 myop.op_next = PL_op; 602 myop.op_next = PL_op;
535 myop.op_flags = OPf_WANT_VOID; 603 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
536
537 sv_setiv (get_sv ("Coro::State::_cctx", FALSE), PTR2IV (cctx));
538 604
539 PUSHMARK (SP); 605 PUSHMARK (SP);
606 EXTEND (SP, 2);
607 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx))));
540 XPUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 608 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
541 PUTBACK; 609 PUTBACK;
610 PL_op = (OP *)&myop;
542 PL_restartop = PL_ppaddr[OP_ENTERSUB](aTHX); 611 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
543 SPAGAIN; 612 SPAGAIN;
544} 613}
545 614
615/*
616 * this is a _very_ stripped down perl interpreter ;)
617 */
546static void 618static void
547coro_run (void *arg) 619coro_run (void *arg)
548{ 620{
621 dTHX;
622
549 /* coro_run is the alternative epilogue of transfer() */ 623 /* coro_run is the alternative tail of transfer(), so unlock here. */
550 UNLOCK; 624 UNLOCK;
551 625
552 /*
553 * this is a _very_ stripped down perl interpreter ;)
554 */
555 PL_top_env = &PL_start_env; 626 PL_top_env = &PL_start_env;
556 627
557 /* inject call to cctx_init */ 628 /* inject a fake subroutine call to cctx_init */
558 prepare_cctx ((coro_cctx *)arg); 629 prepare_cctx (aTHX_ (coro_cctx *)arg);
559 630
560 /* somebody will hit me for both perl_run and PL_restartop */ 631 /* somebody or something will hit me for both perl_run and PL_restartop */
632 PL_restartop = PL_op;
561 perl_run (PL_curinterp); 633 perl_run (PL_curinterp);
562 634
563 fputs ("FATAL: C coroutine fell over the edge of the world, aborting. Did you call exit in a coroutine?\n", stderr); 635 /* If perl-run returns we assume exit() was being called, which */
564 abort (); 636 /* seems to be the only valid (non-bug) reason for perl_run to return. */
637 /* We try to exit by jumping to the bootstrap-time "top" top_env, as */
638 /* we cannot restore the "main" coroutine as Coro has no such concept */
639 PL_top_env = main_top_env;
640 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
565} 641}
566 642
567static coro_cctx * 643static coro_cctx *
568cctx_new () 644cctx_new ()
569{ 645{
570 coro_cctx *cctx; 646 coro_cctx *cctx;
647 void *stack_start;
648 size_t stack_size;
571 649
572 ++cctx_count; 650 ++cctx_count;
573 651
574 New (0, cctx, 1, coro_cctx); 652 Newz (0, cctx, 1, coro_cctx);
575 653
576#if HAVE_MMAP 654#if HAVE_MMAP
577 655
578 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; 656 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
579 /* mmap suppsedly does allocate-on-write for us */ 657 /* mmap supposedly does allocate-on-write for us */
580 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 658 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
581 659
582 if (cctx->sptr == (void *)-1) 660 if (cctx->sptr != (void *)-1)
583 {
584 perror ("FATAL: unable to mmap stack for coroutine");
585 _exit (EXIT_FAILURE);
586 } 661 {
587
588# if STACKGUARD 662# if CORO_STACKGUARD
589 mprotect (cctx->sptr, STACKGUARD * PAGESIZE, PROT_NONE); 663 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
590# endif 664# endif
665 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr;
666 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
667 cctx->mapped = 1;
668 }
669 else
670#endif
671 {
672 cctx->ssize = coro_stacksize * (long)sizeof (long);
673 New (0, cctx->sptr, coro_stacksize, long);
591 674
592#else
593
594 cctx->ssize = STACKSIZE * (long)sizeof (long);
595 New (0, cctx->sptr, STACKSIZE, long);
596
597 if (!cctx->sptr) 675 if (!cctx->sptr)
598 { 676 {
599 perror ("FATAL: unable to malloc stack for coroutine"); 677 perror ("FATAL: unable to allocate stack for coroutine");
600 _exit (EXIT_FAILURE); 678 _exit (EXIT_FAILURE);
601 } 679 }
602 680
603#endif 681 stack_start = cctx->sptr;
682 stack_size = cctx->ssize;
683 }
604 684
605#if USE_VALGRIND 685 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
606 cctx->valgrind_id = VALGRIND_STACK_REGISTER (
607 STACKGUARD * PAGESIZE + (char *)cctx->sptr,
608 cctx->ssize + (char *)cctx->sptr
609 );
610#endif
611
612 coro_create (&cctx->cctx, coro_run, (void *)cctx, cctx->sptr, cctx->ssize); 686 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size);
613 687
614 return cctx; 688 return cctx;
615} 689}
616 690
617static void 691static void
618cctx_free (coro_cctx *cctx) 692cctx_destroy (coro_cctx *cctx)
619{ 693{
620 if (!cctx) 694 if (!cctx)
621 return; 695 return;
622 696
623 --cctx_count; 697 --cctx_count;
624 698
625#if USE_VALGRIND 699#if CORO_USE_VALGRIND
626 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 700 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
627#endif 701#endif
628 702
629#if HAVE_MMAP 703#if HAVE_MMAP
704 if (cctx->mapped)
630 munmap (cctx->sptr, cctx->ssize); 705 munmap (cctx->sptr, cctx->ssize);
631#else 706 else
707#endif
632 Safefree (cctx->sptr); 708 Safefree (cctx->sptr);
633#endif
634 709
635 Safefree (cctx); 710 Safefree (cctx);
636} 711}
637 712
638static coro_cctx * 713static coro_cctx *
639cctx_get () 714cctx_get (pTHX)
640{ 715{
641 coro_cctx *cctx;
642
643 if (cctx_first) 716 while (cctx_first)
644 { 717 {
718 coro_cctx *cctx = cctx_first;
719 cctx_first = cctx->next;
645 --cctx_idle; 720 --cctx_idle;
646 cctx = cctx_first; 721
647 cctx_first = cctx->next; 722 if (cctx->ssize >= coro_stacksize)
723 return cctx;
724
725 cctx_destroy (cctx);
648 } 726 }
649 else 727
650 {
651 cctx = cctx_new ();
652 PL_op = PL_op->op_next; 728 PL_op = PL_op->op_next;
653 }
654
655 return cctx; 729 return cctx_new ();
656} 730}
657 731
658static void 732static void
659cctx_put (coro_cctx *cctx) 733cctx_put (coro_cctx *cctx)
660{ 734{
735 /* free another cctx if overlimit */
736 if (cctx_idle >= MAX_IDLE_CCTX)
737 {
738 coro_cctx *first = cctx_first;
739 cctx_first = first->next;
740 --cctx_idle;
741
742 assert (!first->inuse);
743 cctx_destroy (first);
744 }
745
661 ++cctx_idle; 746 ++cctx_idle;
662 cctx->next = cctx_first; 747 cctx->next = cctx_first;
663 cctx_first = cctx; 748 cctx_first = cctx;
664} 749}
665 750
751/** coroutine switching *****************************************************/
752
666/* never call directly, always through the coro_state_transfer global variable */ 753/* never call directly, always through the coro_state_transfer global variable */
667static void NOINLINE 754static void NOINLINE
668transfer (struct coro *prev, struct coro *next, int flags) 755transfer (pTHX_ struct coro *prev, struct coro *next)
669{ 756{
670 dSTACKLEVEL; 757 dSTACKLEVEL;
671 758
672 /* sometimes transfer is only called to set idle_sp */ 759 /* sometimes transfer is only called to set idle_sp */
673 if (flags == TRANSFER_SET_STACKLEVEL) 760 if (!next)
761 {
674 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 762 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
763 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
764 }
675 else if (prev != next) 765 else if (prev != next)
676 { 766 {
677 coro_cctx *prev__cctx; 767 coro_cctx *prev__cctx;
678 768
679 if (!prev->cctx) 769 if (prev->flags & CF_NEW)
680 { 770 {
681 /* create a new empty context */ 771 /* create a new empty context */
682 Newz (0, prev->cctx, 1, coro_cctx); 772 Newz (0, prev->cctx, 1, coro_cctx);
683 prev->cctx->inuse = 1; 773 prev->cctx->inuse = 1;
774 prev->flags &= ~CF_NEW;
684 prev->flags |= CF_RUNNING; 775 prev->flags |= CF_RUNNING;
685 } 776 }
686 777
778 /*TODO: must not croak here */
687 assert ( prev->flags & CF_RUNNING); 779 if (!prev->flags & CF_RUNNING)
780 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states");
781
688 assert (!next->flags & CF_RUNNING); 782 if (next->flags & CF_RUNNING)
783 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
784
785 if (next->flags & CF_DESTROYED)
786 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
689 787
690 prev->flags &= ~CF_RUNNING; 788 prev->flags &= ~CF_RUNNING;
691 next->flags |= CF_RUNNING; 789 next->flags |= CF_RUNNING;
692 790
693 LOCK; 791 LOCK;
694 792
695 if (next->mainstack) 793 if (next->flags & CF_NEW)
696 { 794 {
697 /* coroutine already started */ 795 /* need to start coroutine */
698 SAVE (prev, flags); 796 next->flags &= ~CF_NEW;
699 LOAD (next); 797 /* first get rid of the old state */
798 save_perl (aTHX_ prev);
799 /* setup coroutine call */
800 setup_coro (aTHX_ next);
801 /* need a new stack */
802 assert (!next->cctx);
700 } 803 }
701 else 804 else
702 { 805 {
703 /* need to start coroutine */ 806 /* coroutine already started */
704 /* first get rid of the old state */ 807 save_perl (aTHX_ prev);
705 SAVE (prev, -1); 808 load_perl (aTHX_ next);
706 /* setup coroutine call */
707 setup_coro (next);
708 /* need a stack */
709 assert (!next->stack);
710 next->cctx = 0;
711 } 809 }
712 810
713 prev__cctx = prev->cctx; 811 prev__cctx = prev->cctx;
714 812
715 /* possibly "free" the cctx */ 813 /* possibly "free" the cctx */
716 if (prev__cctx->idle_sp == STACKLEVEL) 814 if (prev__cctx->idle_sp == STACKLEVEL)
717 { 815 {
718 assert (PL_top_env == prev__cctx->top_env);//D 816 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
817 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
818
819 prev->cctx = 0;
820
719 cctx_put (prev__cctx); 821 cctx_put (prev__cctx);
720 prev->cctx = 0; 822 prev__cctx->inuse = 0;
721 } 823 }
722 824
723 if (!next->cctx) 825 if (!next->cctx)
826 {
724 next->cctx = cctx_get (); 827 next->cctx = cctx_get (aTHX);
828 assert (!next->cctx->inuse);
829 next->cctx->inuse = 1;
830 }
725 831
726 if (prev__cctx != next->cctx) 832 if (prev__cctx != next->cctx)
727 { 833 {
728 assert ( prev__cctx->inuse);
729 assert (!next->cctx->inuse);
730
731 prev__cctx->inuse = 0;
732 next->cctx->inuse = 1;
733
734 prev__cctx->top_env = PL_top_env; 834 prev__cctx->top_env = PL_top_env;
735 PL_top_env = next->cctx->top_env; 835 PL_top_env = next->cctx->top_env;
736 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 836 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
737 } 837 }
738 838
739 free_coro_mortal (); 839 free_coro_mortal (aTHX);
740
741 UNLOCK; 840 UNLOCK;
742 } 841 }
743} 842}
744 843
745struct transfer_args 844struct transfer_args
746{ 845{
747 struct coro *prev, *next; 846 struct coro *prev, *next;
748 int flags;
749}; 847};
750 848
751#define TRANSFER(ta) transfer ((ta).prev, (ta).next, (ta).flags) 849#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next)
752 850
851/** high level stuff ********************************************************/
852
753static void 853static int
754coro_state_destroy (struct coro *coro) 854coro_state_destroy (pTHX_ struct coro *coro)
755{ 855{
756 if (coro->refcnt--) 856 if (coro->flags & CF_DESTROYED)
757 return; 857 return 0;
858
859 coro->flags |= CF_DESTROYED;
860
861 if (coro->flags & CF_READY)
862 {
863 /* reduce nready, as destroying a ready coro effectively unreadies it */
864 /* alternative: look through all ready queues and remove the coro */
865 LOCK;
866 --coro_nready;
867 UNLOCK;
868 }
869 else
870 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
758 871
759 if (coro->mainstack && coro->mainstack != main_mainstack) 872 if (coro->mainstack && coro->mainstack != main_mainstack)
760 { 873 {
761 struct coro temp; 874 struct coro temp;
762 875
763 SAVE ((&temp), TRANSFER_SAVE_ALL); 876 assert (!(coro->flags & CF_RUNNING));
764 LOAD (coro);
765 877
878 Zero (&temp, 1, struct coro);
879 temp.save = CORO_SAVE_DEF;
880
881 if (coro->flags & CF_RUNNING)
882 croak ("FATAL: tried to destroy currently running coroutine");
883
884 save_perl (aTHX_ &temp);
885 load_perl (aTHX_ coro);
886
766 coro_destroy_stacks (); 887 coro_destroy_stacks (aTHX);
767 888
768 LOAD ((&temp)); /* this will get rid of defsv etc.. */ 889 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */
769 890
770 coro->mainstack = 0; 891 coro->mainstack = 0;
771 } 892 }
772 893
773 cctx_free (coro->cctx); 894 cctx_destroy (coro->cctx);
774 SvREFCNT_dec (coro->args); 895 SvREFCNT_dec (coro->args);
775 Safefree (coro); 896
897 return 1;
776} 898}
777 899
778static int 900static int
779coro_state_clear (pTHX_ SV *sv, MAGIC *mg) 901coro_state_free (pTHX_ SV *sv, MAGIC *mg)
780{ 902{
781 struct coro *coro = (struct coro *)mg->mg_ptr; 903 struct coro *coro = (struct coro *)mg->mg_ptr;
782 mg->mg_ptr = 0; 904 mg->mg_ptr = 0;
783 905
906 if (--coro->refcnt < 0)
907 {
784 coro_state_destroy (coro); 908 coro_state_destroy (aTHX_ coro);
909 Safefree (coro);
910 }
785 911
786 return 0; 912 return 0;
787} 913}
788 914
789static int 915static int
796 return 0; 922 return 0;
797} 923}
798 924
799static MGVTBL coro_state_vtbl = { 925static MGVTBL coro_state_vtbl = {
800 0, 0, 0, 0, 926 0, 0, 0, 0,
801 coro_state_clear, 927 coro_state_free,
802 0, 928 0,
803#ifdef MGf_DUP 929#ifdef MGf_DUP
804 coro_state_dup, 930 coro_state_dup,
805#else 931#else
806# define MGf_DUP 0 932# define MGf_DUP 0
807#endif 933#endif
808}; 934};
809 935
810static struct coro * 936static struct coro *
811SvSTATE (SV *coro) 937SvSTATE_ (pTHX_ SV *coro)
812{ 938{
813 HV *stash; 939 HV *stash;
814 MAGIC *mg; 940 MAGIC *mg;
815 941
816 if (SvROK (coro)) 942 if (SvROK (coro))
822 /* very slow, but rare, check */ 948 /* very slow, but rare, check */
823 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 949 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
824 croak ("Coro::State object required"); 950 croak ("Coro::State object required");
825 } 951 }
826 952
827 mg = SvMAGIC (coro); 953 mg = CORO_MAGIC (coro);
828 assert (mg->mg_type == PERL_MAGIC_ext);
829 return (struct coro *)mg->mg_ptr; 954 return (struct coro *)mg->mg_ptr;
830} 955}
831 956
957#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
958
832static void 959static void
833prepare_transfer (struct transfer_args *ta, SV *prev, SV *next, int flags) 960prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
834{ 961{
835 ta->prev = SvSTATE (prev); 962 ta->prev = SvSTATE (prev_sv);
836 ta->next = SvSTATE (next); 963 ta->next = SvSTATE (next_sv);
837 ta->flags = flags;
838} 964}
839 965
840static void 966static void
841api_transfer (SV *prev, SV *next, int flags) 967api_transfer (SV *prev_sv, SV *next_sv)
842{ 968{
843 dTHX; 969 dTHX;
844 struct transfer_args ta; 970 struct transfer_args ta;
845 971
846 prepare_transfer (&ta, prev, next, flags); 972 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
847 TRANSFER (ta); 973 TRANSFER (ta);
848} 974}
849 975
976static int
977api_save (SV *coro_sv, int new_save)
978{
979 dTHX;
980 struct coro *coro = SvSTATE (coro_sv);
981 int old_save = coro->save;
982
983 if (new_save >= 0)
984 coro->save = new_save;
985
986 return old_save;
987}
988
850/** Coro ********************************************************************/ 989/** Coro ********************************************************************/
851 990
852#define PRIO_MAX 3
853#define PRIO_HIGH 1
854#define PRIO_NORMAL 0
855#define PRIO_LOW -1
856#define PRIO_IDLE -3
857#define PRIO_MIN -4
858
859/* for Coro.pm */
860static GV *coro_current, *coro_idle;
861static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
862static int coro_nready;
863
864static void 991static void
865coro_enq (SV *sv) 992coro_enq (pTHX_ SV *coro_sv)
866{ 993{
867 int prio;
868
869 if (SvTYPE (sv) != SVt_PVHV)
870 croak ("Coro::ready tried to enqueue something that is not a coroutine");
871
872 prio = SvSTATE (sv)->prio;
873
874 av_push (coro_ready [prio - PRIO_MIN], sv); 994 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
875 coro_nready++;
876} 995}
877 996
878static SV * 997static SV *
879coro_deq (int min_prio) 998coro_deq (pTHX_ int min_prio)
880{ 999{
881 int prio = PRIO_MAX - PRIO_MIN; 1000 int prio = PRIO_MAX - PRIO_MIN;
882 1001
883 min_prio -= PRIO_MIN; 1002 min_prio -= PRIO_MIN;
884 if (min_prio < 0) 1003 if (min_prio < 0)
885 min_prio = 0; 1004 min_prio = 0;
886 1005
887 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1006 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; )
888 if (AvFILLp (coro_ready [prio]) >= 0) 1007 if (AvFILLp (coro_ready [prio]) >= 0)
889 {
890 coro_nready--;
891 return av_shift (coro_ready [prio]); 1008 return av_shift (coro_ready [prio]);
892 }
893 1009
894 return 0; 1010 return 0;
895} 1011}
896 1012
897static int 1013static int
898api_ready (SV *coro_sv) 1014api_ready (SV *coro_sv)
899{ 1015{
1016 dTHX;
900 struct coro *coro; 1017 struct coro *coro;
901 1018
902 if (SvROK (coro_sv)) 1019 if (SvROK (coro_sv))
903 coro_sv = SvRV (coro_sv); 1020 coro_sv = SvRV (coro_sv);
904 1021
905 coro = SvSTATE (coro_sv); 1022 coro = SvSTATE (coro_sv);
1023
906 if (coro->flags & CF_READY) 1024 if (coro->flags & CF_READY)
907 return 0; 1025 return 0;
908 1026
909 coro->flags |= CF_READY; 1027 coro->flags |= CF_READY;
910 1028
911 LOCK; 1029 LOCK;
912 coro_enq (SvREFCNT_inc (coro_sv)); 1030 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1031 ++coro_nready;
913 UNLOCK; 1032 UNLOCK;
914 1033
915 return 1; 1034 return 1;
916} 1035}
917 1036
918static int 1037static int
919api_is_ready (SV *coro_sv) 1038api_is_ready (SV *coro_sv)
920{ 1039{
921 struct coro *coro; 1040 dTHX;
922
923 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1041 return !!(SvSTATE (coro_sv)->flags & CF_READY);
924} 1042}
925 1043
926static void 1044static void
927prepare_schedule (struct transfer_args *ta) 1045prepare_schedule (pTHX_ struct transfer_args *ta)
928{ 1046{
929 SV *current, *prev, *next; 1047 SV *prev_sv, *next_sv;
930
931 current = GvSV (coro_current);
932 1048
933 for (;;) 1049 for (;;)
934 { 1050 {
935 LOCK; 1051 LOCK;
936 next = coro_deq (PRIO_MIN); 1052 next_sv = coro_deq (aTHX_ PRIO_MIN);
1053
1054 /* nothing to schedule: call the idle handler */
1055 if (!next_sv)
1056 {
1057 dSP;
1058 UNLOCK;
1059
1060 ENTER;
1061 SAVETMPS;
1062
1063 PUSHMARK (SP);
1064 PUTBACK;
1065 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1066
1067 FREETMPS;
1068 LEAVE;
1069 continue;
1070 }
1071
1072 ta->next = SvSTATE (next_sv);
1073
1074 /* cannot transfer to destroyed coros, skip and look for next */
1075 if (ta->next->flags & CF_DESTROYED)
1076 {
1077 UNLOCK;
1078 SvREFCNT_dec (next_sv);
1079 /* coro_nready is already taken care of by destroy */
1080 continue;
1081 }
1082
1083 --coro_nready;
937 UNLOCK; 1084 UNLOCK;
938
939 if (next)
940 break; 1085 break;
941
942 {
943 dSP;
944
945 ENTER;
946 SAVETMPS;
947
948 PUSHMARK (SP);
949 PUTBACK;
950 call_sv (GvSV (coro_idle), G_DISCARD);
951
952 FREETMPS;
953 LEAVE;
954 } 1086 }
955 }
956
957 prev = SvRV (current);
958 SvRV (current) = next;
959 1087
960 /* free this only after the transfer */ 1088 /* free this only after the transfer */
1089 prev_sv = SvRV (coro_current);
1090 SvRV_set (coro_current, next_sv);
1091 ta->prev = SvSTATE (prev_sv);
1092
1093 assert (ta->next->flags & CF_READY);
1094 ta->next->flags &= ~CF_READY;
1095
961 LOCK; 1096 LOCK;
962 free_coro_mortal (); 1097 free_coro_mortal (aTHX);
1098 coro_mortal = prev_sv;
963 UNLOCK; 1099 UNLOCK;
964 coro_mortal = prev;
965
966 ta->prev = SvSTATE (prev);
967 ta->next = SvSTATE (next);
968 ta->flags = TRANSFER_SAVE_ALL;
969
970 ta->next->flags &= ~CF_READY;
971} 1100}
972 1101
973static void 1102static void
974prepare_cede (struct transfer_args *ta) 1103prepare_cede (pTHX_ struct transfer_args *ta)
975{ 1104{
976 api_ready (GvSV (coro_current)); 1105 api_ready (coro_current);
977
978 prepare_schedule (ta); 1106 prepare_schedule (aTHX_ ta);
1107}
1108
1109static int
1110prepare_cede_notself (pTHX_ struct transfer_args *ta)
1111{
1112 if (coro_nready)
1113 {
1114 SV *prev = SvRV (coro_current);
1115 prepare_schedule (aTHX_ ta);
1116 api_ready (prev);
1117 return 1;
1118 }
1119 else
1120 return 0;
979} 1121}
980 1122
981static void 1123static void
982api_schedule (void) 1124api_schedule (void)
983{ 1125{
984 dTHX; 1126 dTHX;
985 struct transfer_args ta; 1127 struct transfer_args ta;
986 1128
987 prepare_schedule (&ta); 1129 prepare_schedule (aTHX_ &ta);
988 TRANSFER (ta); 1130 TRANSFER (ta);
989} 1131}
990 1132
991static void 1133static int
992api_cede (void) 1134api_cede (void)
993{ 1135{
994 dTHX; 1136 dTHX;
995 struct transfer_args ta; 1137 struct transfer_args ta;
996 1138
997 prepare_cede (&ta); 1139 prepare_cede (aTHX_ &ta);
1140
1141 if (ta.prev != ta.next)
1142 {
998 TRANSFER (ta); 1143 TRANSFER (ta);
1144 return 1;
1145 }
1146 else
1147 return 0;
1148}
1149
1150static int
1151api_cede_notself (void)
1152{
1153 dTHX;
1154 struct transfer_args ta;
1155
1156 if (prepare_cede_notself (aTHX_ &ta))
1157 {
1158 TRANSFER (ta);
1159 return 1;
1160 }
1161 else
1162 return 0;
999} 1163}
1000 1164
1001MODULE = Coro::State PACKAGE = Coro::State 1165MODULE = Coro::State PACKAGE = Coro::State
1002 1166
1003PROTOTYPES: DISABLE 1167PROTOTYPES: DISABLE
1009#endif 1173#endif
1010 BOOT_PAGESIZE; 1174 BOOT_PAGESIZE;
1011 1175
1012 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1176 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1013 1177
1014 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 1178 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1015 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 1179 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1016 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 1180 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1181 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1182 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1183 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1184 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1017 1185
1018 main_mainstack = PL_mainstack; 1186 main_mainstack = PL_mainstack;
1187 main_top_env = PL_top_env;
1188
1189 while (main_top_env->je_prev)
1190 main_top_env = main_top_env->je_prev;
1019 1191
1020 coroapi.ver = CORO_API_VERSION; 1192 coroapi.ver = CORO_API_VERSION;
1021 coroapi.transfer = api_transfer; 1193 coroapi.transfer = api_transfer;
1022 1194
1023 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1195 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1031 HV *hv; 1203 HV *hv;
1032 int i; 1204 int i;
1033 1205
1034 Newz (0, coro, 1, struct coro); 1206 Newz (0, coro, 1, struct coro);
1035 coro->args = newAV (); 1207 coro->args = newAV ();
1208 coro->save = CORO_SAVE_DEF;
1209 coro->flags = CF_NEW;
1036 1210
1037 hv = newHV (); 1211 hv = newHV ();
1038 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1212 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1039 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1213 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1040 1214
1041 for (i = 1; i < items; i++) 1215 for (i = 1; i < items; i++)
1042 av_push (coro->args, newSVsv (ST (i))); 1216 av_push (coro->args, newSVsv (ST (i)));
1043} 1217}
1044 OUTPUT: 1218 OUTPUT:
1219 RETVAL
1220
1221int
1222save (SV *coro, int new_save = -1)
1223 CODE:
1224 RETVAL = api_save (coro, new_save);
1225 OUTPUT:
1226 RETVAL
1227
1228int
1229save_also (SV *coro_sv, int save_also)
1230 CODE:
1231{
1232 struct coro *coro = SvSTATE (coro_sv);
1233 RETVAL = coro->save;
1234 coro->save |= save_also;
1235}
1236 OUTPUT:
1045 RETVAL 1237 RETVAL
1046 1238
1047void 1239void
1048_set_stacklevel (...) 1240_set_stacklevel (...)
1049 ALIAS: 1241 ALIAS:
1050 Coro::State::transfer = 1 1242 Coro::State::transfer = 1
1051 Coro::schedule = 2 1243 Coro::schedule = 2
1052 Coro::cede = 3 1244 Coro::cede = 3
1053 Coro::Cont::yield = 4 1245 Coro::cede_notself = 4
1054 CODE: 1246 CODE:
1055{ 1247{
1056 struct transfer_args ta; 1248 struct transfer_args ta;
1057 1249
1058 switch (ix) 1250 switch (ix)
1059 { 1251 {
1060 case 0: 1252 case 0:
1061 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1253 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1062 ta.next = 0; 1254 ta.next = 0;
1063 ta.flags = TRANSFER_SET_STACKLEVEL;
1064 break; 1255 break;
1065 1256
1066 case 1: 1257 case 1:
1067 if (items != 3) 1258 if (items != 2)
1068 croak ("Coro::State::transfer(prev,next,flags) expects three arguments, not %d", items); 1259 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1069 1260
1070 prepare_transfer (&ta, ST (0), ST (1), SvIV (ST (2))); 1261 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1071 break; 1262 break;
1072 1263
1073 case 2: 1264 case 2:
1074 prepare_schedule (&ta); 1265 prepare_schedule (aTHX_ &ta);
1075 break; 1266 break;
1076 1267
1077 case 3: 1268 case 3:
1078 prepare_cede (&ta); 1269 prepare_cede (aTHX_ &ta);
1079 break; 1270 break;
1080 1271
1081 case 4: 1272 case 4:
1082 { 1273 if (!prepare_cede_notself (aTHX_ &ta))
1083 SV *yieldstack; 1274 XSRETURN_EMPTY;
1084 SV *sv;
1085 AV *defav = GvAV (PL_defgv);
1086 1275
1087 yieldstack = *hv_fetch (
1088 (HV *)SvRV (GvSV (coro_current)),
1089 "yieldstack", sizeof ("yieldstack") - 1,
1090 0
1091 );
1092
1093 /* set up @_ -- ugly */
1094 av_clear (defav);
1095 av_fill (defav, items - 1);
1096 while (items--)
1097 av_store (defav, items, SvREFCNT_inc (ST(items)));
1098
1099 sv = av_pop ((AV *)SvRV (yieldstack));
1100 ta.prev = SvSTATE (*av_fetch ((AV *)SvRV (sv), 0, 0));
1101 ta.next = SvSTATE (*av_fetch ((AV *)SvRV (sv), 1, 0));
1102 ta.flags = 0;
1103 SvREFCNT_dec (sv);
1104 }
1105 break; 1276 break;
1106
1107 } 1277 }
1108 1278
1279 BARRIER;
1109 TRANSFER (ta); 1280 TRANSFER (ta);
1110}
1111 1281
1112void 1282 if (GIMME_V != G_VOID && ta.next != ta.prev)
1113_clone_state_from (SV *dst, SV *src) 1283 XSRETURN_YES;
1284}
1285
1286bool
1287_destroy (SV *coro_sv)
1114 CODE: 1288 CODE:
1115{ 1289 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1116 struct coro *coro_src = SvSTATE (src); 1290 OUTPUT:
1117 1291 RETVAL
1118 sv_unmagic (SvRV (dst), PERL_MAGIC_ext);
1119
1120 ++coro_src->refcnt;
1121 sv_magicext (SvRV (dst), 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro_src, 0)->mg_flags |= MGf_DUP;
1122}
1123 1292
1124void 1293void
1125_exit (code) 1294_exit (code)
1126 int code 1295 int code
1127 PROTOTYPE: $ 1296 PROTOTYPE: $
1128 CODE: 1297 CODE:
1129 _exit (code); 1298 _exit (code);
1130 1299
1131int 1300int
1301cctx_stacksize (int new_stacksize = 0)
1302 CODE:
1303 RETVAL = coro_stacksize;
1304 if (new_stacksize)
1305 coro_stacksize = new_stacksize;
1306 OUTPUT:
1307 RETVAL
1308
1309int
1132cctx_count () 1310cctx_count ()
1133 CODE: 1311 CODE:
1134 RETVAL = cctx_count; 1312 RETVAL = cctx_count;
1135 OUTPUT: 1313 OUTPUT:
1136 RETVAL 1314 RETVAL
1155 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1333 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1156 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1334 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1157 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 1335 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
1158 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 1336 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
1159 1337
1160 coro_current = gv_fetchpv ("Coro::current", TRUE, SVt_PV); 1338 coro_current = get_sv ("Coro::current", FALSE);
1161 coro_idle = gv_fetchpv ("Coro::idle" , TRUE, SVt_PV); 1339 SvREADONLY_on (coro_current);
1162 1340
1163 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1341 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1164 coro_ready[i] = newAV (); 1342 coro_ready[i] = newAV ();
1165 1343
1166 { 1344 {
1167 SV *sv = perl_get_sv("Coro::API", 1); 1345 SV *sv = perl_get_sv("Coro::API", 1);
1168 1346
1169 coroapi.schedule = api_schedule; 1347 coroapi.schedule = api_schedule;
1348 coroapi.save = api_save;
1170 coroapi.cede = api_cede; 1349 coroapi.cede = api_cede;
1350 coroapi.cede_notself = api_cede_notself;
1171 coroapi.ready = api_ready; 1351 coroapi.ready = api_ready;
1172 coroapi.is_ready = api_is_ready; 1352 coroapi.is_ready = api_is_ready;
1173 coroapi.nready = &coro_nready; 1353 coroapi.nready = &coro_nready;
1174 coroapi.current = coro_current; 1354 coroapi.current = coro_current;
1175 1355
1176 GCoroAPI = &coroapi; 1356 GCoroAPI = &coroapi;
1177 sv_setiv (sv, (IV)&coroapi); 1357 sv_setiv (sv, (IV)&coroapi);
1178 SvREADONLY_on (sv); 1358 SvREADONLY_on (sv);
1179 } 1359 }
1180} 1360}
1361
1362void
1363_set_current (SV *current)
1364 PROTOTYPE: $
1365 CODE:
1366 SvREFCNT_dec (SvRV (coro_current));
1367 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1181 1368
1182int 1369int
1183prio (Coro::State coro, int newprio = 0) 1370prio (Coro::State coro, int newprio = 0)
1184 ALIAS: 1371 ALIAS:
1185 nice = 1 1372 nice = 1
1188 RETVAL = coro->prio; 1375 RETVAL = coro->prio;
1189 1376
1190 if (items > 1) 1377 if (items > 1)
1191 { 1378 {
1192 if (ix) 1379 if (ix)
1193 newprio += coro->prio; 1380 newprio = coro->prio - newprio;
1194 1381
1195 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 1382 if (newprio < PRIO_MIN) newprio = PRIO_MIN;
1196 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 1383 if (newprio > PRIO_MAX) newprio = PRIO_MAX;
1197 1384
1198 coro->prio = newprio; 1385 coro->prio = newprio;
1199 } 1386 }
1200} 1387}
1388 OUTPUT:
1389 RETVAL
1201 1390
1202SV * 1391SV *
1203ready (SV *self) 1392ready (SV *self)
1204 PROTOTYPE: $ 1393 PROTOTYPE: $
1205 CODE: 1394 CODE:
1227 1416
1228SV * 1417SV *
1229_get_state () 1418_get_state ()
1230 CODE: 1419 CODE:
1231{ 1420{
1232 struct { 1421 struct io_state *data;
1233 int errorno;
1234 int laststype;
1235 int laststatval;
1236 Stat_t statcache;
1237 } data;
1238 1422
1423 RETVAL = newSV (sizeof (struct io_state));
1424 data = (struct io_state *)SvPVX (RETVAL);
1425 SvCUR_set (RETVAL, sizeof (struct io_state));
1426 SvPOK_only (RETVAL);
1427
1239 data.errorno = errno; 1428 data->errorno = errno;
1240 data.laststype = PL_laststype; 1429 data->laststype = PL_laststype;
1241 data.laststatval = PL_laststatval; 1430 data->laststatval = PL_laststatval;
1242 data.statcache = PL_statcache; 1431 data->statcache = PL_statcache;
1243
1244 RETVAL = newSVpvn ((char *)&data, sizeof data);
1245} 1432}
1246 OUTPUT: 1433 OUTPUT:
1247 RETVAL 1434 RETVAL
1248 1435
1249void 1436void
1250_set_state (char *data_) 1437_set_state (char *data_)
1251 PROTOTYPE: $ 1438 PROTOTYPE: $
1252 CODE: 1439 CODE:
1253{ 1440{
1254 struct { 1441 struct io_state *data = (void *)data_;
1255 int errorno;
1256 int laststype;
1257 int laststatval;
1258 Stat_t statcache;
1259 } *data = (void *)data_;
1260 1442
1261 errno = data->errorno; 1443 errno = data->errorno;
1262 PL_laststype = data->laststype; 1444 PL_laststype = data->laststype;
1263 PL_laststatval = data->laststatval; 1445 PL_laststatval = data->laststatval;
1264 PL_statcache = data->statcache; 1446 PL_statcache = data->statcache;
1265} 1447}
1448

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines