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.121 by root, Sat Dec 2 20:40:25 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) \
98#else 101#else
99# define LOCK (void)0 102# define LOCK (void)0
100# define UNLOCK (void)0 103# define UNLOCK (void)0
101#endif 104#endif
102 105
106struct io_state
107{
108 int errorno;
109 I32 laststype;
110 int laststatval;
111 Stat_t statcache;
112};
113
103static struct CoroAPI coroapi; 114static struct CoroAPI coroapi;
104static AV *main_mainstack; /* used to differentiate between $main and others */ 115static AV *main_mainstack; /* used to differentiate between $main and others */
105static HV *coro_state_stash, *coro_stash; 116static HV *coro_state_stash, *coro_stash;
106static SV *coro_mortal; /* will be freed after next transfer */ 117static SV *coro_mortal; /* will be freed after next transfer */
107 118
119static struct coro_cctx *cctx_first;
120static int cctx_count, cctx_idle;
121
108/* this is a structure representing a c-level coroutine */ 122/* this is a structure representing a c-level coroutine */
109typedef struct coro_cctx { 123typedef struct coro_cctx {
110 struct coro_cctx *next; 124 struct coro_cctx *next;
111 125
112 /* the stack */ 126 /* the stack */
116 /* cpu state */ 130 /* cpu state */
117 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 131 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
118 JMPENV *top_env; 132 JMPENV *top_env;
119 coro_context cctx; 133 coro_context cctx;
120 134
135 int inuse;
136
121#if USE_VALGRIND 137#if USE_VALGRIND
122 int valgrind_id; 138 int valgrind_id;
123#endif 139#endif
124} coro_cctx; 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};
125 147
126/* this is a structure representing a perl-level coroutine */ 148/* this is a structure representing a perl-level coroutine */
127struct coro { 149struct coro {
128 /* the c coroutine allocated to this perl coroutine, if any */ 150 /* the c coroutine allocated to this perl coroutine, if any */
129 coro_cctx *cctx; 151 coro_cctx *cctx;
130 152
131 /* data associated with this coroutine (initial args) */ 153 /* data associated with this coroutine (initial args) */
132 AV *args; 154 AV *args;
133 int refcnt; 155 int refcnt;
156 int flags;
134 157
135 /* optionally saved, might be zero */ 158 /* optionally saved, might be zero */
136 AV *defav; 159 AV *defav;
137 SV *defsv; 160 SV *defsv;
138 SV *errsv; 161 SV *errsv;
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)); 294#define LOAD(state) load_state ((state))
288#define SAVE(state,flags) save_state((state),(flags)); 295#define SAVE(state,flags) save_state ((state),(flags))
289 296
290#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
291 298
292static void 299static void
293load_state(Coro__State c) 300load_state (Coro__State c)
294{ 301{
295 PL_dowarn = c->dowarn; 302#define VAR(name,type) PL_ ## name = c->name;
296 PL_in_eval = c->in_eval; 303# include "state.h"
297 304#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 305
329 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 306 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
330 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 307 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
331 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 308 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
332 309
335 CV *cv; 312 CV *cv;
336 313
337 /* now do the ugly restore mess */ 314 /* now do the ugly restore mess */
338 while ((cv = (CV *)POPs)) 315 while ((cv = (CV *)POPs))
339 { 316 {
340 AV *padlist = (AV *)POPs;
341
342 if (padlist)
343 {
344 put_padlist (cv); /* mark this padlist as available */ 317 put_padlist (cv); /* mark this padlist as available */
345 CvPADLIST(cv) = padlist; 318 CvDEPTH (cv) = PTR2IV (POPs);
346 } 319 CvPADLIST (cv) = (AV *)POPs;
347
348 ++CvDEPTH(cv);
349 } 320 }
350 321
351 PUTBACK; 322 PUTBACK;
352 } 323 }
353} 324}
354 325
355static void 326static void
356save_state(Coro__State c, int flags) 327save_state (Coro__State c, int flags)
357{ 328{
358 { 329 {
359 dSP; 330 dSP;
360 I32 cxix = cxstack_ix; 331 I32 cxix = cxstack_ix;
361 PERL_CONTEXT *ccstk = cxstack; 332 PERL_CONTEXT *ccstk = cxstack;
372 { 343 {
373 while (cxix >= 0) 344 while (cxix >= 0)
374 { 345 {
375 PERL_CONTEXT *cx = &ccstk[cxix--]; 346 PERL_CONTEXT *cx = &ccstk[cxix--];
376 347
377 if (CxTYPE(cx) == CXt_SUB) 348 if (CxTYPE (cx) == CXt_SUB)
378 { 349 {
379 CV *cv = cx->blk_sub.cv; 350 CV *cv = cx->blk_sub.cv;
351
380 if (CvDEPTH(cv)) 352 if (CvDEPTH (cv))
381 { 353 {
382 EXTEND (SP, CvDEPTH(cv)*2); 354 EXTEND (SP, 3);
383 355
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)); 356 PUSHs ((SV *)CvPADLIST (cv));
357 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
392 PUSHs ((SV *)cv); 358 PUSHs ((SV *)cv);
393 359
360 CvDEPTH (cv) = 0;
394 get_padlist (cv); 361 get_padlist (cv);
395 } 362 }
396 } 363 }
397#ifdef CXt_FORMAT 364#ifdef CXt_FORMAT
398 else if (CxTYPE(cx) == CXt_FORMAT) 365 else if (CxTYPE (cx) == CXt_FORMAT)
399 { 366 {
400 /* 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? */
401 /* my bold guess is as a simple, plain sub... */ 368 /* my bold guess is as a simple, plain sub... */
402 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");
403 } 370 }
417 384
418 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;
419 c->defsv = flags & TRANSFER_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 386 c->defsv = flags & TRANSFER_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0;
420 c->errsv = flags & TRANSFER_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 387 c->errsv = flags & TRANSFER_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0;
421 388
422 c->dowarn = PL_dowarn; 389#define VAR(name,type)c->name = PL_ ## name;
423 c->in_eval = PL_in_eval; 390# include "state.h"
424 391#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} 392}
456 393
457/* 394/*
458 * allocate various perl stacks. This is an exact copy 395 * allocate various perl stacks. This is an exact copy
459 * of perl.c:init_stacks, except that it uses less memory 396 * of perl.c:init_stacks, except that it uses less memory
461 * not usually need a lot of stackspace. 398 * not usually need a lot of stackspace.
462 */ 399 */
463static void 400static void
464coro_init_stacks () 401coro_init_stacks ()
465{ 402{
466 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 403 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT));
467 PL_curstackinfo->si_type = PERLSI_MAIN; 404 PL_curstackinfo->si_type = PERLSI_MAIN;
468 PL_curstack = PL_curstackinfo->si_stack; 405 PL_curstack = PL_curstackinfo->si_stack;
469 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 406 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
470 407
471 PL_stack_base = AvARRAY(PL_curstack); 408 PL_stack_base = AvARRAY(PL_curstack);
472 PL_stack_sp = PL_stack_base; 409 PL_stack_sp = PL_stack_base;
473 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 410 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
474 411
475 New(50,PL_tmps_stack,96,SV*); 412 New(50,PL_tmps_stack,128,SV*);
476 PL_tmps_floor = -1; 413 PL_tmps_floor = -1;
477 PL_tmps_ix = -1; 414 PL_tmps_ix = -1;
478 PL_tmps_max = 96; 415 PL_tmps_max = 128;
479 416
480 New(54,PL_markstack,16,I32); 417 New(54,PL_markstack,32,I32);
481 PL_markstack_ptr = PL_markstack; 418 PL_markstack_ptr = PL_markstack;
482 PL_markstack_max = PL_markstack + 16; 419 PL_markstack_max = PL_markstack + 32;
483 420
484#ifdef SET_MARK_OFFSET 421#ifdef SET_MARK_OFFSET
485 SET_MARK_OFFSET; 422 SET_MARK_OFFSET;
486#endif 423#endif
487 424
488 New(54,PL_scopestack,16,I32); 425 New(54,PL_scopestack,32,I32);
489 PL_scopestack_ix = 0; 426 PL_scopestack_ix = 0;
490 PL_scopestack_max = 16; 427 PL_scopestack_max = 32;
491 428
492 New(54,PL_savestack,96,ANY); 429 New(54,PL_savestack,64,ANY);
493 PL_savestack_ix = 0; 430 PL_savestack_ix = 0;
494 PL_savestack_max = 96; 431 PL_savestack_max = 64;
495 432
496#if !PERL_VERSION_ATLEAST (5,9,0) 433#if !PERL_VERSION_ATLEAST (5,9,0)
497 New(54,PL_retstack,8,OP*); 434 New(54,PL_retstack,16,OP*);
498 PL_retstack_ix = 0; 435 PL_retstack_ix = 0;
499 PL_retstack_max = 8; 436 PL_retstack_max = 16;
500#endif 437#endif
501} 438}
502 439
503/* 440/*
504 * destroy the stacks, the callchain etc... 441 * destroy the stacks, the callchain etc...
557 * emulate part of the perl startup here. 494 * emulate part of the perl startup here.
558 */ 495 */
559 496
560 coro_init_stacks (); 497 coro_init_stacks ();
561 498
562 PL_curcop = 0; 499 PL_curcop = &PL_compiling;
563 PL_in_eval = 0; 500 PL_in_eval = EVAL_NULL;
564 PL_curpm = 0; 501 PL_curpm = 0;
502 PL_localizing = 0;
503 PL_dirty = 0;
504 PL_restartop = 0;
565 505
566 { 506 {
567 dSP; 507 dSP;
568 LOGOP myop; 508 LOGOP myop;
569 509
570 /* I have no idea why this is needed, but it is */
571 PUSHMARK (SP);
572
573 SvREFCNT_dec (GvAV (PL_defgv)); 510 SvREFCNT_dec (GvAV (PL_defgv));
574 GvAV (PL_defgv) = coro->args; coro->args = 0; 511 GvAV (PL_defgv) = coro->args; coro->args = 0;
575 512
576 Zero (&myop, 1, LOGOP); 513 Zero (&myop, 1, LOGOP);
577 myop.op_next = Nullop; 514 myop.op_next = Nullop;
578 myop.op_flags = OPf_WANT_VOID; 515 myop.op_flags = OPf_WANT_VOID;
579 516
517 PUSHMARK (SP);
518 XPUSHs ((SV *)get_cv ("Coro::State::_coro_init", FALSE));
519 PUTBACK;
580 PL_op = (OP *)&myop; 520 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); 521 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
586 SPAGAIN; 522 SPAGAIN;
587
588 ENTER; /* necessary e.g. for dounwind */
589 } 523 }
524
525 ENTER; /* necessary e.g. for dounwind */
590} 526}
591 527
592static void 528static void
593free_coro_mortal () 529free_coro_mortal ()
594{ 530{
597 SvREFCNT_dec (coro_mortal); 533 SvREFCNT_dec (coro_mortal);
598 coro_mortal = 0; 534 coro_mortal = 0;
599 } 535 }
600} 536}
601 537
538/* inject a fake call to Coro::State::_cctx_init into the execution */
602static void NOINLINE 539static void NOINLINE
603prepare_cctx (coro_cctx *cctx) 540prepare_cctx (coro_cctx *cctx)
604{ 541{
605 dSP; 542 dSP;
606 LOGOP myop; 543 LOGOP myop;
607 544
608 Zero (&myop, 1, LOGOP); 545 Zero (&myop, 1, LOGOP);
609 myop.op_next = PL_op; 546 myop.op_next = PL_op;
610 myop.op_flags = OPf_WANT_VOID; 547 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
611
612 sv_setiv (get_sv ("Coro::State::cctx", FALSE), PTR2IV (cctx));
613 548
614 PUSHMARK (SP); 549 PUSHMARK (SP);
550 EXTEND (SP, 2);
551 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx))));
615 XPUSHs ((SV *)get_cv ("Coro::State::cctx_init", FALSE)); 552 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
616 PUTBACK; 553 PUTBACK;
554 PL_op = (OP *)&myop;
617 PL_restartop = PL_ppaddr[OP_ENTERSUB](aTHX); 555 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
618 SPAGAIN; 556 SPAGAIN;
619} 557}
620 558
621static void 559static void
622coro_run (void *arg) 560coro_run (void *arg)
623{ 561{
624 /* coro_run is the alternative epilogue of transfer() */ 562 /* coro_run is the alternative tail of transfer(), so unlock here. */
625 UNLOCK; 563 UNLOCK;
626 564
627 /* 565 /*
628 * this is a _very_ stripped down perl interpreter ;) 566 * this is a _very_ stripped down perl interpreter ;)
629 */ 567 */
630 PL_top_env = &PL_start_env; 568 PL_top_env = &PL_start_env;
569
631 /* inject call to cctx_init */ 570 /* inject call to cctx_init */
632 prepare_cctx ((coro_cctx *)arg); 571 prepare_cctx ((coro_cctx *)arg);
633 572
634 /* somebody will hit me for both perl_run and PL_restartop */ 573 /* somebody will hit me for both perl_run and PL_restartop */
574 PL_restartop = PL_op;
635 perl_run (PL_curinterp); 575 perl_run (PL_curinterp);
636 576
637 fputs ("FATAL: C coroutine fell over the edge of the world, aborting. Did you call exit in a coroutine?\n", stderr); 577 fputs ("FATAL: C coroutine fell over the edge of the world, aborting. Did you call exit in a coroutine?\n", stderr);
638 abort (); 578 abort ();
639} 579}
641static coro_cctx * 581static coro_cctx *
642cctx_new () 582cctx_new ()
643{ 583{
644 coro_cctx *cctx; 584 coro_cctx *cctx;
645 585
586 ++cctx_count;
587
646 New (0, cctx, 1, coro_cctx); 588 New (0, cctx, 1, coro_cctx);
647 589
648#if HAVE_MMAP 590#if HAVE_MMAP
649 591
650 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; 592 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE;
651 /* mmap suppsedly does allocate-on-write for us */ 593 /* 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); 594 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
653 595
654 if (cctx->sptr == (void *)-1) 596 if (cctx->sptr == (void *)-1)
655 { 597 {
656 perror ("FATAL: unable to mmap stack for coroutine"); 598 perror ("FATAL: unable to mmap stack for coroutine");
685 627
686 return cctx; 628 return cctx;
687} 629}
688 630
689static void 631static void
690cctx_free (coro_cctx *cctx) 632cctx_destroy (coro_cctx *cctx)
691{ 633{
692 if (!cctx) 634 if (!cctx)
693 return; 635 return;
636
637 --cctx_count;
694 638
695#if USE_VALGRIND 639#if USE_VALGRIND
696 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 640 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
697#endif 641#endif
698 642
703#endif 647#endif
704 648
705 Safefree (cctx); 649 Safefree (cctx);
706} 650}
707 651
708static coro_cctx *cctx_first;
709static int cctx_count, cctx_idle;
710
711static coro_cctx * 652static coro_cctx *
712cctx_get () 653cctx_get ()
713{ 654{
714 coro_cctx *cctx; 655 coro_cctx *cctx;
715 656
716 if (cctx_first) 657 if (cctx_first)
717 { 658 {
718 --cctx_idle;
719 cctx = cctx_first; 659 cctx = cctx_first;
720 cctx_first = cctx->next; 660 cctx_first = cctx->next;
661 --cctx_idle;
721 } 662 }
722 else 663 else
723 { 664 {
724 ++cctx_count;
725 cctx = cctx_new (); 665 cctx = cctx_new ();
726 PL_op = PL_op->op_next; 666 PL_op = PL_op->op_next;
727 } 667 }
728 668
729 return cctx; 669 return cctx;
730} 670}
731 671
732static void 672static void
733cctx_put (coro_cctx *cctx) 673cctx_put (coro_cctx *cctx)
734{ 674{
675 /* free another cctx if overlimit */
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
735 ++cctx_idle; 686 ++cctx_idle;
736 cctx->next = cctx_first; 687 cctx->next = cctx_first;
737 cctx_first = cctx; 688 cctx_first = cctx;
738} 689}
739 690
748 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 699 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
749 else if (prev != next) 700 else if (prev != next)
750 { 701 {
751 coro_cctx *prev__cctx; 702 coro_cctx *prev__cctx;
752 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;
722
753 LOCK; 723 LOCK;
754 724
755 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
756 { 737 {
757 /* coroutine already started */ 738 /* coroutine already started */
758 SAVE (prev, flags); 739 SAVE (prev, flags);
759 LOAD (next); 740 LOAD (next);
760 } 741 }
761 else
762 {
763 /* need to start coroutine */
764 /* first get rid of the old state */
765 SAVE (prev, -1);
766 /* setup coroutine call */
767 setup_coro (next);
768 /* need a stack */
769 next->cctx = 0;
770 }
771
772 if (!prev->cctx)
773 /* create a new empty context */
774 Newz (0, prev->cctx, 1, coro_cctx);
775 742
776 prev__cctx = prev->cctx; 743 prev__cctx = prev->cctx;
777 744
778 /* possibly "free" the cctx */ 745 /* possibly "free" the cctx */
779 if (prev__cctx->idle_sp == STACKLEVEL) 746 if (prev__cctx->idle_sp == STACKLEVEL)
780 { 747 {
748 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
749 assert (PL_top_env == prev__cctx->top_env);
750
751 prev->cctx = 0;
752
781 cctx_put (prev__cctx); 753 cctx_put (prev__cctx);
782 prev->cctx = 0; 754 prev__cctx->inuse = 0;
783 } 755 }
784 756
785 if (!next->cctx) 757 if (!next->cctx)
758 {
786 next->cctx = cctx_get (); 759 next->cctx = cctx_get ();
760 assert (!next->cctx->inuse);
761 next->cctx->inuse = 1;
762 }
787 763
788 if (prev__cctx != next->cctx) 764 if (prev__cctx != next->cctx)
789 { 765 {
790 prev__cctx->top_env = PL_top_env; 766 prev__cctx->top_env = PL_top_env;
791 PL_top_env = next->cctx->top_env; 767 PL_top_env = next->cctx->top_env;
814 790
815 if (coro->mainstack && coro->mainstack != main_mainstack) 791 if (coro->mainstack && coro->mainstack != main_mainstack)
816 { 792 {
817 struct coro temp; 793 struct coro temp;
818 794
795 if (coro->flags & CF_RUNNING)
796 croak ("FATAL: tried to destroy currently running coroutine");
797
819 SAVE ((&temp), TRANSFER_SAVE_ALL); 798 SAVE ((&temp), TRANSFER_SAVE_ALL);
820 LOAD (coro); 799 LOAD (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 ((&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
894} 873}
895 874
896static void 875static void
897api_transfer (SV *prev, SV *next, int flags) 876api_transfer (SV *prev, SV *next, int flags)
898{ 877{
899 dTHX;
900 struct transfer_args ta; 878 struct transfer_args ta;
901 879
902 prepare_transfer (&ta, prev, next, flags); 880 prepare_transfer (&ta, prev, next, flags);
903 TRANSFER (ta); 881 TRANSFER (ta);
904} 882}
911#define PRIO_LOW -1 889#define PRIO_LOW -1
912#define PRIO_IDLE -3 890#define PRIO_IDLE -3
913#define PRIO_MIN -4 891#define PRIO_MIN -4
914 892
915/* for Coro.pm */ 893/* for Coro.pm */
916static GV *coro_current, *coro_idle; 894static SV *coro_current;
917static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 895static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
918static int coro_nready; 896static int coro_nready;
919 897
920static void 898static void
921coro_enq (SV *sv) 899coro_enq (SV *coro_sv)
922{ 900{
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); 901 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
931 coro_nready++; 902 coro_nready++;
932} 903}
933 904
934static SV * 905static SV *
935coro_deq (int min_prio) 906coro_deq (int min_prio)
948 } 919 }
949 920
950 return 0; 921 return 0;
951} 922}
952 923
953static void 924static int
954api_ready (SV *coro) 925api_ready (SV *coro_sv)
955{ 926{
956 dTHX; 927 struct coro *coro;
957 928
958 if (SvROK (coro)) 929 if (SvROK (coro_sv))
959 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;
960 943
961 LOCK; 944 LOCK;
962 coro_enq (SvREFCNT_inc (coro)); 945 coro_enq (SvREFCNT_inc (coro_sv));
963 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;
964} 955}
965 956
966static void 957static void
967prepare_schedule (struct transfer_args *ta) 958prepare_schedule (struct transfer_args *ta)
968{ 959{
969 SV *current, *prev, *next; 960 SV *prev, *next;
970
971 current = GvSV (coro_current);
972 961
973 for (;;) 962 for (;;)
974 { 963 {
975 LOCK; 964 LOCK;
976 next = coro_deq (PRIO_MIN); 965 next = coro_deq (PRIO_MIN);
985 ENTER; 974 ENTER;
986 SAVETMPS; 975 SAVETMPS;
987 976
988 PUSHMARK (SP); 977 PUSHMARK (SP);
989 PUTBACK; 978 PUTBACK;
990 call_sv (GvSV (coro_idle), G_DISCARD); 979 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
991 980
992 FREETMPS; 981 FREETMPS;
993 LEAVE; 982 LEAVE;
994 } 983 }
995 } 984 }
996 985
997 prev = SvRV (current); 986 prev = SvRV (coro_current);
998 SvRV (current) = next; 987 SvRV_set (coro_current, next);
999 988
1000 /* free this only after the transfer */ 989 /* free this only after the transfer */
1001 LOCK; 990 LOCK;
1002 free_coro_mortal (); 991 free_coro_mortal ();
1003 UNLOCK; 992 UNLOCK;
1004 coro_mortal = prev; 993 coro_mortal = prev;
1005 994
995 assert (!SvROK(prev));//D
996 assert (!SvROK(next));//D
997
1006 ta->prev = SvSTATE (prev); 998 ta->prev = SvSTATE (prev);
1007 ta->next = SvSTATE (next); 999 ta->next = SvSTATE (next);
1008 ta->flags = TRANSFER_SAVE_ALL; 1000 ta->flags = TRANSFER_SAVE_ALL;
1001
1002 assert (ta->flags & CF_READY);
1003 ta->next->flags &= ~CF_READY;
1009} 1004}
1010 1005
1011static void 1006static void
1012prepare_cede (struct transfer_args *ta) 1007prepare_cede (struct transfer_args *ta)
1013{ 1008{
1014 LOCK; 1009 api_ready (coro_current);
1015 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current))));
1016 UNLOCK;
1017 1010
1018 prepare_schedule (ta); 1011 prepare_schedule (ta);
1019} 1012}
1020 1013
1021static void 1014static void
1022api_schedule (void) 1015api_schedule (void)
1023{ 1016{
1024 dTHX;
1025 struct transfer_args ta; 1017 struct transfer_args ta;
1026 1018
1027 prepare_schedule (&ta); 1019 prepare_schedule (&ta);
1028 TRANSFER (ta); 1020 TRANSFER (ta);
1029} 1021}
1030 1022
1031static void 1023static void
1032api_cede (void) 1024api_cede (void)
1033{ 1025{
1034 dTHX;
1035 struct transfer_args ta; 1026 struct transfer_args ta;
1036 1027
1037 prepare_cede (&ta); 1028 prepare_cede (&ta);
1038 TRANSFER (ta); 1029 TRANSFER (ta);
1039} 1030}
1071 HV *hv; 1062 HV *hv;
1072 int i; 1063 int i;
1073 1064
1074 Newz (0, coro, 1, struct coro); 1065 Newz (0, coro, 1, struct coro);
1075 coro->args = newAV (); 1066 coro->args = newAV ();
1067 coro->flags = CF_NEW;
1076 1068
1077 hv = newHV (); 1069 hv = newHV ();
1078 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;
1079 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1071 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1080 1072
1088_set_stacklevel (...) 1080_set_stacklevel (...)
1089 ALIAS: 1081 ALIAS:
1090 Coro::State::transfer = 1 1082 Coro::State::transfer = 1
1091 Coro::schedule = 2 1083 Coro::schedule = 2
1092 Coro::cede = 3 1084 Coro::cede = 3
1093 Coro::Cont::yield = 4
1094 CODE: 1085 CODE:
1095{ 1086{
1096 struct transfer_args ta; 1087 struct transfer_args ta;
1097 1088
1098 switch (ix) 1089 switch (ix)
1103 ta.flags = TRANSFER_SET_STACKLEVEL; 1094 ta.flags = TRANSFER_SET_STACKLEVEL;
1104 break; 1095 break;
1105 1096
1106 case 1: 1097 case 1:
1107 if (items != 3) 1098 if (items != 3)
1108 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);
1109 1100
1110 prepare_transfer (&ta, ST (0), ST (1), SvIV (ST (2))); 1101 prepare_transfer (&ta, ST (0), ST (1), SvIV (ST (2)));
1111 break; 1102 break;
1112 1103
1113 case 2: 1104 case 2:
1115 break; 1106 break;
1116 1107
1117 case 3: 1108 case 3:
1118 prepare_cede (&ta); 1109 prepare_cede (&ta);
1119 break; 1110 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 } 1111 }
1148 1112
1149 TRANSFER (ta); 1113 TRANSFER (ta);
1150} 1114}
1151 1115
1195 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1159 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1196 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1160 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1197 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 1161 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
1198 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 1162 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
1199 1163
1200 coro_current = gv_fetchpv ("Coro::current", TRUE, SVt_PV); 1164 coro_current = get_sv ("Coro::current", FALSE);
1201 coro_idle = gv_fetchpv ("Coro::idle" , TRUE, SVt_PV); 1165 SvREADONLY_on (coro_current);
1202 1166
1203 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1167 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1204 coro_ready[i] = newAV (); 1168 coro_ready[i] = newAV ();
1205 1169
1206 { 1170 {
1207 SV *sv = perl_get_sv("Coro::API", 1); 1171 SV *sv = perl_get_sv("Coro::API", 1);
1208 1172
1209 coroapi.schedule = api_schedule; 1173 coroapi.schedule = api_schedule;
1210 coroapi.cede = api_cede; 1174 coroapi.cede = api_cede;
1211 coroapi.ready = api_ready; 1175 coroapi.ready = api_ready;
1176 coroapi.is_ready = api_is_ready;
1212 coroapi.nready = &coro_nready; 1177 coroapi.nready = &coro_nready;
1213 coroapi.current = coro_current; 1178 coroapi.current = coro_current;
1214 1179
1215 GCoroAPI = &coroapi; 1180 GCoroAPI = &coroapi;
1216 sv_setiv (sv, (IV)&coroapi); 1181 sv_setiv (sv, (IV)&coroapi);
1236 1201
1237 coro->prio = newprio; 1202 coro->prio = newprio;
1238 } 1203 }
1239} 1204}
1240 1205
1241void 1206SV *
1242ready (SV *self) 1207ready (SV *self)
1243 PROTOTYPE: $ 1208 PROTOTYPE: $
1244 CODE: 1209 CODE:
1245 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
1246 1221
1247int 1222int
1248nready (...) 1223nready (...)
1249 PROTOTYPE: 1224 PROTOTYPE:
1250 CODE: 1225 CODE:
1251 RETVAL = coro_nready; 1226 RETVAL = coro_nready;
1252 OUTPUT: 1227 OUTPUT:
1253 RETVAL 1228 RETVAL
1254 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
1255MODULE = Coro::State PACKAGE = Coro::AIO 1237MODULE = Coro::State PACKAGE = Coro::AIO
1256 1238
1257SV * 1239SV *
1258_get_state () 1240_get_state ()
1259 CODE: 1241 CODE:
1260{ 1242{
1261 struct { 1243 struct io_state *data;
1262 int errorno;
1263 int laststype;
1264 int laststatval;
1265 Stat_t statcache;
1266 } data;
1267 1244
1245 RETVAL = newSV (sizeof (struct io_state));
1246 data = (struct io_state *)SvPVX (RETVAL);
1247 SvCUR_set (RETVAL, sizeof (struct io_state));
1248 SvPOK_only (RETVAL);
1249
1268 data.errorno = errno; 1250 data->errorno = errno;
1269 data.laststype = PL_laststype; 1251 data->laststype = PL_laststype;
1270 data.laststatval = PL_laststatval; 1252 data->laststatval = PL_laststatval;
1271 data.statcache = PL_statcache; 1253 data->statcache = PL_statcache;
1272
1273 RETVAL = newSVpvn ((char *)&data, sizeof data);
1274} 1254}
1275 OUTPUT: 1255 OUTPUT:
1276 RETVAL 1256 RETVAL
1277 1257
1278void 1258void
1279_set_state (char *data_) 1259_set_state (char *data_)
1280 PROTOTYPE: $ 1260 PROTOTYPE: $
1281 CODE: 1261 CODE:
1282{ 1262{
1283 struct { 1263 struct io_state *data = (void *)data_;
1284 int errorno;
1285 int laststype;
1286 int laststatval;
1287 Stat_t statcache;
1288 } *data = (void *)data_;
1289 1264
1290 errno = data->errorno; 1265 errno = data->errorno;
1291 PL_laststype = data->laststype; 1266 PL_laststype = data->laststype;
1292 PL_laststatval = data->laststatval; 1267 PL_laststatval = data->laststatval;
1293 PL_statcache = data->statcache; 1268 PL_statcache = data->statcache;
1294} 1269}
1270

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines