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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines