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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines