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

Diff Legend

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