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.106 by root, Mon Nov 27 02:08:55 2006 UTC vs.
Revision 1.125 by root, Mon Dec 11 20:54:45 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines