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.94 by root, Sun Nov 26 17:14:15 2006 UTC vs.
Revision 1.125 by root, Mon Dec 11 20:54:45 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines