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.38 by root, Wed Nov 7 00:21:06 2001 UTC vs.
Revision 1.56 by pcg, Thu Apr 1 02:41:05 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines