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.100 by root, Mon Nov 27 00:07:49 2006 UTC vs.
Revision 1.120 by root, Sat Dec 2 18:01:30 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines