ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

Comparing Coro/Coro/State.xs (file contents):
Revision 1.123 by root, Mon Dec 4 21:56:00 2006 UTC vs.
Revision 1.147 by root, Mon Mar 19 15:50:48 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines