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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines