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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines