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.108 by root, Mon Nov 27 18:15:47 2006 UTC vs.
Revision 1.132 by root, Fri Dec 29 13:03:05 2006 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
117struct io_state
118{
119 int errorno;
120 I32 laststype;
121 int laststatval;
122 Stat_t statcache;
123};
124
103static struct CoroAPI coroapi; 125static struct CoroAPI coroapi;
104static AV *main_mainstack; /* used to differentiate between $main and others */ 126static AV *main_mainstack; /* used to differentiate between $main and others */
105static HV *coro_state_stash, *coro_stash; 127static HV *coro_state_stash, *coro_stash;
106static SV *coro_mortal; /* will be freed after next transfer */ 128static SV *coro_mortal; /* will be freed after next transfer */
107 129
… …
115 /* the stack */ 137 /* the stack */
116 void *sptr; 138 void *sptr;
117 long ssize; /* positive == mmap, otherwise malloc */ 139 long ssize; /* positive == mmap, otherwise malloc */
118 140
119 /* cpu state */ 141 /* cpu state */
120 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 142 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
143 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */
121 JMPENV *top_env; 144 JMPENV *top_env;
122 coro_context cctx; 145 coro_context cctx;
123 146
147 int inuse;
148
124#if USE_VALGRIND 149#if USE_VALGRIND
125 int valgrind_id; 150 int valgrind_id;
126#endif 151#endif
127} coro_cctx; 152} coro_cctx;
153
154enum {
155 CF_RUNNING = 0x0001, /* coroutine is running */
156 CF_READY = 0x0002, /* coroutine is ready */
157 CF_NEW = 0x0004, /* ahs never been switched to */
158};
128 159
129/* this is a structure representing a perl-level coroutine */ 160/* this is a structure representing a perl-level coroutine */
130struct coro { 161struct coro {
131 /* the c coroutine allocated to this perl coroutine, if any */ 162 /* the c coroutine allocated to this perl coroutine, if any */
132 coro_cctx *cctx; 163 coro_cctx *cctx;
133 164
134 /* data associated with this coroutine (initial args) */ 165 /* data associated with this coroutine (initial args) */
135 AV *args; 166 AV *args;
136 int refcnt; 167 int refcnt;
168 int save; /* CORO_SAVE flags */
169 int flags; /* CF_ flags */
137 170
138 /* optionally saved, might be zero */ 171 /* optionally saved, might be zero */
139 AV *defav; 172 AV *defav; /* @_ */
140 SV *defsv; 173 SV *defsv; /* $_ */
141 SV *errsv; 174 SV *errsv; /* $@ */
175 SV *irssv; /* $/ */
176 SV *irssv_sv; /* real $/ cache */
142 177
143#define VAR(name,type) type name; 178#define VAR(name,type) type name;
144# include "state.h" 179# include "state.h"
145#undef VAR 180#undef VAR
146 181
… …
214 249
215#define PERL_MAGIC_coro PERL_MAGIC_ext 250#define PERL_MAGIC_coro PERL_MAGIC_ext
216 251
217static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 252static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
218 253
254#define CORO_MAGIC(cv) \
255 SvMAGIC (cv) \
256 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \
257 ? SvMAGIC (cv) \
258 : mg_find ((SV *)cv, PERL_MAGIC_coro) \
259 : 0
260
219/* the next two functions merely cache the padlists */ 261/* the next two functions merely cache the padlists */
220static void 262static void
221get_padlist (CV *cv) 263get_padlist (CV *cv)
222{ 264{
223 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 265 MAGIC *mg = CORO_MAGIC (cv);
266 AV *av;
224 267
225 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0) 268 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)
226 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj); 269 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
227 else 270 else
228 { 271 {
229#if 0 272#if PREFER_PERL_FUNCTIONS
230 /* this is probably cleaner, but also slower? */ 273 /* this is probably cleaner, but also slower? */
231 CV *cp = Perl_cv_clone (cv); 274 CV *cp = Perl_cv_clone (cv);
232 CvPADLIST (cv) = CvPADLIST (cp); 275 CvPADLIST (cv) = CvPADLIST (cp);
233 CvPADLIST (cp) = 0; 276 CvPADLIST (cp) = 0;
234 SvREFCNT_dec (cp); 277 SvREFCNT_dec (cp);
… …
239} 282}
240 283
241static void 284static void
242put_padlist (CV *cv) 285put_padlist (CV *cv)
243{ 286{
244 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 287 MAGIC *mg = CORO_MAGIC (cv);
288 AV *av;
245 289
246 if (!mg) 290 if (!mg)
247 { 291 {
248 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 292 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
249 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 293 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
250 mg->mg_virtual = &vtbl_coro; 294 mg->mg_virtual = &vtbl_coro;
251 mg->mg_obj = (SV *)newAV (); 295 mg->mg_obj = (SV *)newAV ();
252 } 296 }
253 297
254 av_push ((AV *)mg->mg_obj, (SV *)CvPADLIST (cv)); 298 av = (AV *)mg->mg_obj;
299
300 if (AvFILLp (av) >= AvMAX (av))
301 av_extend (av, AvMAX (av) + 1);
302
303 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
255} 304}
256 305
257#define SB do { 306#define SB do {
258#define SE } while (0) 307#define SE } while (0)
259 308
260#define LOAD(state) load_state((state));
261#define SAVE(state,flags) save_state((state),(flags));
262
263#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE 309#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
264 310
265static void 311static void
266load_state(Coro__State c) 312load_perl (Coro__State c)
267{ 313{
268#define VAR(name,type) PL_ ## name = c->name; 314#define VAR(name,type) PL_ ## name = c->name;
269# include "state.h" 315# include "state.h"
270#undef VAR 316#undef VAR
271 317
272 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 318 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
273 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 319 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
274 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 320 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
321 if (c->irssv)
322 {
323 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
324 SvREFCNT_dec (c->irssv);
325 else
326 {
327 REPLACE_SV (PL_rs, c->irssv);
328 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
329 sv_setsv (c->irssv_sv, PL_rs);
330 }
331 }
275 332
276 { 333 {
277 dSP; 334 dSP;
278 CV *cv; 335 CV *cv;
279 336
280 /* now do the ugly restore mess */ 337 /* now do the ugly restore mess */
281 while ((cv = (CV *)POPs)) 338 while ((cv = (CV *)POPs))
282 { 339 {
283 AV *padlist = (AV *)POPs;
284
285 if (padlist)
286 {
287 put_padlist (cv); /* mark this padlist as available */ 340 put_padlist (cv); /* mark this padlist as available */
288 CvPADLIST(cv) = padlist; 341 CvDEPTH (cv) = PTR2IV (POPs);
289 } 342 CvPADLIST (cv) = (AV *)POPs;
290
291 ++CvDEPTH(cv);
292 } 343 }
293 344
294 PUTBACK; 345 PUTBACK;
295 } 346 }
296} 347}
297 348
298static void 349static void
299save_state(Coro__State c, int flags) 350save_perl (Coro__State c)
300{ 351{
301 { 352 {
302 dSP; 353 dSP;
303 I32 cxix = cxstack_ix; 354 I32 cxix = cxstack_ix;
304 PERL_CONTEXT *ccstk = cxstack; 355 PERL_CONTEXT *ccstk = cxstack;
… …
307 /* 358 /*
308 * the worst thing you can imagine happens first - we have to save 359 * the worst thing you can imagine happens first - we have to save
309 * (and reinitialize) all cv's in the whole callchain :( 360 * (and reinitialize) all cv's in the whole callchain :(
310 */ 361 */
311 362
363 EXTEND (SP, 3 + 1);
312 PUSHs (Nullsv); 364 PUSHs (Nullsv);
313 /* this loop was inspired by pp_caller */ 365 /* this loop was inspired by pp_caller */
314 for (;;) 366 for (;;)
315 { 367 {
316 while (cxix >= 0) 368 while (cxix >= 0)
317 { 369 {
318 PERL_CONTEXT *cx = &ccstk[cxix--]; 370 PERL_CONTEXT *cx = &ccstk[cxix--];
319 371
320 if (CxTYPE(cx) == CXt_SUB) 372 if (CxTYPE (cx) == CXt_SUB)
321 { 373 {
322 CV *cv = cx->blk_sub.cv; 374 CV *cv = cx->blk_sub.cv;
375
323 if (CvDEPTH(cv)) 376 if (CvDEPTH (cv))
324 { 377 {
325 EXTEND (SP, CvDEPTH(cv)*2); 378 EXTEND (SP, 3);
326
327 while (--CvDEPTH(cv))
328 {
329 /* this tells the restore code to increment CvDEPTH */
330 PUSHs (Nullsv);
331 PUSHs ((SV *)cv);
332 }
333
334 PUSHs ((SV *)CvPADLIST(cv)); 379 PUSHs ((SV *)CvPADLIST (cv));
380 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
335 PUSHs ((SV *)cv); 381 PUSHs ((SV *)cv);
336 382
383 CvDEPTH (cv) = 0;
337 get_padlist (cv); 384 get_padlist (cv);
338 } 385 }
339 } 386 }
340#ifdef CXt_FORMAT
341 else if (CxTYPE(cx) == CXt_FORMAT)
342 {
343 /* I never used formats, so how should I know how these are implemented? */
344 /* my bold guess is as a simple, plain sub... */
345 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
346 }
347#endif
348 } 387 }
349 388
350 if (top_si->si_type == PERLSI_MAIN) 389 if (top_si->si_type == PERLSI_MAIN)
351 break; 390 break;
352 391
… …
356 } 395 }
357 396
358 PUTBACK; 397 PUTBACK;
359 } 398 }
360 399
361 c->defav = flags & TRANSFER_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 400 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0;
362 c->defsv = flags & TRANSFER_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 401 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0;
363 c->errsv = flags & TRANSFER_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 402 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0;
403 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0;
364 404
365#define VAR(name,type)c->name = PL_ ## name; 405#define VAR(name,type)c->name = PL_ ## name;
366# include "state.h" 406# include "state.h"
367#undef VAR 407#undef VAR
368} 408}
… …
371 * allocate various perl stacks. This is an exact copy 411 * allocate various perl stacks. This is an exact copy
372 * of perl.c:init_stacks, except that it uses less memory 412 * of perl.c:init_stacks, except that it uses less memory
373 * on the (sometimes correct) assumption that coroutines do 413 * on the (sometimes correct) assumption that coroutines do
374 * not usually need a lot of stackspace. 414 * not usually need a lot of stackspace.
375 */ 415 */
416#if PREFER_PERL_FUNCTIONS
417# define coro_init_stacks init_stacks
418#else
376static void 419static void
377coro_init_stacks () 420coro_init_stacks ()
378{ 421{
379 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 422 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT));
380 PL_curstackinfo->si_type = PERLSI_MAIN; 423 PL_curstackinfo->si_type = PERLSI_MAIN;
381 PL_curstack = PL_curstackinfo->si_stack; 424 PL_curstack = PL_curstackinfo->si_stack;
382 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 425 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
383 426
384 PL_stack_base = AvARRAY(PL_curstack); 427 PL_stack_base = AvARRAY(PL_curstack);
385 PL_stack_sp = PL_stack_base; 428 PL_stack_sp = PL_stack_base;
386 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 429 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
387 430
388 New(50,PL_tmps_stack,96,SV*); 431 New(50,PL_tmps_stack,128,SV*);
389 PL_tmps_floor = -1; 432 PL_tmps_floor = -1;
390 PL_tmps_ix = -1; 433 PL_tmps_ix = -1;
391 PL_tmps_max = 96; 434 PL_tmps_max = 128;
392 435
393 New(54,PL_markstack,16,I32); 436 New(54,PL_markstack,32,I32);
394 PL_markstack_ptr = PL_markstack; 437 PL_markstack_ptr = PL_markstack;
395 PL_markstack_max = PL_markstack + 16; 438 PL_markstack_max = PL_markstack + 32;
396 439
397#ifdef SET_MARK_OFFSET 440#ifdef SET_MARK_OFFSET
398 SET_MARK_OFFSET; 441 SET_MARK_OFFSET;
399#endif 442#endif
400 443
401 New(54,PL_scopestack,16,I32); 444 New(54,PL_scopestack,32,I32);
402 PL_scopestack_ix = 0; 445 PL_scopestack_ix = 0;
403 PL_scopestack_max = 16; 446 PL_scopestack_max = 32;
404 447
405 New(54,PL_savestack,96,ANY); 448 New(54,PL_savestack,64,ANY);
406 PL_savestack_ix = 0; 449 PL_savestack_ix = 0;
407 PL_savestack_max = 96; 450 PL_savestack_max = 64;
408 451
409#if !PERL_VERSION_ATLEAST (5,9,0) 452#if !PERL_VERSION_ATLEAST (5,9,0)
410 New(54,PL_retstack,8,OP*); 453 New(54,PL_retstack,16,OP*);
411 PL_retstack_ix = 0; 454 PL_retstack_ix = 0;
412 PL_retstack_max = 8; 455 PL_retstack_max = 16;
413#endif 456#endif
414} 457}
458#endif
415 459
416/* 460/*
417 * destroy the stacks, the callchain etc... 461 * destroy the stacks, the callchain etc...
418 */ 462 */
419static void 463static void
420coro_destroy_stacks () 464coro_destroy_stacks ()
421{ 465{
422 if (!IN_DESTRUCT) 466 if (!IN_DESTRUCT)
423 { 467 {
424 /* is this ugly, I ask? */ 468 /* restore all saved variables and stuff */
425 LEAVE_SCOPE (0); 469 LEAVE_SCOPE (0);
470 assert (PL_tmps_floor == -1);
426 471
427 /* sure it is, but more important: is it correct?? :/ */ 472 /* free all temporaries */
428 FREETMPS; 473 FREETMPS;
474 assert (PL_tmps_ix == -1);
429 475
430 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/ 476 POPSTACK_TO (PL_mainstack);
431 } 477 }
432 478
433 while (PL_curstackinfo->si_next) 479 while (PL_curstackinfo->si_next)
434 PL_curstackinfo = PL_curstackinfo->si_next; 480 PL_curstackinfo = PL_curstackinfo->si_next;
435 481
436 while (PL_curstackinfo) 482 while (PL_curstackinfo)
437 { 483 {
438 PERL_SI *p = PL_curstackinfo->si_prev; 484 PERL_SI *p = PL_curstackinfo->si_prev;
439 485
440 { /*D*//*remove*/
441 dSP;
442 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
443 PUTBACK; /* possibly superfluous */
444 }
445
446 if (!IN_DESTRUCT) 486 if (!IN_DESTRUCT)
447 {
448 dounwind (-1);/*D*//*remove*/
449 SvREFCNT_dec (PL_curstackinfo->si_stack); 487 SvREFCNT_dec (PL_curstackinfo->si_stack);
450 }
451 488
452 Safefree (PL_curstackinfo->si_cxstack); 489 Safefree (PL_curstackinfo->si_cxstack);
453 Safefree (PL_curstackinfo); 490 Safefree (PL_curstackinfo);
454 PL_curstackinfo = p; 491 PL_curstackinfo = p;
455 } 492 }
… …
470 * emulate part of the perl startup here. 507 * emulate part of the perl startup here.
471 */ 508 */
472 509
473 coro_init_stacks (); 510 coro_init_stacks ();
474 511
475 PL_curcop = 0; 512 PL_curcop = &PL_compiling;
476 PL_in_eval = 0; 513 PL_in_eval = EVAL_NULL;
477 PL_curpm = 0; 514 PL_curpm = 0;
515 PL_localizing = 0;
516 PL_dirty = 0;
517 PL_restartop = 0;
478 518
479 { 519 {
480 dSP; 520 dSP;
481 LOGOP myop; 521 LOGOP myop;
482 522
483 /* I have no idea why this is needed, but it is */
484 PUSHMARK (SP);
485
486 SvREFCNT_dec (GvAV (PL_defgv)); 523 SvREFCNT_dec (GvAV (PL_defgv));
487 GvAV (PL_defgv) = coro->args; coro->args = 0; 524 GvAV (PL_defgv) = coro->args; coro->args = 0;
488 525
489 Zero (&myop, 1, LOGOP); 526 Zero (&myop, 1, LOGOP);
490 myop.op_next = Nullop; 527 myop.op_next = Nullop;
491 myop.op_flags = OPf_WANT_VOID; 528 myop.op_flags = OPf_WANT_VOID;
492 529
493 PL_op = (OP *)&myop;
494
495 PUSHMARK (SP); 530 PUSHMARK (SP);
496 XPUSHs ((SV *)get_cv ("Coro::State::_coro_init", FALSE)); 531 XPUSHs ((SV *)get_cv ("Coro::State::_coro_init", FALSE));
497 PUTBACK; 532 PUTBACK;
533 PL_op = (OP *)&myop;
498 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 534 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
499 SPAGAIN; 535 SPAGAIN;
500
501 ENTER; /* necessary e.g. for dounwind */
502 } 536 }
537
538 ENTER; /* necessary e.g. for dounwind */
503} 539}
504 540
505static void 541static void
506free_coro_mortal () 542free_coro_mortal ()
507{ 543{
… …
510 SvREFCNT_dec (coro_mortal); 546 SvREFCNT_dec (coro_mortal);
511 coro_mortal = 0; 547 coro_mortal = 0;
512 } 548 }
513} 549}
514 550
551/* inject a fake call to Coro::State::_cctx_init into the execution */
515static void NOINLINE 552static void NOINLINE
516prepare_cctx (coro_cctx *cctx) 553prepare_cctx (coro_cctx *cctx)
517{ 554{
518 dSP; 555 dSP;
519 LOGOP myop; 556 LOGOP myop;
520 557
521 Zero (&myop, 1, LOGOP); 558 Zero (&myop, 1, LOGOP);
522 myop.op_next = PL_op; 559 myop.op_next = PL_op;
523 myop.op_flags = OPf_WANT_VOID; 560 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
524
525 sv_setiv (get_sv ("Coro::State::_cctx", FALSE), PTR2IV (cctx));
526 561
527 PUSHMARK (SP); 562 PUSHMARK (SP);
563 EXTEND (SP, 2);
564 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx))));
528 XPUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 565 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
529 PUTBACK; 566 PUTBACK;
567 PL_op = (OP *)&myop;
530 PL_restartop = PL_ppaddr[OP_ENTERSUB](aTHX); 568 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
531 SPAGAIN; 569 SPAGAIN;
532} 570}
533 571
534static void 572static void
535coro_run (void *arg) 573coro_run (void *arg)
536{ 574{
537 /* coro_run is the alternative epilogue of transfer() */ 575 /* coro_run is the alternative tail of transfer(), so unlock here. */
538 UNLOCK; 576 UNLOCK;
539 577
540 /* 578 /*
541 * this is a _very_ stripped down perl interpreter ;) 579 * this is a _very_ stripped down perl interpreter ;)
542 */ 580 */
… …
544 582
545 /* inject call to cctx_init */ 583 /* inject call to cctx_init */
546 prepare_cctx ((coro_cctx *)arg); 584 prepare_cctx ((coro_cctx *)arg);
547 585
548 /* somebody will hit me for both perl_run and PL_restartop */ 586 /* somebody will hit me for both perl_run and PL_restartop */
587 PL_restartop = PL_op;
549 perl_run (PL_curinterp); 588 perl_run (PL_curinterp);
550 589
551 fputs ("FATAL: C coroutine fell over the edge of the world, aborting. Did you call exit in a coroutine?\n", stderr); 590 fputs ("FATAL: C coroutine fell over the edge of the world, aborting. Did you call exit in a coroutine?\n", stderr);
552 abort (); 591 abort ();
553} 592}
… …
557{ 596{
558 coro_cctx *cctx; 597 coro_cctx *cctx;
559 598
560 ++cctx_count; 599 ++cctx_count;
561 600
562 New (0, cctx, 1, coro_cctx); 601 Newz (0, cctx, 1, coro_cctx);
563 602
564#if HAVE_MMAP 603#if HAVE_MMAP
565 604
566 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; 605 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE;
567 /* mmap suppsedly does allocate-on-write for us */ 606 /* mmap supposedly does allocate-on-write for us */
568 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 607 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
569 608
570 if (cctx->sptr == (void *)-1) 609 if (cctx->sptr == (void *)-1)
571 { 610 {
572 perror ("FATAL: unable to mmap stack for coroutine"); 611 perror ("FATAL: unable to mmap stack for coroutine");
… …
601 640
602 return cctx; 641 return cctx;
603} 642}
604 643
605static void 644static void
606cctx_free (coro_cctx *cctx) 645cctx_destroy (coro_cctx *cctx)
607{ 646{
608 if (!cctx) 647 if (!cctx)
609 return; 648 return;
610 649
611 --cctx_count; 650 --cctx_count;
… …
628{ 667{
629 coro_cctx *cctx; 668 coro_cctx *cctx;
630 669
631 if (cctx_first) 670 if (cctx_first)
632 { 671 {
633 --cctx_idle;
634 cctx = cctx_first; 672 cctx = cctx_first;
635 cctx_first = cctx->next; 673 cctx_first = cctx->next;
674 --cctx_idle;
636 } 675 }
637 else 676 else
638 { 677 {
639 cctx = cctx_new (); 678 cctx = cctx_new ();
640 PL_op = PL_op->op_next; 679 PL_op = PL_op->op_next;
… …
644} 683}
645 684
646static void 685static void
647cctx_put (coro_cctx *cctx) 686cctx_put (coro_cctx *cctx)
648{ 687{
688 /* free another cctx if overlimit */
689 if (cctx_idle >= MAX_IDLE_CCTX)
690 {
691 coro_cctx *first = cctx_first;
692 cctx_first = first->next;
693 --cctx_idle;
694
695 assert (!first->inuse);
696 cctx_destroy (first);
697 }
698
649 ++cctx_idle; 699 ++cctx_idle;
650 cctx->next = cctx_first; 700 cctx->next = cctx_first;
651 cctx_first = cctx; 701 cctx_first = cctx;
652} 702}
653 703
654/* never call directly, always through the coro_state_transfer global variable */ 704/* never call directly, always through the coro_state_transfer global variable */
655static void NOINLINE 705static void NOINLINE
656transfer (struct coro *prev, struct coro *next, int flags) 706transfer (struct coro *prev, struct coro *next)
657{ 707{
658 dSTACKLEVEL; 708 dSTACKLEVEL;
659 709
660 /* sometimes transfer is only called to set idle_sp */ 710 /* sometimes transfer is only called to set idle_sp */
661 if (flags == TRANSFER_SET_STACKLEVEL) 711 if (!next)
712 {
662 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 713 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
714 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
715 }
663 else if (prev != next) 716 else if (prev != next)
664 { 717 {
665 coro_cctx *prev__cctx; 718 coro_cctx *prev__cctx;
666 719
720 if (prev->flags & CF_NEW)
721 {
722 /* create a new empty context */
723 Newz (0, prev->cctx, 1, coro_cctx);
724 prev->cctx->inuse = 1;
725 prev->flags &= ~CF_NEW;
726 prev->flags |= CF_RUNNING;
727 }
728
729 /*TODO: must not croak here */
730 if (!prev->flags & CF_RUNNING)
731 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states");
732
733 if (next->flags & CF_RUNNING)
734 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
735
736 prev->flags &= ~CF_RUNNING;
737 next->flags |= CF_RUNNING;
738
667 LOCK; 739 LOCK;
668 740
669 if (next->mainstack) 741 if (next->flags & CF_NEW)
670 { 742 {
671 /* coroutine already started */ 743 /* need to start coroutine */
672 SAVE (prev, flags); 744 next->flags &= ~CF_NEW;
673 LOAD (next); 745 /* first get rid of the old state */
746 save_perl (prev);
747 /* setup coroutine call */
748 setup_coro (next);
749 /* need a new stack */
750 assert (!next->cctx);
674 } 751 }
675 else 752 else
676 { 753 {
677 /* need to start coroutine */ 754 /* coroutine already started */
678 /* first get rid of the old state */ 755 save_perl (prev);
679 SAVE (prev, -1); 756 load_perl (next);
680 /* setup coroutine call */
681 setup_coro (next);
682 /* need a stack */
683 next->cctx = 0;
684 } 757 }
685
686 if (!prev->cctx)
687 /* create a new empty context */
688 Newz (0, prev->cctx, 1, coro_cctx);
689 758
690 prev__cctx = prev->cctx; 759 prev__cctx = prev->cctx;
691 760
692 /* possibly "free" the cctx */ 761 /* possibly "free" the cctx */
693 if (prev__cctx->idle_sp == STACKLEVEL) 762 if (prev__cctx->idle_sp == STACKLEVEL)
694 { 763 {
764 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
765 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
766
767 prev->cctx = 0;
768
695 cctx_put (prev__cctx); 769 cctx_put (prev__cctx);
696 prev->cctx = 0; 770 prev__cctx->inuse = 0;
697 } 771 }
698 772
699 if (!next->cctx) 773 if (!next->cctx)
774 {
700 next->cctx = cctx_get (); 775 next->cctx = cctx_get ();
776 assert (!next->cctx->inuse);
777 next->cctx->inuse = 1;
778 }
701 779
702 if (prev__cctx != next->cctx) 780 if (prev__cctx != next->cctx)
703 { 781 {
704 prev__cctx->top_env = PL_top_env; 782 prev__cctx->top_env = PL_top_env;
705 PL_top_env = next->cctx->top_env; 783 PL_top_env = next->cctx->top_env;
… …
713} 791}
714 792
715struct transfer_args 793struct transfer_args
716{ 794{
717 struct coro *prev, *next; 795 struct coro *prev, *next;
718 int flags;
719}; 796};
720 797
721#define TRANSFER(ta) transfer ((ta).prev, (ta).next, (ta).flags) 798#define TRANSFER(ta) transfer ((ta).prev, (ta).next)
722 799
723static void 800static void
724coro_state_destroy (struct coro *coro) 801coro_state_destroy (struct coro *coro)
725{ 802{
726 if (coro->refcnt--) 803 if (coro->refcnt--)
727 return; 804 return;
728 805
729 if (coro->mainstack && coro->mainstack != main_mainstack) 806 if (coro->mainstack && coro->mainstack != main_mainstack)
730 { 807 {
731 struct coro temp; 808 struct coro temp;
809 Zero (&temp, 1, struct coro);
810 temp.save = CORO_SAVE_ALL;
732 811
733 SAVE ((&temp), TRANSFER_SAVE_ALL); 812 if (coro->flags & CF_RUNNING)
734 LOAD (coro); 813 croak ("FATAL: tried to destroy currently running coroutine");
814
815 save_perl (&temp);
816 load_perl (coro);
735 817
736 coro_destroy_stacks (); 818 coro_destroy_stacks ();
737 819
738 LOAD ((&temp)); /* this will get rid of defsv etc.. */ 820 load_perl (&temp); /* this will get rid of defsv etc.. */
739 821
740 coro->mainstack = 0; 822 coro->mainstack = 0;
741 } 823 }
742 824
743 cctx_free (coro->cctx); 825 cctx_destroy (coro->cctx);
744 SvREFCNT_dec (coro->args); 826 SvREFCNT_dec (coro->args);
745 Safefree (coro); 827 Safefree (coro);
746} 828}
747 829
748static int 830static int
… …
798 assert (mg->mg_type == PERL_MAGIC_ext); 880 assert (mg->mg_type == PERL_MAGIC_ext);
799 return (struct coro *)mg->mg_ptr; 881 return (struct coro *)mg->mg_ptr;
800} 882}
801 883
802static void 884static void
803prepare_transfer (struct transfer_args *ta, SV *prev, SV *next, int flags) 885prepare_transfer (struct transfer_args *ta, SV *prev_sv, SV *next_sv)
804{ 886{
805 ta->prev = SvSTATE (prev); 887 ta->prev = SvSTATE (prev_sv);
806 ta->next = SvSTATE (next); 888 ta->next = SvSTATE (next_sv);
807 ta->flags = flags;
808} 889}
809 890
810static void 891static void
811api_transfer (SV *prev, SV *next, int flags) 892api_transfer (SV *prev_sv, SV *next_sv)
812{ 893{
813 dTHX;
814 struct transfer_args ta; 894 struct transfer_args ta;
815 895
816 prepare_transfer (&ta, prev, next, flags); 896 prepare_transfer (&ta, prev_sv, next_sv);
817 TRANSFER (ta); 897 TRANSFER (ta);
898}
899
900static int
901api_save (SV *coro_sv, int new_save)
902{
903 struct coro *coro = SvSTATE (coro_sv);
904 int old_save = coro->save;
905
906 if (new_save >= 0)
907 coro->save = new_save;
908
909 return old_save;
818} 910}
819 911
820/** Coro ********************************************************************/ 912/** Coro ********************************************************************/
821 913
822#define PRIO_MAX 3 914#define PRIO_MAX 3
… …
825#define PRIO_LOW -1 917#define PRIO_LOW -1
826#define PRIO_IDLE -3 918#define PRIO_IDLE -3
827#define PRIO_MIN -4 919#define PRIO_MIN -4
828 920
829/* for Coro.pm */ 921/* for Coro.pm */
830static GV *coro_current, *coro_idle; 922static SV *coro_current;
831static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 923static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
832static int coro_nready; 924static int coro_nready;
833 925
834static void 926static void
835coro_enq (SV *sv) 927coro_enq (SV *coro_sv)
836{ 928{
837 int prio;
838
839 if (SvTYPE (sv) != SVt_PVHV)
840 croak ("Coro::ready tried to enqueue something that is not a coroutine");
841
842 prio = SvSTATE (sv)->prio;
843
844 av_push (coro_ready [prio - PRIO_MIN], sv); 929 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
845 coro_nready++; 930 coro_nready++;
846} 931}
847 932
848static SV * 933static SV *
849coro_deq (int min_prio) 934coro_deq (int min_prio)
… …
862 } 947 }
863 948
864 return 0; 949 return 0;
865} 950}
866 951
867static void 952static int
868api_ready (SV *coro) 953api_ready (SV *coro_sv)
869{ 954{
870 dTHX; 955 struct coro *coro;
871 956
872 if (SvROK (coro)) 957 if (SvROK (coro_sv))
873 coro = SvRV (coro); 958 coro_sv = SvRV (coro_sv);
959
960 coro = SvSTATE (coro_sv);
961
962 if (coro->flags & CF_READY)
963 return 0;
964
965 coro->flags |= CF_READY;
874 966
875 LOCK; 967 LOCK;
876 coro_enq (SvREFCNT_inc (coro)); 968 coro_enq (SvREFCNT_inc (coro_sv));
877 UNLOCK; 969 UNLOCK;
970
971 return 1;
972}
973
974static int
975api_is_ready (SV *coro_sv)
976{
977 return !!(SvSTATE (coro_sv)->flags & CF_READY);
878} 978}
879 979
880static void 980static void
881prepare_schedule (struct transfer_args *ta) 981prepare_schedule (struct transfer_args *ta)
882{ 982{
883 SV *current, *prev, *next; 983 SV *prev, *next;
884
885 current = GvSV (coro_current);
886 984
887 for (;;) 985 for (;;)
888 { 986 {
889 LOCK; 987 LOCK;
890 next = coro_deq (PRIO_MIN); 988 next = coro_deq (PRIO_MIN);
… …
899 ENTER; 997 ENTER;
900 SAVETMPS; 998 SAVETMPS;
901 999
902 PUSHMARK (SP); 1000 PUSHMARK (SP);
903 PUTBACK; 1001 PUTBACK;
904 call_sv (GvSV (coro_idle), G_DISCARD); 1002 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
905 1003
906 FREETMPS; 1004 FREETMPS;
907 LEAVE; 1005 LEAVE;
908 } 1006 }
909 } 1007 }
910 1008
911 prev = SvRV (current); 1009 prev = SvRV (coro_current);
912 SvRV (current) = next; 1010 SvRV_set (coro_current, next);
913 1011
914 /* free this only after the transfer */ 1012 /* free this only after the transfer */
915 LOCK; 1013 LOCK;
916 free_coro_mortal (); 1014 free_coro_mortal ();
917 UNLOCK; 1015 UNLOCK;
918 coro_mortal = prev; 1016 coro_mortal = prev;
919 1017
1018 assert (!SvROK(prev));//D
1019 assert (!SvROK(next));//D
1020
920 ta->prev = SvSTATE (prev); 1021 ta->prev = SvSTATE (prev);
921 ta->next = SvSTATE (next); 1022 ta->next = SvSTATE (next);
922 ta->flags = TRANSFER_SAVE_ALL; 1023
1024 assert (ta->next->flags & CF_READY);
1025 ta->next->flags &= ~CF_READY;
923} 1026}
924 1027
925static void 1028static void
926prepare_cede (struct transfer_args *ta) 1029prepare_cede (struct transfer_args *ta)
927{ 1030{
928 LOCK; 1031 api_ready (coro_current);
929 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current))));
930 UNLOCK;
931
932 prepare_schedule (ta); 1032 prepare_schedule (ta);
933} 1033}
934 1034
1035static int
1036prepare_cede_notself (struct transfer_args *ta)
1037{
1038 if (coro_nready)
1039 {
1040 SV *prev = SvRV (coro_current);
1041 prepare_schedule (ta);
1042 api_ready (prev);
1043 return 1;
1044 }
1045 else
1046 return 0;
1047}
1048
935static void 1049static void
936api_schedule (void) 1050api_schedule (void)
937{ 1051{
938 dTHX;
939 struct transfer_args ta; 1052 struct transfer_args ta;
940 1053
941 prepare_schedule (&ta); 1054 prepare_schedule (&ta);
942 TRANSFER (ta); 1055 TRANSFER (ta);
943} 1056}
944 1057
945static void 1058static int
946api_cede (void) 1059api_cede (void)
947{ 1060{
948 dTHX;
949 struct transfer_args ta; 1061 struct transfer_args ta;
950 1062
951 prepare_cede (&ta); 1063 prepare_cede (&ta);
1064
1065 if (ta.prev != ta.next)
1066 {
952 TRANSFER (ta); 1067 TRANSFER (ta);
1068 return 1;
1069 }
1070 else
1071 return 0;
1072}
1073
1074static int
1075api_cede_notself (void)
1076{
1077 struct transfer_args ta;
1078
1079 if (prepare_cede_notself (&ta))
1080 {
1081 TRANSFER (ta);
1082 return 1;
1083 }
1084 else
1085 return 0;
953} 1086}
954 1087
955MODULE = Coro::State PACKAGE = Coro::State 1088MODULE = Coro::State PACKAGE = Coro::State
956 1089
957PROTOTYPES: DISABLE 1090PROTOTYPES: DISABLE
… …
963#endif 1096#endif
964 BOOT_PAGESIZE; 1097 BOOT_PAGESIZE;
965 1098
966 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1099 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
967 1100
968 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 1101 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
969 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 1102 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
970 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 1103 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1104 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1105 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
971 1106
972 main_mainstack = PL_mainstack; 1107 main_mainstack = PL_mainstack;
973 1108
974 coroapi.ver = CORO_API_VERSION; 1109 coroapi.ver = CORO_API_VERSION;
975 coroapi.transfer = api_transfer; 1110 coroapi.transfer = api_transfer;
… …
985 HV *hv; 1120 HV *hv;
986 int i; 1121 int i;
987 1122
988 Newz (0, coro, 1, struct coro); 1123 Newz (0, coro, 1, struct coro);
989 coro->args = newAV (); 1124 coro->args = newAV ();
1125 coro->save = CORO_SAVE_ALL;
1126 coro->flags = CF_NEW;
990 1127
991 hv = newHV (); 1128 hv = newHV ();
992 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1129 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
993 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1130 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
994 1131
995 for (i = 1; i < items; i++) 1132 for (i = 1; i < items; i++)
996 av_push (coro->args, newSVsv (ST (i))); 1133 av_push (coro->args, newSVsv (ST (i)));
997} 1134}
998 OUTPUT: 1135 OUTPUT:
1136 RETVAL
1137
1138int
1139save (SV *coro, int new_save = -1)
1140 CODE:
1141 RETVAL = api_save (coro, new_save);
1142 OUTPUT:
999 RETVAL 1143 RETVAL
1000 1144
1001void 1145void
1002_set_stacklevel (...) 1146_set_stacklevel (...)
1003 ALIAS: 1147 ALIAS:
1004 Coro::State::transfer = 1 1148 Coro::State::transfer = 1
1005 Coro::schedule = 2 1149 Coro::schedule = 2
1006 Coro::cede = 3 1150 Coro::cede = 3
1007 Coro::Cont::yield = 4 1151 Coro::cede_notself = 4
1008 CODE: 1152 CODE:
1009{ 1153{
1010 struct transfer_args ta; 1154 struct transfer_args ta;
1011 1155
1012 switch (ix) 1156 switch (ix)
1013 { 1157 {
1014 case 0: 1158 case 0:
1015 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1159 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1016 ta.next = 0; 1160 ta.next = 0;
1017 ta.flags = TRANSFER_SET_STACKLEVEL;
1018 break; 1161 break;
1019 1162
1020 case 1: 1163 case 1:
1021 if (items != 3) 1164 if (items != 2)
1022 croak ("Coro::State::transfer(prev,next,flags) expects three arguments, not %d", items); 1165 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1023 1166
1024 prepare_transfer (&ta, ST (0), ST (1), SvIV (ST (2))); 1167 prepare_transfer (&ta, ST (0), ST (1));
1025 break; 1168 break;
1026 1169
1027 case 2: 1170 case 2:
1028 prepare_schedule (&ta); 1171 prepare_schedule (&ta);
1029 break; 1172 break;
… …
1031 case 3: 1174 case 3:
1032 prepare_cede (&ta); 1175 prepare_cede (&ta);
1033 break; 1176 break;
1034 1177
1035 case 4: 1178 case 4:
1036 { 1179 if (!prepare_cede_notself (&ta))
1037 SV *yieldstack; 1180 XSRETURN_EMPTY;
1038 SV *sv;
1039 AV *defav = GvAV (PL_defgv);
1040 1181
1041 yieldstack = *hv_fetch (
1042 (HV *)SvRV (GvSV (coro_current)),
1043 "yieldstack", sizeof ("yieldstack") - 1,
1044 0
1045 );
1046
1047 /* set up @_ -- ugly */
1048 av_clear (defav);
1049 av_fill (defav, items - 1);
1050 while (items--)
1051 av_store (defav, items, SvREFCNT_inc (ST(items)));
1052
1053 sv = av_pop ((AV *)SvRV (yieldstack));
1054 ta.prev = SvSTATE (*av_fetch ((AV *)SvRV (sv), 0, 0));
1055 ta.next = SvSTATE (*av_fetch ((AV *)SvRV (sv), 1, 0));
1056 ta.flags = 0;
1057 SvREFCNT_dec (sv);
1058 }
1059 break; 1182 break;
1060
1061 } 1183 }
1062 1184
1185 BARRIER;
1063 TRANSFER (ta); 1186 TRANSFER (ta);
1064} 1187}
1065 1188
1066void 1189void
1067_clone_state_from (SV *dst, SV *src) 1190_clone_state_from (SV *dst, SV *src)
… …
1109 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1232 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1110 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1233 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1111 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 1234 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
1112 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 1235 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
1113 1236
1114 coro_current = gv_fetchpv ("Coro::current", TRUE, SVt_PV); 1237 coro_current = get_sv ("Coro::current", FALSE);
1115 coro_idle = gv_fetchpv ("Coro::idle" , TRUE, SVt_PV); 1238 SvREADONLY_on (coro_current);
1116 1239
1117 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1240 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1118 coro_ready[i] = newAV (); 1241 coro_ready[i] = newAV ();
1119 1242
1120 { 1243 {
1121 SV *sv = perl_get_sv("Coro::API", 1); 1244 SV *sv = perl_get_sv("Coro::API", 1);
1122 1245
1123 coroapi.schedule = api_schedule; 1246 coroapi.schedule = api_schedule;
1247 coroapi.save = api_save;
1124 coroapi.cede = api_cede; 1248 coroapi.cede = api_cede;
1249 coroapi.cede_notself = api_cede_notself;
1125 coroapi.ready = api_ready; 1250 coroapi.ready = api_ready;
1251 coroapi.is_ready = api_is_ready;
1126 coroapi.nready = &coro_nready; 1252 coroapi.nready = &coro_nready;
1127 coroapi.current = coro_current; 1253 coroapi.current = coro_current;
1128 1254
1129 GCoroAPI = &coroapi; 1255 GCoroAPI = &coroapi;
1130 sv_setiv (sv, (IV)&coroapi); 1256 sv_setiv (sv, (IV)&coroapi);
1131 SvREADONLY_on (sv); 1257 SvREADONLY_on (sv);
1132 } 1258 }
1133} 1259}
1260
1261void
1262_set_current (SV *current)
1263 PROTOTYPE: $
1264 CODE:
1265 SvREFCNT_dec (SvRV (coro_current));
1266 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1134 1267
1135int 1268int
1136prio (Coro::State coro, int newprio = 0) 1269prio (Coro::State coro, int newprio = 0)
1137 ALIAS: 1270 ALIAS:
1138 nice = 1 1271 nice = 1
… …
1141 RETVAL = coro->prio; 1274 RETVAL = coro->prio;
1142 1275
1143 if (items > 1) 1276 if (items > 1)
1144 { 1277 {
1145 if (ix) 1278 if (ix)
1146 newprio += coro->prio; 1279 newprio = coro->prio - newprio;
1147 1280
1148 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 1281 if (newprio < PRIO_MIN) newprio = PRIO_MIN;
1149 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 1282 if (newprio > PRIO_MAX) newprio = PRIO_MAX;
1150 1283
1151 coro->prio = newprio; 1284 coro->prio = newprio;
1152 } 1285 }
1153} 1286}
1287 OUTPUT:
1288 RETVAL
1154 1289
1155void 1290SV *
1156ready (SV *self) 1291ready (SV *self)
1157 PROTOTYPE: $ 1292 PROTOTYPE: $
1158 CODE: 1293 CODE:
1159 api_ready (self); 1294 RETVAL = boolSV (api_ready (self));
1295 OUTPUT:
1296 RETVAL
1297
1298SV *
1299is_ready (SV *self)
1300 PROTOTYPE: $
1301 CODE:
1302 RETVAL = boolSV (api_is_ready (self));
1303 OUTPUT:
1304 RETVAL
1160 1305
1161int 1306int
1162nready (...) 1307nready (...)
1163 PROTOTYPE: 1308 PROTOTYPE:
1164 CODE: 1309 CODE:
… …
1170 1315
1171SV * 1316SV *
1172_get_state () 1317_get_state ()
1173 CODE: 1318 CODE:
1174{ 1319{
1175 struct { 1320 struct io_state *data;
1176 int errorno;
1177 int laststype;
1178 int laststatval;
1179 Stat_t statcache;
1180 } data;
1181 1321
1322 RETVAL = newSV (sizeof (struct io_state));
1323 data = (struct io_state *)SvPVX (RETVAL);
1324 SvCUR_set (RETVAL, sizeof (struct io_state));
1325 SvPOK_only (RETVAL);
1326
1182 data.errorno = errno; 1327 data->errorno = errno;
1183 data.laststype = PL_laststype; 1328 data->laststype = PL_laststype;
1184 data.laststatval = PL_laststatval; 1329 data->laststatval = PL_laststatval;
1185 data.statcache = PL_statcache; 1330 data->statcache = PL_statcache;
1186
1187 RETVAL = newSVpvn ((char *)&data, sizeof data);
1188} 1331}
1189 OUTPUT: 1332 OUTPUT:
1190 RETVAL 1333 RETVAL
1191 1334
1192void 1335void
1193_set_state (char *data_) 1336_set_state (char *data_)
1194 PROTOTYPE: $ 1337 PROTOTYPE: $
1195 CODE: 1338 CODE:
1196{ 1339{
1197 struct { 1340 struct io_state *data = (void *)data_;
1198 int errorno;
1199 int laststype;
1200 int laststatval;
1201 Stat_t statcache;
1202 } *data = (void *)data_;
1203 1341
1204 errno = data->errorno; 1342 errno = data->errorno;
1205 PL_laststype = data->laststype; 1343 PL_laststype = data->laststype;
1206 PL_laststatval = data->laststatval; 1344 PL_laststatval = data->laststatval;
1207 PL_statcache = data->statcache; 1345 PL_statcache = data->statcache;
1208} 1346}
1347

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines