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.107 by root, Mon Nov 27 02:15:51 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
119 /* cpu state */ 130 /* cpu state */
120 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 131 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
121 JMPENV *top_env; 132 JMPENV *top_env;
122 coro_context cctx; 133 coro_context cctx;
123 134
135 int inuse;
136
124#if USE_VALGRIND 137#if USE_VALGRIND
125 int valgrind_id; 138 int valgrind_id;
126#endif 139#endif
127} 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};
128 147
129/* this is a structure representing a perl-level coroutine */ 148/* this is a structure representing a perl-level coroutine */
130struct coro { 149struct coro {
131 /* the c coroutine allocated to this perl coroutine, if any */ 150 /* the c coroutine allocated to this perl coroutine, if any */
132 coro_cctx *cctx; 151 coro_cctx *cctx;
133 152
134 /* data associated with this coroutine (initial args) */ 153 /* data associated with this coroutine (initial args) */
135 AV *args; 154 AV *args;
136 int refcnt; 155 int refcnt;
156 int flags;
137 157
138 /* optionally saved, might be zero */ 158 /* optionally saved, might be zero */
139 AV *defav; 159 AV *defav;
140 SV *defsv; 160 SV *defsv;
141 SV *errsv; 161 SV *errsv;
142 162
143 /* saved global state not related to stacks */ 163#define VAR(name,type) type name;
144 U8 dowarn; 164# include "state.h"
145 I32 in_eval; 165#undef VAR
146
147 /* the stacks and related info (callchain etc..) */
148 PERL_SI *curstackinfo;
149 AV *curstack;
150 AV *mainstack;
151 SV **stack_sp;
152 OP *op;
153 SV **curpad;
154 AV *comppad;
155 CV *compcv;
156 SV **stack_base;
157 SV **stack_max;
158 SV **tmps_stack;
159 I32 tmps_floor;
160 I32 tmps_ix;
161 I32 tmps_max;
162 I32 *markstack;
163 I32 *markstack_ptr;
164 I32 *markstack_max;
165 I32 *scopestack;
166 I32 scopestack_ix;
167 I32 scopestack_max;
168 ANY *savestack;
169 I32 savestack_ix;
170 I32 savestack_max;
171 OP **retstack;
172 I32 retstack_ix;
173 I32 retstack_max;
174 PMOP *curpm;
175 COP *curcop;
176 166
177 /* coro process data */ 167 /* coro process data */
178 int prio; 168 int prio;
179}; 169};
180 170
244 234
245#define PERL_MAGIC_coro PERL_MAGIC_ext 235#define PERL_MAGIC_coro PERL_MAGIC_ext
246 236
247static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 237static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
248 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
249/* the next two functions merely cache the padlists */ 246/* the next two functions merely cache the padlists */
250static void 247static void
251get_padlist (CV *cv) 248get_padlist (CV *cv)
252{ 249{
253 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 250 MAGIC *mg = CORO_MAGIC (cv);
251 AV *av;
254 252
255 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0) 253 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)
256 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj); 254 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
257 else 255 else
258 { 256 {
259#if 0 257#if 0
260 /* this is probably cleaner, but also slower? */ 258 /* this is probably cleaner, but also slower? */
261 CV *cp = Perl_cv_clone (cv); 259 CV *cp = Perl_cv_clone (cv);
269} 267}
270 268
271static void 269static void
272put_padlist (CV *cv) 270put_padlist (CV *cv)
273{ 271{
274 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 272 MAGIC *mg = CORO_MAGIC (cv);
273 AV *av;
275 274
276 if (!mg) 275 if (!mg)
277 { 276 {
278 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 277 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
279 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 278 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
280 mg->mg_virtual = &vtbl_coro; 279 mg->mg_virtual = &vtbl_coro;
281 mg->mg_obj = (SV *)newAV (); 280 mg->mg_obj = (SV *)newAV ();
282 } 281 }
283 282
284 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);
285} 289}
286 290
287#define SB do { 291#define SB do {
288#define SE } while (0) 292#define SE } while (0)
289 293
290#define LOAD(state) load_state((state)); 294#define LOAD(state) load_state ((state))
291#define SAVE(state,flags) save_state((state),(flags)); 295#define SAVE(state,flags) save_state ((state),(flags))
292 296
293#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
294 298
295static void 299static void
296load_state(Coro__State c) 300load_state (Coro__State c)
297{ 301{
298 PL_dowarn = c->dowarn; 302#define VAR(name,type) PL_ ## name = c->name;
299 PL_in_eval = c->in_eval; 303# include "state.h"
300 304#undef VAR
301 PL_curstackinfo = c->curstackinfo;
302 PL_curstack = c->curstack;
303 PL_mainstack = c->mainstack;
304 PL_stack_sp = c->stack_sp;
305 PL_op = c->op;
306 PL_curpad = c->curpad;
307 PL_comppad = c->comppad;
308 PL_compcv = c->compcv;
309 PL_stack_base = c->stack_base;
310 PL_stack_max = c->stack_max;
311 PL_tmps_stack = c->tmps_stack;
312 PL_tmps_floor = c->tmps_floor;
313 PL_tmps_ix = c->tmps_ix;
314 PL_tmps_max = c->tmps_max;
315 PL_markstack = c->markstack;
316 PL_markstack_ptr = c->markstack_ptr;
317 PL_markstack_max = c->markstack_max;
318 PL_scopestack = c->scopestack;
319 PL_scopestack_ix = c->scopestack_ix;
320 PL_scopestack_max = c->scopestack_max;
321 PL_savestack = c->savestack;
322 PL_savestack_ix = c->savestack_ix;
323 PL_savestack_max = c->savestack_max;
324#if !PERL_VERSION_ATLEAST (5,9,0)
325 PL_retstack = c->retstack;
326 PL_retstack_ix = c->retstack_ix;
327 PL_retstack_max = c->retstack_max;
328#endif
329 PL_curpm = c->curpm;
330 PL_curcop = c->curcop;
331 305
332 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 306 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
333 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 307 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
334 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 308 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
335 309
338 CV *cv; 312 CV *cv;
339 313
340 /* now do the ugly restore mess */ 314 /* now do the ugly restore mess */
341 while ((cv = (CV *)POPs)) 315 while ((cv = (CV *)POPs))
342 { 316 {
343 AV *padlist = (AV *)POPs;
344
345 if (padlist)
346 {
347 put_padlist (cv); /* mark this padlist as available */ 317 put_padlist (cv); /* mark this padlist as available */
348 CvPADLIST(cv) = padlist; 318 CvDEPTH (cv) = PTR2IV (POPs);
349 } 319 CvPADLIST (cv) = (AV *)POPs;
350
351 ++CvDEPTH(cv);
352 } 320 }
353 321
354 PUTBACK; 322 PUTBACK;
355 } 323 }
356} 324}
357 325
358static void 326static void
359save_state(Coro__State c, int flags) 327save_state (Coro__State c, int flags)
360{ 328{
361 { 329 {
362 dSP; 330 dSP;
363 I32 cxix = cxstack_ix; 331 I32 cxix = cxstack_ix;
364 PERL_CONTEXT *ccstk = cxstack; 332 PERL_CONTEXT *ccstk = cxstack;
375 { 343 {
376 while (cxix >= 0) 344 while (cxix >= 0)
377 { 345 {
378 PERL_CONTEXT *cx = &ccstk[cxix--]; 346 PERL_CONTEXT *cx = &ccstk[cxix--];
379 347
380 if (CxTYPE(cx) == CXt_SUB) 348 if (CxTYPE (cx) == CXt_SUB)
381 { 349 {
382 CV *cv = cx->blk_sub.cv; 350 CV *cv = cx->blk_sub.cv;
351
383 if (CvDEPTH(cv)) 352 if (CvDEPTH (cv))
384 { 353 {
385 EXTEND (SP, CvDEPTH(cv)*2); 354 EXTEND (SP, 3);
386 355
387 while (--CvDEPTH(cv))
388 {
389 /* this tells the restore code to increment CvDEPTH */
390 PUSHs (Nullsv);
391 PUSHs ((SV *)cv);
392 }
393
394 PUSHs ((SV *)CvPADLIST(cv)); 356 PUSHs ((SV *)CvPADLIST (cv));
357 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
395 PUSHs ((SV *)cv); 358 PUSHs ((SV *)cv);
396 359
360 CvDEPTH (cv) = 0;
397 get_padlist (cv); 361 get_padlist (cv);
398 } 362 }
399 } 363 }
400#ifdef CXt_FORMAT 364#ifdef CXt_FORMAT
401 else if (CxTYPE(cx) == CXt_FORMAT) 365 else if (CxTYPE (cx) == CXt_FORMAT)
402 { 366 {
403 /* 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? */
404 /* my bold guess is as a simple, plain sub... */ 368 /* my bold guess is as a simple, plain sub... */
405 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");
406 } 370 }
420 384
421 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;
422 c->defsv = flags & TRANSFER_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 386 c->defsv = flags & TRANSFER_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0;
423 c->errsv = flags & TRANSFER_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 387 c->errsv = flags & TRANSFER_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0;
424 388
425 c->dowarn = PL_dowarn; 389#define VAR(name,type)c->name = PL_ ## name;
426 c->in_eval = PL_in_eval; 390# include "state.h"
427 391#undef VAR
428 c->curstackinfo = PL_curstackinfo;
429 c->curstack = PL_curstack;
430 c->mainstack = PL_mainstack;
431 c->stack_sp = PL_stack_sp;
432 c->op = PL_op;
433 c->curpad = PL_curpad;
434 c->comppad = PL_comppad;
435 c->compcv = PL_compcv;
436 c->stack_base = PL_stack_base;
437 c->stack_max = PL_stack_max;
438 c->tmps_stack = PL_tmps_stack;
439 c->tmps_floor = PL_tmps_floor;
440 c->tmps_ix = PL_tmps_ix;
441 c->tmps_max = PL_tmps_max;
442 c->markstack = PL_markstack;
443 c->markstack_ptr = PL_markstack_ptr;
444 c->markstack_max = PL_markstack_max;
445 c->scopestack = PL_scopestack;
446 c->scopestack_ix = PL_scopestack_ix;
447 c->scopestack_max = PL_scopestack_max;
448 c->savestack = PL_savestack;
449 c->savestack_ix = PL_savestack_ix;
450 c->savestack_max = PL_savestack_max;
451#if !PERL_VERSION_ATLEAST (5,9,0)
452 c->retstack = PL_retstack;
453 c->retstack_ix = PL_retstack_ix;
454 c->retstack_max = PL_retstack_max;
455#endif
456 c->curpm = PL_curpm;
457 c->curcop = PL_curcop;
458} 392}
459 393
460/* 394/*
461 * allocate various perl stacks. This is an exact copy 395 * allocate various perl stacks. This is an exact copy
462 * of perl.c:init_stacks, except that it uses less memory 396 * of perl.c:init_stacks, except that it uses less memory
464 * not usually need a lot of stackspace. 398 * not usually need a lot of stackspace.
465 */ 399 */
466static void 400static void
467coro_init_stacks () 401coro_init_stacks ()
468{ 402{
469 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 403 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT));
470 PL_curstackinfo->si_type = PERLSI_MAIN; 404 PL_curstackinfo->si_type = PERLSI_MAIN;
471 PL_curstack = PL_curstackinfo->si_stack; 405 PL_curstack = PL_curstackinfo->si_stack;
472 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 406 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
473 407
474 PL_stack_base = AvARRAY(PL_curstack); 408 PL_stack_base = AvARRAY(PL_curstack);
475 PL_stack_sp = PL_stack_base; 409 PL_stack_sp = PL_stack_base;
476 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 410 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
477 411
478 New(50,PL_tmps_stack,96,SV*); 412 New(50,PL_tmps_stack,128,SV*);
479 PL_tmps_floor = -1; 413 PL_tmps_floor = -1;
480 PL_tmps_ix = -1; 414 PL_tmps_ix = -1;
481 PL_tmps_max = 96; 415 PL_tmps_max = 128;
482 416
483 New(54,PL_markstack,16,I32); 417 New(54,PL_markstack,32,I32);
484 PL_markstack_ptr = PL_markstack; 418 PL_markstack_ptr = PL_markstack;
485 PL_markstack_max = PL_markstack + 16; 419 PL_markstack_max = PL_markstack + 32;
486 420
487#ifdef SET_MARK_OFFSET 421#ifdef SET_MARK_OFFSET
488 SET_MARK_OFFSET; 422 SET_MARK_OFFSET;
489#endif 423#endif
490 424
491 New(54,PL_scopestack,16,I32); 425 New(54,PL_scopestack,32,I32);
492 PL_scopestack_ix = 0; 426 PL_scopestack_ix = 0;
493 PL_scopestack_max = 16; 427 PL_scopestack_max = 32;
494 428
495 New(54,PL_savestack,96,ANY); 429 New(54,PL_savestack,64,ANY);
496 PL_savestack_ix = 0; 430 PL_savestack_ix = 0;
497 PL_savestack_max = 96; 431 PL_savestack_max = 64;
498 432
499#if !PERL_VERSION_ATLEAST (5,9,0) 433#if !PERL_VERSION_ATLEAST (5,9,0)
500 New(54,PL_retstack,8,OP*); 434 New(54,PL_retstack,16,OP*);
501 PL_retstack_ix = 0; 435 PL_retstack_ix = 0;
502 PL_retstack_max = 8; 436 PL_retstack_max = 16;
503#endif 437#endif
504} 438}
505 439
506/* 440/*
507 * destroy the stacks, the callchain etc... 441 * destroy the stacks, the callchain etc...
560 * emulate part of the perl startup here. 494 * emulate part of the perl startup here.
561 */ 495 */
562 496
563 coro_init_stacks (); 497 coro_init_stacks ();
564 498
565 PL_curcop = 0; 499 PL_curcop = &PL_compiling;
566 PL_in_eval = 0; 500 PL_in_eval = EVAL_NULL;
567 PL_curpm = 0; 501 PL_curpm = 0;
502 PL_localizing = 0;
503 PL_dirty = 0;
504 PL_restartop = 0;
568 505
569 { 506 {
570 dSP; 507 dSP;
571 LOGOP myop; 508 LOGOP myop;
572 509
573 /* I have no idea why this is needed, but it is */
574 PUSHMARK (SP);
575
576 SvREFCNT_dec (GvAV (PL_defgv)); 510 SvREFCNT_dec (GvAV (PL_defgv));
577 GvAV (PL_defgv) = coro->args; coro->args = 0; 511 GvAV (PL_defgv) = coro->args; coro->args = 0;
578 512
579 Zero (&myop, 1, LOGOP); 513 Zero (&myop, 1, LOGOP);
580 myop.op_next = Nullop; 514 myop.op_next = Nullop;
581 myop.op_flags = OPf_WANT_VOID; 515 myop.op_flags = OPf_WANT_VOID;
582 516
583 PL_op = (OP *)&myop;
584
585 PUSHMARK (SP); 517 PUSHMARK (SP);
586 XPUSHs ((SV *)get_cv ("Coro::State::_coro_init", FALSE)); 518 XPUSHs ((SV *)get_cv ("Coro::State::_coro_init", FALSE));
587 PUTBACK; 519 PUTBACK;
520 PL_op = (OP *)&myop;
588 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 521 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
589 SPAGAIN; 522 SPAGAIN;
590
591 ENTER; /* necessary e.g. for dounwind */
592 } 523 }
524
525 ENTER; /* necessary e.g. for dounwind */
593} 526}
594 527
595static void 528static void
596free_coro_mortal () 529free_coro_mortal ()
597{ 530{
600 SvREFCNT_dec (coro_mortal); 533 SvREFCNT_dec (coro_mortal);
601 coro_mortal = 0; 534 coro_mortal = 0;
602 } 535 }
603} 536}
604 537
538/* inject a fake call to Coro::State::_cctx_init into the execution */
605static void NOINLINE 539static void NOINLINE
606prepare_cctx (coro_cctx *cctx) 540prepare_cctx (coro_cctx *cctx)
607{ 541{
608 dSP; 542 dSP;
609 LOGOP myop; 543 LOGOP myop;
610 544
611 Zero (&myop, 1, LOGOP); 545 Zero (&myop, 1, LOGOP);
612 myop.op_next = PL_op; 546 myop.op_next = PL_op;
613 myop.op_flags = OPf_WANT_VOID; 547 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
614
615 sv_setiv (get_sv ("Coro::State::_cctx", FALSE), PTR2IV (cctx));
616 548
617 PUSHMARK (SP); 549 PUSHMARK (SP);
550 EXTEND (SP, 2);
551 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx))));
618 XPUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 552 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
619 PUTBACK; 553 PUTBACK;
554 PL_op = (OP *)&myop;
620 PL_restartop = PL_ppaddr[OP_ENTERSUB](aTHX); 555 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
621 SPAGAIN; 556 SPAGAIN;
622} 557}
623 558
624static void 559static void
625coro_run (void *arg) 560coro_run (void *arg)
626{ 561{
627 /* coro_run is the alternative epilogue of transfer() */ 562 /* coro_run is the alternative tail of transfer(), so unlock here. */
628 UNLOCK; 563 UNLOCK;
629 564
630 /* 565 /*
631 * this is a _very_ stripped down perl interpreter ;) 566 * this is a _very_ stripped down perl interpreter ;)
632 */ 567 */
634 569
635 /* inject call to cctx_init */ 570 /* inject call to cctx_init */
636 prepare_cctx ((coro_cctx *)arg); 571 prepare_cctx ((coro_cctx *)arg);
637 572
638 /* 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;
639 perl_run (PL_curinterp); 575 perl_run (PL_curinterp);
640 576
641 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);
642 abort (); 578 abort ();
643} 579}
652 New (0, cctx, 1, coro_cctx); 588 New (0, cctx, 1, coro_cctx);
653 589
654#if HAVE_MMAP 590#if HAVE_MMAP
655 591
656 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; 592 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE;
657 /* mmap suppsedly does allocate-on-write for us */ 593 /* mmap supposedly does allocate-on-write for us */
658 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);
659 595
660 if (cctx->sptr == (void *)-1) 596 if (cctx->sptr == (void *)-1)
661 { 597 {
662 perror ("FATAL: unable to mmap stack for coroutine"); 598 perror ("FATAL: unable to mmap stack for coroutine");
691 627
692 return cctx; 628 return cctx;
693} 629}
694 630
695static void 631static void
696cctx_free (coro_cctx *cctx) 632cctx_destroy (coro_cctx *cctx)
697{ 633{
698 if (!cctx) 634 if (!cctx)
699 return; 635 return;
700 636
701 --cctx_count; 637 --cctx_count;
718{ 654{
719 coro_cctx *cctx; 655 coro_cctx *cctx;
720 656
721 if (cctx_first) 657 if (cctx_first)
722 { 658 {
723 --cctx_idle;
724 cctx = cctx_first; 659 cctx = cctx_first;
725 cctx_first = cctx->next; 660 cctx_first = cctx->next;
661 --cctx_idle;
726 } 662 }
727 else 663 else
728 { 664 {
729 cctx = cctx_new (); 665 cctx = cctx_new ();
730 PL_op = PL_op->op_next; 666 PL_op = PL_op->op_next;
734} 670}
735 671
736static void 672static void
737cctx_put (coro_cctx *cctx) 673cctx_put (coro_cctx *cctx)
738{ 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
739 ++cctx_idle; 686 ++cctx_idle;
740 cctx->next = cctx_first; 687 cctx->next = cctx_first;
741 cctx_first = cctx; 688 cctx_first = cctx;
742} 689}
743 690
752 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 699 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
753 else if (prev != next) 700 else if (prev != next)
754 { 701 {
755 coro_cctx *prev__cctx; 702 coro_cctx *prev__cctx;
756 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
757 LOCK; 723 LOCK;
758 724
759 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
760 { 737 {
761 /* coroutine already started */ 738 /* coroutine already started */
762 SAVE (prev, flags); 739 SAVE (prev, flags);
763 LOAD (next); 740 LOAD (next);
764 } 741 }
765 else
766 {
767 /* need to start coroutine */
768 /* first get rid of the old state */
769 SAVE (prev, -1);
770 /* setup coroutine call */
771 setup_coro (next);
772 /* need a stack */
773 next->cctx = 0;
774 }
775
776 if (!prev->cctx)
777 /* create a new empty context */
778 Newz (0, prev->cctx, 1, coro_cctx);
779 742
780 prev__cctx = prev->cctx; 743 prev__cctx = prev->cctx;
781 744
782 /* possibly "free" the cctx */ 745 /* possibly "free" the cctx */
783 if (prev__cctx->idle_sp == STACKLEVEL) 746 if (prev__cctx->idle_sp == STACKLEVEL)
784 { 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
785 cctx_put (prev__cctx); 753 cctx_put (prev__cctx);
786 prev->cctx = 0; 754 prev__cctx->inuse = 0;
787 } 755 }
788 756
789 if (!next->cctx) 757 if (!next->cctx)
758 {
790 next->cctx = cctx_get (); 759 next->cctx = cctx_get ();
760 assert (!next->cctx->inuse);
761 next->cctx->inuse = 1;
762 }
791 763
792 if (prev__cctx != next->cctx) 764 if (prev__cctx != next->cctx)
793 { 765 {
794 prev__cctx->top_env = PL_top_env; 766 prev__cctx->top_env = PL_top_env;
795 PL_top_env = next->cctx->top_env; 767 PL_top_env = next->cctx->top_env;
818 790
819 if (coro->mainstack && coro->mainstack != main_mainstack) 791 if (coro->mainstack && coro->mainstack != main_mainstack)
820 { 792 {
821 struct coro temp; 793 struct coro temp;
822 794
795 if (coro->flags & CF_RUNNING)
796 croak ("FATAL: tried to destroy currently running coroutine");
797
823 SAVE ((&temp), TRANSFER_SAVE_ALL); 798 SAVE ((&temp), TRANSFER_SAVE_ALL);
824 LOAD (coro); 799 LOAD (coro);
825 800
826 coro_destroy_stacks (); 801 coro_destroy_stacks ();
827 802
828 LOAD ((&temp)); /* this will get rid of defsv etc.. */ 803 LOAD ((&temp)); /* this will get rid of defsv etc.. */
829 804
830 coro->mainstack = 0; 805 coro->mainstack = 0;
831 } 806 }
832 807
833 cctx_free (coro->cctx); 808 cctx_destroy (coro->cctx);
834 SvREFCNT_dec (coro->args); 809 SvREFCNT_dec (coro->args);
835 Safefree (coro); 810 Safefree (coro);
836} 811}
837 812
838static int 813static int
898} 873}
899 874
900static void 875static void
901api_transfer (SV *prev, SV *next, int flags) 876api_transfer (SV *prev, SV *next, int flags)
902{ 877{
903 dTHX;
904 struct transfer_args ta; 878 struct transfer_args ta;
905 879
906 prepare_transfer (&ta, prev, next, flags); 880 prepare_transfer (&ta, prev, next, flags);
907 TRANSFER (ta); 881 TRANSFER (ta);
908} 882}
915#define PRIO_LOW -1 889#define PRIO_LOW -1
916#define PRIO_IDLE -3 890#define PRIO_IDLE -3
917#define PRIO_MIN -4 891#define PRIO_MIN -4
918 892
919/* for Coro.pm */ 893/* for Coro.pm */
920static GV *coro_current, *coro_idle; 894static SV *coro_current;
921static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 895static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
922static int coro_nready; 896static int coro_nready;
923 897
924static void 898static void
925coro_enq (SV *sv) 899coro_enq (SV *coro_sv)
926{ 900{
927 int prio;
928
929 if (SvTYPE (sv) != SVt_PVHV)
930 croak ("Coro::ready tried to enqueue something that is not a coroutine");
931
932 prio = SvSTATE (sv)->prio;
933
934 av_push (coro_ready [prio - PRIO_MIN], sv); 901 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
935 coro_nready++; 902 coro_nready++;
936} 903}
937 904
938static SV * 905static SV *
939coro_deq (int min_prio) 906coro_deq (int min_prio)
952 } 919 }
953 920
954 return 0; 921 return 0;
955} 922}
956 923
957static void 924static int
958api_ready (SV *coro) 925api_ready (SV *coro_sv)
959{ 926{
960 dTHX; 927 struct coro *coro;
961 928
962 if (SvROK (coro)) 929 if (SvROK (coro_sv))
963 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;
964 943
965 LOCK; 944 LOCK;
966 coro_enq (SvREFCNT_inc (coro)); 945 coro_enq (SvREFCNT_inc (coro_sv));
967 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;
968} 955}
969 956
970static void 957static void
971prepare_schedule (struct transfer_args *ta) 958prepare_schedule (struct transfer_args *ta)
972{ 959{
973 SV *current, *prev, *next; 960 SV *prev, *next;
974
975 current = GvSV (coro_current);
976 961
977 for (;;) 962 for (;;)
978 { 963 {
979 LOCK; 964 LOCK;
980 next = coro_deq (PRIO_MIN); 965 next = coro_deq (PRIO_MIN);
989 ENTER; 974 ENTER;
990 SAVETMPS; 975 SAVETMPS;
991 976
992 PUSHMARK (SP); 977 PUSHMARK (SP);
993 PUTBACK; 978 PUTBACK;
994 call_sv (GvSV (coro_idle), G_DISCARD); 979 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
995 980
996 FREETMPS; 981 FREETMPS;
997 LEAVE; 982 LEAVE;
998 } 983 }
999 } 984 }
1000 985
1001 prev = SvRV (current); 986 prev = SvRV (coro_current);
1002 SvRV (current) = next; 987 SvRV_set (coro_current, next);
1003 988
1004 /* free this only after the transfer */ 989 /* free this only after the transfer */
1005 LOCK; 990 LOCK;
1006 free_coro_mortal (); 991 free_coro_mortal ();
1007 UNLOCK; 992 UNLOCK;
1008 coro_mortal = prev; 993 coro_mortal = prev;
1009 994
995 assert (!SvROK(prev));//D
996 assert (!SvROK(next));//D
997
1010 ta->prev = SvSTATE (prev); 998 ta->prev = SvSTATE (prev);
1011 ta->next = SvSTATE (next); 999 ta->next = SvSTATE (next);
1012 ta->flags = TRANSFER_SAVE_ALL; 1000 ta->flags = TRANSFER_SAVE_ALL;
1001
1002 assert (ta->flags & CF_READY);
1003 ta->next->flags &= ~CF_READY;
1013} 1004}
1014 1005
1015static void 1006static void
1016prepare_cede (struct transfer_args *ta) 1007prepare_cede (struct transfer_args *ta)
1017{ 1008{
1018 LOCK; 1009 api_ready (coro_current);
1019 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current))));
1020 UNLOCK;
1021 1010
1022 prepare_schedule (ta); 1011 prepare_schedule (ta);
1023} 1012}
1024 1013
1025static void 1014static void
1026api_schedule (void) 1015api_schedule (void)
1027{ 1016{
1028 dTHX;
1029 struct transfer_args ta; 1017 struct transfer_args ta;
1030 1018
1031 prepare_schedule (&ta); 1019 prepare_schedule (&ta);
1032 TRANSFER (ta); 1020 TRANSFER (ta);
1033} 1021}
1034 1022
1035static void 1023static void
1036api_cede (void) 1024api_cede (void)
1037{ 1025{
1038 dTHX;
1039 struct transfer_args ta; 1026 struct transfer_args ta;
1040 1027
1041 prepare_cede (&ta); 1028 prepare_cede (&ta);
1042 TRANSFER (ta); 1029 TRANSFER (ta);
1043} 1030}
1075 HV *hv; 1062 HV *hv;
1076 int i; 1063 int i;
1077 1064
1078 Newz (0, coro, 1, struct coro); 1065 Newz (0, coro, 1, struct coro);
1079 coro->args = newAV (); 1066 coro->args = newAV ();
1067 coro->flags = CF_NEW;
1080 1068
1081 hv = newHV (); 1069 hv = newHV ();
1082 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;
1083 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1071 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1084 1072
1092_set_stacklevel (...) 1080_set_stacklevel (...)
1093 ALIAS: 1081 ALIAS:
1094 Coro::State::transfer = 1 1082 Coro::State::transfer = 1
1095 Coro::schedule = 2 1083 Coro::schedule = 2
1096 Coro::cede = 3 1084 Coro::cede = 3
1097 Coro::Cont::yield = 4
1098 CODE: 1085 CODE:
1099{ 1086{
1100 struct transfer_args ta; 1087 struct transfer_args ta;
1101 1088
1102 switch (ix) 1089 switch (ix)
1107 ta.flags = TRANSFER_SET_STACKLEVEL; 1094 ta.flags = TRANSFER_SET_STACKLEVEL;
1108 break; 1095 break;
1109 1096
1110 case 1: 1097 case 1:
1111 if (items != 3) 1098 if (items != 3)
1112 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);
1113 1100
1114 prepare_transfer (&ta, ST (0), ST (1), SvIV (ST (2))); 1101 prepare_transfer (&ta, ST (0), ST (1), SvIV (ST (2)));
1115 break; 1102 break;
1116 1103
1117 case 2: 1104 case 2:
1119 break; 1106 break;
1120 1107
1121 case 3: 1108 case 3:
1122 prepare_cede (&ta); 1109 prepare_cede (&ta);
1123 break; 1110 break;
1124
1125 case 4:
1126 {
1127 SV *yieldstack;
1128 SV *sv;
1129 AV *defav = GvAV (PL_defgv);
1130
1131 yieldstack = *hv_fetch (
1132 (HV *)SvRV (GvSV (coro_current)),
1133 "yieldstack", sizeof ("yieldstack") - 1,
1134 0
1135 );
1136
1137 /* set up @_ -- ugly */
1138 av_clear (defav);
1139 av_fill (defav, items - 1);
1140 while (items--)
1141 av_store (defav, items, SvREFCNT_inc (ST(items)));
1142
1143 sv = av_pop ((AV *)SvRV (yieldstack));
1144 ta.prev = SvSTATE (*av_fetch ((AV *)SvRV (sv), 0, 0));
1145 ta.next = SvSTATE (*av_fetch ((AV *)SvRV (sv), 1, 0));
1146 ta.flags = 0;
1147 SvREFCNT_dec (sv);
1148 }
1149 break;
1150
1151 } 1111 }
1152 1112
1153 TRANSFER (ta); 1113 TRANSFER (ta);
1154} 1114}
1155 1115
1199 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1159 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1200 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1160 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1201 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 1161 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
1202 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 1162 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
1203 1163
1204 coro_current = gv_fetchpv ("Coro::current", TRUE, SVt_PV); 1164 coro_current = get_sv ("Coro::current", FALSE);
1205 coro_idle = gv_fetchpv ("Coro::idle" , TRUE, SVt_PV); 1165 SvREADONLY_on (coro_current);
1206 1166
1207 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1167 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1208 coro_ready[i] = newAV (); 1168 coro_ready[i] = newAV ();
1209 1169
1210 { 1170 {
1211 SV *sv = perl_get_sv("Coro::API", 1); 1171 SV *sv = perl_get_sv("Coro::API", 1);
1212 1172
1213 coroapi.schedule = api_schedule; 1173 coroapi.schedule = api_schedule;
1214 coroapi.cede = api_cede; 1174 coroapi.cede = api_cede;
1215 coroapi.ready = api_ready; 1175 coroapi.ready = api_ready;
1176 coroapi.is_ready = api_is_ready;
1216 coroapi.nready = &coro_nready; 1177 coroapi.nready = &coro_nready;
1217 coroapi.current = coro_current; 1178 coroapi.current = coro_current;
1218 1179
1219 GCoroAPI = &coroapi; 1180 GCoroAPI = &coroapi;
1220 sv_setiv (sv, (IV)&coroapi); 1181 sv_setiv (sv, (IV)&coroapi);
1240 1201
1241 coro->prio = newprio; 1202 coro->prio = newprio;
1242 } 1203 }
1243} 1204}
1244 1205
1245void 1206SV *
1246ready (SV *self) 1207ready (SV *self)
1247 PROTOTYPE: $ 1208 PROTOTYPE: $
1248 CODE: 1209 CODE:
1249 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
1250 1221
1251int 1222int
1252nready (...) 1223nready (...)
1253 PROTOTYPE: 1224 PROTOTYPE:
1254 CODE: 1225 CODE:
1255 RETVAL = coro_nready; 1226 RETVAL = coro_nready;
1256 OUTPUT: 1227 OUTPUT:
1257 RETVAL 1228 RETVAL
1258 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
1259MODULE = Coro::State PACKAGE = Coro::AIO 1237MODULE = Coro::State PACKAGE = Coro::AIO
1260 1238
1261SV * 1239SV *
1262_get_state () 1240_get_state ()
1263 CODE: 1241 CODE:
1264{ 1242{
1265 struct { 1243 struct io_state *data;
1266 int errorno;
1267 int laststype;
1268 int laststatval;
1269 Stat_t statcache;
1270 } data;
1271 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
1272 data.errorno = errno; 1250 data->errorno = errno;
1273 data.laststype = PL_laststype; 1251 data->laststype = PL_laststype;
1274 data.laststatval = PL_laststatval; 1252 data->laststatval = PL_laststatval;
1275 data.statcache = PL_statcache; 1253 data->statcache = PL_statcache;
1276
1277 RETVAL = newSVpvn ((char *)&data, sizeof data);
1278} 1254}
1279 OUTPUT: 1255 OUTPUT:
1280 RETVAL 1256 RETVAL
1281 1257
1282void 1258void
1283_set_state (char *data_) 1259_set_state (char *data_)
1284 PROTOTYPE: $ 1260 PROTOTYPE: $
1285 CODE: 1261 CODE:
1286{ 1262{
1287 struct { 1263 struct io_state *data = (void *)data_;
1288 int errorno;
1289 int laststype;
1290 int laststatval;
1291 Stat_t statcache;
1292 } *data = (void *)data_;
1293 1264
1294 errno = data->errorno; 1265 errno = data->errorno;
1295 PL_laststype = data->laststype; 1266 PL_laststype = data->laststype;
1296 PL_laststatval = data->laststatval; 1267 PL_laststatval = data->laststatval;
1297 PL_statcache = data->statcache; 1268 PL_statcache = data->statcache;
1298} 1269}
1270

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines