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.123 by root, Mon Dec 4 21:56:00 2006 UTC vs.
Revision 1.150 by root, Wed Jun 13 21:04:48 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines