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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines