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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines