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.44 by root, Sat Mar 22 18:50:32 2003 UTC vs.
Revision 1.58 by pcg, Fri May 14 13:25:09 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 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
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;
107static SV *coro_mortal; /* will be freed after next transfer */
108
109/* mostly copied from op.c:cv_clone2 */ 142/* mostly copied from op.c:cv_clone2 */
110STATIC AV * 143STATIC AV *
111clone_padlist (AV *protopadlist) 144clone_padlist (pTHX_ AV *protopadlist)
112{ 145{
113 AV *av; 146 AV *av;
114 I32 ix; 147 I32 ix;
115 AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE); 148 AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE);
116 AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE); 149 AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE);
140 AvFLAGS (av) = AVf_REIFY; 173 AvFLAGS (av) = AVf_REIFY;
141 174
142 for (ix = fpad; ix > 0; ix--) 175 for (ix = fpad; ix > 0; ix--)
143 { 176 {
144 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv; 177 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv;
178
145 if (namesv && namesv != &PL_sv_undef) 179 if (namesv && namesv != &PL_sv_undef)
146 { 180 {
147 char *name = SvPVX (namesv); /* XXX */ 181 char *name = SvPVX (namesv); /* XXX */
182
148 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&') 183 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&')
149 { /* lexical from outside? */ 184 { /* lexical from outside? */
150 npad[ix] = SvREFCNT_inc (ppad[ix]); 185 npad[ix] = SvREFCNT_inc (ppad[ix]);
151 } 186 }
152 else 187 else
158 sv = (SV *) newAV (); 193 sv = (SV *) newAV ();
159 else if (*name == '%') 194 else if (*name == '%')
160 sv = (SV *) newHV (); 195 sv = (SV *) newHV ();
161 else 196 else
162 sv = NEWSV (0, 0); 197 sv = NEWSV (0, 0);
198
199#ifdef SvPADBUSY
163 if (!SvPADBUSY (sv)) 200 if (!SvPADBUSY (sv))
201#endif
164 SvPADMY_on (sv); 202 SvPADMY_on (sv);
203
165 npad[ix] = sv; 204 npad[ix] = sv;
166 } 205 }
167 } 206 }
168 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix])) 207 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix]))
169 { 208 {
198#endif 237#endif
199 238
200 return newpadlist; 239 return newpadlist;
201} 240}
202 241
203#ifdef MAY_FLUSH
204STATIC void 242STATIC void
205free_padlist (AV *padlist) 243free_padlist (pTHX_ AV *padlist)
206{ 244{
207 /* may be during global destruction */ 245 /* may be during global destruction */
208 if (SvREFCNT(padlist)) 246 if (SvREFCNT (padlist))
209 { 247 {
210 I32 i = AvFILLp(padlist); 248 I32 i = AvFILLp (padlist);
211 while (i >= 0) 249 while (i >= 0)
212 { 250 {
213 SV **svp = av_fetch(padlist, i--, FALSE); 251 SV **svp = av_fetch (padlist, i--, FALSE);
214 SV *sv = svp ? *svp : Nullsv;
215 if (sv) 252 if (svp)
253 {
254 SV *sv;
255 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp)))
216 SvREFCNT_dec(sv); 256 SvREFCNT_dec (sv);
257
258 SvREFCNT_dec (*svp);
259 }
217 } 260 }
218 261
219 SvREFCNT_dec((SV*)padlist); 262 SvREFCNT_dec ((SV*)padlist);
220 } 263 }
221} 264}
222#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};
223 280
224/* the next two functions merely cache the padlists */ 281/* the next two functions merely cache the padlists */
225STATIC void 282STATIC void
226get_padlist (CV *cv) 283get_padlist (pTHX_ CV *cv)
227{ 284{
228 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 0); 285 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
229 286
230 if (he && AvFILLp ((AV *)*he) >= 0) 287 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
231 CvPADLIST (cv) = (AV *)av_pop ((AV *)*he); 288 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
232 else 289 else
233 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv)); 290 CvPADLIST (cv) = clone_padlist (aTHX_ CvPADLIST (cv));
234} 291}
235 292
236STATIC void 293STATIC void
237put_padlist (CV *cv) 294put_padlist (pTHX_ CV *cv)
238{ 295{
239 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 1); 296 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
240 297
241 if (SvTYPE (*he) != SVt_PVAV) 298 if (!mg)
242 { 299 {
243 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;
244 *he = (SV *)newAV (); 303 mg->mg_obj = (SV *)newAV ();
245 } 304 }
246 305
247 av_push ((AV *)*he, (SV *)CvPADLIST (cv)); 306 av_push ((AV *)mg->mg_obj, (SV *)CvPADLIST (cv));
248} 307}
249
250#ifdef MAY_FLUSH
251STATIC void
252flush_padlist_cache ()
253{
254 HV *hv = padlist_cache;
255 padlist_cache = newHV ();
256
257 if (hv_iterinit (hv))
258 {
259 HE *he;
260 AV *padlist;
261
262 while (!!(he = hv_iternext (hv)))
263 {
264 AV *av = (AV *)HeVAL(he);
265
266 /* casting is fun. */
267 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
268 free_padlist (padlist);
269 }
270 }
271
272 SvREFCNT_dec (hv);
273}
274#endif
275 308
276#define SB do { 309#define SB do {
277#define SE } while (0) 310#define SE } while (0)
278 311
279#define LOAD(state) load_state(aTHX_ (state)); 312#define LOAD(state) load_state(aTHX_ (state));
280#define SAVE(state,flags) save_state(aTHX_ (state),(flags)); 313#define SAVE(state,flags) save_state(aTHX_ (state),(flags));
281 314
282#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
283 316
284static void 317static void
285load_state(pTHX_ Coro__State c) 318load_state(pTHX_ Coro__State c)
286{ 319{
287 PL_dowarn = c->dowarn; 320 PL_dowarn = c->dowarn;
328 { 361 {
329 AV *padlist = (AV *)POPs; 362 AV *padlist = (AV *)POPs;
330 363
331 if (padlist) 364 if (padlist)
332 { 365 {
333 put_padlist (cv); /* mark this padlist as available */ 366 put_padlist (aTHX_ cv); /* mark this padlist as available */
334 CvPADLIST(cv) = padlist; 367 CvPADLIST(cv) = padlist;
335#ifdef USE_THREADS
336 /*CvOWNER(cv) = (struct perl_thread *)POPs;*/
337#endif
338 } 368 }
339 369
340 ++CvDEPTH(cv); 370 ++CvDEPTH(cv);
341 } 371 }
342 372
369 if (CxTYPE(cx) == CXt_SUB) 399 if (CxTYPE(cx) == CXt_SUB)
370 { 400 {
371 CV *cv = cx->blk_sub.cv; 401 CV *cv = cx->blk_sub.cv;
372 if (CvDEPTH(cv)) 402 if (CvDEPTH(cv))
373 { 403 {
374#ifdef USE_THREADS
375 /*XPUSHs ((SV *)CvOWNER(cv));*/
376 /*CvOWNER(cv) = 0;*/
377 /*error must unlock this cv etc.. etc...*/
378#endif
379 EXTEND (SP, CvDEPTH(cv)*2); 404 EXTEND (SP, CvDEPTH(cv)*2);
380 405
381 while (--CvDEPTH(cv)) 406 while (--CvDEPTH(cv))
382 { 407 {
383 /* this tells the restore code to increment CvDEPTH */ 408 /* this tells the restore code to increment CvDEPTH */
386 } 411 }
387 412
388 PUSHs ((SV *)CvPADLIST(cv)); 413 PUSHs ((SV *)CvPADLIST(cv));
389 PUSHs ((SV *)cv); 414 PUSHs ((SV *)cv);
390 415
391 get_padlist (cv); /* this is a monster */ 416 get_padlist (aTHX_ cv); /* this is a monster */
392 } 417 }
393 } 418 }
419#ifdef CXt_FORMAT
394 else if (CxTYPE(cx) == CXt_FORMAT) 420 else if (CxTYPE(cx) == CXt_FORMAT)
395 { 421 {
396 /* 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? */
397 /* my bold guess is as a simple, plain sub... */ 423 /* my bold guess is as a simple, plain sub... */
398 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");
399 } 425 }
426#endif
400 } 427 }
401 428
402 if (top_si->si_type == PERLSI_MAIN) 429 if (top_si->si_type == PERLSI_MAIN)
403 break; 430 break;
404 431
447} 474}
448 475
449/* 476/*
450 * allocate various perl stacks. This is an exact copy 477 * allocate various perl stacks. This is an exact copy
451 * of perl.c:init_stacks, except that it uses less memory 478 * of perl.c:init_stacks, except that it uses less memory
452 * on the assumption that coroutines do not usually need 479 * on the (sometimes correct) assumption that coroutines do
453 * a lot of stackspace. 480 * not usually need a lot of stackspace.
454 */ 481 */
455STATIC void 482STATIC void
456coro_init_stacks (pTHX) 483coro_init_stacks (pTHX)
457{ 484{
485 LOCK;
486
458 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 487 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
459 PL_curstackinfo->si_type = PERLSI_MAIN; 488 PL_curstackinfo->si_type = PERLSI_MAIN;
460 PL_curstack = PL_curstackinfo->si_stack; 489 PL_curstack = PL_curstackinfo->si_stack;
461 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 490 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
462 491
471 500
472 New(54,PL_markstack,16,I32); 501 New(54,PL_markstack,16,I32);
473 PL_markstack_ptr = PL_markstack; 502 PL_markstack_ptr = PL_markstack;
474 PL_markstack_max = PL_markstack + 16; 503 PL_markstack_max = PL_markstack + 16;
475 504
505#ifdef SET_MARK_OFFSET
476 SET_MARK_OFFSET; 506 SET_MARK_OFFSET;
507#endif
477 508
478 New(54,PL_scopestack,16,I32); 509 New(54,PL_scopestack,16,I32);
479 PL_scopestack_ix = 0; 510 PL_scopestack_ix = 0;
480 PL_scopestack_max = 16; 511 PL_scopestack_max = 16;
481 512
484 PL_savestack_max = 96; 515 PL_savestack_max = 96;
485 516
486 New(54,PL_retstack,8,OP*); 517 New(54,PL_retstack,8,OP*);
487 PL_retstack_ix = 0; 518 PL_retstack_ix = 0;
488 PL_retstack_max = 8; 519 PL_retstack_max = 8;
520
521 UNLOCK;
489} 522}
490 523
491/* 524/*
492 * destroy the stacks, the callchain etc... 525 * destroy the stacks, the callchain etc...
493 * still there is a memleak of 128 bytes...
494 */ 526 */
495STATIC void 527STATIC void
496destroy_stacks(pTHX) 528destroy_stacks(pTHX)
497{ 529{
498 if (!IN_DESTRUCT) 530 if (!IN_DESTRUCT)
499 { 531 {
500 /* is this ugly, I ask? */ 532 /* is this ugly, I ask? */
501 while (PL_scopestack_ix) 533 LEAVE_SCOPE (0);
502 LEAVE;
503 534
504 /* sure it is, but more important: is it correct?? :/ */ 535 /* sure it is, but more important: is it correct?? :/ */
505 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */
506 FREETMPS; 536 FREETMPS;
537
538 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/
507 } 539 }
508 540
509 while (PL_curstackinfo->si_next) 541 while (PL_curstackinfo->si_next)
510 PL_curstackinfo = PL_curstackinfo->si_next; 542 PL_curstackinfo = PL_curstackinfo->si_next;
511 543
512 while (PL_curstackinfo) 544 while (PL_curstackinfo)
513 { 545 {
514 PERL_SI *p = PL_curstackinfo->si_prev; 546 PERL_SI *p = PL_curstackinfo->si_prev;
515 547
516 { 548 { /*D*//*remove*/
517 dSP; 549 dSP;
518 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack); 550 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
519 PUTBACK; /* possibly superfluous */ 551 PUTBACK; /* possibly superfluous */
520 } 552 }
521 553
522 if (!IN_DESTRUCT) 554 if (!IN_DESTRUCT)
523 { 555 {
524 dounwind(-1); 556 dounwind (-1);/*D*//*remove*/
525 SvREFCNT_dec(PL_curstackinfo->si_stack); 557 SvREFCNT_dec (PL_curstackinfo->si_stack);
526 } 558 }
527 559
528 Safefree(PL_curstackinfo->si_cxstack); 560 Safefree (PL_curstackinfo->si_cxstack);
529 Safefree(PL_curstackinfo); 561 Safefree (PL_curstackinfo);
530 PL_curstackinfo = p; 562 PL_curstackinfo = p;
531 } 563 }
532 564
533 Safefree(PL_tmps_stack); 565 Safefree (PL_tmps_stack);
534 Safefree(PL_markstack); 566 Safefree (PL_markstack);
535 Safefree(PL_scopestack); 567 Safefree (PL_scopestack);
536 Safefree(PL_savestack); 568 Safefree (PL_savestack);
537 Safefree(PL_retstack); 569 Safefree (PL_retstack);
538} 570}
539 571
540static void 572static void
541allocate_stack (Coro__State ctx, int alloc) 573allocate_stack (Coro__State ctx, int alloc)
542{ 574{
545 New (0, stack, 1, coro_stack); 577 New (0, stack, 1, coro_stack);
546 578
547 stack->refcnt = 1; 579 stack->refcnt = 1;
548 stack->usecnt = 1; 580 stack->usecnt = 1;
549 stack->gencnt = ctx->gencnt = 0; 581 stack->gencnt = ctx->gencnt = 0;
582
550 if (alloc) 583 if (alloc)
551 { 584 {
552#if HAVE_MMAP 585#if HAVE_MMAP
553 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */ 586 stack->ssize = 16384 * sizeof (long); /* mmap should do allocate-on-write for us */
554 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 587 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
555 if (stack->sptr == (void *)-1) 588 if (stack->sptr == (void *)-1)
556#endif 589#endif
557 { 590 {
558 /*FIXME*//*D*//* reasonable stack size! */ 591 /*FIXME*//*D*//* reasonable stack size! */
559 stack->ssize = -4096 * sizeof (long); 592 stack->ssize = - (8192 * sizeof (long));
560 New (0, stack->sptr, 4096, long); 593 New (0, stack->sptr, 8192, long);
561 } 594 }
562 } 595 }
563 else 596 else
564 stack->sptr = 0; 597 stack->sptr = 0;
565 598
579 { 612 {
580#ifdef HAVE_MMAP 613#ifdef HAVE_MMAP
581 if (stack->ssize > 0 && stack->sptr) 614 if (stack->ssize > 0 && stack->sptr)
582 munmap (stack->sptr, stack->ssize); 615 munmap (stack->sptr, stack->ssize);
583 else 616 else
584#else 617#endif
585 Safefree (stack->sptr); 618 Safefree (stack->sptr);
586#endif 619
587 Safefree (stack); 620 Safefree (stack);
588 } 621 }
589 else if (ctx->gencnt == stack->gencnt) 622 else if (ctx->gencnt == stack->gencnt)
590 --stack->usecnt; 623 --stack->usecnt;
591 } 624 }
595setup_coro (void *arg) 628setup_coro (void *arg)
596{ 629{
597 /* 630 /*
598 * emulate part of the perl startup here. 631 * emulate part of the perl startup here.
599 */ 632 */
633 dTHX;
600 dSP; 634 dSP;
601 Coro__State ctx = (Coro__State)arg; 635 Coro__State ctx = (Coro__State)arg;
602 SV *sub_init = (SV*)get_cv(SUB_INIT, FALSE); 636 SV *sub_init = (SV *)get_cv (SUB_INIT, FALSE);
603 637
604 coro_init_stacks (aTHX); 638 coro_init_stacks (aTHX);
605 /*PL_curcop = 0;*/ 639 /*PL_curcop = 0;*/
606 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 640 /*PL_in_eval = PL_in_eval;*/ /* inherit */
607 SvREFCNT_dec (GvAV (PL_defgv)); 641 SvREFCNT_dec (GvAV (PL_defgv));
608 GvAV (PL_defgv) = ctx->args; 642 GvAV (PL_defgv) = ctx->args; ctx->args = 0;
609 643
610 SPAGAIN; 644 SPAGAIN;
611 645
612 if (ctx->stack) 646 if (ctx->stack)
613 { 647 {
653continue_coro (void *arg) 687continue_coro (void *arg)
654{ 688{
655 /* 689 /*
656 * this is a _very_ stripped down perl interpreter ;) 690 * this is a _very_ stripped down perl interpreter ;)
657 */ 691 */
692 dTHX;
658 Coro__State ctx = (Coro__State)arg; 693 Coro__State ctx = (Coro__State)arg;
659 JMPENV coro_start_env; 694 JMPENV coro_start_env;
660 695
661 /* same as JMPENV_BOOTSTRAP */
662 Zero(&coro_start_env, 1, JMPENV);
663 coro_start_env.je_ret = -1;
664 coro_start_env.je_mustcatch = TRUE;
665 PL_top_env = &coro_start_env; 696 PL_top_env = &ctx->start_env;
666 697
667 ctx->cursp = 0; 698 ctx->cursp = 0;
668 PL_op = PL_op->op_next; 699 PL_op = PL_op->op_next;
669 CALLRUNOPS(aTHX); 700 CALLRUNOPS(aTHX);
670 701
671 abort (); 702 abort ();
672} 703}
673 704
674STATIC void 705STATIC void
675transfer(pTHX_ struct coro *prev, struct coro *next, int flags) 706transfer (pTHX_ struct coro *prev, struct coro *next, int flags)
676{ 707{
677 dSTACKLEVEL; 708 dSTACKLEVEL;
678 static struct coro *xnext;
679 709
680 if (prev != next) 710 if (prev != next)
681 { 711 {
682 xnext = next;
683
684 if (next->mainstack) 712 if (next->mainstack)
685 { 713 {
714 LOCK;
686 SAVE (prev, flags); 715 SAVE (prev, flags);
687 LOAD (next); 716 LOAD (next);
717 UNLOCK;
688 718
689 /* mark this state as in-use */ 719 /* mark this state as in-use */
690 next->mainstack = 0; 720 next->mainstack = 0;
691 next->tmps_ix = -2; 721 next->tmps_ix = -2;
692 722
711 continue_coro, (void *)next, 741 continue_coro, (void *)next,
712 next->stack->sptr, labs (next->stack->ssize)); 742 next->stack->sptr, labs (next->stack->ssize));
713 } 743 }
714 744
715 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 745 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
746 prev->cursp = stacklevel;
716 /* don't add any code here */ 747 /* don't add any code here */
717 } 748 }
718 749 else
750 next->cursp = stacklevel;
719 } 751 }
720 else if (next->tmps_ix == -2) 752 else if (next->tmps_ix == -2)
721 croak ("tried to transfer to running coroutine"); 753 croak ("tried to transfer to running coroutine");
722 else 754 else
723 { 755 {
756 LOCK;
724 SAVE (prev, -1); /* first get rid of the old state */ 757 SAVE (prev, -1); /* first get rid of the old state */
758 UNLOCK;
725 759
726 if (flags & TRANSFER_SAVE_CCTXT) 760 if (flags & TRANSFER_SAVE_CCTXT)
727 { 761 {
728 if (!prev->stack) 762 if (!prev->stack)
729 allocate_stack (prev, 0); 763 allocate_stack (prev, 0);
730 764
731 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 765 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
732 { 766 {
767 PL_top_env = &next->start_env;
768
733 setup_coro (next); 769 setup_coro (next);
770 next->cursp = stacklevel;
734 771
735 prev->stack->refcnt++; 772 prev->stack->refcnt++;
736 prev->stack->usecnt++; 773 prev->stack->usecnt++;
737 next->stack = prev->stack; 774 next->stack = prev->stack;
738 next->gencnt = prev->gencnt; 775 next->gencnt = prev->gencnt;
739 } 776 }
740 else 777 else
741 { 778 {
779 assert (!next->stack);
742 allocate_stack (next, 1); 780 allocate_stack (next, 1);
743 coro_create (&(next->stack->cctx), 781 coro_create (&(next->stack->cctx),
744 setup_coro, (void *)next, 782 setup_coro, (void *)next,
745 next->stack->sptr, labs (next->stack->ssize)); 783 next->stack->sptr, labs (next->stack->ssize));
746 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 784 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
785 prev->cursp = stacklevel;
747 /* don't add any code here */ 786 /* don't add any code here */
748 } 787 }
749 } 788 }
750 else 789 else
790 {
751 setup_coro (next); 791 setup_coro (next);
792 next->cursp = stacklevel;
793 }
752 } 794 }
753
754 /*
755 * xnext is now either prev or next, depending on wether
756 * we switched the c stack or not. that's why I use a global
757 * variable, that should become thread-specific at one point.
758 */
759 xnext->cursp = stacklevel;
760 } 795 }
761 796
797 LOCK;
762 if (coro_mortal) 798 if (coro_mortal)
763 { 799 {
764 SvREFCNT_dec (coro_mortal); 800 SvREFCNT_dec (coro_mortal);
765 coro_mortal = 0; 801 coro_mortal = 0;
766 } 802 }
803 UNLOCK;
767} 804}
768 805
769#define SV_CORO(sv,func) \ 806#define SV_CORO(sv,func) \
770 do { \ 807 do { \
771 if (SvROK (sv)) \ 808 if (SvROK (sv)) \
772 sv = SvRV (sv); \ 809 sv = SvRV (sv); \
773 \ 810 \
774 if (SvTYPE(sv) == SVt_PVHV) \ 811 if (SvTYPE (sv) == SVt_PVHV) \
775 { \ 812 { \
776 HE *he = hv_fetch_ent((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \ 813 HE *he = hv_fetch_ent ((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \
777 \ 814 \
778 if (!he) \ 815 if (!he) \
779 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \ 816 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \
780 \ 817 \
781 (sv) = SvRV (HeVAL(he)); \ 818 (sv) = SvRV (HeVAL(he)); \
782 } \ 819 } \
783 \ 820 \
784 /* must also be changed inside Coro::Cont::yield */ \ 821 /* must also be changed inside Coro::Cont::yield */ \
785 if (!SvOBJECT(sv) || SvSTASH(sv) != coro_state_stash) \ 822 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
786 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \ 823 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
787 \ 824 \
788 } while(0) 825 } while(0)
789 826
790#define SvSTATE(sv) (struct coro *)SvIV (sv) 827#define SvSTATE(sv) (struct coro *)SvIV (sv)
793api_transfer(pTHX_ SV *prev, SV *next, int flags) 830api_transfer(pTHX_ SV *prev, SV *next, int flags)
794{ 831{
795 SV_CORO (prev, "Coro::transfer"); 832 SV_CORO (prev, "Coro::transfer");
796 SV_CORO (next, "Coro::transfer"); 833 SV_CORO (next, "Coro::transfer");
797 834
798 transfer(aTHX_ SvSTATE(prev), SvSTATE(next), flags); 835 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
799} 836}
800 837
801/** Coro ********************************************************************/ 838/** Coro ********************************************************************/
802 839
803#define PRIO_MAX 3 840#define PRIO_MAX 3
811static GV *coro_current, *coro_idle; 848static GV *coro_current, *coro_idle;
812static AV *coro_ready[PRIO_MAX-PRIO_MIN+1]; 849static AV *coro_ready[PRIO_MAX-PRIO_MIN+1];
813static int coro_nready; 850static int coro_nready;
814 851
815static void 852static void
816coro_enq (SV *sv) 853coro_enq (pTHX_ SV *sv)
817{ 854{
818 if (SvTYPE (sv) == SVt_PVHV) 855 if (SvTYPE (sv) == SVt_PVHV)
819 { 856 {
820 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0); 857 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
821 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL; 858 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
832 869
833 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 870 croak ("Coro::ready tried to enqueue something that is not a coroutine");
834} 871}
835 872
836static SV * 873static SV *
837coro_deq (int min_prio) 874coro_deq (pTHX_ int min_prio)
838{ 875{
839 int prio = PRIO_MAX - PRIO_MIN; 876 int prio = PRIO_MAX - PRIO_MIN;
840 877
841 min_prio -= PRIO_MIN; 878 min_prio -= PRIO_MIN;
842 if (min_prio < 0) 879 if (min_prio < 0)
853} 890}
854 891
855static void 892static void
856api_ready (SV *coro) 893api_ready (SV *coro)
857{ 894{
895 dTHX;
896
858 if (SvROK (coro)) 897 if (SvROK (coro))
859 coro = SvRV (coro); 898 coro = SvRV (coro);
860 899
900 LOCK;
861 coro_enq (SvREFCNT_inc (coro)); 901 coro_enq (aTHX_ SvREFCNT_inc (coro));
902 UNLOCK;
862} 903}
863 904
864static void 905static void
865api_schedule (void) 906api_schedule (void)
866{ 907{
908 dTHX;
909
867 SV *prev, *next; 910 SV *prev, *next;
868 911
912 LOCK;
913
869 prev = SvRV (GvSV (coro_current)); 914 prev = SvRV (GvSV (coro_current));
870 next = coro_deq (PRIO_MIN); 915 next = coro_deq (aTHX_ PRIO_MIN);
871 916
872 if (!next) 917 if (!next)
873 next = SvREFCNT_inc (SvRV (GvSV (coro_idle))); 918 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
874 919
875 /* free this only after the transfer */ 920 /* free this only after the transfer */
878 923
879 SvRV (GvSV (coro_current)) = next; 924 SvRV (GvSV (coro_current)) = next;
880 925
881 SV_CORO (next, "Coro::schedule"); 926 SV_CORO (next, "Coro::schedule");
882 927
928 UNLOCK;
929
883 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), 930 transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
884 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 931 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
885} 932}
886 933
887static void 934static void
888api_cede (void) 935api_cede (void)
889{ 936{
937 dTHX;
938
939 LOCK;
890 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current)))); 940 coro_enq (aTHX_ SvREFCNT_inc (SvRV (GvSV (coro_current))));
941 UNLOCK;
891 942
892 api_schedule (); 943 api_schedule ();
893} 944}
894 945
895MODULE = Coro::State PACKAGE = Coro::State 946MODULE = Coro::State PACKAGE = Coro::State
896 947
897PROTOTYPES: ENABLE 948PROTOTYPES: ENABLE
898 949
899BOOT: 950BOOT:
900{ /* {} necessary for stoopid perl-5.6.x */ 951{ /* {} necessary for stoopid perl-5.6.x */
952#ifdef USE_ITHREADS
953 MUTEX_INIT (&coro_mutex);
954#endif
955
901 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1); 956 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
902 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1); 957 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
903 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 958 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
904 959
905 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 960 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV));
906 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 961 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV));
907 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 962 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV));
908 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT)); 963 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT));
909
910 if (!padlist_cache)
911 padlist_cache = newHV ();
912 964
913 main_mainstack = PL_mainstack; 965 main_mainstack = PL_mainstack;
914 966
915 coroapi.ver = CORO_API_VERSION; 967 coroapi.ver = CORO_API_VERSION;
916 coroapi.transfer = api_transfer; 968 coroapi.transfer = api_transfer;
924 Coro__State coro; 976 Coro__State coro;
925 977
926 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV) 978 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV)
927 croak ("Coro::State::_newprocess expects an arrayref"); 979 croak ("Coro::State::_newprocess expects an arrayref");
928 980
929 New (0, coro, 1, struct coro); 981 Newz (0, coro, 1, struct coro);
930 982
931 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 983 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
932 coro->mainstack = 0; /* actual work is done inside transfer */ 984 coro->mainstack = 0; /* actual work is done inside transfer */
933 coro->stack = 0; 985 coro->stack = 0;
986
987 /* same as JMPENV_BOOTSTRAP */
988 /* we might be able to recycle start_env, but safe is safe */
989 //Zero(&coro->start_env, 1, JMPENV);
990 coro->start_env.je_ret = -1;
991 coro->start_env.je_mustcatch = TRUE;
934 992
935 RETVAL = coro; 993 RETVAL = coro;
936 OUTPUT: 994 OUTPUT:
937 RETVAL 995 RETVAL
938 996
970 1028
971 coro->mainstack = 0; 1029 coro->mainstack = 0;
972 } 1030 }
973 1031
974 deallocate_stack (coro); 1032 deallocate_stack (coro);
975 1033 SvREFCNT_dec (coro->args);
976 Safefree (coro); 1034 Safefree (coro);
977
978void
979flush()
980 CODE:
981#ifdef MAY_FLUSH
982 flush_padlist_cache ();
983#endif
984 1035
985void 1036void
986_exit(code) 1037_exit(code)
987 int code 1038 int code
988 PROTOTYPE: $ 1039 PROTOTYPE: $
989 CODE: 1040 CODE:
990#if defined(__GLIBC__) || _POSIX_C_SOURCE
991 _exit (code); 1041 _exit (code);
992#else
993 signal (SIGTERM, SIG_DFL);
994 raise (SIGTERM);
995 exit (code);
996#endif
997 1042
998MODULE = Coro::State PACKAGE = Coro::Cont 1043MODULE = Coro::State PACKAGE = Coro::Cont
999 1044
1000# this is slightly dirty (should expose a c-level api) 1045# this is slightly dirty (should expose a c-level api)
1001 1046
1007 SV *sv; 1052 SV *sv;
1008 AV *defav = GvAV (PL_defgv); 1053 AV *defav = GvAV (PL_defgv);
1009 struct coro *prev, *next; 1054 struct coro *prev, *next;
1010 1055
1011 if (!returnstk) 1056 if (!returnstk)
1012 returnstk = SvRV (get_sv ("Coro::Cont::return", FALSE)); 1057 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE));
1013 1058
1014 /* set up @_ -- ugly */ 1059 /* set up @_ -- ugly */
1015 av_clear (defav); 1060 av_clear (defav);
1016 av_fill (defav, items - 1); 1061 av_fill (defav, items - 1);
1017 while (items--) 1062 while (items--)
1060 sv_setiv(sv, (IV)&coroapi); 1105 sv_setiv(sv, (IV)&coroapi);
1061 SvREADONLY_on(sv); 1106 SvREADONLY_on(sv);
1062 } 1107 }
1063} 1108}
1064 1109
1110#if !PERL_MICRO
1111
1065void 1112void
1066ready(self) 1113ready(self)
1067 SV * self 1114 SV * self
1068 PROTOTYPE: $ 1115 PROTOTYPE: $
1069 CODE: 1116 CODE:
1070 api_ready (self); 1117 api_ready (self);
1118
1119#endif
1071 1120
1072int 1121int
1073nready(...) 1122nready(...)
1074 PROTOTYPE: 1123 PROTOTYPE:
1075 CODE: 1124 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines