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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines