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.113 by root, Thu Nov 30 20:54:24 2006 UTC vs.
Revision 1.147 by root, Mon Mar 19 15:50:48 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines