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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines