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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines