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.50 by pcg, Sun Nov 30 16:59:15 2003 UTC vs.
Revision 1.67 by root, Mon Dec 12 20:07:44 2005 UTC

1#define PERL_NO_GET_CONTEXT
2
3#include "libcoro/coro.c"
4
1#include "EXTERN.h" 5#include "EXTERN.h"
2#include "perl.h" 6#include "perl.h"
3#include "XSUB.h" 7#include "XSUB.h"
4 8
5#include "patchlevel.h" 9#include "patchlevel.h"
6 10
7#if PATCHLEVEL < 6 11// threaded perls might need much more, 65536 or more,
12// which is 0.5 to 1MB
13#define STACKSIZE 16384
14
15#if PERL_VERSION < 6
8# ifndef PL_ppaddr 16# ifndef PL_ppaddr
9# define PL_ppaddr ppaddr 17# define PL_ppaddr ppaddr
10# endif 18# endif
11# ifndef call_sv 19# ifndef call_sv
12# define call_sv perl_call_sv 20# define call_sv perl_call_sv
… …
23# ifndef IS_PADCONST 31# ifndef IS_PADCONST
24# define IS_PADCONST(v) 0 32# define IS_PADCONST(v) 0
25# endif 33# endif
26#endif 34#endif
27 35
28#include "libcoro/coro.c"
29
30#include <signal.h> 36#include <signal.h>
31 37
32#ifdef HAVE_MMAP 38#ifdef HAVE_MMAP
33# include <unistd.h> 39# include <unistd.h>
34# include <sys/mman.h> 40# include <sys/mman.h>
… …
53 59
54#define labs(l) ((l) >= 0 ? (l) : -(l)) 60#define labs(l) ((l) >= 0 ? (l) : -(l))
55 61
56#include "CoroAPI.h" 62#include "CoroAPI.h"
57 63
64#ifdef USE_ITHREADS
65static perl_mutex coro_mutex;
66# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0)
67# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0)
68#else
69# define LOCK 0
70# define UNLOCK 0
71#endif
72
58static struct CoroAPI coroapi; 73static struct CoroAPI coroapi;
74static AV *main_mainstack; /* used to differentiate between $main and others */
75static HV *coro_state_stash;
76static SV *ucoro_state_sv;
77static U32 ucoro_state_hash;
78static SV *coro_mortal; /* will be freed after next transfer */
59 79
60/* this is actually not only the c stack but also c registers etc... */ 80/* this is actually not only the c stack but also c registers etc... */
61typedef struct { 81typedef struct {
62 int refcnt; /* pointer reference counter */ 82 int refcnt; /* pointer reference counter */
63 int usecnt; /* shared by how many coroutines */ 83 int usecnt; /* shared by how many coroutines */
… …
93 AV *mainstack; 113 AV *mainstack;
94 SV **stack_sp; 114 SV **stack_sp;
95 OP *op; 115 OP *op;
96 SV **curpad; 116 SV **curpad;
97 AV *comppad; 117 AV *comppad;
118 CV *compcv;
98 SV **stack_base; 119 SV **stack_base;
99 SV **stack_max; 120 SV **stack_max;
100 SV **tmps_stack; 121 SV **tmps_stack;
101 I32 tmps_floor; 122 I32 tmps_floor;
102 I32 tmps_ix; 123 I32 tmps_ix;
… …
111 I32 savestack_ix; 132 I32 savestack_ix;
112 I32 savestack_max; 133 I32 savestack_max;
113 OP **retstack; 134 OP **retstack;
114 I32 retstack_ix; 135 I32 retstack_ix;
115 I32 retstack_max; 136 I32 retstack_max;
137 PMOP *curpm;
116 COP *curcop; 138 COP *curcop;
117 JMPENV *top_env; 139 JMPENV *top_env;
118 140
119 /* data associated with this coroutine (initial args) */ 141 /* data associated with this coroutine (initial args) */
120 AV *args; 142 AV *args;
121}; 143};
122 144
123typedef struct coro *Coro__State; 145typedef struct coro *Coro__State;
124typedef struct coro *Coro__State_or_hashref; 146typedef struct coro *Coro__State_or_hashref;
125 147
126static AV *main_mainstack; /* used to differentiate between $main and others */
127static HV *coro_state_stash;
128static SV *ucoro_state_sv;
129static U32 ucoro_state_hash;
130static HV *padlist_cache;
131static SV *coro_mortal; /* will be freed after next transfer */
132
133/* mostly copied from op.c:cv_clone2 */ 148/* mostly copied from op.c:cv_clone2 */
134STATIC AV * 149STATIC AV *
135clone_padlist (AV *protopadlist) 150clone_padlist (pTHX_ AV *protopadlist)
136{ 151{
137 AV *av; 152 AV *av;
138 I32 ix; 153 I32 ix;
139 AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE); 154 AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE);
140 AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE); 155 AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE);
… …
164 AvFLAGS (av) = AVf_REIFY; 179 AvFLAGS (av) = AVf_REIFY;
165 180
166 for (ix = fpad; ix > 0; ix--) 181 for (ix = fpad; ix > 0; ix--)
167 { 182 {
168 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv; 183 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv;
184
169 if (namesv && namesv != &PL_sv_undef) 185 if (namesv && namesv != &PL_sv_undef)
170 { 186 {
171 char *name = SvPVX (namesv); /* XXX */ 187 char *name = SvPVX (namesv); /* XXX */
188
172 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&') 189 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&')
173 { /* lexical from outside? */ 190 { /* lexical from outside? */
174 npad[ix] = SvREFCNT_inc (ppad[ix]); 191 npad[ix] = SvREFCNT_inc (ppad[ix]);
175 } 192 }
176 else 193 else
… …
182 sv = (SV *) newAV (); 199 sv = (SV *) newAV ();
183 else if (*name == '%') 200 else if (*name == '%')
184 sv = (SV *) newHV (); 201 sv = (SV *) newHV ();
185 else 202 else
186 sv = NEWSV (0, 0); 203 sv = NEWSV (0, 0);
204
187#ifdef SvPADBUSY 205#ifdef SvPADBUSY
188 if (!SvPADBUSY (sv)) 206 if (!SvPADBUSY (sv))
189#endif 207#endif
190 SvPADMY_on (sv); 208 SvPADMY_on (sv);
209
191 npad[ix] = sv; 210 npad[ix] = sv;
192 } 211 }
193 } 212 }
194 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix])) 213 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix]))
195 { 214 {
… …
225 244
226 return newpadlist; 245 return newpadlist;
227} 246}
228 247
229STATIC void 248STATIC void
230free_padlist (AV *padlist) 249free_padlist (pTHX_ AV *padlist)
231{ 250{
232 /* may be during global destruction */ 251 /* may be during global destruction */
233 if (SvREFCNT (padlist)) 252 if (SvREFCNT (padlist))
234 { 253 {
235 I32 i = AvFILLp (padlist); 254 I32 i = AvFILLp (padlist);
… …
249 SvREFCNT_dec ((SV*)padlist); 268 SvREFCNT_dec ((SV*)padlist);
250 } 269 }
251} 270}
252 271
253STATIC int 272STATIC int
254coro_cv_free (SV *sv, MAGIC *mg) 273coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
255{ 274{
256 AV *padlist; 275 AV *padlist;
257 AV *av = (AV *)mg->mg_obj; 276 AV *av = (AV *)mg->mg_obj;
258 277
259 /* casting is fun. */ 278 /* casting is fun. */
260 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 279 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
261 free_padlist (padlist); 280 free_padlist (aTHX_ padlist);
281
282 SvREFCNT_dec (av);
262} 283}
263 284
264#define PERL_MAGIC_coro PERL_MAGIC_ext 285#define PERL_MAGIC_coro PERL_MAGIC_ext
265 286
266static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 287static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
267 288
268/* the next two functions merely cache the padlists */ 289/* the next two functions merely cache the padlists */
269STATIC void 290STATIC void
270get_padlist (CV *cv) 291get_padlist (pTHX_ CV *cv)
271{ 292{
272 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 293 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
273 294
274 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0) 295 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
275 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj); 296 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
276 else 297 else
277 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv)); 298 CvPADLIST (cv) = clone_padlist (aTHX_ CvPADLIST (cv));
278} 299}
279 300
280STATIC void 301STATIC void
281put_padlist (CV *cv) 302put_padlist (pTHX_ CV *cv)
282{ 303{
283 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 304 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
284 305
285 if (!mg) 306 if (!mg)
286 { 307 {
… …
312 PL_mainstack = c->mainstack; 333 PL_mainstack = c->mainstack;
313 PL_stack_sp = c->stack_sp; 334 PL_stack_sp = c->stack_sp;
314 PL_op = c->op; 335 PL_op = c->op;
315 PL_curpad = c->curpad; 336 PL_curpad = c->curpad;
316 PL_comppad = c->comppad; 337 PL_comppad = c->comppad;
338 PL_compcv = c->compcv;
317 PL_stack_base = c->stack_base; 339 PL_stack_base = c->stack_base;
318 PL_stack_max = c->stack_max; 340 PL_stack_max = c->stack_max;
319 PL_tmps_stack = c->tmps_stack; 341 PL_tmps_stack = c->tmps_stack;
320 PL_tmps_floor = c->tmps_floor; 342 PL_tmps_floor = c->tmps_floor;
321 PL_tmps_ix = c->tmps_ix; 343 PL_tmps_ix = c->tmps_ix;
… …
330 PL_savestack_ix = c->savestack_ix; 352 PL_savestack_ix = c->savestack_ix;
331 PL_savestack_max = c->savestack_max; 353 PL_savestack_max = c->savestack_max;
332 PL_retstack = c->retstack; 354 PL_retstack = c->retstack;
333 PL_retstack_ix = c->retstack_ix; 355 PL_retstack_ix = c->retstack_ix;
334 PL_retstack_max = c->retstack_max; 356 PL_retstack_max = c->retstack_max;
357 PL_curpm = c->curpm;
335 PL_curcop = c->curcop; 358 PL_curcop = c->curcop;
336 PL_top_env = c->top_env; 359 PL_top_env = c->top_env;
337 360
338 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 361 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
339 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 362 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
… …
348 { 371 {
349 AV *padlist = (AV *)POPs; 372 AV *padlist = (AV *)POPs;
350 373
351 if (padlist) 374 if (padlist)
352 { 375 {
353 put_padlist (cv); /* mark this padlist as available */ 376 put_padlist (aTHX_ cv); /* mark this padlist as available */
354 CvPADLIST(cv) = padlist; 377 CvPADLIST(cv) = padlist;
355#ifdef USE_THREADS
356 /*CvOWNER(cv) = (struct perl_thread *)POPs;*/
357#endif
358 } 378 }
359 379
360 ++CvDEPTH(cv); 380 ++CvDEPTH(cv);
361 } 381 }
362 382
… …
389 if (CxTYPE(cx) == CXt_SUB) 409 if (CxTYPE(cx) == CXt_SUB)
390 { 410 {
391 CV *cv = cx->blk_sub.cv; 411 CV *cv = cx->blk_sub.cv;
392 if (CvDEPTH(cv)) 412 if (CvDEPTH(cv))
393 { 413 {
394#ifdef USE_THREADS
395 /*XPUSHs ((SV *)CvOWNER(cv));*/
396 /*CvOWNER(cv) = 0;*/
397 /*error must unlock this cv etc.. etc...*/
398#endif
399 EXTEND (SP, CvDEPTH(cv)*2); 414 EXTEND (SP, CvDEPTH(cv)*2);
400 415
401 while (--CvDEPTH(cv)) 416 while (--CvDEPTH(cv))
402 { 417 {
403 /* this tells the restore code to increment CvDEPTH */ 418 /* this tells the restore code to increment CvDEPTH */
… …
406 } 421 }
407 422
408 PUSHs ((SV *)CvPADLIST(cv)); 423 PUSHs ((SV *)CvPADLIST(cv));
409 PUSHs ((SV *)cv); 424 PUSHs ((SV *)cv);
410 425
411 get_padlist (cv); /* this is a monster */ 426 get_padlist (aTHX_ cv); /* this is a monster */
412 } 427 }
413 } 428 }
414#ifdef CXt_FORMAT 429#ifdef CXt_FORMAT
415 else if (CxTYPE(cx) == CXt_FORMAT) 430 else if (CxTYPE(cx) == CXt_FORMAT)
416 { 431 {
… …
444 c->mainstack = PL_mainstack; 459 c->mainstack = PL_mainstack;
445 c->stack_sp = PL_stack_sp; 460 c->stack_sp = PL_stack_sp;
446 c->op = PL_op; 461 c->op = PL_op;
447 c->curpad = PL_curpad; 462 c->curpad = PL_curpad;
448 c->comppad = PL_comppad; 463 c->comppad = PL_comppad;
464 c->compcv = PL_compcv;
449 c->stack_base = PL_stack_base; 465 c->stack_base = PL_stack_base;
450 c->stack_max = PL_stack_max; 466 c->stack_max = PL_stack_max;
451 c->tmps_stack = PL_tmps_stack; 467 c->tmps_stack = PL_tmps_stack;
452 c->tmps_floor = PL_tmps_floor; 468 c->tmps_floor = PL_tmps_floor;
453 c->tmps_ix = PL_tmps_ix; 469 c->tmps_ix = PL_tmps_ix;
… …
462 c->savestack_ix = PL_savestack_ix; 478 c->savestack_ix = PL_savestack_ix;
463 c->savestack_max = PL_savestack_max; 479 c->savestack_max = PL_savestack_max;
464 c->retstack = PL_retstack; 480 c->retstack = PL_retstack;
465 c->retstack_ix = PL_retstack_ix; 481 c->retstack_ix = PL_retstack_ix;
466 c->retstack_max = PL_retstack_max; 482 c->retstack_max = PL_retstack_max;
483 c->curpm = PL_curpm;
467 c->curcop = PL_curcop; 484 c->curcop = PL_curcop;
468 c->top_env = PL_top_env; 485 c->top_env = PL_top_env;
469} 486}
470 487
471/* 488/*
472 * allocate various perl stacks. This is an exact copy 489 * allocate various perl stacks. This is an exact copy
473 * of perl.c:init_stacks, except that it uses less memory 490 * of perl.c:init_stacks, except that it uses less memory
474 * on the assumption that coroutines do not usually need 491 * on the (sometimes correct) assumption that coroutines do
475 * a lot of stackspace. 492 * not usually need a lot of stackspace.
476 */ 493 */
477STATIC void 494STATIC void
478coro_init_stacks (pTHX) 495coro_init_stacks (pTHX)
479{ 496{
497 LOCK;
498
480 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 499 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
481 PL_curstackinfo->si_type = PERLSI_MAIN; 500 PL_curstackinfo->si_type = PERLSI_MAIN;
482 PL_curstack = PL_curstackinfo->si_stack; 501 PL_curstack = PL_curstackinfo->si_stack;
483 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 502 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
484 503
… …
508 PL_savestack_max = 96; 527 PL_savestack_max = 96;
509 528
510 New(54,PL_retstack,8,OP*); 529 New(54,PL_retstack,8,OP*);
511 PL_retstack_ix = 0; 530 PL_retstack_ix = 0;
512 PL_retstack_max = 8; 531 PL_retstack_max = 8;
532
533 UNLOCK;
513} 534}
514 535
515/* 536/*
516 * destroy the stacks, the callchain etc... 537 * destroy the stacks, the callchain etc...
517 */ 538 */
… …
519destroy_stacks(pTHX) 540destroy_stacks(pTHX)
520{ 541{
521 if (!IN_DESTRUCT) 542 if (!IN_DESTRUCT)
522 { 543 {
523 /* is this ugly, I ask? */ 544 /* is this ugly, I ask? */
524 while (PL_scopestack_ix) 545 LEAVE_SCOPE (0);
525 LEAVE;
526 546
527 /* sure it is, but more important: is it correct?? :/ */ 547 /* sure it is, but more important: is it correct?? :/ */
528 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */
529 FREETMPS; 548 FREETMPS;
549
550 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/
530 } 551 }
531 552
532 while (PL_curstackinfo->si_next) 553 while (PL_curstackinfo->si_next)
533 PL_curstackinfo = PL_curstackinfo->si_next; 554 PL_curstackinfo = PL_curstackinfo->si_next;
534 555
535 while (PL_curstackinfo) 556 while (PL_curstackinfo)
536 { 557 {
537 PERL_SI *p = PL_curstackinfo->si_prev; 558 PERL_SI *p = PL_curstackinfo->si_prev;
538 559
539 { 560 { /*D*//*remove*/
540 dSP; 561 dSP;
541 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack); 562 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
542 PUTBACK; /* possibly superfluous */ 563 PUTBACK; /* possibly superfluous */
543 } 564 }
544 565
545 if (!IN_DESTRUCT) 566 if (!IN_DESTRUCT)
546 { 567 {
547 dounwind(-1); 568 dounwind (-1);/*D*//*remove*/
548 SvREFCNT_dec(PL_curstackinfo->si_stack); 569 SvREFCNT_dec (PL_curstackinfo->si_stack);
549 } 570 }
550 571
551 Safefree(PL_curstackinfo->si_cxstack); 572 Safefree (PL_curstackinfo->si_cxstack);
552 Safefree(PL_curstackinfo); 573 Safefree (PL_curstackinfo);
553 PL_curstackinfo = p; 574 PL_curstackinfo = p;
554 } 575 }
555 576
556 Safefree(PL_tmps_stack); 577 Safefree (PL_tmps_stack);
557 Safefree(PL_markstack); 578 Safefree (PL_markstack);
558 Safefree(PL_scopestack); 579 Safefree (PL_scopestack);
559 Safefree(PL_savestack); 580 Safefree (PL_savestack);
560 Safefree(PL_retstack); 581 Safefree (PL_retstack);
561} 582}
562 583
563static void 584static void
564allocate_stack (Coro__State ctx, int alloc) 585allocate_stack (Coro__State ctx, int alloc)
565{ 586{
… …
568 New (0, stack, 1, coro_stack); 589 New (0, stack, 1, coro_stack);
569 590
570 stack->refcnt = 1; 591 stack->refcnt = 1;
571 stack->usecnt = 1; 592 stack->usecnt = 1;
572 stack->gencnt = ctx->gencnt = 0; 593 stack->gencnt = ctx->gencnt = 0;
594
573 if (alloc) 595 if (alloc)
574 { 596 {
575#if HAVE_MMAP 597#if HAVE_MMAP
576 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */ 598 stack->ssize = STACKSIZE * sizeof (long); /* mmap should do allocate-on-write for us */
577 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 599 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
578 if (stack->sptr == (void *)-1) 600 if (stack->sptr == (void *)-1)
579#endif 601#endif
580 { 602 {
581 /*FIXME*//*D*//* reasonable stack size! */ 603 /*FIXME*//*D*//* reasonable stack size! */
582 stack->ssize = -4096 * sizeof (long); 604 stack->ssize = - (STACKSIZE * sizeof (long));
583 New (0, stack->sptr, 4096, long); 605 New (0, stack->sptr, STACKSIZE, long);
584 } 606 }
585 } 607 }
586 else 608 else
587 stack->sptr = 0; 609 stack->sptr = 0;
588 610
… …
618setup_coro (void *arg) 640setup_coro (void *arg)
619{ 641{
620 /* 642 /*
621 * emulate part of the perl startup here. 643 * emulate part of the perl startup here.
622 */ 644 */
645 dTHX;
623 dSP; 646 dSP;
624 Coro__State ctx = (Coro__State)arg; 647 Coro__State ctx = (Coro__State)arg;
625 SV *sub_init = (SV*)get_cv(SUB_INIT, FALSE); 648 SV *sub_init = (SV *)get_cv (SUB_INIT, FALSE);
626 649
627 coro_init_stacks (aTHX); 650 coro_init_stacks (aTHX);
628 /*PL_curcop = 0;*/ 651 /*PL_curcop = 0;*/
629 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 652 /*PL_in_eval = PL_in_eval;*/ /* inherit */
630 SvREFCNT_dec (GvAV (PL_defgv)); 653 SvREFCNT_dec (GvAV (PL_defgv));
… …
676continue_coro (void *arg) 699continue_coro (void *arg)
677{ 700{
678 /* 701 /*
679 * this is a _very_ stripped down perl interpreter ;) 702 * this is a _very_ stripped down perl interpreter ;)
680 */ 703 */
704 dTHX;
681 Coro__State ctx = (Coro__State)arg; 705 Coro__State ctx = (Coro__State)arg;
682 JMPENV coro_start_env; 706 JMPENV coro_start_env;
683 707
684 PL_top_env = &ctx->start_env; 708 PL_top_env = &ctx->start_env;
685 709
… …
689 713
690 abort (); 714 abort ();
691} 715}
692 716
693STATIC void 717STATIC void
694transfer(pTHX_ struct coro *prev, struct coro *next, int flags) 718transfer (pTHX_ struct coro *prev, struct coro *next, int flags)
695{ 719{
696 dSTACKLEVEL; 720 dSTACKLEVEL;
697 static struct coro *xnext;
698 721
699 if (prev != next) 722 if (prev != next)
700 { 723 {
701 xnext = next;
702
703 if (next->mainstack) 724 if (next->mainstack)
704 { 725 {
726 LOCK;
705 SAVE (prev, flags); 727 SAVE (prev, flags);
706 LOAD (next); 728 LOAD (next);
729 UNLOCK;
707 730
708 /* mark this state as in-use */ 731 /* mark this state as in-use */
709 next->mainstack = 0; 732 next->mainstack = 0;
710 next->tmps_ix = -2; 733 next->tmps_ix = -2;
711 734
… …
730 continue_coro, (void *)next, 753 continue_coro, (void *)next,
731 next->stack->sptr, labs (next->stack->ssize)); 754 next->stack->sptr, labs (next->stack->ssize));
732 } 755 }
733 756
734 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 757 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
758 prev->cursp = stacklevel;
735 /* don't add any code here */ 759 /* don't add any code here */
736 } 760 }
737 761 else
762 next->cursp = stacklevel;
738 } 763 }
739 else if (next->tmps_ix == -2) 764 else if (next->tmps_ix == -2)
740 croak ("tried to transfer to running coroutine"); 765 croak ("tried to transfer to running coroutine");
741 else 766 else
742 { 767 {
768 LOCK;
743 SAVE (prev, -1); /* first get rid of the old state */ 769 SAVE (prev, -1); /* first get rid of the old state */
770 UNLOCK;
744 771
745 if (flags & TRANSFER_SAVE_CCTXT) 772 if (flags & TRANSFER_SAVE_CCTXT)
746 { 773 {
747 if (!prev->stack) 774 if (!prev->stack)
748 allocate_stack (prev, 0); 775 allocate_stack (prev, 0);
… …
750 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 777 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
751 { 778 {
752 PL_top_env = &next->start_env; 779 PL_top_env = &next->start_env;
753 780
754 setup_coro (next); 781 setup_coro (next);
782 next->cursp = stacklevel;
755 783
756 prev->stack->refcnt++; 784 prev->stack->refcnt++;
757 prev->stack->usecnt++; 785 prev->stack->usecnt++;
758 next->stack = prev->stack; 786 next->stack = prev->stack;
759 next->gencnt = prev->gencnt; 787 next->gencnt = prev->gencnt;
… …
764 allocate_stack (next, 1); 792 allocate_stack (next, 1);
765 coro_create (&(next->stack->cctx), 793 coro_create (&(next->stack->cctx),
766 setup_coro, (void *)next, 794 setup_coro, (void *)next,
767 next->stack->sptr, labs (next->stack->ssize)); 795 next->stack->sptr, labs (next->stack->ssize));
768 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 796 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
797 prev->cursp = stacklevel;
769 /* don't add any code here */ 798 /* don't add any code here */
770 } 799 }
771 } 800 }
772 else 801 else
802 {
773 setup_coro (next); 803 setup_coro (next);
804 next->cursp = stacklevel;
805 }
774 } 806 }
775
776 /*
777 * xnext is now either prev or next, depending on wether
778 * we switched the c stack or not. that's why I use a global
779 * variable, that should become thread-specific at one point.
780 */
781 xnext->cursp = stacklevel;
782 } 807 }
783 808
809 LOCK;
784 if (coro_mortal) 810 if (coro_mortal)
785 { 811 {
786 SvREFCNT_dec (coro_mortal); 812 SvREFCNT_dec (coro_mortal);
787 coro_mortal = 0; 813 coro_mortal = 0;
788 } 814 }
815 UNLOCK;
789} 816}
790 817
791#define SV_CORO(sv,func) \ 818#define SV_CORO(sv,func) \
792 do { \ 819 do { \
793 if (SvROK (sv)) \ 820 if (SvROK (sv)) \
794 sv = SvRV (sv); \ 821 sv = SvRV (sv); \
795 \ 822 \
796 if (SvTYPE(sv) == SVt_PVHV) \ 823 if (SvTYPE (sv) == SVt_PVHV) \
797 { \ 824 { \
798 HE *he = hv_fetch_ent((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \ 825 HE *he = hv_fetch_ent ((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \
799 \ 826 \
800 if (!he) \ 827 if (!he) \
801 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \ 828 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \
802 \ 829 \
803 (sv) = SvRV (HeVAL(he)); \ 830 (sv) = SvRV (HeVAL(he)); \
804 } \ 831 } \
805 \ 832 \
806 /* must also be changed inside Coro::Cont::yield */ \ 833 /* must also be changed inside Coro::Cont::yield */ \
807 if (!SvOBJECT(sv) || SvSTASH(sv) != coro_state_stash) \ 834 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
808 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \ 835 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
809 \ 836 \
810 } while(0) 837 } while(0)
811 838
812#define SvSTATE(sv) (struct coro *)SvIV (sv) 839#define SvSTATE(sv) (struct coro *)SvIV (sv)
… …
815api_transfer(pTHX_ SV *prev, SV *next, int flags) 842api_transfer(pTHX_ SV *prev, SV *next, int flags)
816{ 843{
817 SV_CORO (prev, "Coro::transfer"); 844 SV_CORO (prev, "Coro::transfer");
818 SV_CORO (next, "Coro::transfer"); 845 SV_CORO (next, "Coro::transfer");
819 846
820 transfer(aTHX_ SvSTATE(prev), SvSTATE(next), flags); 847 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
821} 848}
822 849
823/** Coro ********************************************************************/ 850/** Coro ********************************************************************/
824 851
825#define PRIO_MAX 3 852#define PRIO_MAX 3
… …
833static GV *coro_current, *coro_idle; 860static GV *coro_current, *coro_idle;
834static AV *coro_ready[PRIO_MAX-PRIO_MIN+1]; 861static AV *coro_ready[PRIO_MAX-PRIO_MIN+1];
835static int coro_nready; 862static int coro_nready;
836 863
837static void 864static void
838coro_enq (SV *sv) 865coro_enq (pTHX_ SV *sv)
839{ 866{
840 if (SvTYPE (sv) == SVt_PVHV) 867 if (SvTYPE (sv) == SVt_PVHV)
841 { 868 {
842 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0); 869 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
843 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL; 870 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
… …
854 881
855 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 882 croak ("Coro::ready tried to enqueue something that is not a coroutine");
856} 883}
857 884
858static SV * 885static SV *
859coro_deq (int min_prio) 886coro_deq (pTHX_ int min_prio)
860{ 887{
861 int prio = PRIO_MAX - PRIO_MIN; 888 int prio = PRIO_MAX - PRIO_MIN;
862 889
863 min_prio -= PRIO_MIN; 890 min_prio -= PRIO_MIN;
864 if (min_prio < 0) 891 if (min_prio < 0)
… …
875} 902}
876 903
877static void 904static void
878api_ready (SV *coro) 905api_ready (SV *coro)
879{ 906{
907 dTHX;
908
880 if (SvROK (coro)) 909 if (SvROK (coro))
881 coro = SvRV (coro); 910 coro = SvRV (coro);
882 911
912 LOCK;
883 coro_enq (SvREFCNT_inc (coro)); 913 coro_enq (aTHX_ SvREFCNT_inc (coro));
914 UNLOCK;
884} 915}
885 916
886static void 917static void
887api_schedule (void) 918api_schedule (void)
888{ 919{
920 dTHX;
921
889 SV *prev, *next; 922 SV *prev, *next;
890 923
924 LOCK;
925
891 prev = SvRV (GvSV (coro_current)); 926 prev = SvRV (GvSV (coro_current));
892 next = coro_deq (PRIO_MIN); 927 next = coro_deq (aTHX_ PRIO_MIN);
893 928
894 if (!next) 929 if (!next)
895 next = SvREFCNT_inc (SvRV (GvSV (coro_idle))); 930 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
896 931
897 /* free this only after the transfer */ 932 /* free this only after the transfer */
… …
900 935
901 SvRV (GvSV (coro_current)) = next; 936 SvRV (GvSV (coro_current)) = next;
902 937
903 SV_CORO (next, "Coro::schedule"); 938 SV_CORO (next, "Coro::schedule");
904 939
940 UNLOCK;
941
905 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), 942 transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
906 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 943 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
907} 944}
908 945
909static void 946static void
910api_cede (void) 947api_cede (void)
911{ 948{
949 dTHX;
950
951 LOCK;
912 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current)))); 952 coro_enq (aTHX_ SvREFCNT_inc (SvRV (GvSV (coro_current))));
953 UNLOCK;
913 954
914 api_schedule (); 955 api_schedule ();
915} 956}
916 957
917MODULE = Coro::State PACKAGE = Coro::State 958MODULE = Coro::State PACKAGE = Coro::State
918 959
919PROTOTYPES: ENABLE 960PROTOTYPES: ENABLE
920 961
921BOOT: 962BOOT:
922{ /* {} necessary for stoopid perl-5.6.x */ 963{ /* {} necessary for stoopid perl-5.6.x */
964#ifdef USE_ITHREADS
965 MUTEX_INIT (&coro_mutex);
966#endif
967
923 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1); 968 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
924 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1); 969 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
925 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 970 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
926 971
927 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 972 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV));
928 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 973 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV));
929 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 974 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV));
930 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT)); 975 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT));
931
932 if (!padlist_cache)
933 padlist_cache = newHV ();
934 976
935 main_mainstack = PL_mainstack; 977 main_mainstack = PL_mainstack;
936 978
937 coroapi.ver = CORO_API_VERSION; 979 coroapi.ver = CORO_API_VERSION;
938 coroapi.transfer = api_transfer; 980 coroapi.transfer = api_transfer;
… …
949 croak ("Coro::State::_newprocess expects an arrayref"); 991 croak ("Coro::State::_newprocess expects an arrayref");
950 992
951 Newz (0, coro, 1, struct coro); 993 Newz (0, coro, 1, struct coro);
952 994
953 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 995 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
954 coro->mainstack = 0; /* actual work is done inside transfer */ 996 /*coro->mainstack = 0; *//*actual work is done inside transfer */
955 coro->stack = 0; 997 /*coro->stack = 0;*/
956 998
957 /* same as JMPENV_BOOTSTRAP */ 999 /* same as JMPENV_BOOTSTRAP */
958 /* we might be able to recycle start_env, but safe is safe */ 1000 /* we might be able to recycle start_env, but safe is safe */
959 //Zero(&coro->start_env, 1, JMPENV); 1001 /*Zero(&coro->start_env, 1, JMPENV);*/
960 coro->start_env.je_ret = -1; 1002 coro->start_env.je_ret = -1;
961 coro->start_env.je_mustcatch = TRUE; 1003 coro->start_env.je_mustcatch = TRUE;
962 1004
963 RETVAL = coro; 1005 RETVAL = coro;
964 OUTPUT: 1006 OUTPUT:
… …
985 if (coro->mainstack && coro->mainstack != main_mainstack) 1027 if (coro->mainstack && coro->mainstack != main_mainstack)
986 { 1028 {
987 struct coro temp; 1029 struct coro temp;
988 1030
989 PUTBACK; 1031 PUTBACK;
990 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL); 1032 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL);
991 LOAD(aTHX_ coro); 1033 LOAD (aTHX_ coro);
992 SPAGAIN; 1034 SPAGAIN;
993 1035
994 destroy_stacks (aTHX); 1036 destroy_stacks (aTHX);
995 1037
996 LOAD((&temp)); /* this will get rid of defsv etc.. */ 1038 LOAD ((&temp)); /* this will get rid of defsv etc.. */
997 SPAGAIN; 1039 SPAGAIN;
998 1040
999 coro->mainstack = 0; 1041 coro->mainstack = 0;
1000 } 1042 }
1001 1043
… …
1006void 1048void
1007_exit(code) 1049_exit(code)
1008 int code 1050 int code
1009 PROTOTYPE: $ 1051 PROTOTYPE: $
1010 CODE: 1052 CODE:
1011#if defined(__GLIBC__) || _POSIX_C_SOURCE
1012 _exit (code); 1053 _exit (code);
1013#else
1014 signal (SIGTERM, SIG_DFL);
1015 raise (SIGTERM);
1016 exit (code);
1017#endif
1018 1054
1019MODULE = Coro::State PACKAGE = Coro::Cont 1055MODULE = Coro::State PACKAGE = Coro::Cont
1020 1056
1021# this is slightly dirty (should expose a c-level api) 1057# this is slightly dirty (should expose a c-level api)
1022 1058
1023void 1059void
1024yield(...) 1060yield(...)
1025 PROTOTYPE: @ 1061 PROTOTYPE: @
1026 CODE: 1062 CODE:
1027 static SV *returnstk; 1063 SV *yieldstack;
1028 SV *sv; 1064 SV *sv;
1029 AV *defav = GvAV (PL_defgv); 1065 AV *defav = GvAV (PL_defgv);
1030 struct coro *prev, *next; 1066 struct coro *prev, *next;
1031 1067
1032 if (!returnstk) 1068 yieldstack = *hv_fetch (
1033 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE)); 1069 (HV *)SvRV (GvSV (coro_current)),
1070 "yieldstack", sizeof ("yieldstack") - 1,
1071 0
1072 );
1034 1073
1035 /* set up @_ -- ugly */ 1074 /* set up @_ -- ugly */
1036 av_clear (defav); 1075 av_clear (defav);
1037 av_fill (defav, items - 1); 1076 av_fill (defav, items - 1);
1038 while (items--) 1077 while (items--)
1039 av_store (defav, items, SvREFCNT_inc (ST(items))); 1078 av_store (defav, items, SvREFCNT_inc (ST(items)));
1040 1079
1041 mg_get (returnstk); /* isn't documentation wrong for mg_get? */
1042 sv = av_pop ((AV *)SvRV (returnstk)); 1080 sv = av_pop ((AV *)SvRV (yieldstack));
1043 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0))); 1081 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0)));
1044 next = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0))); 1082 next = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0)));
1045 SvREFCNT_dec (sv); 1083 SvREFCNT_dec (sv);
1046 1084
1047 transfer(aTHX_ prev, next, 0); 1085 transfer (aTHX_ prev, next, 0);
1048 1086
1049MODULE = Coro::State PACKAGE = Coro 1087MODULE = Coro::State PACKAGE = Coro
1050 1088
1051# this is slightly dirty (should expose a c-level api) 1089# this is slightly dirty (should expose a c-level api)
1052 1090

Diff Legend

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