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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines