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

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

Diff Legend

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