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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines