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.115 by root, Fri Dec 1 13:36:08 2006 UTC vs.
Revision 1.143 by root, Wed Feb 28 11:43:03 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines