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.97 by root, Sun Nov 26 21:21:14 2006 UTC vs.
Revision 1.107 by root, Mon Nov 27 02:15:51 2006 UTC

1#define PERL_NO_GET_CONTEXT
2
3#include "libcoro/coro.c" 1#include "libcoro/coro.c"
4 2
5#include "EXTERN.h" 3#include "EXTERN.h"
6#include "perl.h" 4#include "perl.h"
7#include "XSUB.h" 5#include "XSUB.h"
8 6
9#include "patchlevel.h" 7#include "patchlevel.h"
10 8
11#if PERL_VERSION < 6 9#if USE_VALGRIND
10# include <valgrind/valgrind.h>
11#endif
12
13#define PERL_VERSION_ATLEAST(a,b,c) \
14 (PERL_REVISION > (a) \
15 || (PERL_REVISION == (a) \
16 && (PERL_VERSION > (b) \
17 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c)))))
18
19#if !PERL_VERSION_ATLEAST (5,6,0)
12# ifndef PL_ppaddr 20# ifndef PL_ppaddr
13# define PL_ppaddr ppaddr 21# define PL_ppaddr ppaddr
14# endif 22# endif
15# ifndef call_sv 23# ifndef call_sv
16# define call_sv perl_call_sv 24# define call_sv perl_call_sv
… …
54# ifndef PAGESIZE 62# ifndef PAGESIZE
55# define PAGESIZE pagesize 63# define PAGESIZE pagesize
56# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE) 64# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
57static long pagesize; 65static long pagesize;
58# else 66# else
59# define BOOT_PAGESIZE 67# define BOOT_PAGESIZE (void)0
60# endif 68# endif
69#else
70# define PAGESIZE 0
71# define BOOT_PAGESIZE (void)0
61#endif 72#endif
62 73
63/* The next macro should declare a variable stacklevel that contains and approximation 74/* The next macro should declare a variable stacklevel that contains and approximation
64 * to the current C stack pointer. Its property is that it changes with each call 75 * to the current C stack pointer. Its property is that it changes with each call
65 * and should be unique. */ 76 * and should be unique. */
66#define dSTACKLEVEL int stacklevel 77#define dSTACKLEVEL int stacklevel
67#define STACKLEVEL ((void *)&stacklevel) 78#define STACKLEVEL ((void *)&stacklevel)
68 79
69#define IN_DESTRUCT (PL_main_cv == Nullcv) 80#define IN_DESTRUCT (PL_main_cv == Nullcv)
81
82#if __GNUC__ >= 3
83# define attribute(x) __attribute__(x)
84#else
85# define attribute(x)
86#endif
87
88#define NOINLINE attribute ((noinline))
70 89
71#include "CoroAPI.h" 90#include "CoroAPI.h"
72 91
73#define TRANSFER_SET_STACKLEVEL 0x8bfbfbfb /* magic cookie */ 92#define TRANSFER_SET_STACKLEVEL 0x8bfbfbfb /* magic cookie */
74 93
… …
84static struct CoroAPI coroapi; 103static struct CoroAPI coroapi;
85static AV *main_mainstack; /* used to differentiate between $main and others */ 104static AV *main_mainstack; /* used to differentiate between $main and others */
86static HV *coro_state_stash, *coro_stash; 105static HV *coro_state_stash, *coro_stash;
87static SV *coro_mortal; /* will be freed after next transfer */ 106static SV *coro_mortal; /* will be freed after next transfer */
88 107
108static struct coro_cctx *cctx_first;
109static int cctx_count, cctx_idle;
110
89/* this is a structure representing a c-level coroutine */ 111/* this is a structure representing a c-level coroutine */
90typedef struct coro_stack { 112typedef struct coro_cctx {
91 struct coro_stack *next; 113 struct coro_cctx *next;
92 114
93 /* the stack */ 115 /* the stack */
94 void *sptr; 116 void *sptr;
95 long ssize; /* positive == mmap, otherwise malloc */ 117 long ssize; /* positive == mmap, otherwise malloc */
96 118
97 /* cpu state */ 119 /* cpu state */
98 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 120 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
99 JMPENV *top_env; 121 JMPENV *top_env;
100 coro_context cctx; 122 coro_context cctx;
101} coro_stack; 123
124#if USE_VALGRIND
125 int valgrind_id;
126#endif
127} coro_cctx;
102 128
103/* this is a structure representing a perl-level coroutine */ 129/* this is a structure representing a perl-level coroutine */
104struct coro { 130struct coro {
105 /* the c coroutine allocated to this perl coroutine, if any */ 131 /* the c coroutine allocated to this perl coroutine, if any */
106 coro_stack *stack; 132 coro_cctx *cctx;
107 133
108 /* data associated with this coroutine (initial args) */ 134 /* data associated with this coroutine (initial args) */
109 AV *args; 135 AV *args;
110 int refcnt; 136 int refcnt;
111 137
… …
154 180
155typedef struct coro *Coro__State; 181typedef struct coro *Coro__State;
156typedef struct coro *Coro__State_or_hashref; 182typedef struct coro *Coro__State_or_hashref;
157 183
158static AV * 184static AV *
159coro_clone_padlist (pTHX_ CV *cv) 185coro_clone_padlist (CV *cv)
160{ 186{
161 AV *padlist = CvPADLIST (cv); 187 AV *padlist = CvPADLIST (cv);
162 AV *newpadlist, *newpad; 188 AV *newpadlist, *newpad;
163 189
164 newpadlist = newAV (); 190 newpadlist = newAV ();
165 AvREAL_off (newpadlist); 191 AvREAL_off (newpadlist);
166#if PERL_VERSION < 9 192#if PERL_VERSION_ATLEAST (5,9,0)
193 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
194#else
167 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 195 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
168#else
169 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
170#endif 196#endif
171 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 197 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
172 --AvFILLp (padlist); 198 --AvFILLp (padlist);
173 199
174 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 200 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE)));
… …
176 202
177 return newpadlist; 203 return newpadlist;
178} 204}
179 205
180static void 206static void
181free_padlist (pTHX_ AV *padlist) 207free_padlist (AV *padlist)
182{ 208{
183 /* may be during global destruction */ 209 /* may be during global destruction */
184 if (SvREFCNT (padlist)) 210 if (SvREFCNT (padlist))
185 { 211 {
186 I32 i = AvFILLp (padlist); 212 I32 i = AvFILLp (padlist);
… …
207 AV *padlist; 233 AV *padlist;
208 AV *av = (AV *)mg->mg_obj; 234 AV *av = (AV *)mg->mg_obj;
209 235
210 /* casting is fun. */ 236 /* casting is fun. */
211 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 237 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
212 free_padlist (aTHX_ padlist); 238 free_padlist (padlist);
213 239
214 SvREFCNT_dec (av); 240 SvREFCNT_dec (av);
215 241
216 return 0; 242 return 0;
217} 243}
… …
220 246
221static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 247static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
222 248
223/* the next two functions merely cache the padlists */ 249/* the next two functions merely cache the padlists */
224static void 250static void
225get_padlist (pTHX_ CV *cv) 251get_padlist (CV *cv)
226{ 252{
227 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 253 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
228 254
229 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0) 255 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
230 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj); 256 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
231 else 257 else
232 { 258 {
233#if 0 259#if 0
234 /* this is probably cleaner, but also slower? */ 260 /* this is probably cleaner, but also slower? */
235 CV *cp = Perl_cv_clone (aTHX_ cv); 261 CV *cp = Perl_cv_clone (cv);
236 CvPADLIST (cv) = CvPADLIST (cp); 262 CvPADLIST (cv) = CvPADLIST (cp);
237 CvPADLIST (cp) = 0; 263 CvPADLIST (cp) = 0;
238 SvREFCNT_dec (cp); 264 SvREFCNT_dec (cp);
239#else 265#else
240 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 266 CvPADLIST (cv) = coro_clone_padlist (cv);
241#endif 267#endif
242 } 268 }
243} 269}
244 270
245static void 271static void
246put_padlist (pTHX_ CV *cv) 272put_padlist (CV *cv)
247{ 273{
248 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 274 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
249 275
250 if (!mg) 276 if (!mg)
251 { 277 {
… …
259} 285}
260 286
261#define SB do { 287#define SB do {
262#define SE } while (0) 288#define SE } while (0)
263 289
264#define LOAD(state) load_state(aTHX_ (state)); 290#define LOAD(state) load_state((state));
265#define SAVE(state,flags) save_state(aTHX_ (state),(flags)); 291#define SAVE(state,flags) save_state((state),(flags));
266 292
267#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE 293#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE
268 294
269static void 295static void
270load_state(pTHX_ Coro__State c) 296load_state(Coro__State c)
271{ 297{
272 PL_dowarn = c->dowarn; 298 PL_dowarn = c->dowarn;
273 PL_in_eval = c->in_eval; 299 PL_in_eval = c->in_eval;
274 300
275 PL_curstackinfo = c->curstackinfo; 301 PL_curstackinfo = c->curstackinfo;
… …
293 PL_scopestack_ix = c->scopestack_ix; 319 PL_scopestack_ix = c->scopestack_ix;
294 PL_scopestack_max = c->scopestack_max; 320 PL_scopestack_max = c->scopestack_max;
295 PL_savestack = c->savestack; 321 PL_savestack = c->savestack;
296 PL_savestack_ix = c->savestack_ix; 322 PL_savestack_ix = c->savestack_ix;
297 PL_savestack_max = c->savestack_max; 323 PL_savestack_max = c->savestack_max;
298#if PERL_VERSION < 9 324#if !PERL_VERSION_ATLEAST (5,9,0)
299 PL_retstack = c->retstack; 325 PL_retstack = c->retstack;
300 PL_retstack_ix = c->retstack_ix; 326 PL_retstack_ix = c->retstack_ix;
301 PL_retstack_max = c->retstack_max; 327 PL_retstack_max = c->retstack_max;
302#endif 328#endif
303 PL_curpm = c->curpm; 329 PL_curpm = c->curpm;
… …
316 { 342 {
317 AV *padlist = (AV *)POPs; 343 AV *padlist = (AV *)POPs;
318 344
319 if (padlist) 345 if (padlist)
320 { 346 {
321 put_padlist (aTHX_ cv); /* mark this padlist as available */ 347 put_padlist (cv); /* mark this padlist as available */
322 CvPADLIST(cv) = padlist; 348 CvPADLIST(cv) = padlist;
323 } 349 }
324 350
325 ++CvDEPTH(cv); 351 ++CvDEPTH(cv);
326 } 352 }
… …
328 PUTBACK; 354 PUTBACK;
329 } 355 }
330} 356}
331 357
332static void 358static void
333save_state(pTHX_ Coro__State c, int flags) 359save_state(Coro__State c, int flags)
334{ 360{
335 { 361 {
336 dSP; 362 dSP;
337 I32 cxix = cxstack_ix; 363 I32 cxix = cxstack_ix;
338 PERL_CONTEXT *ccstk = cxstack; 364 PERL_CONTEXT *ccstk = cxstack;
… …
366 } 392 }
367 393
368 PUSHs ((SV *)CvPADLIST(cv)); 394 PUSHs ((SV *)CvPADLIST(cv));
369 PUSHs ((SV *)cv); 395 PUSHs ((SV *)cv);
370 396
371 get_padlist (aTHX_ cv); 397 get_padlist (cv);
372 } 398 }
373 } 399 }
374#ifdef CXt_FORMAT 400#ifdef CXt_FORMAT
375 else if (CxTYPE(cx) == CXt_FORMAT) 401 else if (CxTYPE(cx) == CXt_FORMAT)
376 { 402 {
… …
420 c->scopestack_ix = PL_scopestack_ix; 446 c->scopestack_ix = PL_scopestack_ix;
421 c->scopestack_max = PL_scopestack_max; 447 c->scopestack_max = PL_scopestack_max;
422 c->savestack = PL_savestack; 448 c->savestack = PL_savestack;
423 c->savestack_ix = PL_savestack_ix; 449 c->savestack_ix = PL_savestack_ix;
424 c->savestack_max = PL_savestack_max; 450 c->savestack_max = PL_savestack_max;
425#if PERL_VERSION < 9 451#if !PERL_VERSION_ATLEAST (5,9,0)
426 c->retstack = PL_retstack; 452 c->retstack = PL_retstack;
427 c->retstack_ix = PL_retstack_ix; 453 c->retstack_ix = PL_retstack_ix;
428 c->retstack_max = PL_retstack_max; 454 c->retstack_max = PL_retstack_max;
429#endif 455#endif
430 c->curpm = PL_curpm; 456 c->curpm = PL_curpm;
… …
436 * of perl.c:init_stacks, except that it uses less memory 462 * of perl.c:init_stacks, except that it uses less memory
437 * on the (sometimes correct) assumption that coroutines do 463 * on the (sometimes correct) assumption that coroutines do
438 * not usually need a lot of stackspace. 464 * not usually need a lot of stackspace.
439 */ 465 */
440static void 466static void
441coro_init_stacks (pTHX) 467coro_init_stacks ()
442{ 468{
443 LOCK;
444
445 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 469 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
446 PL_curstackinfo->si_type = PERLSI_MAIN; 470 PL_curstackinfo->si_type = PERLSI_MAIN;
447 PL_curstack = PL_curstackinfo->si_stack; 471 PL_curstack = PL_curstackinfo->si_stack;
448 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 472 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
449 473
… …
470 494
471 New(54,PL_savestack,96,ANY); 495 New(54,PL_savestack,96,ANY);
472 PL_savestack_ix = 0; 496 PL_savestack_ix = 0;
473 PL_savestack_max = 96; 497 PL_savestack_max = 96;
474 498
475#if PERL_VERSION < 9 499#if !PERL_VERSION_ATLEAST (5,9,0)
476 New(54,PL_retstack,8,OP*); 500 New(54,PL_retstack,8,OP*);
477 PL_retstack_ix = 0; 501 PL_retstack_ix = 0;
478 PL_retstack_max = 8; 502 PL_retstack_max = 8;
479#endif 503#endif
480
481 UNLOCK;
482} 504}
483 505
484/* 506/*
485 * destroy the stacks, the callchain etc... 507 * destroy the stacks, the callchain etc...
486 */ 508 */
487static void 509static void
488destroy_stacks(pTHX) 510coro_destroy_stacks ()
489{ 511{
490 if (!IN_DESTRUCT) 512 if (!IN_DESTRUCT)
491 { 513 {
492 /* is this ugly, I ask? */ 514 /* is this ugly, I ask? */
493 LEAVE_SCOPE (0); 515 LEAVE_SCOPE (0);
… …
524 546
525 Safefree (PL_tmps_stack); 547 Safefree (PL_tmps_stack);
526 Safefree (PL_markstack); 548 Safefree (PL_markstack);
527 Safefree (PL_scopestack); 549 Safefree (PL_scopestack);
528 Safefree (PL_savestack); 550 Safefree (PL_savestack);
529#if PERL_VERSION < 9 551#if !PERL_VERSION_ATLEAST (5,9,0)
530 Safefree (PL_retstack); 552 Safefree (PL_retstack);
531#endif 553#endif
532} 554}
533 555
534static void 556static void
535setup_coro (struct coro *coro) 557setup_coro (struct coro *coro)
536{ 558{
537 /* 559 /*
538 * emulate part of the perl startup here. 560 * emulate part of the perl startup here.
539 */ 561 */
540 dTHX;
541 dSP;
542 UNOP myop;
543 SV *sub_init = (SV *)get_cv ("Coro::State::coro_init", FALSE);
544 562
545 coro_init_stacks (aTHX); 563 coro_init_stacks ();
564
546 /*PL_curcop = 0;*/ 565 PL_curcop = 0;
547 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 566 PL_in_eval = 0;
567 PL_curpm = 0;
568
569 {
570 dSP;
571 LOGOP myop;
572
573 /* I have no idea why this is needed, but it is */
574 PUSHMARK (SP);
575
548 SvREFCNT_dec (GvAV (PL_defgv)); 576 SvREFCNT_dec (GvAV (PL_defgv));
549 GvAV (PL_defgv) = coro->args; coro->args = 0; 577 GvAV (PL_defgv) = coro->args; coro->args = 0;
550 578
551 SPAGAIN;
552
553 Zero (&myop, 1, UNOP); 579 Zero (&myop, 1, LOGOP);
554 myop.op_next = Nullop; 580 myop.op_next = Nullop;
555 myop.op_flags = OPf_WANT_VOID; 581 myop.op_flags = OPf_WANT_VOID;
556 582
557 PL_op = (OP *)&myop; 583 PL_op = (OP *)&myop;
558 584
559 PUSHMARK(SP); 585 PUSHMARK (SP);
560 XPUSHs (sub_init); 586 XPUSHs ((SV *)get_cv ("Coro::State::_coro_init", FALSE));
561 PUTBACK; 587 PUTBACK;
562 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 588 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
563 SPAGAIN; 589 SPAGAIN;
564 590
565 ENTER; /* necessary e.g. for dounwind */ 591 ENTER; /* necessary e.g. for dounwind */
592 }
566} 593}
567 594
568static void 595static void
569free_coro_mortal () 596free_coro_mortal ()
570{ 597{
571 if (coro_mortal) 598 if (coro_mortal)
572 { 599 {
573 dTHX;
574
575 SvREFCNT_dec (coro_mortal); 600 SvREFCNT_dec (coro_mortal);
576 coro_mortal = 0; 601 coro_mortal = 0;
577 } 602 }
578} 603}
579 604
605static void NOINLINE
606prepare_cctx (coro_cctx *cctx)
607{
608 dSP;
609 LOGOP myop;
610
611 Zero (&myop, 1, LOGOP);
612 myop.op_next = PL_op;
613 myop.op_flags = OPf_WANT_VOID;
614
615 sv_setiv (get_sv ("Coro::State::_cctx", FALSE), PTR2IV (cctx));
616
617 PUSHMARK (SP);
618 XPUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
619 PUTBACK;
620 PL_restartop = PL_ppaddr[OP_ENTERSUB](aTHX);
621 SPAGAIN;
622}
623
580static void 624static void
581coro_run (void *arg) 625coro_run (void *arg)
582{ 626{
627 /* coro_run is the alternative epilogue of transfer() */
628 UNLOCK;
629
583 /* 630 /*
584 * this is a _very_ stripped down perl interpreter ;) 631 * this is a _very_ stripped down perl interpreter ;)
585 */ 632 */
586 dTHX;
587 int ret;
588
589 UNLOCK;
590
591 PL_top_env = &PL_start_env; 633 PL_top_env = &PL_start_env;
592 634
593 sv_setiv (get_sv ("Coro::State::cctx_stack", FALSE), PTR2IV ((coro_stack *)arg)); 635 /* inject call to cctx_init */
594 sv_setiv (get_sv ("Coro::State::cctx_restartop", FALSE), PTR2IV (PL_op)); 636 prepare_cctx ((coro_cctx *)arg);
595
596 /* continue at cctx_init, without entersub */
597 PL_restartop = CvSTART (get_cv ("Coro::State::cctx_init", FALSE));
598 637
599 /* somebody will hit me for both perl_run and PL_restartop */ 638 /* somebody will hit me for both perl_run and PL_restartop */
600 ret = perl_run (aTHX_ PERL_GET_CONTEXT); 639 perl_run (PL_curinterp);
601 printf ("ret %d\n", ret);//D
602 640
603 fputs ("FATAL: C coroutine fell over the edge of the world, aborting.\n", stderr); 641 fputs ("FATAL: C coroutine fell over the edge of the world, aborting. Did you call exit in a coroutine?\n", stderr);
604 abort (); 642 abort ();
605} 643}
606 644
607static coro_stack * 645static coro_cctx *
608stack_new () 646cctx_new ()
609{ 647{
610 coro_stack *stack; 648 coro_cctx *cctx;
611 649
650 ++cctx_count;
651
612 New (0, stack, 1, coro_stack); 652 New (0, cctx, 1, coro_cctx);
613 653
614#if HAVE_MMAP 654#if HAVE_MMAP
615 655
616 stack->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; 656 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE;
617 /* mmap suppsedly does allocate-on-write for us */ 657 /* mmap suppsedly does allocate-on-write for us */
618 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 658 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
619 659
620 if (stack->sptr == (void *)-1) 660 if (cctx->sptr == (void *)-1)
621 { 661 {
622 perror ("FATAL: unable to mmap stack for coroutine"); 662 perror ("FATAL: unable to mmap stack for coroutine");
623 _exit (EXIT_FAILURE); 663 _exit (EXIT_FAILURE);
624 } 664 }
625 665
626# if STACKGUARD 666# if STACKGUARD
627 mprotect (stack->sptr, STACKGUARD * PAGESIZE, PROT_NONE); 667 mprotect (cctx->sptr, STACKGUARD * PAGESIZE, PROT_NONE);
628# endif 668# endif
629 669
630#else 670#else
631 671
632 stack->ssize = STACKSIZE * (long)sizeof (long); 672 cctx->ssize = STACKSIZE * (long)sizeof (long);
633 New (0, stack->sptr, STACKSIZE, long); 673 New (0, cctx->sptr, STACKSIZE, long);
634 674
635 if (!stack->sptr) 675 if (!cctx->sptr)
636 { 676 {
637 perror (stderr, "FATAL: unable to malloc stack for coroutine"); 677 perror ("FATAL: unable to malloc stack for coroutine");
638 _exit (EXIT_FAILURE); 678 _exit (EXIT_FAILURE);
639 } 679 }
640 680
641#endif 681#endif
642 682
683#if USE_VALGRIND
684 cctx->valgrind_id = VALGRIND_STACK_REGISTER (
685 STACKGUARD * PAGESIZE + (char *)cctx->sptr,
686 cctx->ssize + (char *)cctx->sptr
687 );
688#endif
689
643 coro_create (&stack->cctx, coro_run, (void *)stack, stack->sptr, stack->ssize); 690 coro_create (&cctx->cctx, coro_run, (void *)cctx, cctx->sptr, cctx->ssize);
644 691
645 return stack; 692 return cctx;
646} 693}
647 694
648static void 695static void
649stack_free (coro_stack *stack) 696cctx_free (coro_cctx *cctx)
650{ 697{
651 if (!stack) 698 if (!cctx)
652 return; 699 return;
653 700
701 --cctx_count;
702
703#if USE_VALGRIND
704 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
705#endif
706
654#if HAVE_MMAP 707#if HAVE_MMAP
655 munmap (stack->sptr, stack->ssize); 708 munmap (cctx->sptr, cctx->ssize);
656#else 709#else
657 Safefree (stack->sptr); 710 Safefree (cctx->sptr);
658#endif 711#endif
659 712
660 Safefree (stack); 713 Safefree (cctx);
661} 714}
662 715
663static coro_stack *stack_first;
664
665static coro_stack * 716static coro_cctx *
666stack_get () 717cctx_get ()
667{ 718{
668 coro_stack *stack; 719 coro_cctx *cctx;
669 720
670 if (stack_first) 721 if (cctx_first)
671 { 722 {
672 stack = stack_first; 723 --cctx_idle;
724 cctx = cctx_first;
673 stack_first = stack->next; 725 cctx_first = cctx->next;
674 } 726 }
675 else 727 else
676 { 728 {
677 stack = stack_new (); 729 cctx = cctx_new ();
678 PL_op = PL_op->op_next; 730 PL_op = PL_op->op_next;
679 } 731 }
680 732
681 return stack; 733 return cctx;
682} 734}
683 735
684static void 736static void
685stack_put (coro_stack *stack) 737cctx_put (coro_cctx *cctx)
686{ 738{
687 stack->next = stack_first; 739 ++cctx_idle;
688 stack_first = stack; 740 cctx->next = cctx_first;
741 cctx_first = cctx;
689} 742}
690 743
691/* never call directly, always through the coro_state_transfer global variable */ 744/* never call directly, always through the coro_state_transfer global variable */
692static void 745static void NOINLINE
693transfer_impl (pTHX_ struct coro *prev, struct coro *next, int flags) 746transfer (struct coro *prev, struct coro *next, int flags)
694{ 747{
695 dSTACKLEVEL; 748 dSTACKLEVEL;
696 749
697 /* sometimes transfer is only called to set idle_sp */ 750 /* sometimes transfer is only called to set idle_sp */
698 if (flags == TRANSFER_SET_STACKLEVEL) 751 if (flags == TRANSFER_SET_STACKLEVEL)
699 ((coro_stack *)prev)->idle_sp = STACKLEVEL; 752 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
700 else if (prev != next) 753 else if (prev != next)
701 { 754 {
702 coro_stack *prev__stack; 755 coro_cctx *prev__cctx;
703 756
704 LOCK; 757 LOCK;
705 758
706 if (next->mainstack) 759 if (next->mainstack)
707 { 760 {
… …
715 /* first get rid of the old state */ 768 /* first get rid of the old state */
716 SAVE (prev, -1); 769 SAVE (prev, -1);
717 /* setup coroutine call */ 770 /* setup coroutine call */
718 setup_coro (next); 771 setup_coro (next);
719 /* need a stack */ 772 /* need a stack */
720 next->stack = 0; 773 next->cctx = 0;
721 } 774 }
722 775
723 if (!prev->stack) 776 if (!prev->cctx)
724 /* create a new empty context */ 777 /* create a new empty context */
725 Newz (0, prev->stack, 1, coro_stack); 778 Newz (0, prev->cctx, 1, coro_cctx);
726 779
727 prev__stack = prev->stack; 780 prev__cctx = prev->cctx;
728 781
729 /* possibly "free" the stack */ 782 /* possibly "free" the cctx */
730 if (prev__stack->idle_sp == STACKLEVEL) 783 if (prev__cctx->idle_sp == STACKLEVEL)
731 { 784 {
732 stack_put (prev__stack); 785 cctx_put (prev__cctx);
733 prev->stack = 0; 786 prev->cctx = 0;
734 } 787 }
735 788
736 if (!next->stack) 789 if (!next->cctx)
737 next->stack = stack_get (); 790 next->cctx = cctx_get ();
738 791
739 if (prev__stack != next->stack) 792 if (prev__cctx != next->cctx)
740 { 793 {
741 prev__stack->top_env = PL_top_env; 794 prev__cctx->top_env = PL_top_env;
742 PL_top_env = next->stack->top_env; 795 PL_top_env = next->cctx->top_env;
743 coro_transfer (&prev__stack->cctx, &next->stack->cctx); 796 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
744 } 797 }
745 798
746 free_coro_mortal (); 799 free_coro_mortal ();
747 800
748 UNLOCK; 801 UNLOCK;
749 } 802 }
750} 803}
751
752/* use this function pointer to call the above function */
753/* this is done to increase chances of the compiler not inlining the call */
754/* not static to make it even harder for the compiler (and theoretically impossible in most cases */
755void (*coro_state_transfer)(pTHX_ struct coro *prev, struct coro *next, int flags) = transfer_impl;
756 804
757struct transfer_args 805struct transfer_args
758{ 806{
759 struct coro *prev, *next; 807 struct coro *prev, *next;
760 int flags; 808 int flags;
761}; 809};
762 810
763#define TRANSFER(ta) coro_state_transfer ((ta).prev, (ta).next, (ta).flags) 811#define TRANSFER(ta) transfer ((ta).prev, (ta).next, (ta).flags)
764 812
765static void 813static void
766coro_state_destroy (struct coro *coro) 814coro_state_destroy (struct coro *coro)
767{ 815{
768 if (coro->refcnt--) 816 if (coro->refcnt--)
… …
770 818
771 if (coro->mainstack && coro->mainstack != main_mainstack) 819 if (coro->mainstack && coro->mainstack != main_mainstack)
772 { 820 {
773 struct coro temp; 821 struct coro temp;
774 822
775 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL); 823 SAVE ((&temp), TRANSFER_SAVE_ALL);
776 LOAD (aTHX_ coro); 824 LOAD (coro);
777 825
778 destroy_stacks (aTHX); 826 coro_destroy_stacks ();
779 827
780 LOAD ((&temp)); /* this will get rid of defsv etc.. */ 828 LOAD ((&temp)); /* this will get rid of defsv etc.. */
781 829
782 coro->mainstack = 0; 830 coro->mainstack = 0;
783 } 831 }
784 832
785 stack_free (coro->stack); 833 cctx_free (coro->cctx);
786 SvREFCNT_dec (coro->args); 834 SvREFCNT_dec (coro->args);
787 Safefree (coro); 835 Safefree (coro);
788} 836}
789 837
790static int 838static int
791coro_state_clear (SV *sv, MAGIC *mg) 839coro_state_clear (pTHX_ SV *sv, MAGIC *mg)
792{ 840{
793 struct coro *coro = (struct coro *)mg->mg_ptr; 841 struct coro *coro = (struct coro *)mg->mg_ptr;
794 mg->mg_ptr = 0; 842 mg->mg_ptr = 0;
795 843
796 coro_state_destroy (coro); 844 coro_state_destroy (coro);
797 845
798 return 0; 846 return 0;
799} 847}
800 848
801static int 849static int
802coro_state_dup (MAGIC *mg, CLONE_PARAMS *params) 850coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
803{ 851{
804 struct coro *coro = (struct coro *)mg->mg_ptr; 852 struct coro *coro = (struct coro *)mg->mg_ptr;
805 853
806 ++coro->refcnt; 854 ++coro->refcnt;
807 855
808 return 0; 856 return 0;
809} 857}
810 858
811static MGVTBL coro_state_vtbl = { 0, 0, 0, 0, coro_state_clear, 0, coro_state_dup, 0 }; 859static MGVTBL coro_state_vtbl = {
860 0, 0, 0, 0,
861 coro_state_clear,
862 0,
863#ifdef MGf_DUP
864 coro_state_dup,
865#else
866# define MGf_DUP 0
867#endif
868};
812 869
813static struct coro * 870static struct coro *
814SvSTATE (SV *coro) 871SvSTATE (SV *coro)
815{ 872{
816 HV *stash; 873 HV *stash;
… …
831 assert (mg->mg_type == PERL_MAGIC_ext); 888 assert (mg->mg_type == PERL_MAGIC_ext);
832 return (struct coro *)mg->mg_ptr; 889 return (struct coro *)mg->mg_ptr;
833} 890}
834 891
835static void 892static void
836prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev, SV *next, int flags) 893prepare_transfer (struct transfer_args *ta, SV *prev, SV *next, int flags)
837{ 894{
838 ta->prev = SvSTATE (prev); 895 ta->prev = SvSTATE (prev);
839 ta->next = SvSTATE (next); 896 ta->next = SvSTATE (next);
840 ta->flags = flags; 897 ta->flags = flags;
841} 898}
… …
844api_transfer (SV *prev, SV *next, int flags) 901api_transfer (SV *prev, SV *next, int flags)
845{ 902{
846 dTHX; 903 dTHX;
847 struct transfer_args ta; 904 struct transfer_args ta;
848 905
849 prepare_transfer (aTHX_ &ta, prev, next, flags); 906 prepare_transfer (&ta, prev, next, flags);
850 TRANSFER (ta); 907 TRANSFER (ta);
851} 908}
852 909
853/** Coro ********************************************************************/ 910/** Coro ********************************************************************/
854 911
… …
863static GV *coro_current, *coro_idle; 920static GV *coro_current, *coro_idle;
864static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 921static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
865static int coro_nready; 922static int coro_nready;
866 923
867static void 924static void
868coro_enq (pTHX_ SV *sv) 925coro_enq (SV *sv)
869{ 926{
870 int prio; 927 int prio;
871 928
872 if (SvTYPE (sv) != SVt_PVHV) 929 if (SvTYPE (sv) != SVt_PVHV)
873 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 930 croak ("Coro::ready tried to enqueue something that is not a coroutine");
… …
877 av_push (coro_ready [prio - PRIO_MIN], sv); 934 av_push (coro_ready [prio - PRIO_MIN], sv);
878 coro_nready++; 935 coro_nready++;
879} 936}
880 937
881static SV * 938static SV *
882coro_deq (pTHX_ int min_prio) 939coro_deq (int min_prio)
883{ 940{
884 int prio = PRIO_MAX - PRIO_MIN; 941 int prio = PRIO_MAX - PRIO_MIN;
885 942
886 min_prio -= PRIO_MIN; 943 min_prio -= PRIO_MIN;
887 if (min_prio < 0) 944 if (min_prio < 0)
… …
904 961
905 if (SvROK (coro)) 962 if (SvROK (coro))
906 coro = SvRV (coro); 963 coro = SvRV (coro);
907 964
908 LOCK; 965 LOCK;
909 coro_enq (aTHX_ SvREFCNT_inc (coro)); 966 coro_enq (SvREFCNT_inc (coro));
910 UNLOCK; 967 UNLOCK;
911} 968}
912 969
913static void 970static void
914prepare_schedule (aTHX_ struct transfer_args *ta) 971prepare_schedule (struct transfer_args *ta)
915{ 972{
916 SV *current, *prev, *next; 973 SV *current, *prev, *next;
917
918 LOCK;
919 974
920 current = GvSV (coro_current); 975 current = GvSV (coro_current);
921 976
922 for (;;) 977 for (;;)
923 { 978 {
924 LOCK; 979 LOCK;
925
926 next = coro_deq (aTHX_ PRIO_MIN); 980 next = coro_deq (PRIO_MIN);
981 UNLOCK;
927 982
928 if (next) 983 if (next)
929 break; 984 break;
930
931 UNLOCK;
932 985
933 { 986 {
934 dSP; 987 dSP;
935 988
936 ENTER; 989 ENTER;
… …
947 1000
948 prev = SvRV (current); 1001 prev = SvRV (current);
949 SvRV (current) = next; 1002 SvRV (current) = next;
950 1003
951 /* free this only after the transfer */ 1004 /* free this only after the transfer */
1005 LOCK;
952 free_coro_mortal (); 1006 free_coro_mortal ();
1007 UNLOCK;
953 coro_mortal = prev; 1008 coro_mortal = prev;
954 1009
955 ta->prev = SvSTATE (prev); 1010 ta->prev = SvSTATE (prev);
956 ta->next = SvSTATE (next); 1011 ta->next = SvSTATE (next);
957 ta->flags = TRANSFER_SAVE_ALL; 1012 ta->flags = TRANSFER_SAVE_ALL;
958
959 UNLOCK;
960} 1013}
961 1014
962static void 1015static void
963prepare_cede (aTHX_ struct transfer_args *ta) 1016prepare_cede (struct transfer_args *ta)
964{ 1017{
965 LOCK; 1018 LOCK;
966 coro_enq (aTHX_ SvREFCNT_inc (SvRV (GvSV (coro_current)))); 1019 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current))));
967 UNLOCK; 1020 UNLOCK;
968 1021
969 prepare_schedule (ta); 1022 prepare_schedule (ta);
970} 1023}
971 1024
… …
1029 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1082 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1030 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1083 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1031 1084
1032 for (i = 1; i < items; i++) 1085 for (i = 1; i < items; i++)
1033 av_push (coro->args, newSVsv (ST (i))); 1086 av_push (coro->args, newSVsv (ST (i)));
1034
1035 /*coro->mainstack = 0; *//*actual work is done inside transfer */
1036 /*coro->stack = 0;*/
1037} 1087}
1038 OUTPUT: 1088 OUTPUT:
1039 RETVAL 1089 RETVAL
1040 1090
1041void 1091void
… …
1050 struct transfer_args ta; 1100 struct transfer_args ta;
1051 1101
1052 switch (ix) 1102 switch (ix)
1053 { 1103 {
1054 case 0: 1104 case 0:
1055 ta.prev = (struct coro *)INT2PTR (coro_stack *, SvIV (ST (0))); 1105 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1056 ta.next = 0; 1106 ta.next = 0;
1057 ta.flags = TRANSFER_SET_STACKLEVEL; 1107 ta.flags = TRANSFER_SET_STACKLEVEL;
1058 break; 1108 break;
1059 1109
1060 case 1: 1110 case 1:
… …
1114 ++coro_src->refcnt; 1164 ++coro_src->refcnt;
1115 sv_magicext (SvRV (dst), 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro_src, 0)->mg_flags |= MGf_DUP; 1165 sv_magicext (SvRV (dst), 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro_src, 0)->mg_flags |= MGf_DUP;
1116} 1166}
1117 1167
1118void 1168void
1119_nonlocal_goto (IV nextop)
1120 CODE:
1121 /* uuh, somebody will kill me again for this */
1122 PL_op->op_next = INT2PTR (OP *, nextop);
1123
1124void
1125_exit (code) 1169_exit (code)
1126 int code 1170 int code
1127 PROTOTYPE: $ 1171 PROTOTYPE: $
1128 CODE: 1172 CODE:
1129 _exit (code); 1173 _exit (code);
1174
1175int
1176cctx_count ()
1177 CODE:
1178 RETVAL = cctx_count;
1179 OUTPUT:
1180 RETVAL
1181
1182int
1183cctx_idle ()
1184 CODE:
1185 RETVAL = cctx_idle;
1186 OUTPUT:
1187 RETVAL
1130 1188
1131MODULE = Coro::State PACKAGE = Coro 1189MODULE = Coro::State PACKAGE = Coro
1132 1190
1133BOOT: 1191BOOT:
1134{ 1192{

Diff Legend

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