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.144 by root, Sun Mar 4 11:45:23 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
103static struct CoroAPI coroapi; 129static struct CoroAPI coroapi;
104static AV *main_mainstack; /* used to differentiate between $main and others */ 130static AV *main_mainstack; /* used to differentiate between $main and others */
105static HV *coro_state_stash, *coro_stash; 131static HV *coro_state_stash, *coro_stash;
106static SV *coro_mortal; /* will be freed after next transfer */ 132static SV *coro_mortal; /* will be freed after next transfer */
107 133
112typedef struct coro_cctx { 138typedef struct coro_cctx {
113 struct coro_cctx *next; 139 struct coro_cctx *next;
114 140
115 /* the stack */ 141 /* the stack */
116 void *sptr; 142 void *sptr;
117 long ssize; /* positive == mmap, otherwise malloc */ 143 ssize_t ssize; /* positive == mmap, otherwise malloc */
118 144
119 /* cpu state */ 145 /* cpu state */
120 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 */
121 JMPENV *top_env; 148 JMPENV *top_env;
122 coro_context cctx; 149 coro_context cctx;
123 150
124 int inuse; 151 int inuse;
125 152
126#if USE_VALGRIND 153#if CORO_USE_VALGRIND
127 int valgrind_id; 154 int valgrind_id;
128#endif 155#endif
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}
569{ 628{
570 coro_cctx *cctx; 629 coro_cctx *cctx;
571 630
572 ++cctx_count; 631 ++cctx_count;
573 632
574 New (0, cctx, 1, coro_cctx); 633 Newz (0, cctx, 1, coro_cctx);
575 634
576#if HAVE_MMAP 635#if HAVE_MMAP
577 636
578 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; 637 cctx->ssize = ((CORO_STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
579 /* mmap suppsedly does allocate-on-write for us */ 638 /* 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); 639 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
581 640
582 if (cctx->sptr == (void *)-1) 641 if (cctx->sptr != (void *)-1)
583 {
584 perror ("FATAL: unable to mmap stack for coroutine");
585 _exit (EXIT_FAILURE);
586 } 642 {
587
588# if STACKGUARD 643# if CORO_STACKGUARD
589 mprotect (cctx->sptr, STACKGUARD * PAGESIZE, PROT_NONE); 644 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
590# endif 645# endif
591 646 REGISTER_STACK (
592#else 647 cctx,
593
594 cctx->ssize = STACKSIZE * (long)sizeof (long);
595 New (0, cctx->sptr, STACKSIZE, long);
596
597 if (!cctx->sptr)
598 {
599 perror ("FATAL: unable to malloc stack for coroutine");
600 _exit (EXIT_FAILURE);
601 }
602
603#endif
604
605#if USE_VALGRIND
606 cctx->valgrind_id = VALGRIND_STACK_REGISTER (
607 STACKGUARD * PAGESIZE + (char *)cctx->sptr, 648 CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr,
608 cctx->ssize + (char *)cctx->sptr 649 cctx->ssize + (char *)cctx->sptr
609 ); 650 );
610#endif
611 651
612 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 }
613 674
614 return cctx; 675 return cctx;
615} 676}
616 677
617static void 678static void
618cctx_free (coro_cctx *cctx) 679cctx_destroy (coro_cctx *cctx)
619{ 680{
620 if (!cctx) 681 if (!cctx)
621 return; 682 return;
622 683
623 --cctx_count; 684 --cctx_count;
624 685
625#if USE_VALGRIND 686#if CORO_USE_VALGRIND
626 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 687 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
627#endif 688#endif
628 689
629#if HAVE_MMAP 690#if HAVE_MMAP
691 if (cctx->ssize > 0)
630 munmap (cctx->sptr, cctx->ssize); 692 munmap (cctx->sptr, cctx->ssize);
631#else 693 else
694#endif
632 Safefree (cctx->sptr); 695 Safefree (cctx->sptr);
633#endif
634 696
635 Safefree (cctx); 697 Safefree (cctx);
636} 698}
637 699
638static coro_cctx * 700static coro_cctx *
640{ 702{
641 coro_cctx *cctx; 703 coro_cctx *cctx;
642 704
643 if (cctx_first) 705 if (cctx_first)
644 { 706 {
645 --cctx_idle;
646 cctx = cctx_first; 707 cctx = cctx_first;
647 cctx_first = cctx->next; 708 cctx_first = cctx->next;
709 --cctx_idle;
648 } 710 }
649 else 711 else
650 { 712 {
651 cctx = cctx_new (); 713 cctx = cctx_new ();
652 PL_op = PL_op->op_next; 714 PL_op = PL_op->op_next;
656} 718}
657 719
658static void 720static void
659cctx_put (coro_cctx *cctx) 721cctx_put (coro_cctx *cctx)
660{ 722{
723 /* free another cctx if overlimit */
724 if (cctx_idle >= MAX_IDLE_CCTX)
725 {
726 coro_cctx *first = cctx_first;
727 cctx_first = first->next;
728 --cctx_idle;
729
730 assert (!first->inuse);
731 cctx_destroy (first);
732 }
733
661 ++cctx_idle; 734 ++cctx_idle;
662 cctx->next = cctx_first; 735 cctx->next = cctx_first;
663 cctx_first = cctx; 736 cctx_first = cctx;
664} 737}
665 738
739/** coroutine switching *****************************************************/
740
666/* never call directly, always through the coro_state_transfer global variable */ 741/* never call directly, always through the coro_state_transfer global variable */
667static void NOINLINE 742static void NOINLINE
668transfer (struct coro *prev, struct coro *next, int flags) 743transfer (struct coro *prev, struct coro *next)
669{ 744{
670 dSTACKLEVEL; 745 dSTACKLEVEL;
671 746
672 /* sometimes transfer is only called to set idle_sp */ 747 /* sometimes transfer is only called to set idle_sp */
673 if (flags == TRANSFER_SET_STACKLEVEL) 748 if (!next)
749 {
674 ((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 }
675 else if (prev != next) 753 else if (prev != next)
676 { 754 {
677 coro_cctx *prev__cctx; 755 coro_cctx *prev__cctx;
678 756
679 if (!prev->cctx) 757 if (prev->flags & CF_NEW)
680 { 758 {
681 /* create a new empty context */ 759 /* create a new empty context */
682 Newz (0, prev->cctx, 1, coro_cctx); 760 Newz (0, prev->cctx, 1, coro_cctx);
683 prev->cctx->inuse = 1; 761 prev->cctx->inuse = 1;
762 prev->flags &= ~CF_NEW;
684 prev->flags |= CF_RUNNING; 763 prev->flags |= CF_RUNNING;
685 } 764 }
686 765
766 /*TODO: must not croak here */
687 assert ( prev->flags & CF_RUNNING); 767 if (!prev->flags & CF_RUNNING)
768 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states");
769
688 assert (!next->flags & CF_RUNNING); 770 if (next->flags & CF_RUNNING)
771 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
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");
689 775
690 prev->flags &= ~CF_RUNNING; 776 prev->flags &= ~CF_RUNNING;
691 next->flags |= CF_RUNNING; 777 next->flags |= CF_RUNNING;
692 778
693 LOCK; 779 LOCK;
694 780
695 if (next->mainstack) 781 if (next->flags & CF_NEW)
696 { 782 {
697 /* coroutine already started */ 783 /* need to start coroutine */
698 SAVE (prev, flags); 784 next->flags &= ~CF_NEW;
699 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);
700 } 791 }
701 else 792 else
702 { 793 {
703 /* need to start coroutine */ 794 /* coroutine already started */
704 /* first get rid of the old state */ 795 save_perl (prev);
705 SAVE (prev, -1); 796 load_perl (next);
706 /* setup coroutine call */
707 setup_coro (next);
708 /* need a stack */
709 assert (!next->stack);
710 next->cctx = 0;
711 } 797 }
712 798
713 prev__cctx = prev->cctx; 799 prev__cctx = prev->cctx;
714 800
715 /* possibly "free" the cctx */ 801 /* possibly "free" the cctx */
716 if (prev__cctx->idle_sp == STACKLEVEL) 802 if (prev__cctx->idle_sp == STACKLEVEL)
717 { 803 {
718 assert (PL_top_env == prev__cctx->top_env);//D 804 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
805 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
806
807 prev->cctx = 0;
808
719 cctx_put (prev__cctx); 809 cctx_put (prev__cctx);
720 prev->cctx = 0; 810 prev__cctx->inuse = 0;
721 } 811 }
722 812
723 if (!next->cctx) 813 if (!next->cctx)
814 {
724 next->cctx = cctx_get (); 815 next->cctx = cctx_get ();
816 assert (!next->cctx->inuse);
817 next->cctx->inuse = 1;
818 }
725 819
726 if (prev__cctx != next->cctx) 820 if (prev__cctx != next->cctx)
727 { 821 {
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; 822 prev__cctx->top_env = PL_top_env;
735 PL_top_env = next->cctx->top_env; 823 PL_top_env = next->cctx->top_env;
736 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 824 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
737 } 825 }
738 826
739 free_coro_mortal (); 827 free_coro_mortal ();
740
741 UNLOCK; 828 UNLOCK;
742 } 829 }
743} 830}
744 831
745struct transfer_args 832struct transfer_args
746{ 833{
747 struct coro *prev, *next; 834 struct coro *prev, *next;
748 int flags;
749}; 835};
750 836
751#define TRANSFER(ta) transfer ((ta).prev, (ta).next, (ta).flags) 837#define TRANSFER(ta) transfer ((ta).prev, (ta).next)
752 838
839/** high level stuff ********************************************************/
840
753static void 841static int
754coro_state_destroy (struct coro *coro) 842coro_state_destroy (struct coro *coro)
755{ 843{
756 if (coro->refcnt--) 844 if (coro->flags & CF_DESTROYED)
757 return; 845 return 0;
846
847 coro->flags |= CF_DESTROYED;
848
849 if (coro->flags & CF_READY)
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 */
758 859
759 if (coro->mainstack && coro->mainstack != main_mainstack) 860 if (coro->mainstack && coro->mainstack != main_mainstack)
760 { 861 {
761 struct coro temp; 862 struct coro temp;
762 863
763 SAVE ((&temp), TRANSFER_SAVE_ALL); 864 assert (!(coro->flags & CF_RUNNING));
764 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);
765 874
766 coro_destroy_stacks (); 875 coro_destroy_stacks ();
767 876
768 LOAD ((&temp)); /* this will get rid of defsv etc.. */ 877 load_perl (&temp); /* this will get rid of defsv etc.. */
769 878
770 coro->mainstack = 0; 879 coro->mainstack = 0;
771 } 880 }
772 881
773 cctx_free (coro->cctx); 882 cctx_destroy (coro->cctx);
774 SvREFCNT_dec (coro->args); 883 SvREFCNT_dec (coro->args);
775 Safefree (coro); 884
885 return 1;
776} 886}
777 887
778static int 888static int
779coro_state_clear (pTHX_ SV *sv, MAGIC *mg) 889coro_state_free (pTHX_ SV *sv, MAGIC *mg)
780{ 890{
781 struct coro *coro = (struct coro *)mg->mg_ptr; 891 struct coro *coro = (struct coro *)mg->mg_ptr;
782 mg->mg_ptr = 0; 892 mg->mg_ptr = 0;
783 893
894 if (--coro->refcnt < 0)
895 {
784 coro_state_destroy (coro); 896 coro_state_destroy (coro);
897 Safefree (coro);
898 }
785 899
786 return 0; 900 return 0;
787} 901}
788 902
789static int 903static int
796 return 0; 910 return 0;
797} 911}
798 912
799static MGVTBL coro_state_vtbl = { 913static MGVTBL coro_state_vtbl = {
800 0, 0, 0, 0, 914 0, 0, 0, 0,
801 coro_state_clear, 915 coro_state_free,
802 0, 916 0,
803#ifdef MGf_DUP 917#ifdef MGf_DUP
804 coro_state_dup, 918 coro_state_dup,
805#else 919#else
806# define MGf_DUP 0 920# define MGf_DUP 0
822 /* very slow, but rare, check */ 936 /* very slow, but rare, check */
823 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 937 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
824 croak ("Coro::State object required"); 938 croak ("Coro::State object required");
825 } 939 }
826 940
827 mg = SvMAGIC (coro); 941 mg = CORO_MAGIC (coro);
828 assert (mg->mg_type == PERL_MAGIC_ext);
829 return (struct coro *)mg->mg_ptr; 942 return (struct coro *)mg->mg_ptr;
830} 943}
831 944
832static void 945static void
833prepare_transfer (struct transfer_args *ta, SV *prev, SV *next, int flags) 946prepare_transfer (struct transfer_args *ta, SV *prev_sv, SV *next_sv)
834{ 947{
835 ta->prev = SvSTATE (prev); 948 ta->prev = SvSTATE (prev_sv);
836 ta->next = SvSTATE (next); 949 ta->next = SvSTATE (next_sv);
837 ta->flags = flags;
838} 950}
839 951
840static void 952static void
841api_transfer (SV *prev, SV *next, int flags) 953api_transfer (SV *prev_sv, SV *next_sv)
842{ 954{
843 dTHX;
844 struct transfer_args ta; 955 struct transfer_args ta;
845 956
846 prepare_transfer (&ta, prev, next, flags); 957 prepare_transfer (&ta, prev_sv, next_sv);
847 TRANSFER (ta); 958 TRANSFER (ta);
848} 959}
849 960
961static int
962api_save (SV *coro_sv, int new_save)
963{
964 struct coro *coro = SvSTATE (coro_sv);
965 int old_save = coro->save;
966
967 if (new_save >= 0)
968 coro->save = new_save;
969
970 return old_save;
971}
972
850/** Coro ********************************************************************/ 973/** Coro ********************************************************************/
851 974
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 975static void
865coro_enq (SV *sv) 976coro_enq (SV *coro_sv)
866{ 977{
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); 978 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
875 coro_nready++;
876} 979}
877 980
878static SV * 981static SV *
879coro_deq (int min_prio) 982coro_deq (int min_prio)
880{ 983{
884 if (min_prio < 0) 987 if (min_prio < 0)
885 min_prio = 0; 988 min_prio = 0;
886 989
887 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 990 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; )
888 if (AvFILLp (coro_ready [prio]) >= 0) 991 if (AvFILLp (coro_ready [prio]) >= 0)
889 {
890 coro_nready--;
891 return av_shift (coro_ready [prio]); 992 return av_shift (coro_ready [prio]);
892 }
893 993
894 return 0; 994 return 0;
895} 995}
896 996
897static int 997static int
901 1001
902 if (SvROK (coro_sv)) 1002 if (SvROK (coro_sv))
903 coro_sv = SvRV (coro_sv); 1003 coro_sv = SvRV (coro_sv);
904 1004
905 coro = SvSTATE (coro_sv); 1005 coro = SvSTATE (coro_sv);
1006
906 if (coro->flags & CF_READY) 1007 if (coro->flags & CF_READY)
907 return 0; 1008 return 0;
908 1009
909 coro->flags |= CF_READY; 1010 coro->flags |= CF_READY;
910 1011
911 LOCK; 1012 LOCK;
912 coro_enq (SvREFCNT_inc (coro_sv)); 1013 coro_enq (SvREFCNT_inc (coro_sv));
1014 ++coro_nready;
913 UNLOCK; 1015 UNLOCK;
914 1016
915 return 1; 1017 return 1;
916} 1018}
917 1019
918static int 1020static int
919api_is_ready (SV *coro_sv) 1021api_is_ready (SV *coro_sv)
920{ 1022{
921 struct coro *coro;
922
923 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1023 return !!(SvSTATE (coro_sv)->flags & CF_READY);
924} 1024}
925 1025
926static void 1026static void
927prepare_schedule (struct transfer_args *ta) 1027prepare_schedule (struct transfer_args *ta)
928{ 1028{
929 SV *current, *prev, *next; 1029 SV *prev_sv, *next_sv;
930
931 current = GvSV (coro_current);
932 1030
933 for (;;) 1031 for (;;)
934 { 1032 {
935 LOCK; 1033 LOCK;
936 next = coro_deq (PRIO_MIN); 1034 next_sv = coro_deq (PRIO_MIN);
1035
1036 /* nothing to schedule: call the idle handler */
1037 if (!next_sv)
1038 {
1039 dSP;
1040 UNLOCK;
1041
1042 ENTER;
1043 SAVETMPS;
1044
1045 PUSHMARK (SP);
1046 PUTBACK;
1047 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1048
1049 FREETMPS;
1050 LEAVE;
1051 continue;
1052 }
1053
1054 ta->next = SvSTATE (next_sv);
1055
1056 /* cannot transfer to destroyed coros, skip and look for next */
1057 if (ta->next->flags & CF_DESTROYED)
1058 {
1059 UNLOCK;
1060 SvREFCNT_dec (next_sv);
1061 /* coro_nready is already taken care of by destroy */
1062 continue;
1063 }
1064
1065 --coro_nready;
937 UNLOCK; 1066 UNLOCK;
938
939 if (next)
940 break; 1067 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 } 1068 }
955 }
956
957 prev = SvRV (current);
958 SvRV (current) = next;
959 1069
960 /* free this only after the transfer */ 1070 /* free this only after the transfer */
1071 prev_sv = SvRV (coro_current);
1072 SvRV_set (coro_current, next_sv);
1073 ta->prev = SvSTATE (prev_sv);
1074
1075 assert (ta->next->flags & CF_READY);
1076 ta->next->flags &= ~CF_READY;
1077
961 LOCK; 1078 LOCK;
962 free_coro_mortal (); 1079 free_coro_mortal ();
1080 coro_mortal = prev_sv;
963 UNLOCK; 1081 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} 1082}
972 1083
973static void 1084static void
974prepare_cede (struct transfer_args *ta) 1085prepare_cede (struct transfer_args *ta)
975{ 1086{
976 api_ready (GvSV (coro_current)); 1087 api_ready (coro_current);
977
978 prepare_schedule (ta); 1088 prepare_schedule (ta);
979} 1089}
980 1090
1091static int
1092prepare_cede_notself (struct transfer_args *ta)
1093{
1094 if (coro_nready)
1095 {
1096 SV *prev = SvRV (coro_current);
1097 prepare_schedule (ta);
1098 api_ready (prev);
1099 return 1;
1100 }
1101 else
1102 return 0;
1103}
1104
981static void 1105static void
982api_schedule (void) 1106api_schedule (void)
983{ 1107{
984 dTHX;
985 struct transfer_args ta; 1108 struct transfer_args ta;
986 1109
987 prepare_schedule (&ta); 1110 prepare_schedule (&ta);
988 TRANSFER (ta); 1111 TRANSFER (ta);
989} 1112}
990 1113
991static void 1114static int
992api_cede (void) 1115api_cede (void)
993{ 1116{
994 dTHX;
995 struct transfer_args ta; 1117 struct transfer_args ta;
996 1118
997 prepare_cede (&ta); 1119 prepare_cede (&ta);
1120
1121 if (ta.prev != ta.next)
1122 {
998 TRANSFER (ta); 1123 TRANSFER (ta);
1124 return 1;
1125 }
1126 else
1127 return 0;
1128}
1129
1130static int
1131api_cede_notself (void)
1132{
1133 struct transfer_args ta;
1134
1135 if (prepare_cede_notself (&ta))
1136 {
1137 TRANSFER (ta);
1138 return 1;
1139 }
1140 else
1141 return 0;
999} 1142}
1000 1143
1001MODULE = Coro::State PACKAGE = Coro::State 1144MODULE = Coro::State PACKAGE = Coro::State
1002 1145
1003PROTOTYPES: DISABLE 1146PROTOTYPES: DISABLE
1009#endif 1152#endif
1010 BOOT_PAGESIZE; 1153 BOOT_PAGESIZE;
1011 1154
1012 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1155 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1013 1156
1014 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 1157 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1015 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 1158 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1016 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 1159 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1160 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1161 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1017 1162
1018 main_mainstack = PL_mainstack; 1163 main_mainstack = PL_mainstack;
1019 1164
1020 coroapi.ver = CORO_API_VERSION; 1165 coroapi.ver = CORO_API_VERSION;
1021 coroapi.transfer = api_transfer; 1166 coroapi.transfer = api_transfer;
1031 HV *hv; 1176 HV *hv;
1032 int i; 1177 int i;
1033 1178
1034 Newz (0, coro, 1, struct coro); 1179 Newz (0, coro, 1, struct coro);
1035 coro->args = newAV (); 1180 coro->args = newAV ();
1181 coro->save = CORO_SAVE_ALL;
1182 coro->flags = CF_NEW;
1036 1183
1037 hv = newHV (); 1184 hv = newHV ();
1038 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1185 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)); 1186 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1040 1187
1041 for (i = 1; i < items; i++) 1188 for (i = 1; i < items; i++)
1042 av_push (coro->args, newSVsv (ST (i))); 1189 av_push (coro->args, newSVsv (ST (i)));
1043} 1190}
1044 OUTPUT: 1191 OUTPUT:
1192 RETVAL
1193
1194int
1195save (SV *coro, int new_save = -1)
1196 CODE:
1197 RETVAL = api_save (coro, new_save);
1198 OUTPUT:
1045 RETVAL 1199 RETVAL
1046 1200
1047void 1201void
1048_set_stacklevel (...) 1202_set_stacklevel (...)
1049 ALIAS: 1203 ALIAS:
1050 Coro::State::transfer = 1 1204 Coro::State::transfer = 1
1051 Coro::schedule = 2 1205 Coro::schedule = 2
1052 Coro::cede = 3 1206 Coro::cede = 3
1053 Coro::Cont::yield = 4 1207 Coro::cede_notself = 4
1054 CODE: 1208 CODE:
1055{ 1209{
1056 struct transfer_args ta; 1210 struct transfer_args ta;
1057 1211
1058 switch (ix) 1212 switch (ix)
1059 { 1213 {
1060 case 0: 1214 case 0:
1061 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1215 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1062 ta.next = 0; 1216 ta.next = 0;
1063 ta.flags = TRANSFER_SET_STACKLEVEL;
1064 break; 1217 break;
1065 1218
1066 case 1: 1219 case 1:
1067 if (items != 3) 1220 if (items != 2)
1068 croak ("Coro::State::transfer(prev,next,flags) expects three arguments, not %d", items); 1221 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1069 1222
1070 prepare_transfer (&ta, ST (0), ST (1), SvIV (ST (2))); 1223 prepare_transfer (&ta, ST (0), ST (1));
1071 break; 1224 break;
1072 1225
1073 case 2: 1226 case 2:
1074 prepare_schedule (&ta); 1227 prepare_schedule (&ta);
1075 break; 1228 break;
1077 case 3: 1230 case 3:
1078 prepare_cede (&ta); 1231 prepare_cede (&ta);
1079 break; 1232 break;
1080 1233
1081 case 4: 1234 case 4:
1082 { 1235 if (!prepare_cede_notself (&ta))
1083 SV *yieldstack; 1236 XSRETURN_EMPTY;
1084 SV *sv;
1085 AV *defav = GvAV (PL_defgv);
1086 1237
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; 1238 break;
1106
1107 } 1239 }
1108 1240
1241 BARRIER;
1109 TRANSFER (ta); 1242 TRANSFER (ta);
1110}
1111 1243
1112void 1244 if (GIMME_V != G_VOID && ta.next != ta.prev)
1113_clone_state_from (SV *dst, SV *src) 1245 XSRETURN_YES;
1246}
1247
1248bool
1249_destroy (SV *coro_sv)
1114 CODE: 1250 CODE:
1115{ 1251 RETVAL = coro_state_destroy (SvSTATE (coro_sv));
1116 struct coro *coro_src = SvSTATE (src); 1252 OUTPUT:
1117 1253 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 1254
1124void 1255void
1125_exit (code) 1256_exit (code)
1126 int code 1257 int code
1127 PROTOTYPE: $ 1258 PROTOTYPE: $
1155 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1286 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1156 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1287 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1157 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 1288 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
1158 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 1289 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
1159 1290
1160 coro_current = gv_fetchpv ("Coro::current", TRUE, SVt_PV); 1291 coro_current = get_sv ("Coro::current", FALSE);
1161 coro_idle = gv_fetchpv ("Coro::idle" , TRUE, SVt_PV); 1292 SvREADONLY_on (coro_current);
1162 1293
1163 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1294 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1164 coro_ready[i] = newAV (); 1295 coro_ready[i] = newAV ();
1165 1296
1166 { 1297 {
1167 SV *sv = perl_get_sv("Coro::API", 1); 1298 SV *sv = perl_get_sv("Coro::API", 1);
1168 1299
1169 coroapi.schedule = api_schedule; 1300 coroapi.schedule = api_schedule;
1301 coroapi.save = api_save;
1170 coroapi.cede = api_cede; 1302 coroapi.cede = api_cede;
1303 coroapi.cede_notself = api_cede_notself;
1171 coroapi.ready = api_ready; 1304 coroapi.ready = api_ready;
1172 coroapi.is_ready = api_is_ready; 1305 coroapi.is_ready = api_is_ready;
1173 coroapi.nready = &coro_nready; 1306 coroapi.nready = &coro_nready;
1174 coroapi.current = coro_current; 1307 coroapi.current = coro_current;
1175 1308
1176 GCoroAPI = &coroapi; 1309 GCoroAPI = &coroapi;
1177 sv_setiv (sv, (IV)&coroapi); 1310 sv_setiv (sv, (IV)&coroapi);
1178 SvREADONLY_on (sv); 1311 SvREADONLY_on (sv);
1179 } 1312 }
1180} 1313}
1314
1315void
1316_set_current (SV *current)
1317 PROTOTYPE: $
1318 CODE:
1319 SvREFCNT_dec (SvRV (coro_current));
1320 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1181 1321
1182int 1322int
1183prio (Coro::State coro, int newprio = 0) 1323prio (Coro::State coro, int newprio = 0)
1184 ALIAS: 1324 ALIAS:
1185 nice = 1 1325 nice = 1
1188 RETVAL = coro->prio; 1328 RETVAL = coro->prio;
1189 1329
1190 if (items > 1) 1330 if (items > 1)
1191 { 1331 {
1192 if (ix) 1332 if (ix)
1193 newprio += coro->prio; 1333 newprio = coro->prio - newprio;
1194 1334
1195 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 1335 if (newprio < PRIO_MIN) newprio = PRIO_MIN;
1196 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 1336 if (newprio > PRIO_MAX) newprio = PRIO_MAX;
1197 1337
1198 coro->prio = newprio; 1338 coro->prio = newprio;
1199 } 1339 }
1200} 1340}
1341 OUTPUT:
1342 RETVAL
1201 1343
1202SV * 1344SV *
1203ready (SV *self) 1345ready (SV *self)
1204 PROTOTYPE: $ 1346 PROTOTYPE: $
1205 CODE: 1347 CODE:
1227 1369
1228SV * 1370SV *
1229_get_state () 1371_get_state ()
1230 CODE: 1372 CODE:
1231{ 1373{
1232 struct { 1374 struct io_state *data;
1233 int errorno;
1234 int laststype;
1235 int laststatval;
1236 Stat_t statcache;
1237 } data;
1238 1375
1376 RETVAL = newSV (sizeof (struct io_state));
1377 data = (struct io_state *)SvPVX (RETVAL);
1378 SvCUR_set (RETVAL, sizeof (struct io_state));
1379 SvPOK_only (RETVAL);
1380
1239 data.errorno = errno; 1381 data->errorno = errno;
1240 data.laststype = PL_laststype; 1382 data->laststype = PL_laststype;
1241 data.laststatval = PL_laststatval; 1383 data->laststatval = PL_laststatval;
1242 data.statcache = PL_statcache; 1384 data->statcache = PL_statcache;
1243
1244 RETVAL = newSVpvn ((char *)&data, sizeof data);
1245} 1385}
1246 OUTPUT: 1386 OUTPUT:
1247 RETVAL 1387 RETVAL
1248 1388
1249void 1389void
1250_set_state (char *data_) 1390_set_state (char *data_)
1251 PROTOTYPE: $ 1391 PROTOTYPE: $
1252 CODE: 1392 CODE:
1253{ 1393{
1254 struct { 1394 struct io_state *data = (void *)data_;
1255 int errorno;
1256 int laststype;
1257 int laststatval;
1258 Stat_t statcache;
1259 } *data = (void *)data_;
1260 1395
1261 errno = data->errorno; 1396 errno = data->errorno;
1262 PL_laststype = data->laststype; 1397 PL_laststype = data->laststype;
1263 PL_laststatval = data->laststatval; 1398 PL_laststatval = data->laststatval;
1264 PL_statcache = data->statcache; 1399 PL_statcache = data->statcache;
1265} 1400}
1401

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines