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.107 by root, Mon Nov 27 02:15:51 2006 UTC vs.
Revision 1.145 by root, Mon Mar 12 21:40:14 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines