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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines