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.145 by root, Mon Mar 12 21:40:14 2007 UTC vs.
Revision 1.156 by root, Fri Sep 21 01:10:55 2007 UTC

1#include "libcoro/coro.c" 1#include "libcoro/coro.c"
2
3#define PERL_NO_GET_CONTEXT
2 4
3#include "EXTERN.h" 5#include "EXTERN.h"
4#include "perl.h" 6#include "perl.h"
5#include "XSUB.h" 7#include "XSUB.h"
6 8
… …
127}; 129};
128 130
129static size_t coro_stacksize = CORO_STACKSIZE; 131static size_t coro_stacksize = CORO_STACKSIZE;
130static struct CoroAPI coroapi; 132static struct CoroAPI coroapi;
131static AV *main_mainstack; /* used to differentiate between $main and others */ 133static AV *main_mainstack; /* used to differentiate between $main and others */
134static JMPENV *main_top_env;
132static HV *coro_state_stash, *coro_stash; 135static HV *coro_state_stash, *coro_stash;
133static SV *coro_mortal; /* will be freed after next transfer */ 136static SV *coro_mortal; /* will be freed after next transfer */
134 137
135static struct coro_cctx *cctx_first; 138static struct coro_cctx *cctx_first;
136static int cctx_count, cctx_idle; 139static int cctx_count, cctx_idle;
… …
175 178
176 /* optionally saved, might be zero */ 179 /* optionally saved, might be zero */
177 AV *defav; /* @_ */ 180 AV *defav; /* @_ */
178 SV *defsv; /* $_ */ 181 SV *defsv; /* $_ */
179 SV *errsv; /* $@ */ 182 SV *errsv; /* $@ */
183 GV *deffh; /* default filehandle */
180 SV *irssv; /* $/ */ 184 SV *irssv; /* $/ */
181 SV *irssv_sv; /* real $/ cache */ 185 SV *irssv_sv; /* real $/ cache */
182 186
183#define VAR(name,type) type name; 187#define VAR(name,type) type name;
184# include "state.h" 188# include "state.h"
185#undef VAR 189#undef VAR
186 190
187 /* coro process data */ 191 /* coro process data */
188 int prio; 192 int prio;
193
194 /* linked list */
195 struct coro *next, *prev;
196 HV *hv; /* the perl hash associated with this coro, if any */
189}; 197};
190 198
191typedef struct coro *Coro__State; 199typedef struct coro *Coro__State;
192typedef struct coro *Coro__State_or_hashref; 200typedef struct coro *Coro__State_or_hashref;
193 201
… …
202 210
203/* for Coro.pm */ 211/* for Coro.pm */
204static SV *coro_current; 212static SV *coro_current;
205static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 213static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
206static int coro_nready; 214static int coro_nready;
215static struct coro *coro_first;
207 216
208/** lowlevel stuff **********************************************************/ 217/** lowlevel stuff **********************************************************/
209 218
210static AV * 219static AV *
211coro_clone_padlist (CV *cv) 220coro_clone_padlist (pTHX_ CV *cv)
212{ 221{
213 AV *padlist = CvPADLIST (cv); 222 AV *padlist = CvPADLIST (cv);
214 AV *newpadlist, *newpad; 223 AV *newpadlist, *newpad;
215 224
216 newpadlist = newAV (); 225 newpadlist = newAV ();
… …
228 237
229 return newpadlist; 238 return newpadlist;
230} 239}
231 240
232static void 241static void
233free_padlist (AV *padlist) 242free_padlist (pTHX_ AV *padlist)
234{ 243{
235 /* may be during global destruction */ 244 /* may be during global destruction */
236 if (SvREFCNT (padlist)) 245 if (SvREFCNT (padlist))
237 { 246 {
238 I32 i = AvFILLp (padlist); 247 I32 i = AvFILLp (padlist);
… …
259 AV *padlist; 268 AV *padlist;
260 AV *av = (AV *)mg->mg_obj; 269 AV *av = (AV *)mg->mg_obj;
261 270
262 /* casting is fun. */ 271 /* casting is fun. */
263 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 272 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
264 free_padlist (padlist); 273 free_padlist (aTHX_ padlist);
265 274
266 SvREFCNT_dec (av); 275 SvREFCNT_dec (av);
267 276
268 return 0; 277 return 0;
269} 278}
… …
279 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 288 : mg_find ((SV *)cv, PERL_MAGIC_coro) \
280 : 0 289 : 0
281 290
282/* the next two functions merely cache the padlists */ 291/* the next two functions merely cache the padlists */
283static void 292static void
284get_padlist (CV *cv) 293get_padlist (pTHX_ CV *cv)
285{ 294{
286 MAGIC *mg = CORO_MAGIC (cv); 295 MAGIC *mg = CORO_MAGIC (cv);
287 AV *av; 296 AV *av;
288 297
289 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 298 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)
… …
295 CV *cp = Perl_cv_clone (cv); 304 CV *cp = Perl_cv_clone (cv);
296 CvPADLIST (cv) = CvPADLIST (cp); 305 CvPADLIST (cv) = CvPADLIST (cp);
297 CvPADLIST (cp) = 0; 306 CvPADLIST (cp) = 0;
298 SvREFCNT_dec (cp); 307 SvREFCNT_dec (cp);
299#else 308#else
300 CvPADLIST (cv) = coro_clone_padlist (cv); 309 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
301#endif 310#endif
302 } 311 }
303} 312}
304 313
305static void 314static void
306put_padlist (CV *cv) 315put_padlist (pTHX_ CV *cv)
307{ 316{
308 MAGIC *mg = CORO_MAGIC (cv); 317 MAGIC *mg = CORO_MAGIC (cv);
309 AV *av; 318 AV *av;
310 319
311 if (!mg) 320 if (!mg)
… …
330#define SE } while (0) 339#define SE } while (0)
331 340
332#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE 341#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
333 342
334static void 343static void
335load_perl (Coro__State c) 344load_perl (pTHX_ Coro__State c)
336{ 345{
337#define VAR(name,type) PL_ ## name = c->name; 346#define VAR(name,type) PL_ ## name = c->name;
338# include "state.h" 347# include "state.h"
339#undef VAR 348#undef VAR
340 349
341 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 350 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
342 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 351 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
343 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 352 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
353 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh);
354
344 if (c->irssv) 355 if (c->irssv)
345 { 356 {
346 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv)) 357 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
358 {
347 SvREFCNT_dec (c->irssv); 359 SvREFCNT_dec (c->irssv);
360 c->irssv = 0;
361 }
348 else 362 else
349 { 363 {
350 REPLACE_SV (PL_rs, c->irssv); 364 REPLACE_SV (PL_rs, c->irssv);
351 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0); 365 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
352 sv_setsv (c->irssv_sv, PL_rs); 366 sv_setsv (c->irssv_sv, PL_rs);
… …
358 CV *cv; 372 CV *cv;
359 373
360 /* now do the ugly restore mess */ 374 /* now do the ugly restore mess */
361 while ((cv = (CV *)POPs)) 375 while ((cv = (CV *)POPs))
362 { 376 {
363 put_padlist (cv); /* mark this padlist as available */ 377 put_padlist (aTHX_ cv); /* mark this padlist as available */
364 CvDEPTH (cv) = PTR2IV (POPs); 378 CvDEPTH (cv) = PTR2IV (POPs);
365 CvPADLIST (cv) = (AV *)POPs; 379 CvPADLIST (cv) = (AV *)POPs;
366 } 380 }
367 381
368 PUTBACK; 382 PUTBACK;
369 } 383 }
370 assert (!PL_comppad || AvARRAY (PL_comppad));//D
371} 384}
372 385
373static void 386static void
374save_perl (Coro__State c) 387save_perl (pTHX_ Coro__State c)
375{ 388{
376 assert (!PL_comppad || AvARRAY (PL_comppad));//D
377 { 389 {
378 dSP; 390 dSP;
379 I32 cxix = cxstack_ix; 391 I32 cxix = cxstack_ix;
380 PERL_CONTEXT *ccstk = cxstack; 392 PERL_CONTEXT *ccstk = cxstack;
381 PERL_SI *top_si = PL_curstackinfo; 393 PERL_SI *top_si = PL_curstackinfo;
… …
392 { 404 {
393 while (cxix >= 0) 405 while (cxix >= 0)
394 { 406 {
395 PERL_CONTEXT *cx = &ccstk[cxix--]; 407 PERL_CONTEXT *cx = &ccstk[cxix--];
396 408
397 if (CxTYPE (cx) == CXt_SUB) 409 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)
398 { 410 {
399 CV *cv = cx->blk_sub.cv; 411 CV *cv = cx->blk_sub.cv;
400 412
401 if (CvDEPTH (cv)) 413 if (CvDEPTH (cv))
402 { 414 {
… …
404 PUSHs ((SV *)CvPADLIST (cv)); 416 PUSHs ((SV *)CvPADLIST (cv));
405 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 417 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
406 PUSHs ((SV *)cv); 418 PUSHs ((SV *)cv);
407 419
408 CvDEPTH (cv) = 0; 420 CvDEPTH (cv) = 0;
409 get_padlist (cv); 421 get_padlist (aTHX_ cv);
410 } 422 }
411 } 423 }
412 } 424 }
413 425
414 if (top_si->si_type == PERLSI_MAIN) 426 if (top_si->si_type == PERLSI_MAIN)
… …
423 } 435 }
424 436
425 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 437 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0;
426 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 438 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0;
427 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 439 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0;
440 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0;
428 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0; 441 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0;
429 442
430#define VAR(name,type)c->name = PL_ ## name; 443#define VAR(name,type)c->name = PL_ ## name;
431# include "state.h" 444# include "state.h"
432#undef VAR 445#undef VAR
… …
440 */ 453 */
441#if CORO_PREFER_PERL_FUNCTIONS 454#if CORO_PREFER_PERL_FUNCTIONS
442# define coro_init_stacks init_stacks 455# define coro_init_stacks init_stacks
443#else 456#else
444static void 457static void
445coro_init_stacks () 458coro_init_stacks (pTHX)
446{ 459{
447 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT)); 460 PL_curstackinfo = new_stackinfo(64, 6);
448 PL_curstackinfo->si_type = PERLSI_MAIN; 461 PL_curstackinfo->si_type = PERLSI_MAIN;
449 PL_curstack = PL_curstackinfo->si_stack; 462 PL_curstack = PL_curstackinfo->si_stack;
450 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 463 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
451 464
452 PL_stack_base = AvARRAY(PL_curstack); 465 PL_stack_base = AvARRAY(PL_curstack);
453 PL_stack_sp = PL_stack_base; 466 PL_stack_sp = PL_stack_base;
454 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 467 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
455 468
456 New(50,PL_tmps_stack,128,SV*); 469 New(50,PL_tmps_stack,64,SV*);
457 PL_tmps_floor = -1; 470 PL_tmps_floor = -1;
458 PL_tmps_ix = -1; 471 PL_tmps_ix = -1;
459 PL_tmps_max = 128; 472 PL_tmps_max = 64;
460 473
461 New(54,PL_markstack,32,I32); 474 New(54,PL_markstack,16,I32);
462 PL_markstack_ptr = PL_markstack; 475 PL_markstack_ptr = PL_markstack;
463 PL_markstack_max = PL_markstack + 32; 476 PL_markstack_max = PL_markstack + 16;
464 477
465#ifdef SET_MARK_OFFSET 478#ifdef SET_MARK_OFFSET
466 SET_MARK_OFFSET; 479 SET_MARK_OFFSET;
467#endif 480#endif
468 481
469 New(54,PL_scopestack,32,I32); 482 New(54,PL_scopestack,16,I32);
470 PL_scopestack_ix = 0; 483 PL_scopestack_ix = 0;
471 PL_scopestack_max = 32; 484 PL_scopestack_max = 16;
472 485
473 New(54,PL_savestack,64,ANY); 486 New(54,PL_savestack,64,ANY);
474 PL_savestack_ix = 0; 487 PL_savestack_ix = 0;
475 PL_savestack_max = 64; 488 PL_savestack_max = 64;
476 489
477#if !PERL_VERSION_ATLEAST (5,9,0) 490#if !PERL_VERSION_ATLEAST (5,9,0)
478 New(54,PL_retstack,16,OP*); 491 New(54,PL_retstack,4,OP*);
479 PL_retstack_ix = 0; 492 PL_retstack_ix = 0;
480 PL_retstack_max = 16; 493 PL_retstack_max = 4;
481#endif 494#endif
482} 495}
483#endif 496#endif
484 497
485/* 498/*
486 * destroy the stacks, the callchain etc... 499 * destroy the stacks, the callchain etc...
487 */ 500 */
488static void 501static void
489coro_destroy_stacks () 502coro_destroy_stacks (pTHX)
490{ 503{
491 if (!IN_DESTRUCT) 504 if (!IN_DESTRUCT)
492 { 505 {
493 /* restore all saved variables and stuff */ 506 /* restore all saved variables and stuff */
494 LEAVE_SCOPE (0); 507 LEAVE_SCOPE (0);
… …
527#if !PERL_VERSION_ATLEAST (5,9,0) 540#if !PERL_VERSION_ATLEAST (5,9,0)
528 Safefree (PL_retstack); 541 Safefree (PL_retstack);
529#endif 542#endif
530} 543}
531 544
545static size_t
546coro_rss (struct coro *coro)
547{
548 size_t rss = sizeof (coro);
549
550 if (coro->mainstack)
551 {
552 if (coro->flags & CF_RUNNING)
553 {
554 #define VAR(name,type)coro->name = PL_ ## name;
555 # include "state.h"
556 #undef VAR
557 }
558
559 rss += sizeof (coro->curstackinfo);
560 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
561 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
562 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *);
563 rss += coro->tmps_max * sizeof (SV *);
564 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32);
565 rss += coro->scopestack_max * sizeof (I32);
566 rss += coro->savestack_max * sizeof (ANY);
567
568#if !PERL_VERSION_ATLEAST (5,9,0)
569 rss += coro->retstack_max * sizeof (OP *);
570#endif
571 }
572
573 return rss;
574}
575
532/** coroutine stack handling ************************************************/ 576/** coroutine stack handling ************************************************/
533 577
534static void 578static void
535setup_coro (struct coro *coro) 579setup_coro (pTHX_ struct coro *coro)
536{ 580{
537 /* 581 /*
538 * emulate part of the perl startup here. 582 * emulate part of the perl startup here.
539 */ 583 */
540
541 coro_init_stacks (); 584 coro_init_stacks (aTHX);
542 585
543 PL_curcop = &PL_compiling; 586 PL_curcop = &PL_compiling;
544 PL_in_eval = EVAL_NULL; 587 PL_in_eval = EVAL_NULL;
545 PL_comppad = 0; 588 PL_comppad = 0;
546 PL_curpm = 0; 589 PL_curpm = 0;
… …
558 Zero (&myop, 1, LOGOP); 601 Zero (&myop, 1, LOGOP);
559 myop.op_next = Nullop; 602 myop.op_next = Nullop;
560 myop.op_flags = OPf_WANT_VOID; 603 myop.op_flags = OPf_WANT_VOID;
561 604
562 PUSHMARK (SP); 605 PUSHMARK (SP);
563 XPUSHs ((SV *)get_cv ("Coro::State::_coro_init", FALSE)); 606 XPUSHs (av_shift (GvAV (PL_defgv)));
564 PUTBACK; 607 PUTBACK;
565 PL_op = (OP *)&myop; 608 PL_op = (OP *)&myop;
566 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 609 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
567 SPAGAIN; 610 SPAGAIN;
568 } 611 }
569 612
570 ENTER; /* necessary e.g. for dounwind */ 613 ENTER; /* necessary e.g. for dounwind */
571} 614}
572 615
573static void 616static void
574free_coro_mortal () 617free_coro_mortal (pTHX)
575{ 618{
576 if (coro_mortal) 619 if (coro_mortal)
577 { 620 {
578 SvREFCNT_dec (coro_mortal); 621 SvREFCNT_dec (coro_mortal);
579 coro_mortal = 0; 622 coro_mortal = 0;
580 } 623 }
581} 624}
582 625
583/* inject a fake call to Coro::State::_cctx_init into the execution */ 626/* inject a fake call to Coro::State::_cctx_init into the execution */
627/* _cctx_init should be careful, as it could be called at almost any time */
628/* during execution of a perl program */
584static void NOINLINE 629static void NOINLINE
585prepare_cctx (coro_cctx *cctx) 630prepare_cctx (pTHX_ coro_cctx *cctx)
586{ 631{
587 dSP; 632 dSP;
588 LOGOP myop; 633 LOGOP myop;
589 634
590 Zero (&myop, 1, LOGOP); 635 Zero (&myop, 1, LOGOP);
… …
599 PL_op = (OP *)&myop; 644 PL_op = (OP *)&myop;
600 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 645 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
601 SPAGAIN; 646 SPAGAIN;
602} 647}
603 648
649/*
650 * this is a _very_ stripped down perl interpreter ;)
651 */
604static void 652static void
605coro_run (void *arg) 653coro_run (void *arg)
606{ 654{
655 dTHX;
656
607 /* coro_run is the alternative tail of transfer(), so unlock here. */ 657 /* coro_run is the alternative tail of transfer(), so unlock here. */
608 UNLOCK; 658 UNLOCK;
609 659
610 /*
611 * this is a _very_ stripped down perl interpreter ;)
612 */
613 PL_top_env = &PL_start_env; 660 PL_top_env = &PL_start_env;
614 661
615 /* inject call to cctx_init */ 662 /* inject a fake subroutine call to cctx_init */
616 prepare_cctx ((coro_cctx *)arg); 663 prepare_cctx (aTHX_ (coro_cctx *)arg);
617 664
618 /* somebody will hit me for both perl_run and PL_restartop */ 665 /* somebody or something will hit me for both perl_run and PL_restartop */
619 PL_restartop = PL_op; 666 PL_restartop = PL_op;
620 perl_run (PL_curinterp); 667 perl_run (PL_curinterp);
621 668
622 fputs ("FATAL: C coroutine fell over the edge of the world, aborting. Did you call exit in a coroutine?\n", stderr); 669 /*
623 abort (); 670 * If perl-run returns we assume exit() was being called or the coro
671 * fell off the end, which seems to be the only valid (non-bug)
672 * reason for perl_run to return. We try to exit by jumping to the
673 * bootstrap-time "top" top_env, as we cannot restore the "main"
674 * coroutine as Coro has no such concept
675 */
676 PL_top_env = main_top_env;
677 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
624} 678}
625 679
626static coro_cctx * 680static coro_cctx *
627cctx_new () 681cctx_new ()
628{ 682{
… …
692 746
693 Safefree (cctx); 747 Safefree (cctx);
694} 748}
695 749
696static coro_cctx * 750static coro_cctx *
697cctx_get () 751cctx_get (pTHX)
698{ 752{
699 while (cctx_first) 753 while (cctx_first)
700 { 754 {
701 coro_cctx *cctx = cctx_first; 755 coro_cctx *cctx = cctx_first;
702 cctx_first = cctx->next; 756 cctx_first = cctx->next;
… …
733 787
734/** coroutine switching *****************************************************/ 788/** coroutine switching *****************************************************/
735 789
736/* never call directly, always through the coro_state_transfer global variable */ 790/* never call directly, always through the coro_state_transfer global variable */
737static void NOINLINE 791static void NOINLINE
738transfer (struct coro *prev, struct coro *next) 792transfer (pTHX_ struct coro *prev, struct coro *next)
739{ 793{
740 dSTACKLEVEL; 794 dSTACKLEVEL;
741 795
742 /* sometimes transfer is only called to set idle_sp */ 796 /* sometimes transfer is only called to set idle_sp */
743 if (!next) 797 if (!next)
… …
776 if (next->flags & CF_NEW) 830 if (next->flags & CF_NEW)
777 { 831 {
778 /* need to start coroutine */ 832 /* need to start coroutine */
779 next->flags &= ~CF_NEW; 833 next->flags &= ~CF_NEW;
780 /* first get rid of the old state */ 834 /* first get rid of the old state */
781 save_perl (prev); 835 save_perl (aTHX_ prev);
782 /* setup coroutine call */ 836 /* setup coroutine call */
783 setup_coro (next); 837 setup_coro (aTHX_ next);
784 /* need a new stack */ 838 /* need a new stack */
785 assert (!next->cctx); 839 assert (!next->cctx);
786 } 840 }
787 else 841 else
788 { 842 {
789 /* coroutine already started */ 843 /* coroutine already started */
790 save_perl (prev); 844 save_perl (aTHX_ prev);
791 load_perl (next); 845 load_perl (aTHX_ next);
792 } 846 }
793 847
794 prev__cctx = prev->cctx; 848 prev__cctx = prev->cctx;
795 849
796 /* possibly "free" the cctx */ 850 /* possibly "free" the cctx */
… …
805 prev__cctx->inuse = 0; 859 prev__cctx->inuse = 0;
806 } 860 }
807 861
808 if (!next->cctx) 862 if (!next->cctx)
809 { 863 {
810 next->cctx = cctx_get (); 864 next->cctx = cctx_get (aTHX);
811 assert (!next->cctx->inuse); 865 assert (!next->cctx->inuse);
812 next->cctx->inuse = 1; 866 next->cctx->inuse = 1;
813 } 867 }
814 868
815 if (prev__cctx != next->cctx) 869 if (prev__cctx != next->cctx)
… …
817 prev__cctx->top_env = PL_top_env; 871 prev__cctx->top_env = PL_top_env;
818 PL_top_env = next->cctx->top_env; 872 PL_top_env = next->cctx->top_env;
819 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 873 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
820 } 874 }
821 875
822 free_coro_mortal (); 876 free_coro_mortal (aTHX);
823 UNLOCK; 877 UNLOCK;
824 } 878 }
825} 879}
826 880
827struct transfer_args 881struct transfer_args
828{ 882{
829 struct coro *prev, *next; 883 struct coro *prev, *next;
830}; 884};
831 885
832#define TRANSFER(ta) transfer ((ta).prev, (ta).next) 886#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next)
833 887
834/** high level stuff ********************************************************/ 888/** high level stuff ********************************************************/
835 889
836static int 890static int
837coro_state_destroy (struct coro *coro) 891coro_state_destroy (pTHX_ struct coro *coro)
838{ 892{
839 if (coro->flags & CF_DESTROYED) 893 if (coro->flags & CF_DESTROYED)
840 return 0; 894 return 0;
841 895
842 coro->flags |= CF_DESTROYED; 896 coro->flags |= CF_DESTROYED;
… …
862 temp.save = CORO_SAVE_ALL; 916 temp.save = CORO_SAVE_ALL;
863 917
864 if (coro->flags & CF_RUNNING) 918 if (coro->flags & CF_RUNNING)
865 croak ("FATAL: tried to destroy currently running coroutine"); 919 croak ("FATAL: tried to destroy currently running coroutine");
866 920
867 save_perl (&temp); 921 save_perl (aTHX_ &temp);
868 load_perl (coro); 922 load_perl (aTHX_ coro);
869 923
870 coro_destroy_stacks (); 924 coro_destroy_stacks (aTHX);
871 925
872 load_perl (&temp); /* this will get rid of defsv etc.. */ 926 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */
873 927
874 coro->mainstack = 0; 928 coro->mainstack = 0;
875 } 929 }
876 930
877 cctx_destroy (coro->cctx); 931 cctx_destroy (coro->cctx);
878 SvREFCNT_dec (coro->args); 932 SvREFCNT_dec (coro->args);
879 933
934 if (coro->next) coro->next->prev = coro->prev;
935 if (coro->prev) coro->prev->next = coro->next;
936 if (coro == coro_first) coro_first = coro->next;
937
880 return 1; 938 return 1;
881} 939}
882 940
883static int 941static int
884coro_state_free (pTHX_ SV *sv, MAGIC *mg) 942coro_state_free (pTHX_ SV *sv, MAGIC *mg)
885{ 943{
886 struct coro *coro = (struct coro *)mg->mg_ptr; 944 struct coro *coro = (struct coro *)mg->mg_ptr;
887 mg->mg_ptr = 0; 945 mg->mg_ptr = 0;
888 946
947 coro->hv = 0;
948
889 if (--coro->refcnt < 0) 949 if (--coro->refcnt < 0)
890 { 950 {
891 coro_state_destroy (coro); 951 coro_state_destroy (aTHX_ coro);
892 Safefree (coro); 952 Safefree (coro);
893 } 953 }
894 954
895 return 0; 955 return 0;
896} 956}
… …
915# define MGf_DUP 0 975# define MGf_DUP 0
916#endif 976#endif
917}; 977};
918 978
919static struct coro * 979static struct coro *
920SvSTATE (SV *coro) 980SvSTATE_ (pTHX_ SV *coro)
921{ 981{
922 HV *stash; 982 HV *stash;
923 MAGIC *mg; 983 MAGIC *mg;
924 984
925 if (SvROK (coro)) 985 if (SvROK (coro))
… …
935 995
936 mg = CORO_MAGIC (coro); 996 mg = CORO_MAGIC (coro);
937 return (struct coro *)mg->mg_ptr; 997 return (struct coro *)mg->mg_ptr;
938} 998}
939 999
1000#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
1001
940static void 1002static void
941prepare_transfer (struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1003prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
942{ 1004{
943 ta->prev = SvSTATE (prev_sv); 1005 ta->prev = SvSTATE (prev_sv);
944 ta->next = SvSTATE (next_sv); 1006 ta->next = SvSTATE (next_sv);
945} 1007}
946 1008
947static void 1009static void
948api_transfer (SV *prev_sv, SV *next_sv) 1010api_transfer (SV *prev_sv, SV *next_sv)
949{ 1011{
1012 dTHX;
950 struct transfer_args ta; 1013 struct transfer_args ta;
951 1014
952 prepare_transfer (&ta, prev_sv, next_sv); 1015 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
953 TRANSFER (ta); 1016 TRANSFER (ta);
954} 1017}
955 1018
956static int 1019static int
957api_save (SV *coro_sv, int new_save) 1020api_save (SV *coro_sv, int new_save)
958{ 1021{
1022 dTHX;
959 struct coro *coro = SvSTATE (coro_sv); 1023 struct coro *coro = SvSTATE (coro_sv);
960 int old_save = coro->save; 1024 int old_save = coro->save;
961 1025
962 if (new_save >= 0) 1026 if (new_save >= 0)
963 coro->save = new_save; 1027 coro->save = new_save;
… …
966} 1030}
967 1031
968/** Coro ********************************************************************/ 1032/** Coro ********************************************************************/
969 1033
970static void 1034static void
971coro_enq (SV *coro_sv) 1035coro_enq (pTHX_ SV *coro_sv)
972{ 1036{
973 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1037 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
974} 1038}
975 1039
976static SV * 1040static SV *
977coro_deq (int min_prio) 1041coro_deq (pTHX_ int min_prio)
978{ 1042{
979 int prio = PRIO_MAX - PRIO_MIN; 1043 int prio = PRIO_MAX - PRIO_MIN;
980 1044
981 min_prio -= PRIO_MIN; 1045 min_prio -= PRIO_MIN;
982 if (min_prio < 0) 1046 if (min_prio < 0)
… …
990} 1054}
991 1055
992static int 1056static int
993api_ready (SV *coro_sv) 1057api_ready (SV *coro_sv)
994{ 1058{
1059 dTHX;
995 struct coro *coro; 1060 struct coro *coro;
996 1061
997 if (SvROK (coro_sv)) 1062 if (SvROK (coro_sv))
998 coro_sv = SvRV (coro_sv); 1063 coro_sv = SvRV (coro_sv);
999 1064
… …
1003 return 0; 1068 return 0;
1004 1069
1005 coro->flags |= CF_READY; 1070 coro->flags |= CF_READY;
1006 1071
1007 LOCK; 1072 LOCK;
1008 coro_enq (SvREFCNT_inc (coro_sv)); 1073 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1009 ++coro_nready; 1074 ++coro_nready;
1010 UNLOCK; 1075 UNLOCK;
1011 1076
1012 return 1; 1077 return 1;
1013} 1078}
1014 1079
1015static int 1080static int
1016api_is_ready (SV *coro_sv) 1081api_is_ready (SV *coro_sv)
1017{ 1082{
1083 dTHX;
1018 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1084 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1019} 1085}
1020 1086
1021static void 1087static void
1022prepare_schedule (struct transfer_args *ta) 1088prepare_schedule (pTHX_ struct transfer_args *ta)
1023{ 1089{
1024 SV *prev_sv, *next_sv; 1090 SV *prev_sv, *next_sv;
1025 1091
1026 for (;;) 1092 for (;;)
1027 { 1093 {
1028 LOCK; 1094 LOCK;
1029 next_sv = coro_deq (PRIO_MIN); 1095 next_sv = coro_deq (aTHX_ PRIO_MIN);
1030 1096
1031 /* nothing to schedule: call the idle handler */ 1097 /* nothing to schedule: call the idle handler */
1032 if (!next_sv) 1098 if (!next_sv)
1033 { 1099 {
1034 dSP; 1100 dSP;
… …
1069 1135
1070 assert (ta->next->flags & CF_READY); 1136 assert (ta->next->flags & CF_READY);
1071 ta->next->flags &= ~CF_READY; 1137 ta->next->flags &= ~CF_READY;
1072 1138
1073 LOCK; 1139 LOCK;
1074 free_coro_mortal (); 1140 free_coro_mortal (aTHX);
1075 coro_mortal = prev_sv; 1141 coro_mortal = prev_sv;
1076 UNLOCK; 1142 UNLOCK;
1077} 1143}
1078 1144
1079static void 1145static void
1080prepare_cede (struct transfer_args *ta) 1146prepare_cede (pTHX_ struct transfer_args *ta)
1081{ 1147{
1082 api_ready (coro_current); 1148 api_ready (coro_current);
1083 prepare_schedule (ta); 1149 prepare_schedule (aTHX_ ta);
1084} 1150}
1085 1151
1086static int 1152static int
1087prepare_cede_notself (struct transfer_args *ta) 1153prepare_cede_notself (pTHX_ struct transfer_args *ta)
1088{ 1154{
1089 if (coro_nready) 1155 if (coro_nready)
1090 { 1156 {
1091 SV *prev = SvRV (coro_current); 1157 SV *prev = SvRV (coro_current);
1092 prepare_schedule (ta); 1158 prepare_schedule (aTHX_ ta);
1093 api_ready (prev); 1159 api_ready (prev);
1094 return 1; 1160 return 1;
1095 } 1161 }
1096 else 1162 else
1097 return 0; 1163 return 0;
1098} 1164}
1099 1165
1100static void 1166static void
1101api_schedule (void) 1167api_schedule (void)
1102{ 1168{
1169 dTHX;
1103 struct transfer_args ta; 1170 struct transfer_args ta;
1104 1171
1105 prepare_schedule (&ta); 1172 prepare_schedule (aTHX_ &ta);
1106 TRANSFER (ta); 1173 TRANSFER (ta);
1107} 1174}
1108 1175
1109static int 1176static int
1110api_cede (void) 1177api_cede (void)
1111{ 1178{
1179 dTHX;
1112 struct transfer_args ta; 1180 struct transfer_args ta;
1113 1181
1114 prepare_cede (&ta); 1182 prepare_cede (aTHX_ &ta);
1115 1183
1116 if (ta.prev != ta.next) 1184 if (ta.prev != ta.next)
1117 { 1185 {
1118 TRANSFER (ta); 1186 TRANSFER (ta);
1119 return 1; 1187 return 1;
… …
1123} 1191}
1124 1192
1125static int 1193static int
1126api_cede_notself (void) 1194api_cede_notself (void)
1127{ 1195{
1196 dTHX;
1128 struct transfer_args ta; 1197 struct transfer_args ta;
1129 1198
1130 if (prepare_cede_notself (&ta)) 1199 if (prepare_cede_notself (aTHX_ &ta))
1131 { 1200 {
1132 TRANSFER (ta); 1201 TRANSFER (ta);
1133 return 1; 1202 return 1;
1134 } 1203 }
1135 else 1204 else
… …
1151 1220
1152 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV)); 1221 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1153 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV)); 1222 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1154 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV)); 1223 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1155 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV)); 1224 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1225 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1226 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1156 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL)); 1227 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1157 1228
1158 main_mainstack = PL_mainstack; 1229 main_mainstack = PL_mainstack;
1230 main_top_env = PL_top_env;
1231
1232 while (main_top_env->je_prev)
1233 main_top_env = main_top_env->je_prev;
1159 1234
1160 coroapi.ver = CORO_API_VERSION; 1235 coroapi.ver = CORO_API_VERSION;
1161 coroapi.transfer = api_transfer; 1236 coroapi.transfer = api_transfer;
1162 1237
1163 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1238 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
… …
1171 HV *hv; 1246 HV *hv;
1172 int i; 1247 int i;
1173 1248
1174 Newz (0, coro, 1, struct coro); 1249 Newz (0, coro, 1, struct coro);
1175 coro->args = newAV (); 1250 coro->args = newAV ();
1176 coro->save = CORO_SAVE_ALL; 1251 coro->save = CORO_SAVE_DEF;
1177 coro->flags = CF_NEW; 1252 coro->flags = CF_NEW;
1178 1253
1254 if (coro_first) coro_first->prev = coro;
1255 coro->next = coro_first;
1256 coro_first = coro;
1257
1179 hv = newHV (); 1258 coro->hv = hv = newHV ();
1180 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1259 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1181 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1260 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1182 1261
1183 for (i = 1; i < items; i++) 1262 for (i = 1; i < items; i++)
1184 av_push (coro->args, newSVsv (ST (i))); 1263 av_push (coro->args, newSVsv (ST (i)));
… …
1188 1267
1189int 1268int
1190save (SV *coro, int new_save = -1) 1269save (SV *coro, int new_save = -1)
1191 CODE: 1270 CODE:
1192 RETVAL = api_save (coro, new_save); 1271 RETVAL = api_save (coro, new_save);
1272 OUTPUT:
1273 RETVAL
1274
1275int
1276save_also (SV *coro_sv, int save_also)
1277 CODE:
1278{
1279 struct coro *coro = SvSTATE (coro_sv);
1280 RETVAL = coro->save;
1281 coro->save |= save_also;
1282}
1193 OUTPUT: 1283 OUTPUT:
1194 RETVAL 1284 RETVAL
1195 1285
1196void 1286void
1197_set_stacklevel (...) 1287_set_stacklevel (...)
… …
1213 1303
1214 case 1: 1304 case 1:
1215 if (items != 2) 1305 if (items != 2)
1216 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items); 1306 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1217 1307
1218 prepare_transfer (&ta, ST (0), ST (1)); 1308 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1219 break; 1309 break;
1220 1310
1221 case 2: 1311 case 2:
1222 prepare_schedule (&ta); 1312 prepare_schedule (aTHX_ &ta);
1223 break; 1313 break;
1224 1314
1225 case 3: 1315 case 3:
1226 prepare_cede (&ta); 1316 prepare_cede (aTHX_ &ta);
1227 break; 1317 break;
1228 1318
1229 case 4: 1319 case 4:
1230 if (!prepare_cede_notself (&ta)) 1320 if (!prepare_cede_notself (aTHX_ &ta))
1231 XSRETURN_EMPTY; 1321 XSRETURN_EMPTY;
1232 1322
1233 break; 1323 break;
1234 } 1324 }
1235 1325
… …
1241} 1331}
1242 1332
1243bool 1333bool
1244_destroy (SV *coro_sv) 1334_destroy (SV *coro_sv)
1245 CODE: 1335 CODE:
1246 RETVAL = coro_state_destroy (SvSTATE (coro_sv)); 1336 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1247 OUTPUT: 1337 OUTPUT:
1248 RETVAL 1338 RETVAL
1249 1339
1250void 1340void
1251_exit (code) 1341_exit (code)
… …
1275 CODE: 1365 CODE:
1276 RETVAL = cctx_idle; 1366 RETVAL = cctx_idle;
1277 OUTPUT: 1367 OUTPUT:
1278 RETVAL 1368 RETVAL
1279 1369
1370void
1371list ()
1372 PPCODE:
1373{
1374 struct coro *coro;
1375 for (coro = coro_first; coro; coro = coro->next)
1376 if (coro->hv)
1377 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
1378}
1379
1380void
1381_eval (Coro::State coro, SV *coderef)
1382 CODE:
1383{
1384 if (coro->mainstack)
1385 {
1386 struct coro temp;
1387 Zero (&temp, 1, struct coro);
1388 temp.save = CORO_SAVE_ALL;
1389
1390 if (!(coro->flags & CF_RUNNING))
1391 {
1392 save_perl (aTHX_ &temp);
1393 load_perl (aTHX_ coro);
1394 }
1395
1396 {
1397 dSP;
1398 ENTER;
1399 SAVETMPS;
1400 PUSHMARK (SP);
1401 PUTBACK;
1402 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1403 SPAGAIN;
1404 FREETMPS;
1405 LEAVE;
1406 PUTBACK;
1407 }
1408
1409 if (!(coro->flags & CF_RUNNING))
1410 {
1411 save_perl (aTHX_ coro);
1412 load_perl (aTHX_ &temp);
1413 }
1414 }
1415}
1416
1417SV *
1418is_ready (Coro::State coro)
1419 PROTOTYPE: $
1420 ALIAS:
1421 is_ready = CF_READY
1422 is_running = CF_RUNNING
1423 is_new = CF_NEW
1424 is_destroyed = CF_DESTROYED
1425 CODE:
1426 RETVAL = boolSV (coro->flags & ix);
1427 OUTPUT:
1428 RETVAL
1429
1430IV
1431rss (Coro::State coro)
1432 PROTOTYPE: $
1433 CODE:
1434 RETVAL = coro_rss (coro);
1435 OUTPUT:
1436 RETVAL
1437
1438
1280MODULE = Coro::State PACKAGE = Coro 1439MODULE = Coro::State PACKAGE = Coro
1281 1440
1282BOOT: 1441BOOT:
1283{ 1442{
1284 int i; 1443 int i;
… …
1351 CODE: 1510 CODE:
1352 RETVAL = boolSV (api_ready (self)); 1511 RETVAL = boolSV (api_ready (self));
1353 OUTPUT: 1512 OUTPUT:
1354 RETVAL 1513 RETVAL
1355 1514
1356SV *
1357is_ready (SV *self)
1358 PROTOTYPE: $
1359 CODE:
1360 RETVAL = boolSV (api_is_ready (self));
1361 OUTPUT:
1362 RETVAL
1363
1364int 1515int
1365nready (...) 1516nready (...)
1366 PROTOTYPE: 1517 PROTOTYPE:
1367 CODE: 1518 CODE:
1368 RETVAL = coro_nready; 1519 RETVAL = coro_nready;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines