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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines