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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines