ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines