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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines