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.103 by root, Mon Nov 27 01:33:30 2006 UTC vs.
Revision 1.158 by root, Fri Sep 21 02:23:48 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines