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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines