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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines