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.98 by root, Sun Nov 26 21:25:53 2006 UTC vs.
Revision 1.131 by root, Fri Dec 29 11:37:49 2006 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines