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.36 by root, Fri Oct 5 14:20:10 2001 UTC vs.
Revision 1.55 by pcg, Thu Apr 1 02:29:05 2004 UTC

1#include "EXTERN.h" 1#include "EXTERN.h"
2#include "perl.h" 2#include "perl.h"
3#include "XSUB.h" 3#include "XSUB.h"
4
5#include "patchlevel.h"
6
7#if PATCHLEVEL < 6
8# ifndef PL_ppaddr
9# define PL_ppaddr ppaddr
10# endif
11# ifndef call_sv
12# define call_sv perl_call_sv
13# endif
14# ifndef get_sv
15# define get_sv perl_get_sv
16# endif
17# ifndef get_cv
18# define get_cv perl_get_cv
19# endif
20# ifndef IS_PADGV
21# define IS_PADGV(v) 0
22# endif
23# ifndef IS_PADCONST
24# define IS_PADCONST(v) 0
25# endif
26#endif
4 27
5#include "libcoro/coro.c" 28#include "libcoro/coro.c"
6 29
7#include <signal.h> 30#include <signal.h>
8 31
16# undef HAVE_MMAP 39# undef HAVE_MMAP
17# endif 40# endif
18# endif 41# endif
19#endif 42#endif
20 43
21#define MAY_FLUSH /* increases codesize and is rarely used */
22
23#define SUB_INIT "Coro::State::initialize" 44#define SUB_INIT "Coro::State::initialize"
24#define UCORO_STATE "_coro_state" 45#define UCORO_STATE "_coro_state"
25 46
26/* The next macro should declare a variable stacklevel that contains and approximation 47/* The next macro should declare a variable stacklevel that contains and approximation
27 * to the current C stack pointer. Its property is that it changes with each call 48 * to the current C stack pointer. Its property is that it changes with each call
31#define IN_DESTRUCT (PL_main_cv == Nullcv) 52#define IN_DESTRUCT (PL_main_cv == Nullcv)
32 53
33#define labs(l) ((l) >= 0 ? (l) : -(l)) 54#define labs(l) ((l) >= 0 ? (l) : -(l))
34 55
35#include "CoroAPI.h" 56#include "CoroAPI.h"
57
58#ifdef USE_ITHREADS
59static perl_mutex coro_mutex;
60# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0)
61# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0)
62#else
63# define LOCK 0
64# define UNLOCK 0
65#endif
36 66
37static struct CoroAPI coroapi; 67static struct CoroAPI coroapi;
38 68
39/* this is actually not only the c stack but also c registers etc... */ 69/* this is actually not only the c stack but also c registers etc... */
40typedef struct { 70typedef struct {
47 void *sptr; 77 void *sptr;
48 long ssize; /* positive == mmap, otherwise malloc */ 78 long ssize; /* positive == mmap, otherwise malloc */
49} coro_stack; 79} coro_stack;
50 80
51struct coro { 81struct coro {
82 /* the top-level JMPENV for each coroutine, needed to catch dies. */
83 JMPENV start_env;
84
52 /* the optional C context */ 85 /* the optional C context */
53 coro_stack *stack; 86 coro_stack *stack;
54 void *cursp; 87 void *cursp;
55 int gencnt; 88 int gencnt;
56 89
68 AV *curstack; 101 AV *curstack;
69 AV *mainstack; 102 AV *mainstack;
70 SV **stack_sp; 103 SV **stack_sp;
71 OP *op; 104 OP *op;
72 SV **curpad; 105 SV **curpad;
106 AV *comppad;
73 SV **stack_base; 107 SV **stack_base;
74 SV **stack_max; 108 SV **stack_max;
75 SV **tmps_stack; 109 SV **tmps_stack;
76 I32 tmps_floor; 110 I32 tmps_floor;
77 I32 tmps_ix; 111 I32 tmps_ix;
100 134
101static AV *main_mainstack; /* used to differentiate between $main and others */ 135static AV *main_mainstack; /* used to differentiate between $main and others */
102static HV *coro_state_stash; 136static HV *coro_state_stash;
103static SV *ucoro_state_sv; 137static SV *ucoro_state_sv;
104static U32 ucoro_state_hash; 138static U32 ucoro_state_hash;
105static HV *padlist_cache; 139static SV *coro_mortal; /* will be freed after next transfer */
106 140
107/* mostly copied from op.c:cv_clone2 */ 141/* mostly copied from op.c:cv_clone2 */
108STATIC AV * 142STATIC AV *
109clone_padlist (AV *protopadlist) 143clone_padlist (AV *protopadlist)
110{ 144{
138 AvFLAGS (av) = AVf_REIFY; 172 AvFLAGS (av) = AVf_REIFY;
139 173
140 for (ix = fpad; ix > 0; ix--) 174 for (ix = fpad; ix > 0; ix--)
141 { 175 {
142 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv; 176 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv;
177
143 if (namesv && namesv != &PL_sv_undef) 178 if (namesv && namesv != &PL_sv_undef)
144 { 179 {
145 char *name = SvPVX (namesv); /* XXX */ 180 char *name = SvPVX (namesv); /* XXX */
181
146 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&') 182 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&')
147 { /* lexical from outside? */ 183 { /* lexical from outside? */
148 npad[ix] = SvREFCNT_inc (ppad[ix]); 184 npad[ix] = SvREFCNT_inc (ppad[ix]);
149 } 185 }
150 else 186 else
156 sv = (SV *) newAV (); 192 sv = (SV *) newAV ();
157 else if (*name == '%') 193 else if (*name == '%')
158 sv = (SV *) newHV (); 194 sv = (SV *) newHV ();
159 else 195 else
160 sv = NEWSV (0, 0); 196 sv = NEWSV (0, 0);
197
198#ifdef SvPADBUSY
161 if (!SvPADBUSY (sv)) 199 if (!SvPADBUSY (sv))
200#endif
162 SvPADMY_on (sv); 201 SvPADMY_on (sv);
202
163 npad[ix] = sv; 203 npad[ix] = sv;
164 } 204 }
165 } 205 }
166 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix])) 206 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix]))
167 { 207 {
196#endif 236#endif
197 237
198 return newpadlist; 238 return newpadlist;
199} 239}
200 240
201#ifdef MAY_FLUSH
202STATIC void 241STATIC void
203free_padlist (AV *padlist) 242free_padlist (AV *padlist)
204{ 243{
205 /* may be during global destruction */ 244 /* may be during global destruction */
206 if (SvREFCNT(padlist)) 245 if (SvREFCNT (padlist))
207 { 246 {
208 I32 i = AvFILLp(padlist); 247 I32 i = AvFILLp (padlist);
209 while (i >= 0) 248 while (i >= 0)
210 { 249 {
211 SV **svp = av_fetch(padlist, i--, FALSE); 250 SV **svp = av_fetch (padlist, i--, FALSE);
212 SV *sv = svp ? *svp : Nullsv;
213 if (sv) 251 if (svp)
252 {
253 SV *sv;
254 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp)))
214 SvREFCNT_dec(sv); 255 SvREFCNT_dec (sv);
256
257 SvREFCNT_dec (*svp);
258 }
215 } 259 }
216 260
217 SvREFCNT_dec((SV*)padlist); 261 SvREFCNT_dec ((SV*)padlist);
218 } 262 }
219} 263}
220#endif 264
265STATIC int
266coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
267{
268 AV *padlist;
269 AV *av = (AV *)mg->mg_obj;
270
271 /* casting is fun. */
272 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
273 free_padlist (padlist);
274}
275
276#define PERL_MAGIC_coro PERL_MAGIC_ext
277
278static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
221 279
222/* the next two functions merely cache the padlists */ 280/* the next two functions merely cache the padlists */
223STATIC void 281STATIC void
224get_padlist (CV *cv) 282get_padlist (CV *cv)
225{ 283{
226 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 0); 284 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
227 285
228 if (he && AvFILLp ((AV *)*he) >= 0) 286 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
229 CvPADLIST (cv) = (AV *)av_pop ((AV *)*he); 287 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
230 else 288 else
231 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv)); 289 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv));
232} 290}
233 291
234STATIC void 292STATIC void
235put_padlist (CV *cv) 293put_padlist (CV *cv)
236{ 294{
237 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 1); 295 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
238 296
239 if (SvTYPE (*he) != SVt_PVAV) 297 if (!mg)
240 { 298 {
241 SvREFCNT_dec (*he); 299 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
300 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
301 mg->mg_virtual = &vtbl_coro;
242 *he = (SV *)newAV (); 302 mg->mg_obj = (SV *)newAV ();
243 } 303 }
244 304
245 av_push ((AV *)*he, (SV *)CvPADLIST (cv)); 305 av_push ((AV *)mg->mg_obj, (SV *)CvPADLIST (cv));
246} 306}
247
248#ifdef MAY_FLUSH
249STATIC void
250flush_padlist_cache ()
251{
252 HV *hv = padlist_cache;
253 padlist_cache = newHV ();
254
255 if (hv_iterinit (hv))
256 {
257 HE *he;
258 AV *padlist;
259
260 while (!!(he = hv_iternext (hv)))
261 {
262 AV *av = (AV *)HeVAL(he);
263
264 /* casting is fun. */
265 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
266 free_padlist (padlist);
267 }
268 }
269
270 SvREFCNT_dec (hv);
271}
272#endif
273 307
274#define SB do { 308#define SB do {
275#define SE } while (0) 309#define SE } while (0)
276 310
277#define LOAD(state) load_state(aTHX_ (state)); 311#define LOAD(state) load_state(aTHX_ (state));
278#define SAVE(state,flags) save_state(aTHX_ (state),(flags)); 312#define SAVE(state,flags) save_state(aTHX_ (state),(flags));
279 313
280#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); SE 314#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE
281 315
282static void 316static void
283load_state(pTHX_ Coro__State c) 317load_state(pTHX_ Coro__State c)
284{ 318{
285 PL_dowarn = c->dowarn; 319 PL_dowarn = c->dowarn;
289 PL_curstack = c->curstack; 323 PL_curstack = c->curstack;
290 PL_mainstack = c->mainstack; 324 PL_mainstack = c->mainstack;
291 PL_stack_sp = c->stack_sp; 325 PL_stack_sp = c->stack_sp;
292 PL_op = c->op; 326 PL_op = c->op;
293 PL_curpad = c->curpad; 327 PL_curpad = c->curpad;
328 PL_comppad = c->comppad;
294 PL_stack_base = c->stack_base; 329 PL_stack_base = c->stack_base;
295 PL_stack_max = c->stack_max; 330 PL_stack_max = c->stack_max;
296 PL_tmps_stack = c->tmps_stack; 331 PL_tmps_stack = c->tmps_stack;
297 PL_tmps_floor = c->tmps_floor; 332 PL_tmps_floor = c->tmps_floor;
298 PL_tmps_ix = c->tmps_ix; 333 PL_tmps_ix = c->tmps_ix;
327 362
328 if (padlist) 363 if (padlist)
329 { 364 {
330 put_padlist (cv); /* mark this padlist as available */ 365 put_padlist (cv); /* mark this padlist as available */
331 CvPADLIST(cv) = padlist; 366 CvPADLIST(cv) = padlist;
332#ifdef USE_THREADS
333 /*CvOWNER(cv) = (struct perl_thread *)POPs;*/
334#endif
335 } 367 }
336 368
337 ++CvDEPTH(cv); 369 ++CvDEPTH(cv);
338 } 370 }
339 371
366 if (CxTYPE(cx) == CXt_SUB) 398 if (CxTYPE(cx) == CXt_SUB)
367 { 399 {
368 CV *cv = cx->blk_sub.cv; 400 CV *cv = cx->blk_sub.cv;
369 if (CvDEPTH(cv)) 401 if (CvDEPTH(cv))
370 { 402 {
371#ifdef USE_THREADS
372 /*XPUSHs ((SV *)CvOWNER(cv));*/
373 /*CvOWNER(cv) = 0;*/
374 /*error must unlock this cv etc.. etc...*/
375#endif
376 EXTEND (SP, CvDEPTH(cv)*2); 403 EXTEND (SP, CvDEPTH(cv)*2);
377 404
378 while (--CvDEPTH(cv)) 405 while (--CvDEPTH(cv))
379 { 406 {
380 /* this tells the restore code to increment CvDEPTH */ 407 /* this tells the restore code to increment CvDEPTH */
386 PUSHs ((SV *)cv); 413 PUSHs ((SV *)cv);
387 414
388 get_padlist (cv); /* this is a monster */ 415 get_padlist (cv); /* this is a monster */
389 } 416 }
390 } 417 }
418#ifdef CXt_FORMAT
391 else if (CxTYPE(cx) == CXt_FORMAT) 419 else if (CxTYPE(cx) == CXt_FORMAT)
392 { 420 {
393 /* I never used formats, so how should I know how these are implemented? */ 421 /* I never used formats, so how should I know how these are implemented? */
394 /* my bold guess is as a simple, plain sub... */ 422 /* my bold guess is as a simple, plain sub... */
395 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats"); 423 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
396 } 424 }
425#endif
397 } 426 }
398 427
399 if (top_si->si_type == PERLSI_MAIN) 428 if (top_si->si_type == PERLSI_MAIN)
400 break; 429 break;
401 430
418 c->curstack = PL_curstack; 447 c->curstack = PL_curstack;
419 c->mainstack = PL_mainstack; 448 c->mainstack = PL_mainstack;
420 c->stack_sp = PL_stack_sp; 449 c->stack_sp = PL_stack_sp;
421 c->op = PL_op; 450 c->op = PL_op;
422 c->curpad = PL_curpad; 451 c->curpad = PL_curpad;
452 c->comppad = PL_comppad;
423 c->stack_base = PL_stack_base; 453 c->stack_base = PL_stack_base;
424 c->stack_max = PL_stack_max; 454 c->stack_max = PL_stack_max;
425 c->tmps_stack = PL_tmps_stack; 455 c->tmps_stack = PL_tmps_stack;
426 c->tmps_floor = PL_tmps_floor; 456 c->tmps_floor = PL_tmps_floor;
427 c->tmps_ix = PL_tmps_ix; 457 c->tmps_ix = PL_tmps_ix;
443} 473}
444 474
445/* 475/*
446 * allocate various perl stacks. This is an exact copy 476 * allocate various perl stacks. This is an exact copy
447 * of perl.c:init_stacks, except that it uses less memory 477 * of perl.c:init_stacks, except that it uses less memory
448 * on the assumption that coroutines do not usually need 478 * on the (sometimes correct) assumption that coroutines do
449 * a lot of stackspace. 479 * not usually need a lot of stackspace.
450 */ 480 */
451STATIC void 481STATIC void
452coro_init_stacks (pTHX) 482coro_init_stacks (pTHX)
453{ 483{
484 LOCK;
485
454 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 486 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
455 PL_curstackinfo->si_type = PERLSI_MAIN; 487 PL_curstackinfo->si_type = PERLSI_MAIN;
456 PL_curstack = PL_curstackinfo->si_stack; 488 PL_curstack = PL_curstackinfo->si_stack;
457 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 489 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
458 490
467 499
468 New(54,PL_markstack,16,I32); 500 New(54,PL_markstack,16,I32);
469 PL_markstack_ptr = PL_markstack; 501 PL_markstack_ptr = PL_markstack;
470 PL_markstack_max = PL_markstack + 16; 502 PL_markstack_max = PL_markstack + 16;
471 503
504#ifdef SET_MARK_OFFSET
472 SET_MARK_OFFSET; 505 SET_MARK_OFFSET;
506#endif
473 507
474 New(54,PL_scopestack,16,I32); 508 New(54,PL_scopestack,16,I32);
475 PL_scopestack_ix = 0; 509 PL_scopestack_ix = 0;
476 PL_scopestack_max = 16; 510 PL_scopestack_max = 16;
477 511
480 PL_savestack_max = 96; 514 PL_savestack_max = 96;
481 515
482 New(54,PL_retstack,8,OP*); 516 New(54,PL_retstack,8,OP*);
483 PL_retstack_ix = 0; 517 PL_retstack_ix = 0;
484 PL_retstack_max = 8; 518 PL_retstack_max = 8;
519
520 UNLOCK;
485} 521}
486 522
487/* 523/*
488 * destroy the stacks, the callchain etc... 524 * destroy the stacks, the callchain etc...
489 * still there is a memleak of 128 bytes...
490 */ 525 */
491STATIC void 526STATIC void
492destroy_stacks(pTHX) 527destroy_stacks(pTHX)
493{ 528{
494 if (!IN_DESTRUCT) 529 if (!IN_DESTRUCT)
495 { 530 {
496 /* is this ugly, I ask? */ 531 /* is this ugly, I ask? */
497 while (PL_scopestack_ix) 532 LEAVE_SCOPE (0);
498 LEAVE;
499 533
500 /* sure it is, but more important: is it correct?? :/ */ 534 /* sure it is, but more important: is it correct?? :/ */
501 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */
502 FREETMPS; 535 FREETMPS;
503 } 536 }
504 537
505 while (PL_curstackinfo->si_next) 538 while (PL_curstackinfo->si_next)
506 PL_curstackinfo = PL_curstackinfo->si_next; 539 PL_curstackinfo = PL_curstackinfo->si_next;
507 540
541 New (0, stack, 1, coro_stack); 574 New (0, stack, 1, coro_stack);
542 575
543 stack->refcnt = 1; 576 stack->refcnt = 1;
544 stack->usecnt = 1; 577 stack->usecnt = 1;
545 stack->gencnt = ctx->gencnt = 0; 578 stack->gencnt = ctx->gencnt = 0;
579
546 if (alloc) 580 if (alloc)
547 { 581 {
548#ifdef HAVE_MMAP 582#if HAVE_MMAP
549 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */ 583 stack->ssize = 16384 * sizeof (long); /* mmap should do allocate-on-write for us */
550 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 584 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
551 if (stack->sptr == (void *)-1) 585 if (stack->sptr == (void *)-1)
552#endif 586#endif
553 { 587 {
554 /*FIXME*//*D*//* reasonable stack size! */ 588 /*FIXME*//*D*//* reasonable stack size! */
555 stack->ssize = -4096 * sizeof (long); 589 stack->ssize = - (8192 * sizeof (long));
556 New (0, stack->sptr, 4096, long); 590 New (0, stack->sptr, 8192, long);
557 } 591 }
558 } 592 }
559 else 593 else
560 stack->sptr = 0; 594 stack->sptr = 0;
561 595
575 { 609 {
576#ifdef HAVE_MMAP 610#ifdef HAVE_MMAP
577 if (stack->ssize > 0 && stack->sptr) 611 if (stack->ssize > 0 && stack->sptr)
578 munmap (stack->sptr, stack->ssize); 612 munmap (stack->sptr, stack->ssize);
579 else 613 else
580#else 614#endif
581 Safefree (stack->sptr); 615 Safefree (stack->sptr);
582#endif 616
583 Safefree (stack); 617 Safefree (stack);
584 } 618 }
585 else if (ctx->gencnt == stack->gencnt) 619 else if (ctx->gencnt == stack->gencnt)
586 --stack->usecnt; 620 --stack->usecnt;
587 } 621 }
593 /* 627 /*
594 * emulate part of the perl startup here. 628 * emulate part of the perl startup here.
595 */ 629 */
596 dSP; 630 dSP;
597 Coro__State ctx = (Coro__State)arg; 631 Coro__State ctx = (Coro__State)arg;
598 SV *sub_init = (SV*)get_cv(SUB_INIT, FALSE); 632 SV *sub_init = (SV *)get_cv (SUB_INIT, FALSE);
599 633
600 coro_init_stacks (aTHX); 634 coro_init_stacks (aTHX);
601 /*PL_curcop = 0;*/ 635 /*PL_curcop = 0;*/
602 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 636 /*PL_in_eval = PL_in_eval;*/ /* inherit */
603 SvREFCNT_dec (GvAV (PL_defgv)); 637 SvREFCNT_dec (GvAV (PL_defgv));
604 GvAV (PL_defgv) = ctx->args; 638 GvAV (PL_defgv) = ctx->args; ctx->args = 0;
605 639
606 SPAGAIN; 640 SPAGAIN;
607 641
608 if (ctx->stack) 642 if (ctx->stack)
609 { 643 {
636 * that doesn't matter, though, since it is only 670 * that doesn't matter, though, since it is only
637 * pp_nextstate and we never return... 671 * pp_nextstate and we never return...
638 * ah yes, and I don't care anyways ;) 672 * ah yes, and I don't care anyways ;)
639 */ 673 */
640 PUTBACK; 674 PUTBACK;
641 PL_op = pp_entersub(); 675 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
642 SPAGAIN; 676 SPAGAIN;
643 677
644 ENTER; /* necessary e.g. for dounwind */ 678 ENTER; /* necessary e.g. for dounwind */
645 } 679 }
646} 680}
652 * this is a _very_ stripped down perl interpreter ;) 686 * this is a _very_ stripped down perl interpreter ;)
653 */ 687 */
654 Coro__State ctx = (Coro__State)arg; 688 Coro__State ctx = (Coro__State)arg;
655 JMPENV coro_start_env; 689 JMPENV coro_start_env;
656 690
657 /* same as JMPENV_BOOTSTRAP */
658 Zero(&coro_start_env, 1, JMPENV);
659 coro_start_env.je_ret = -1;
660 coro_start_env.je_mustcatch = TRUE;
661 PL_top_env = &coro_start_env; 691 PL_top_env = &ctx->start_env;
662 692
663 ctx->cursp = 0; 693 ctx->cursp = 0;
664 PL_op = PL_op->op_next; 694 PL_op = PL_op->op_next;
665 CALLRUNOPS(aTHX); 695 CALLRUNOPS(aTHX);
666 696
667 abort (); 697 abort ();
668} 698}
669 699
670STATIC void 700STATIC void
671transfer(pTHX_ struct coro *prev, struct coro *next, int flags) 701transfer (pTHX_ struct coro *prev, struct coro *next, int flags)
672{ 702{
673 dSTACKLEVEL; 703 dSTACKLEVEL;
674 static struct coro *xnext;
675 704
676 if (prev != next) 705 if (prev != next)
677 { 706 {
678 xnext = next;
679
680 if (next->mainstack) 707 if (next->mainstack)
681 { 708 {
709 LOCK;
682 SAVE (prev, flags); 710 SAVE (prev, flags);
683 LOAD (next); 711 LOAD (next);
712 UNLOCK;
684 713
685 /* mark this state as in-use */ 714 /* mark this state as in-use */
686 next->mainstack = 0; 715 next->mainstack = 0;
687 next->tmps_ix = -2; 716 next->tmps_ix = -2;
688 717
707 continue_coro, (void *)next, 736 continue_coro, (void *)next,
708 next->stack->sptr, labs (next->stack->ssize)); 737 next->stack->sptr, labs (next->stack->ssize));
709 } 738 }
710 739
711 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 740 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
741 prev->cursp = stacklevel;
712 /* don't add any code here */ 742 /* don't add any code here */
713 } 743 }
714 744 else
745 next->cursp = stacklevel;
715 } 746 }
716 else if (next->tmps_ix == -2) 747 else if (next->tmps_ix == -2)
717 croak ("tried to transfer to running coroutine"); 748 croak ("tried to transfer to running coroutine");
718 else 749 else
719 { 750 {
751 LOCK;
720 SAVE (prev, -1); /* first get rid of the old state */ 752 SAVE (prev, -1); /* first get rid of the old state */
753 UNLOCK;
721 754
722 if (flags & TRANSFER_SAVE_CCTXT) 755 if (flags & TRANSFER_SAVE_CCTXT)
723 { 756 {
724 if (!prev->stack) 757 if (!prev->stack)
725 allocate_stack (prev, 0); 758 allocate_stack (prev, 0);
726 759
727 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 760 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
728 { 761 {
762 PL_top_env = &next->start_env;
763
729 setup_coro (next); 764 setup_coro (next);
765 next->cursp = stacklevel;
730 766
731 prev->stack->refcnt++; 767 prev->stack->refcnt++;
732 prev->stack->usecnt++; 768 prev->stack->usecnt++;
733 next->stack = prev->stack; 769 next->stack = prev->stack;
734 next->gencnt = prev->gencnt; 770 next->gencnt = prev->gencnt;
735 } 771 }
736 else 772 else
737 { 773 {
774 assert (!next->stack);
738 allocate_stack (next, 1); 775 allocate_stack (next, 1);
739 coro_create (&(next->stack->cctx), 776 coro_create (&(next->stack->cctx),
740 setup_coro, (void *)next, 777 setup_coro, (void *)next,
741 next->stack->sptr, labs (next->stack->ssize)); 778 next->stack->sptr, labs (next->stack->ssize));
742 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 779 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
780 prev->cursp = stacklevel;
743 /* don't add any code here */ 781 /* don't add any code here */
744 } 782 }
745 } 783 }
746 else 784 else
785 {
747 setup_coro (next); 786 setup_coro (next);
787 next->cursp = stacklevel;
788 }
748 } 789 }
749
750 /*
751 * xnext is now either prev or next, depending on wether
752 * we switched the c stack or not. that's why i use a global
753 * variable, that should become thread-specific at one point.
754 */
755 xnext->cursp = stacklevel;
756 } 790 }
757}
758 791
759static struct coro * 792 LOCK;
760sv_to_coro (SV *arg, const char *funcname, const char *varname) 793 if (coro_mortal)
761{
762 if (SvROK(arg) && SvTYPE(SvRV(arg)) == SVt_PVHV)
763 { 794 {
764 HE *he = hv_fetch_ent((HV *)SvRV(arg), ucoro_state_sv, 0, ucoro_state_hash); 795 SvREFCNT_dec (coro_mortal);
765 796 coro_mortal = 0;
766 if (!he)
767 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", funcname, varname);
768
769 arg = HeVAL(he);
770 } 797 }
771 798 UNLOCK;
799}
800
801#define SV_CORO(sv,func) \
802 do { \
803 if (SvROK (sv)) \
804 sv = SvRV (sv); \
805 \
806 if (SvTYPE (sv) == SVt_PVHV) \
807 { \
808 HE *he = hv_fetch_ent ((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \
809 \
810 if (!he) \
811 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \
812 \
813 (sv) = SvRV (HeVAL(he)); \
814 } \
815 \
772 /* must also be changed inside Coro::Cont::yield */ 816 /* must also be changed inside Coro::Cont::yield */ \
773 if (SvROK(arg) && SvOBJECT(SvRV(arg)) 817 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
774 && SvSTASH(SvRV(arg)) == coro_state_stash)
775 return (struct coro *) SvIV((SV*)SvRV(arg));
776
777 croak ("%s() -- %s is not (and contains not) a Coro::State object", funcname, varname); 818 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
778 /*NORETURN*/ 819 \
779} 820 } while(0)
821
822#define SvSTATE(sv) (struct coro *)SvIV (sv)
780 823
781static void 824static void
782api_transfer(pTHX_ SV *prev, SV *next, int flags) 825api_transfer(pTHX_ SV *prev, SV *next, int flags)
783{ 826{
784 transfer(aTHX_ 827 SV_CORO (prev, "Coro::transfer");
785 sv_to_coro (prev, "Coro::transfer", "prev"), 828 SV_CORO (next, "Coro::transfer");
786 sv_to_coro (next, "Coro::transfer", "next"), 829
787 flags); 830 transfer(aTHX_ SvSTATE(prev), SvSTATE(next), flags);
788} 831}
789 832
790/** Coro ********************************************************************/ 833/** Coro ********************************************************************/
791 834
792#define PRIO_MAX 3 835#define PRIO_MAX 3
802static int coro_nready; 845static int coro_nready;
803 846
804static void 847static void
805coro_enq (SV *sv) 848coro_enq (SV *sv)
806{ 849{
807 if (SvROK (sv)) 850 if (SvTYPE (sv) == SVt_PVHV)
808 { 851 {
809 SV *hv = SvRV (sv);
810 if (SvTYPE (hv) == SVt_PVHV)
811 {
812 SV **xprio = hv_fetch ((HV *)hv, "prio", 4, 0); 852 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
813 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL; 853 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
814 854
815 prio = prio > PRIO_MAX ? PRIO_MAX 855 prio = prio > PRIO_MAX ? PRIO_MAX
816 : prio < PRIO_MIN ? PRIO_MIN 856 : prio < PRIO_MIN ? PRIO_MIN
817 : prio; 857 : prio;
818 858
819 av_push (coro_ready [prio - PRIO_MIN], sv); 859 av_push (coro_ready [prio - PRIO_MIN], sv);
820 coro_nready++; 860 coro_nready++;
821 861
822 return; 862 return;
823 }
824 } 863 }
825 864
826 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 865 croak ("Coro::ready tried to enqueue something that is not a coroutine");
827} 866}
828 867
846} 885}
847 886
848static void 887static void
849api_ready (SV *coro) 888api_ready (SV *coro)
850{ 889{
890 if (SvROK (coro))
891 coro = SvRV (coro);
892
893 LOCK;
851 coro_enq (SvREFCNT_inc (coro)); 894 coro_enq (SvREFCNT_inc (coro));
895 UNLOCK;
852} 896}
853 897
854static void 898static void
855api_schedule (int cede) 899api_schedule (void)
856{ 900{
857 SV *prev, *next; 901 SV *prev, *next;
858 902
903 LOCK;
904
859 prev = GvSV (coro_current); 905 prev = SvRV (GvSV (coro_current));
860
861 if (cede)
862 coro_enq (SvREFCNT_inc (prev));
863
864 next = coro_deq (PRIO_MIN); 906 next = coro_deq (PRIO_MIN);
865 907
866 if (!next) 908 if (!next)
867 next = SvREFCNT_inc (GvSV (coro_idle)); 909 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
868 910
869 GvSV (coro_current) = SvREFCNT_inc (next); 911 /* free this only after the transfer */
870 transfer (aTHX_ 912 coro_mortal = prev;
871 sv_to_coro (prev, "Coro::schedule", "current coroutine"), 913 SV_CORO (prev, "Coro::schedule");
872 sv_to_coro (next, "Coro::schedule", "next coroutine"), 914
915 SvRV (GvSV (coro_current)) = next;
916
917 SV_CORO (next, "Coro::schedule");
918
919 UNLOCK;
920
921 transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
873 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 922 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
874 SvREFCNT_dec (next); 923}
875 SvREFCNT_dec (prev); 924
925static void
926api_cede (void)
927{
928 LOCK;
929 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current))));
930 UNLOCK;
931
932 api_schedule ();
876} 933}
877 934
878MODULE = Coro::State PACKAGE = Coro::State 935MODULE = Coro::State PACKAGE = Coro::State
879 936
880PROTOTYPES: ENABLE 937PROTOTYPES: ENABLE
881 938
882BOOT: 939BOOT:
883{ /* {} necessary for stoopid perl-5.6.x */ 940{ /* {} necessary for stoopid perl-5.6.x */
941#ifdef USE_ITHREADS
942 MUTEX_INIT (&coro_mutex);
943#endif
944
884 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1); 945 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
885 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1); 946 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
886 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 947 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
887 948
888 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 949 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV));
889 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 950 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV));
890 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 951 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV));
891 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT)); 952 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT));
892
893 if (!padlist_cache)
894 padlist_cache = newHV ();
895 953
896 main_mainstack = PL_mainstack; 954 main_mainstack = PL_mainstack;
897 955
898 coroapi.ver = CORO_API_VERSION; 956 coroapi.ver = CORO_API_VERSION;
899 coroapi.transfer = api_transfer; 957 coroapi.transfer = api_transfer;
907 Coro__State coro; 965 Coro__State coro;
908 966
909 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV) 967 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV)
910 croak ("Coro::State::_newprocess expects an arrayref"); 968 croak ("Coro::State::_newprocess expects an arrayref");
911 969
912 New (0, coro, 1, struct coro); 970 Newz (0, coro, 1, struct coro);
913 971
914 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 972 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
915 coro->mainstack = 0; /* actual work is done inside transfer */ 973 coro->mainstack = 0; /* actual work is done inside transfer */
916 coro->stack = 0; 974 coro->stack = 0;
917 975
976 /* same as JMPENV_BOOTSTRAP */
977 /* we might be able to recycle start_env, but safe is safe */
978 //Zero(&coro->start_env, 1, JMPENV);
979 coro->start_env.je_ret = -1;
980 coro->start_env.je_mustcatch = TRUE;
981
918 RETVAL = coro; 982 RETVAL = coro;
919 OUTPUT: 983 OUTPUT:
920 RETVAL 984 RETVAL
921 985
922void 986void
923transfer(prev, next, flags) 987transfer(prev, next, flags)
924 Coro::State_or_hashref prev 988 SV *prev
925 Coro::State_or_hashref next 989 SV *next
926 int flags 990 int flags
927 PROTOTYPE: @ 991 PROTOTYPE: @
928 CODE: 992 CODE:
929 PUTBACK; 993 PUTBACK;
994 SV_CORO (next, "Coro::transfer");
995 SV_CORO (prev, "Coro::transfer");
930 transfer (aTHX_ prev, next, flags); 996 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
931 SPAGAIN; 997 SPAGAIN;
932 998
933void 999void
934DESTROY(coro) 1000DESTROY(coro)
935 Coro::State coro 1001 Coro::State coro
951 1017
952 coro->mainstack = 0; 1018 coro->mainstack = 0;
953 } 1019 }
954 1020
955 deallocate_stack (coro); 1021 deallocate_stack (coro);
956 1022 SvREFCNT_dec (coro->args);
957 Safefree (coro); 1023 Safefree (coro);
958
959void
960flush()
961 CODE:
962#ifdef MAY_FLUSH
963 flush_padlist_cache ();
964#endif
965 1024
966void 1025void
967_exit(code) 1026_exit(code)
968 int code 1027 int code
969 PROTOTYPE: $ 1028 PROTOTYPE: $
970 CODE: 1029 CODE:
971#if defined(__GLIBC__) || _POSIX_C_SOURCE
972 _exit (code); 1030 _exit (code);
973#else
974 signal (SIGTERM, SIG_DFL);
975 raise (SIGTERM);
976 exit (code);
977#endif
978 1031
979MODULE = Coro::State PACKAGE = Coro::Cont 1032MODULE = Coro::State PACKAGE = Coro::Cont
980 1033
981# this is slightly dirty (should expose a c-level api) 1034# this is slightly dirty (should expose a c-level api)
982 1035
988 SV *sv; 1041 SV *sv;
989 AV *defav = GvAV (PL_defgv); 1042 AV *defav = GvAV (PL_defgv);
990 struct coro *prev, *next; 1043 struct coro *prev, *next;
991 1044
992 if (!returnstk) 1045 if (!returnstk)
993 returnstk = SvRV (get_sv ("Coro::Cont::return", FALSE)); 1046 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE));
994 1047
995 /* set up @_ -- ugly */ 1048 /* set up @_ -- ugly */
996 av_clear (defav); 1049 av_clear (defav);
997 av_fill (defav, items - 1); 1050 av_fill (defav, items - 1);
998 while (items--) 1051 while (items--)
1030 1083
1031 { 1084 {
1032 SV *sv = perl_get_sv("Coro::API", 1); 1085 SV *sv = perl_get_sv("Coro::API", 1);
1033 1086
1034 coroapi.schedule = api_schedule; 1087 coroapi.schedule = api_schedule;
1088 coroapi.cede = api_cede;
1035 coroapi.ready = api_ready; 1089 coroapi.ready = api_ready;
1036 coroapi.nready = &coro_nready; 1090 coroapi.nready = &coro_nready;
1037 coroapi.current = coro_current; 1091 coroapi.current = coro_current;
1038 1092
1039 GCoroAPI = &coroapi; 1093 GCoroAPI = &coroapi;
1040 sv_setiv(sv, (IV)&coroapi); 1094 sv_setiv(sv, (IV)&coroapi);
1041 SvREADONLY_on(sv); 1095 SvREADONLY_on(sv);
1042 } 1096 }
1043} 1097}
1098
1099#if !PERL_MICRO
1044 1100
1045void 1101void
1046ready(self) 1102ready(self)
1047 SV * self 1103 SV * self
1048 PROTOTYPE: $ 1104 PROTOTYPE: $
1049 CODE: 1105 CODE:
1050 api_ready (self); 1106 api_ready (self);
1107
1108#endif
1051 1109
1052int 1110int
1053nready(...) 1111nready(...)
1054 PROTOTYPE: 1112 PROTOTYPE:
1055 CODE: 1113 CODE:
1058 RETVAL 1116 RETVAL
1059 1117
1060void 1118void
1061schedule(...) 1119schedule(...)
1062 PROTOTYPE: 1120 PROTOTYPE:
1063 ALIAS:
1064 cede = 1
1065 CODE: 1121 CODE:
1066 api_schedule (ix); 1122 api_schedule ();
1067 1123
1124void
1125cede(...)
1126 PROTOTYPE:
1127 CODE:
1128 api_cede ();
1129

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines