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.126 by root, Tue Dec 12 04:19:56 2006 UTC vs.
Revision 1.148 by root, Fri Apr 13 12:56:55 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;
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 } 421 }
380 422
381 if (top_si->si_type == PERLSI_MAIN) 423 if (top_si->si_type == PERLSI_MAIN)
390 } 432 }
391 433
392 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;
393 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 435 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0;
394 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;
395 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;
396 439
397#define VAR(name,type)c->name = PL_ ## name; 440#define VAR(name,type)c->name = PL_ ## name;
398# include "state.h" 441# include "state.h"
399#undef VAR 442#undef VAR
403 * allocate various perl stacks. This is an exact copy 446 * allocate various perl stacks. This is an exact copy
404 * of perl.c:init_stacks, except that it uses less memory 447 * of perl.c:init_stacks, except that it uses less memory
405 * on the (sometimes correct) assumption that coroutines do 448 * on the (sometimes correct) assumption that coroutines do
406 * not usually need a lot of stackspace. 449 * not usually need a lot of stackspace.
407 */ 450 */
408#if USE_PERL_INIT_STACKS 451#if CORO_PREFER_PERL_FUNCTIONS
409# define coro_init_stacks init_stacks 452# define coro_init_stacks init_stacks
410#else 453#else
411
412static void 454static void
413coro_init_stacks () 455coro_init_stacks (pTHX)
414{ 456{
415 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT)); 457 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT));
416 PL_curstackinfo->si_type = PERLSI_MAIN; 458 PL_curstackinfo->si_type = PERLSI_MAIN;
417 PL_curstack = PL_curstackinfo->si_stack; 459 PL_curstack = PL_curstackinfo->si_stack;
418 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 460 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
446 New(54,PL_retstack,16,OP*); 488 New(54,PL_retstack,16,OP*);
447 PL_retstack_ix = 0; 489 PL_retstack_ix = 0;
448 PL_retstack_max = 16; 490 PL_retstack_max = 16;
449#endif 491#endif
450} 492}
493#endif
451 494
452/* 495/*
453 * destroy the stacks, the callchain etc... 496 * destroy the stacks, the callchain etc...
454 */ 497 */
455static void 498static void
456coro_destroy_stacks () 499coro_destroy_stacks (pTHX)
457{ 500{
458 if (!IN_DESTRUCT) 501 if (!IN_DESTRUCT)
459 { 502 {
460 /* restore all saved variables and stuff */ 503 /* restore all saved variables and stuff */
461 LEAVE_SCOPE (0); 504 LEAVE_SCOPE (0);
463 506
464 /* free all temporaries */ 507 /* free all temporaries */
465 FREETMPS; 508 FREETMPS;
466 assert (PL_tmps_ix == -1); 509 assert (PL_tmps_ix == -1);
467 510
511 /* unwind all extra stacks */
468 POPSTACK_TO (PL_mainstack); 512 POPSTACK_TO (PL_mainstack);
513
514 /* unwind main stack */
515 dounwind (-1);
469 } 516 }
470 517
471 while (PL_curstackinfo->si_next) 518 while (PL_curstackinfo->si_next)
472 PL_curstackinfo = PL_curstackinfo->si_next; 519 PL_curstackinfo = PL_curstackinfo->si_next;
473 520
489 Safefree (PL_savestack); 536 Safefree (PL_savestack);
490#if !PERL_VERSION_ATLEAST (5,9,0) 537#if !PERL_VERSION_ATLEAST (5,9,0)
491 Safefree (PL_retstack); 538 Safefree (PL_retstack);
492#endif 539#endif
493} 540}
494#endif
495 541
542/** coroutine stack handling ************************************************/
543
496static void 544static void
497setup_coro (struct coro *coro) 545setup_coro (pTHX_ struct coro *coro)
498{ 546{
499 /* 547 /*
500 * emulate part of the perl startup here. 548 * emulate part of the perl startup here.
501 */ 549 */
502
503 coro_init_stacks (); 550 coro_init_stacks (aTHX);
504 551
505 PL_curcop = &PL_compiling; 552 PL_curcop = &PL_compiling;
506 PL_in_eval = EVAL_NULL; 553 PL_in_eval = EVAL_NULL;
554 PL_comppad = 0;
507 PL_curpm = 0; 555 PL_curpm = 0;
508 PL_localizing = 0; 556 PL_localizing = 0;
509 PL_dirty = 0; 557 PL_dirty = 0;
510 PL_restartop = 0; 558 PL_restartop = 0;
511 559
530 578
531 ENTER; /* necessary e.g. for dounwind */ 579 ENTER; /* necessary e.g. for dounwind */
532} 580}
533 581
534static void 582static void
535free_coro_mortal () 583free_coro_mortal (pTHX)
536{ 584{
537 if (coro_mortal) 585 if (coro_mortal)
538 { 586 {
539 SvREFCNT_dec (coro_mortal); 587 SvREFCNT_dec (coro_mortal);
540 coro_mortal = 0; 588 coro_mortal = 0;
541 } 589 }
542} 590}
543 591
544/* 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 */
545static void NOINLINE 595static void NOINLINE
546prepare_cctx (coro_cctx *cctx) 596prepare_cctx (pTHX_ coro_cctx *cctx)
547{ 597{
548 dSP; 598 dSP;
549 LOGOP myop; 599 LOGOP myop;
550 600
551 Zero (&myop, 1, LOGOP); 601 Zero (&myop, 1, LOGOP);
560 PL_op = (OP *)&myop; 610 PL_op = (OP *)&myop;
561 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 611 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
562 SPAGAIN; 612 SPAGAIN;
563} 613}
564 614
615/*
616 * this is a _very_ stripped down perl interpreter ;)
617 */
565static void 618static void
566coro_run (void *arg) 619coro_run (void *arg)
567{ 620{
621 dTHX;
622
568 /* coro_run is the alternative tail of transfer(), so unlock here. */ 623 /* coro_run is the alternative tail of transfer(), so unlock here. */
569 UNLOCK; 624 UNLOCK;
570 625
571 /*
572 * this is a _very_ stripped down perl interpreter ;)
573 */
574 PL_top_env = &PL_start_env; 626 PL_top_env = &PL_start_env;
575 627
576 /* inject call to cctx_init */ 628 /* inject a fake subroutine call to cctx_init */
577 prepare_cctx ((coro_cctx *)arg); 629 prepare_cctx (aTHX_ (coro_cctx *)arg);
578 630
579 /* 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 */
580 PL_restartop = PL_op; 632 PL_restartop = PL_op;
581 perl_run (PL_curinterp); 633 perl_run (PL_curinterp);
582 634
583 fputs ("FATAL: C coroutine fell over the edge of the world, aborting. Did you call exit in a coroutine?\n", stderr); 635 /* If perl-run returns we assume exit() was being called, which */
584 abort (); 636 /* seems to be the only valid (non-bug) reason for perl_run to return. */
637 /* We try to exit by jumping to the bootstrap-time "top" top_env, as */
638 /* we cannot restore the "main" coroutine as Coro has no such concept */
639 PL_top_env = main_top_env;
640 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
585} 641}
586 642
587static coro_cctx * 643static coro_cctx *
588cctx_new () 644cctx_new ()
589{ 645{
590 coro_cctx *cctx; 646 coro_cctx *cctx;
647 void *stack_start;
648 size_t stack_size;
591 649
592 ++cctx_count; 650 ++cctx_count;
593 651
594 Newz (0, cctx, 1, coro_cctx); 652 Newz (0, cctx, 1, coro_cctx);
595 653
596#if HAVE_MMAP 654#if HAVE_MMAP
597 655
598 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; 656 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
599 /* mmap supposedly does allocate-on-write for us */ 657 /* mmap supposedly does allocate-on-write for us */
600 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 658 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
601 659
602 if (cctx->sptr == (void *)-1) 660 if (cctx->sptr != (void *)-1)
603 {
604 perror ("FATAL: unable to mmap stack for coroutine");
605 _exit (EXIT_FAILURE);
606 } 661 {
607
608# if STACKGUARD 662# if CORO_STACKGUARD
609 mprotect (cctx->sptr, STACKGUARD * PAGESIZE, PROT_NONE); 663 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
610# endif 664# endif
665 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr;
666 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
667 cctx->mapped = 1;
668 }
669 else
670#endif
671 {
672 cctx->ssize = coro_stacksize * (long)sizeof (long);
673 New (0, cctx->sptr, coro_stacksize, long);
611 674
612#else
613
614 cctx->ssize = STACKSIZE * (long)sizeof (long);
615 New (0, cctx->sptr, STACKSIZE, long);
616
617 if (!cctx->sptr) 675 if (!cctx->sptr)
618 { 676 {
619 perror ("FATAL: unable to malloc stack for coroutine"); 677 perror ("FATAL: unable to allocate stack for coroutine");
620 _exit (EXIT_FAILURE); 678 _exit (EXIT_FAILURE);
621 } 679 }
622 680
623#endif 681 stack_start = cctx->sptr;
682 stack_size = cctx->ssize;
683 }
624 684
625#if USE_VALGRIND 685 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
626 cctx->valgrind_id = VALGRIND_STACK_REGISTER (
627 STACKGUARD * PAGESIZE + (char *)cctx->sptr,
628 cctx->ssize + (char *)cctx->sptr
629 );
630#endif
631
632 coro_create (&cctx->cctx, coro_run, (void *)cctx, cctx->sptr, cctx->ssize); 686 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size);
633 687
634 return cctx; 688 return cctx;
635} 689}
636 690
637static void 691static void
640 if (!cctx) 694 if (!cctx)
641 return; 695 return;
642 696
643 --cctx_count; 697 --cctx_count;
644 698
645#if USE_VALGRIND 699#if CORO_USE_VALGRIND
646 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 700 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
647#endif 701#endif
648 702
649#if HAVE_MMAP 703#if HAVE_MMAP
704 if (cctx->mapped)
650 munmap (cctx->sptr, cctx->ssize); 705 munmap (cctx->sptr, cctx->ssize);
651#else 706 else
707#endif
652 Safefree (cctx->sptr); 708 Safefree (cctx->sptr);
653#endif
654 709
655 Safefree (cctx); 710 Safefree (cctx);
656} 711}
657 712
658static coro_cctx * 713static coro_cctx *
659cctx_get () 714cctx_get (pTHX)
660{ 715{
661 coro_cctx *cctx;
662
663 if (cctx_first) 716 while (cctx_first)
664 { 717 {
665 cctx = cctx_first; 718 coro_cctx *cctx = cctx_first;
666 cctx_first = cctx->next; 719 cctx_first = cctx->next;
667 --cctx_idle; 720 --cctx_idle;
721
722 if (cctx->ssize >= coro_stacksize)
723 return cctx;
724
725 cctx_destroy (cctx);
668 } 726 }
669 else 727
670 {
671 cctx = cctx_new ();
672 PL_op = PL_op->op_next; 728 PL_op = PL_op->op_next;
673 }
674
675 return cctx; 729 return cctx_new ();
676} 730}
677 731
678static void 732static void
679cctx_put (coro_cctx *cctx) 733cctx_put (coro_cctx *cctx)
680{ 734{
692 ++cctx_idle; 746 ++cctx_idle;
693 cctx->next = cctx_first; 747 cctx->next = cctx_first;
694 cctx_first = cctx; 748 cctx_first = cctx;
695} 749}
696 750
751/** coroutine switching *****************************************************/
752
697/* never call directly, always through the coro_state_transfer global variable */ 753/* never call directly, always through the coro_state_transfer global variable */
698static void NOINLINE 754static void NOINLINE
699transfer (struct coro *prev, struct coro *next) 755transfer (pTHX_ struct coro *prev, struct coro *next)
700{ 756{
701 dSTACKLEVEL; 757 dSTACKLEVEL;
702 758
703 /* sometimes transfer is only called to set idle_sp */ 759 /* sometimes transfer is only called to set idle_sp */
704 if (!next) 760 if (!next)
705 { 761 {
706 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 762 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
707 assert (((coro_cctx *)prev)->top_env = PL_top_env); /* just for the side effetc when assert is enabled */ 763 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
708 } 764 }
709 else if (prev != next) 765 else if (prev != next)
710 { 766 {
711 coro_cctx *prev__cctx; 767 coro_cctx *prev__cctx;
712 768
724 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states"); 780 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states");
725 781
726 if (next->flags & CF_RUNNING) 782 if (next->flags & CF_RUNNING)
727 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 783 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
728 784
785 if (next->flags & CF_DESTROYED)
786 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
787
729 prev->flags &= ~CF_RUNNING; 788 prev->flags &= ~CF_RUNNING;
730 next->flags |= CF_RUNNING; 789 next->flags |= CF_RUNNING;
731 790
732 LOCK; 791 LOCK;
733 792
734 if (next->flags & CF_NEW) 793 if (next->flags & CF_NEW)
735 { 794 {
736 /* need to start coroutine */ 795 /* need to start coroutine */
737 next->flags &= ~CF_NEW; 796 next->flags &= ~CF_NEW;
738 /* first get rid of the old state */ 797 /* first get rid of the old state */
739 save_perl (prev); 798 save_perl (aTHX_ prev);
740 /* setup coroutine call */ 799 /* setup coroutine call */
741 setup_coro (next); 800 setup_coro (aTHX_ next);
742 /* need a new stack */ 801 /* need a new stack */
743 assert (!next->cctx); 802 assert (!next->cctx);
744 } 803 }
745 else 804 else
746 { 805 {
747 /* coroutine already started */ 806 /* coroutine already started */
748 save_perl (prev); 807 save_perl (aTHX_ prev);
749 load_perl (next); 808 load_perl (aTHX_ next);
750 } 809 }
751 810
752 prev__cctx = prev->cctx; 811 prev__cctx = prev->cctx;
753 812
754 /* possibly "free" the cctx */ 813 /* possibly "free" the cctx */
755 if (prev__cctx->idle_sp == STACKLEVEL) 814 if (prev__cctx->idle_sp == STACKLEVEL)
756 { 815 {
757 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 816 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
758 assert (PL_top_env == prev__cctx->top_env); 817 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
759 818
760 prev->cctx = 0; 819 prev->cctx = 0;
761 820
762 cctx_put (prev__cctx); 821 cctx_put (prev__cctx);
763 prev__cctx->inuse = 0; 822 prev__cctx->inuse = 0;
764 } 823 }
765 824
766 if (!next->cctx) 825 if (!next->cctx)
767 { 826 {
768 next->cctx = cctx_get (); 827 next->cctx = cctx_get (aTHX);
769 assert (!next->cctx->inuse); 828 assert (!next->cctx->inuse);
770 next->cctx->inuse = 1; 829 next->cctx->inuse = 1;
771 } 830 }
772 831
773 if (prev__cctx != next->cctx) 832 if (prev__cctx != next->cctx)
775 prev__cctx->top_env = PL_top_env; 834 prev__cctx->top_env = PL_top_env;
776 PL_top_env = next->cctx->top_env; 835 PL_top_env = next->cctx->top_env;
777 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 836 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
778 } 837 }
779 838
780 free_coro_mortal (); 839 free_coro_mortal (aTHX);
781
782 UNLOCK; 840 UNLOCK;
783 } 841 }
784} 842}
785 843
786struct transfer_args 844struct transfer_args
787{ 845{
788 struct coro *prev, *next; 846 struct coro *prev, *next;
789}; 847};
790 848
791#define TRANSFER(ta) transfer ((ta).prev, (ta).next) 849#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next)
792 850
851/** high level stuff ********************************************************/
852
793static void 853static int
794coro_state_destroy (struct coro *coro) 854coro_state_destroy (pTHX_ struct coro *coro)
795{ 855{
796 if (coro->refcnt--) 856 if (coro->flags & CF_DESTROYED)
797 return; 857 return 0;
858
859 coro->flags |= CF_DESTROYED;
860
861 if (coro->flags & CF_READY)
862 {
863 /* reduce nready, as destroying a ready coro effectively unreadies it */
864 /* alternative: look through all ready queues and remove the coro */
865 LOCK;
866 --coro_nready;
867 UNLOCK;
868 }
869 else
870 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
798 871
799 if (coro->mainstack && coro->mainstack != main_mainstack) 872 if (coro->mainstack && coro->mainstack != main_mainstack)
800 { 873 {
801 struct coro temp; 874 struct coro temp;
875
876 assert (!(coro->flags & CF_RUNNING));
877
802 Zero (&temp, 1, struct coro); 878 Zero (&temp, 1, struct coro);
803 temp.save = CORO_SAVE_ALL; 879 temp.save = CORO_SAVE_DEF;
804 880
805 if (coro->flags & CF_RUNNING) 881 if (coro->flags & CF_RUNNING)
806 croak ("FATAL: tried to destroy currently running coroutine"); 882 croak ("FATAL: tried to destroy currently running coroutine");
807 883
808 save_perl (&temp); 884 save_perl (aTHX_ &temp);
809 load_perl (coro); 885 load_perl (aTHX_ coro);
810 886
811 coro_destroy_stacks (); 887 coro_destroy_stacks (aTHX);
812 888
813 load_perl (&temp); /* this will get rid of defsv etc.. */ 889 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */
814 890
815 coro->mainstack = 0; 891 coro->mainstack = 0;
816 } 892 }
817 893
818 cctx_destroy (coro->cctx); 894 cctx_destroy (coro->cctx);
819 SvREFCNT_dec (coro->args); 895 SvREFCNT_dec (coro->args);
820 Safefree (coro); 896
897 return 1;
821} 898}
822 899
823static int 900static int
824coro_state_clear (pTHX_ SV *sv, MAGIC *mg) 901coro_state_free (pTHX_ SV *sv, MAGIC *mg)
825{ 902{
826 struct coro *coro = (struct coro *)mg->mg_ptr; 903 struct coro *coro = (struct coro *)mg->mg_ptr;
827 mg->mg_ptr = 0; 904 mg->mg_ptr = 0;
828 905
906 if (--coro->refcnt < 0)
907 {
829 coro_state_destroy (coro); 908 coro_state_destroy (aTHX_ coro);
909 Safefree (coro);
910 }
830 911
831 return 0; 912 return 0;
832} 913}
833 914
834static int 915static int
841 return 0; 922 return 0;
842} 923}
843 924
844static MGVTBL coro_state_vtbl = { 925static MGVTBL coro_state_vtbl = {
845 0, 0, 0, 0, 926 0, 0, 0, 0,
846 coro_state_clear, 927 coro_state_free,
847 0, 928 0,
848#ifdef MGf_DUP 929#ifdef MGf_DUP
849 coro_state_dup, 930 coro_state_dup,
850#else 931#else
851# define MGf_DUP 0 932# define MGf_DUP 0
852#endif 933#endif
853}; 934};
854 935
855static struct coro * 936static struct coro *
856SvSTATE (SV *coro) 937SvSTATE_ (pTHX_ SV *coro)
857{ 938{
858 HV *stash; 939 HV *stash;
859 MAGIC *mg; 940 MAGIC *mg;
860 941
861 if (SvROK (coro)) 942 if (SvROK (coro))
867 /* very slow, but rare, check */ 948 /* very slow, but rare, check */
868 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 949 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
869 croak ("Coro::State object required"); 950 croak ("Coro::State object required");
870 } 951 }
871 952
872 mg = SvMAGIC (coro); 953 mg = CORO_MAGIC (coro);
873 assert (mg->mg_type == PERL_MAGIC_ext);
874 return (struct coro *)mg->mg_ptr; 954 return (struct coro *)mg->mg_ptr;
875} 955}
876 956
957#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
958
877static void 959static void
878prepare_transfer (struct transfer_args *ta, SV *prev_sv, SV *next_sv) 960prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
879{ 961{
880 ta->prev = SvSTATE (prev_sv); 962 ta->prev = SvSTATE (prev_sv);
881 ta->next = SvSTATE (next_sv); 963 ta->next = SvSTATE (next_sv);
882} 964}
883 965
884static void 966static void
885api_transfer (SV *prev_sv, SV *next_sv) 967api_transfer (SV *prev_sv, SV *next_sv)
886{ 968{
969 dTHX;
887 struct transfer_args ta; 970 struct transfer_args ta;
888 971
889 prepare_transfer (&ta, prev_sv, next_sv); 972 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
890 TRANSFER (ta); 973 TRANSFER (ta);
891} 974}
892 975
893static int 976static int
894api_save (SV *coro_sv, int new_save) 977api_save (SV *coro_sv, int new_save)
895{ 978{
979 dTHX;
896 struct coro *coro = SvSTATE (coro_sv); 980 struct coro *coro = SvSTATE (coro_sv);
897 int old_save = coro->save; 981 int old_save = coro->save;
898 982
899 if (new_save >= 0) 983 if (new_save >= 0)
900 coro->save = new_save; 984 coro->save = new_save;
902 return old_save; 986 return old_save;
903} 987}
904 988
905/** Coro ********************************************************************/ 989/** Coro ********************************************************************/
906 990
907#define PRIO_MAX 3
908#define PRIO_HIGH 1
909#define PRIO_NORMAL 0
910#define PRIO_LOW -1
911#define PRIO_IDLE -3
912#define PRIO_MIN -4
913
914/* for Coro.pm */
915static SV *coro_current;
916static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
917static int coro_nready;
918
919static void 991static void
920coro_enq (SV *coro_sv) 992coro_enq (pTHX_ SV *coro_sv)
921{ 993{
922 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 994 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
923 coro_nready++;
924} 995}
925 996
926static SV * 997static SV *
927coro_deq (int min_prio) 998coro_deq (pTHX_ int min_prio)
928{ 999{
929 int prio = PRIO_MAX - PRIO_MIN; 1000 int prio = PRIO_MAX - PRIO_MIN;
930 1001
931 min_prio -= PRIO_MIN; 1002 min_prio -= PRIO_MIN;
932 if (min_prio < 0) 1003 if (min_prio < 0)
933 min_prio = 0; 1004 min_prio = 0;
934 1005
935 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1006 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; )
936 if (AvFILLp (coro_ready [prio]) >= 0) 1007 if (AvFILLp (coro_ready [prio]) >= 0)
937 {
938 coro_nready--;
939 return av_shift (coro_ready [prio]); 1008 return av_shift (coro_ready [prio]);
940 }
941 1009
942 return 0; 1010 return 0;
943} 1011}
944 1012
945static int 1013static int
946api_ready (SV *coro_sv) 1014api_ready (SV *coro_sv)
947{ 1015{
1016 dTHX;
948 struct coro *coro; 1017 struct coro *coro;
949 1018
950 if (SvROK (coro_sv)) 1019 if (SvROK (coro_sv))
951 coro_sv = SvRV (coro_sv); 1020 coro_sv = SvRV (coro_sv);
952 1021
953 coro = SvSTATE (coro_sv); 1022 coro = SvSTATE (coro_sv);
954 1023
955 if (coro->flags & CF_READY) 1024 if (coro->flags & CF_READY)
956 return 0; 1025 return 0;
957 1026
958#if 0 /* this is actually harmless */
959 if (coro->flags & CF_RUNNING)
960 croak ("Coro::ready called on currently running coroutine");
961#endif
962
963 coro->flags |= CF_READY; 1027 coro->flags |= CF_READY;
964 1028
965 LOCK; 1029 LOCK;
966 coro_enq (SvREFCNT_inc (coro_sv)); 1030 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1031 ++coro_nready;
967 UNLOCK; 1032 UNLOCK;
968 1033
969 return 1; 1034 return 1;
970} 1035}
971 1036
972static int 1037static int
973api_is_ready (SV *coro_sv) 1038api_is_ready (SV *coro_sv)
974{ 1039{
1040 dTHX;
975 return !!SvSTATE (coro_sv)->flags & CF_READY; 1041 return !!(SvSTATE (coro_sv)->flags & CF_READY);
976} 1042}
977 1043
978static void 1044static void
979prepare_schedule (struct transfer_args *ta) 1045prepare_schedule (pTHX_ struct transfer_args *ta)
980{ 1046{
981 SV *prev, *next; 1047 SV *prev_sv, *next_sv;
982 1048
983 for (;;) 1049 for (;;)
984 { 1050 {
985 LOCK; 1051 LOCK;
986 next = coro_deq (PRIO_MIN); 1052 next_sv = coro_deq (aTHX_ PRIO_MIN);
1053
1054 /* nothing to schedule: call the idle handler */
1055 if (!next_sv)
1056 {
1057 dSP;
1058 UNLOCK;
1059
1060 ENTER;
1061 SAVETMPS;
1062
1063 PUSHMARK (SP);
1064 PUTBACK;
1065 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1066
1067 FREETMPS;
1068 LEAVE;
1069 continue;
1070 }
1071
1072 ta->next = SvSTATE (next_sv);
1073
1074 /* cannot transfer to destroyed coros, skip and look for next */
1075 if (ta->next->flags & CF_DESTROYED)
1076 {
1077 UNLOCK;
1078 SvREFCNT_dec (next_sv);
1079 /* coro_nready is already taken care of by destroy */
1080 continue;
1081 }
1082
1083 --coro_nready;
987 UNLOCK; 1084 UNLOCK;
988
989 if (next)
990 break; 1085 break;
991
992 {
993 dSP;
994
995 ENTER;
996 SAVETMPS;
997
998 PUSHMARK (SP);
999 PUTBACK;
1000 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1001
1002 FREETMPS;
1003 LEAVE;
1004 } 1086 }
1005 }
1006
1007 prev = SvRV (coro_current);
1008 SvRV_set (coro_current, next);
1009 1087
1010 /* free this only after the transfer */ 1088 /* free this only after the transfer */
1011 LOCK; 1089 prev_sv = SvRV (coro_current);
1012 free_coro_mortal (); 1090 SvRV_set (coro_current, next_sv);
1013 UNLOCK;
1014 coro_mortal = prev;
1015
1016 assert (!SvROK(prev));//D
1017 assert (!SvROK(next));//D
1018
1019 ta->prev = SvSTATE (prev); 1091 ta->prev = SvSTATE (prev_sv);
1020 ta->next = SvSTATE (next);
1021 1092
1022 assert (ta->next->flags & CF_READY); 1093 assert (ta->next->flags & CF_READY);
1023 ta->next->flags &= ~CF_READY; 1094 ta->next->flags &= ~CF_READY;
1024}
1025 1095
1096 LOCK;
1097 free_coro_mortal (aTHX);
1098 coro_mortal = prev_sv;
1099 UNLOCK;
1100}
1101
1026static void 1102static void
1027prepare_cede (struct transfer_args *ta) 1103prepare_cede (pTHX_ struct transfer_args *ta)
1028{ 1104{
1029 api_ready (coro_current); 1105 api_ready (coro_current);
1030
1031 prepare_schedule (ta); 1106 prepare_schedule (aTHX_ ta);
1107}
1108
1109static int
1110prepare_cede_notself (pTHX_ struct transfer_args *ta)
1111{
1112 if (coro_nready)
1113 {
1114 SV *prev = SvRV (coro_current);
1115 prepare_schedule (aTHX_ ta);
1116 api_ready (prev);
1117 return 1;
1118 }
1119 else
1120 return 0;
1032} 1121}
1033 1122
1034static void 1123static void
1035api_schedule (void) 1124api_schedule (void)
1036{ 1125{
1126 dTHX;
1037 struct transfer_args ta; 1127 struct transfer_args ta;
1038 1128
1039 prepare_schedule (&ta); 1129 prepare_schedule (aTHX_ &ta);
1040 TRANSFER (ta); 1130 TRANSFER (ta);
1041} 1131}
1042 1132
1043static void 1133static int
1044api_cede (void) 1134api_cede (void)
1045{ 1135{
1136 dTHX;
1046 struct transfer_args ta; 1137 struct transfer_args ta;
1047 1138
1048 prepare_cede (&ta); 1139 prepare_cede (aTHX_ &ta);
1140
1141 if (ta.prev != ta.next)
1142 {
1049 TRANSFER (ta); 1143 TRANSFER (ta);
1144 return 1;
1145 }
1146 else
1147 return 0;
1148}
1149
1150static int
1151api_cede_notself (void)
1152{
1153 dTHX;
1154 struct transfer_args ta;
1155
1156 if (prepare_cede_notself (aTHX_ &ta))
1157 {
1158 TRANSFER (ta);
1159 return 1;
1160 }
1161 else
1162 return 0;
1050} 1163}
1051 1164
1052MODULE = Coro::State PACKAGE = Coro::State 1165MODULE = Coro::State PACKAGE = Coro::State
1053 1166
1054PROTOTYPES: DISABLE 1167PROTOTYPES: DISABLE
1064 1177
1065 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV)); 1178 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1066 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV)); 1179 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1067 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV)); 1180 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1068 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV)); 1181 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1182 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1183 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1069 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL)); 1184 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1070 1185
1071 main_mainstack = PL_mainstack; 1186 main_mainstack = PL_mainstack;
1187 main_top_env = PL_top_env;
1188
1189 while (main_top_env->je_prev)
1190 main_top_env = main_top_env->je_prev;
1072 1191
1073 coroapi.ver = CORO_API_VERSION; 1192 coroapi.ver = CORO_API_VERSION;
1074 coroapi.transfer = api_transfer; 1193 coroapi.transfer = api_transfer;
1075 1194
1076 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1195 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1084 HV *hv; 1203 HV *hv;
1085 int i; 1204 int i;
1086 1205
1087 Newz (0, coro, 1, struct coro); 1206 Newz (0, coro, 1, struct coro);
1088 coro->args = newAV (); 1207 coro->args = newAV ();
1089 coro->save = CORO_SAVE_ALL; 1208 coro->save = CORO_SAVE_DEF;
1090 coro->flags = CF_NEW; 1209 coro->flags = CF_NEW;
1091 1210
1092 hv = newHV (); 1211 hv = newHV ();
1093 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1212 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1094 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1213 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1104 CODE: 1223 CODE:
1105 RETVAL = api_save (coro, new_save); 1224 RETVAL = api_save (coro, new_save);
1106 OUTPUT: 1225 OUTPUT:
1107 RETVAL 1226 RETVAL
1108 1227
1228int
1229save_also (SV *coro_sv, int save_also)
1230 CODE:
1231{
1232 struct coro *coro = SvSTATE (coro_sv);
1233 RETVAL = coro->save;
1234 coro->save |= save_also;
1235}
1236 OUTPUT:
1237 RETVAL
1238
1109void 1239void
1110_set_stacklevel (...) 1240_set_stacklevel (...)
1111 ALIAS: 1241 ALIAS:
1112 Coro::State::transfer = 1 1242 Coro::State::transfer = 1
1113 Coro::schedule = 2 1243 Coro::schedule = 2
1114 Coro::cede = 3 1244 Coro::cede = 3
1245 Coro::cede_notself = 4
1115 CODE: 1246 CODE:
1116{ 1247{
1117 struct transfer_args ta; 1248 struct transfer_args ta;
1118 1249
1119 switch (ix) 1250 switch (ix)
1125 1256
1126 case 1: 1257 case 1:
1127 if (items != 2) 1258 if (items != 2)
1128 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items); 1259 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1129 1260
1130 prepare_transfer (&ta, ST (0), ST (1)); 1261 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1131 break; 1262 break;
1132 1263
1133 case 2: 1264 case 2:
1134 prepare_schedule (&ta); 1265 prepare_schedule (aTHX_ &ta);
1135 break; 1266 break;
1136 1267
1137 case 3: 1268 case 3:
1138 prepare_cede (&ta); 1269 prepare_cede (aTHX_ &ta);
1270 break;
1271
1272 case 4:
1273 if (!prepare_cede_notself (aTHX_ &ta))
1274 XSRETURN_EMPTY;
1275
1139 break; 1276 break;
1140 } 1277 }
1141 1278
1279 BARRIER;
1142 TRANSFER (ta); 1280 TRANSFER (ta);
1143}
1144 1281
1145void 1282 if (GIMME_V != G_VOID && ta.next != ta.prev)
1146_clone_state_from (SV *dst, SV *src) 1283 XSRETURN_YES;
1284}
1285
1286bool
1287_destroy (SV *coro_sv)
1147 CODE: 1288 CODE:
1148{ 1289 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1149 struct coro *coro_src = SvSTATE (src); 1290 OUTPUT:
1150 1291 RETVAL
1151 sv_unmagic (SvRV (dst), PERL_MAGIC_ext);
1152
1153 ++coro_src->refcnt;
1154 sv_magicext (SvRV (dst), 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro_src, 0)->mg_flags |= MGf_DUP;
1155}
1156 1292
1157void 1293void
1158_exit (code) 1294_exit (code)
1159 int code 1295 int code
1160 PROTOTYPE: $ 1296 PROTOTYPE: $
1161 CODE: 1297 CODE:
1162 _exit (code); 1298 _exit (code);
1163 1299
1164int 1300int
1301cctx_stacksize (int new_stacksize = 0)
1302 CODE:
1303 RETVAL = coro_stacksize;
1304 if (new_stacksize)
1305 coro_stacksize = new_stacksize;
1306 OUTPUT:
1307 RETVAL
1308
1309int
1165cctx_count () 1310cctx_count ()
1166 CODE: 1311 CODE:
1167 RETVAL = cctx_count; 1312 RETVAL = cctx_count;
1168 OUTPUT: 1313 OUTPUT:
1169 RETVAL 1314 RETVAL
1197 coro_ready[i] = newAV (); 1342 coro_ready[i] = newAV ();
1198 1343
1199 { 1344 {
1200 SV *sv = perl_get_sv("Coro::API", 1); 1345 SV *sv = perl_get_sv("Coro::API", 1);
1201 1346
1202 coroapi.schedule = api_schedule; 1347 coroapi.schedule = api_schedule;
1203 coroapi.save = api_save; 1348 coroapi.save = api_save;
1204 coroapi.cede = api_cede; 1349 coroapi.cede = api_cede;
1350 coroapi.cede_notself = api_cede_notself;
1205 coroapi.ready = api_ready; 1351 coroapi.ready = api_ready;
1206 coroapi.is_ready = api_is_ready; 1352 coroapi.is_ready = api_is_ready;
1207 coroapi.nready = &coro_nready; 1353 coroapi.nready = &coro_nready;
1208 coroapi.current = coro_current; 1354 coroapi.current = coro_current;
1209 1355
1210 GCoroAPI = &coroapi; 1356 GCoroAPI = &coroapi;
1211 sv_setiv (sv, (IV)&coroapi); 1357 sv_setiv (sv, (IV)&coroapi);
1212 SvREADONLY_on (sv); 1358 SvREADONLY_on (sv);
1213 } 1359 }
1229 RETVAL = coro->prio; 1375 RETVAL = coro->prio;
1230 1376
1231 if (items > 1) 1377 if (items > 1)
1232 { 1378 {
1233 if (ix) 1379 if (ix)
1234 newprio += coro->prio; 1380 newprio = coro->prio - newprio;
1235 1381
1236 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 1382 if (newprio < PRIO_MIN) newprio = PRIO_MIN;
1237 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 1383 if (newprio > PRIO_MAX) newprio = PRIO_MAX;
1238 1384
1239 coro->prio = newprio; 1385 coro->prio = newprio;
1240 } 1386 }
1241} 1387}
1388 OUTPUT:
1389 RETVAL
1242 1390
1243SV * 1391SV *
1244ready (SV *self) 1392ready (SV *self)
1245 PROTOTYPE: $ 1393 PROTOTYPE: $
1246 CODE: 1394 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines