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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines