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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.94 by root, Sun Nov 26 17:14:15 2006 UTC vs.
Revision 1.147 by root, Mon Mar 19 15:50:48 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines