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.51 by pcg, Sun Nov 30 17:03:48 2003 UTC vs.
Revision 1.72 by root, Wed Feb 1 23:59:41 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);
… …
249 SvREFCNT_dec ((SV*)padlist); 265 SvREFCNT_dec ((SV*)padlist);
250 } 266 }
251} 267}
252 268
253STATIC int 269STATIC int
254coro_cv_free (SV *sv, MAGIC *mg) 270coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
255{ 271{
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/*
472 * allocate various perl stacks. This is an exact copy 490 * allocate various perl stacks. This is an exact copy
473 * of perl.c:init_stacks, except that it uses less memory 491 * of perl.c:init_stacks, except that it uses less memory
474 * on the assumption that coroutines do not usually need 492 * on the (sometimes correct) assumption that coroutines do
475 * 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 */
… …
519destroy_stacks(pTHX) 543destroy_stacks(pTHX)
520{ 544{
521 if (!IN_DESTRUCT) 545 if (!IN_DESTRUCT)
522 { 546 {
523 /* is this ugly, I ask? */ 547 /* is this ugly, I ask? */
524 while (PL_scopestack_ix) 548 LEAVE_SCOPE (0);
525 LEAVE;
526 549
527 /* sure it is, but more important: is it correct?? :/ */ 550 /* 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; 551 FREETMPS;
552
553 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/
530 } 554 }
531 555
532 while (PL_curstackinfo->si_next) 556 while (PL_curstackinfo->si_next)
533 PL_curstackinfo = PL_curstackinfo->si_next; 557 PL_curstackinfo = PL_curstackinfo->si_next;
534 558
535 while (PL_curstackinfo) 559 while (PL_curstackinfo)
536 { 560 {
537 PERL_SI *p = PL_curstackinfo->si_prev; 561 PERL_SI *p = PL_curstackinfo->si_prev;
538 562
539 { 563 { /*D*//*remove*/
540 dSP; 564 dSP;
541 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack); 565 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
542 PUTBACK; /* possibly superfluous */ 566 PUTBACK; /* possibly superfluous */
543 } 567 }
544 568
545 if (!IN_DESTRUCT) 569 if (!IN_DESTRUCT)
546 { 570 {
547 dounwind(-1); 571 dounwind (-1);/*D*//*remove*/
548 SvREFCNT_dec(PL_curstackinfo->si_stack); 572 SvREFCNT_dec (PL_curstackinfo->si_stack);
549 } 573 }
550 574
551 Safefree(PL_curstackinfo->si_cxstack); 575 Safefree (PL_curstackinfo->si_cxstack);
552 Safefree(PL_curstackinfo); 576 Safefree (PL_curstackinfo);
553 PL_curstackinfo = p; 577 PL_curstackinfo = p;
554 } 578 }
555 579
556 Safefree(PL_tmps_stack); 580 Safefree (PL_tmps_stack);
557 Safefree(PL_markstack); 581 Safefree (PL_markstack);
558 Safefree(PL_scopestack); 582 Safefree (PL_scopestack);
559 Safefree(PL_savestack); 583 Safefree (PL_savestack);
584#if PERL_VERSION < 9
560 Safefree(PL_retstack); 585 Safefree (PL_retstack);
586#endif
561} 587}
562 588
563static void 589static void
564allocate_stack (Coro__State ctx, int alloc) 590allocate_stack (Coro__State ctx, int alloc)
565{ 591{
… …
568 New (0, stack, 1, coro_stack); 594 New (0, stack, 1, coro_stack);
569 595
570 stack->refcnt = 1; 596 stack->refcnt = 1;
571 stack->usecnt = 1; 597 stack->usecnt = 1;
572 stack->gencnt = ctx->gencnt = 0; 598 stack->gencnt = ctx->gencnt = 0;
599
573 if (alloc) 600 if (alloc)
574 { 601 {
575#if HAVE_MMAP 602#if HAVE_MMAP
576 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */ 603 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); 604 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
578 if (stack->sptr == (void *)-1) 605 if (stack->sptr == (void *)-1)
579#endif 606#endif
580 { 607 {
581 /*FIXME*//*D*//* reasonable stack size! */ 608 /*FIXME*//*D*//* reasonable stack size! */
582 stack->ssize = - (16384 * sizeof (long)); 609 stack->ssize = - (STACKSIZE * sizeof (long));
583 New (0, stack->sptr, 16384, long); 610 New (0, stack->sptr, STACKSIZE, long);
584 } 611 }
585 } 612 }
586 else 613 else
587 stack->sptr = 0; 614 stack->sptr = 0;
588 615
… …
618setup_coro (void *arg) 645setup_coro (void *arg)
619{ 646{
620 /* 647 /*
621 * emulate part of the perl startup here. 648 * emulate part of the perl startup here.
622 */ 649 */
650 dTHX;
623 dSP; 651 dSP;
624 Coro__State ctx = (Coro__State)arg; 652 Coro__State ctx = (Coro__State)arg;
625 SV *sub_init = (SV*)get_cv(SUB_INIT, FALSE); 653 SV *sub_init = (SV *)get_cv (SUB_INIT, FALSE);
626 654
627 coro_init_stacks (aTHX); 655 coro_init_stacks (aTHX);
628 /*PL_curcop = 0;*/ 656 /*PL_curcop = 0;*/
629 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 657 /*PL_in_eval = PL_in_eval;*/ /* inherit */
630 SvREFCNT_dec (GvAV (PL_defgv)); 658 SvREFCNT_dec (GvAV (PL_defgv));
… …
676continue_coro (void *arg) 704continue_coro (void *arg)
677{ 705{
678 /* 706 /*
679 * this is a _very_ stripped down perl interpreter ;) 707 * this is a _very_ stripped down perl interpreter ;)
680 */ 708 */
709 dTHX;
681 Coro__State ctx = (Coro__State)arg; 710 Coro__State ctx = (Coro__State)arg;
682 JMPENV coro_start_env; 711 JMPENV coro_start_env;
683 712
684 PL_top_env = &ctx->start_env; 713 PL_top_env = &ctx->start_env;
685 714
… …
689 718
690 abort (); 719 abort ();
691} 720}
692 721
693STATIC void 722STATIC void
694transfer(pTHX_ struct coro *prev, struct coro *next, int flags) 723transfer (pTHX_ struct coro *prev, struct coro *next, int flags)
695{ 724{
696 dSTACKLEVEL; 725 dSTACKLEVEL;
697 static struct coro *xnext;
698 726
699 if (prev != next) 727 if (prev != next)
700 { 728 {
701 xnext = next;
702
703 if (next->mainstack) 729 if (next->mainstack)
704 { 730 {
731 LOCK;
705 SAVE (prev, flags); 732 SAVE (prev, flags);
706 LOAD (next); 733 LOAD (next);
734 UNLOCK;
707 735
708 /* mark this state as in-use */ 736 /* mark this state as in-use */
709 next->mainstack = 0; 737 next->mainstack = 0;
710 next->tmps_ix = -2; 738 next->tmps_ix = -2;
711 739
… …
730 continue_coro, (void *)next, 758 continue_coro, (void *)next,
731 next->stack->sptr, labs (next->stack->ssize)); 759 next->stack->sptr, labs (next->stack->ssize));
732 } 760 }
733 761
734 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 762 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
763 prev->cursp = stacklevel;
735 /* don't add any code here */ 764 /* don't add any code here */
736 } 765 }
737 766 else
767 next->cursp = stacklevel;
738 } 768 }
739 else if (next->tmps_ix == -2) 769 else if (next->tmps_ix == -2)
740 croak ("tried to transfer to running coroutine"); 770 croak ("tried to transfer to running coroutine");
741 else 771 else
742 { 772 {
773 LOCK;
743 SAVE (prev, -1); /* first get rid of the old state */ 774 SAVE (prev, -1); /* first get rid of the old state */
775 UNLOCK;
744 776
745 if (flags & TRANSFER_SAVE_CCTXT) 777 if (flags & TRANSFER_SAVE_CCTXT)
746 { 778 {
747 if (!prev->stack) 779 if (!prev->stack)
748 allocate_stack (prev, 0); 780 allocate_stack (prev, 0);
… …
750 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 782 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
751 { 783 {
752 PL_top_env = &next->start_env; 784 PL_top_env = &next->start_env;
753 785
754 setup_coro (next); 786 setup_coro (next);
787 next->cursp = stacklevel;
755 788
756 prev->stack->refcnt++; 789 prev->stack->refcnt++;
757 prev->stack->usecnt++; 790 prev->stack->usecnt++;
758 next->stack = prev->stack; 791 next->stack = prev->stack;
759 next->gencnt = prev->gencnt; 792 next->gencnt = prev->gencnt;
… …
764 allocate_stack (next, 1); 797 allocate_stack (next, 1);
765 coro_create (&(next->stack->cctx), 798 coro_create (&(next->stack->cctx),
766 setup_coro, (void *)next, 799 setup_coro, (void *)next,
767 next->stack->sptr, labs (next->stack->ssize)); 800 next->stack->sptr, labs (next->stack->ssize));
768 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 801 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
802 prev->cursp = stacklevel;
769 /* don't add any code here */ 803 /* don't add any code here */
770 } 804 }
771 } 805 }
772 else 806 else
807 {
773 setup_coro (next); 808 setup_coro (next);
809 next->cursp = stacklevel;
810 }
774 } 811 }
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 } 812 }
783 813
814 LOCK;
784 if (coro_mortal) 815 if (coro_mortal)
785 { 816 {
786 SvREFCNT_dec (coro_mortal); 817 SvREFCNT_dec (coro_mortal);
787 coro_mortal = 0; 818 coro_mortal = 0;
788 } 819 }
820 UNLOCK;
789} 821}
790 822
791#define SV_CORO(sv,func) \ 823#define SV_CORO(sv,func) \
792 do { \ 824 do { \
793 if (SvROK (sv)) \ 825 if (SvROK (sv)) \
794 sv = SvRV (sv); \ 826 sv = SvRV (sv); \
795 \ 827 \
796 if (SvTYPE(sv) == SVt_PVHV) \ 828 if (SvTYPE (sv) == SVt_PVHV) \
797 { \ 829 { \
798 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); \
799 \ 831 \
800 if (!he) \ 832 if (!he) \
801 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); \
802 \ 834 \
803 (sv) = SvRV (HeVAL(he)); \ 835 (sv) = SvRV (HeVAL(he)); \
804 } \ 836 } \
805 \ 837 \
806 /* must also be changed inside Coro::Cont::yield */ \ 838 /* must also be changed inside Coro::Cont::yield */ \
807 if (!SvOBJECT(sv) || SvSTASH(sv) != coro_state_stash) \ 839 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
808 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); \
809 \ 841 \
810 } while(0) 842 } while(0)
811 843
812#define SvSTATE(sv) (struct coro *)SvIV (sv) 844#define SvSTATE(sv) (struct coro *)SvIV (sv)
… …
815api_transfer(pTHX_ SV *prev, SV *next, int flags) 847api_transfer(pTHX_ SV *prev, SV *next, int flags)
816{ 848{
817 SV_CORO (prev, "Coro::transfer"); 849 SV_CORO (prev, "Coro::transfer");
818 SV_CORO (next, "Coro::transfer"); 850 SV_CORO (next, "Coro::transfer");
819 851
820 transfer(aTHX_ SvSTATE(prev), SvSTATE(next), flags); 852 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
821} 853}
822 854
823/** Coro ********************************************************************/ 855/** Coro ********************************************************************/
824 856
825#define PRIO_MAX 3 857#define PRIO_MAX 3
… …
833static GV *coro_current, *coro_idle; 865static GV *coro_current, *coro_idle;
834static AV *coro_ready[PRIO_MAX-PRIO_MIN+1]; 866static AV *coro_ready[PRIO_MAX-PRIO_MIN+1];
835static int coro_nready; 867static int coro_nready;
836 868
837static void 869static void
838coro_enq (SV *sv) 870coro_enq (pTHX_ SV *sv)
839{ 871{
840 if (SvTYPE (sv) == SVt_PVHV) 872 if (SvTYPE (sv) == SVt_PVHV)
841 { 873 {
842 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0); 874 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
843 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL; 875 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
… …
854 886
855 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 887 croak ("Coro::ready tried to enqueue something that is not a coroutine");
856} 888}
857 889
858static SV * 890static SV *
859coro_deq (int min_prio) 891coro_deq (pTHX_ int min_prio)
860{ 892{
861 int prio = PRIO_MAX - PRIO_MIN; 893 int prio = PRIO_MAX - PRIO_MIN;
862 894
863 min_prio -= PRIO_MIN; 895 min_prio -= PRIO_MIN;
864 if (min_prio < 0) 896 if (min_prio < 0)
… …
875} 907}
876 908
877static void 909static void
878api_ready (SV *coro) 910api_ready (SV *coro)
879{ 911{
912 dTHX;
913
880 if (SvROK (coro)) 914 if (SvROK (coro))
881 coro = SvRV (coro); 915 coro = SvRV (coro);
882 916
917 LOCK;
883 coro_enq (SvREFCNT_inc (coro)); 918 coro_enq (aTHX_ SvREFCNT_inc (coro));
919 UNLOCK;
884} 920}
885 921
886static void 922static void
887api_schedule (void) 923api_schedule (void)
888{ 924{
925 dTHX;
926
889 SV *prev, *next; 927 SV *prev, *next;
890 928
929 LOCK;
930
891 prev = SvRV (GvSV (coro_current)); 931 prev = SvRV (GvSV (coro_current));
892 next = coro_deq (PRIO_MIN); 932 next = coro_deq (aTHX_ PRIO_MIN);
893 933
894 if (!next) 934 if (!next)
895 next = SvREFCNT_inc (SvRV (GvSV (coro_idle))); 935 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
896 936
897 /* free this only after the transfer */ 937 /* free this only after the transfer */
… …
900 940
901 SvRV (GvSV (coro_current)) = next; 941 SvRV (GvSV (coro_current)) = next;
902 942
903 SV_CORO (next, "Coro::schedule"); 943 SV_CORO (next, "Coro::schedule");
904 944
945 UNLOCK;
946
905 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), 947 transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
906 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 948 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
907} 949}
908 950
909static void 951static void
910api_cede (void) 952api_cede (void)
911{ 953{
954 dTHX;
955
956 LOCK;
912 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current)))); 957 coro_enq (aTHX_ SvREFCNT_inc (SvRV (GvSV (coro_current))));
958 UNLOCK;
913 959
914 api_schedule (); 960 api_schedule ();
915} 961}
916 962
917MODULE = Coro::State PACKAGE = Coro::State 963MODULE = Coro::State PACKAGE = Coro::State
918 964
919PROTOTYPES: ENABLE 965PROTOTYPES: ENABLE
920 966
921BOOT: 967BOOT:
922{ /* {} necessary for stoopid perl-5.6.x */ 968{ /* {} necessary for stoopid perl-5.6.x */
969#ifdef USE_ITHREADS
970 MUTEX_INIT (&coro_mutex);
971#endif
972
923 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1); 973 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
924 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1); 974 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
925 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 975 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
926 976
927 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 977 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV));
928 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 978 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV));
929 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 979 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV));
930 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT)); 980 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT));
931
932 if (!padlist_cache)
933 padlist_cache = newHV ();
934 981
935 main_mainstack = PL_mainstack; 982 main_mainstack = PL_mainstack;
936 983
937 coroapi.ver = CORO_API_VERSION; 984 coroapi.ver = CORO_API_VERSION;
938 coroapi.transfer = api_transfer; 985 coroapi.transfer = api_transfer;
… …
949 croak ("Coro::State::_newprocess expects an arrayref"); 996 croak ("Coro::State::_newprocess expects an arrayref");
950 997
951 Newz (0, coro, 1, struct coro); 998 Newz (0, coro, 1, struct coro);
952 999
953 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 1000 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
954 coro->mainstack = 0; /* actual work is done inside transfer */ 1001 /*coro->mainstack = 0; *//*actual work is done inside transfer */
955 coro->stack = 0; 1002 /*coro->stack = 0;*/
956 1003
957 /* same as JMPENV_BOOTSTRAP */ 1004 /* same as JMPENV_BOOTSTRAP */
958 /* we might be able to recycle start_env, but safe is safe */ 1005 /* we might be able to recycle start_env, but safe is safe */
959 //Zero(&coro->start_env, 1, JMPENV); 1006 /*Zero(&coro->start_env, 1, JMPENV);*/
960 coro->start_env.je_ret = -1; 1007 coro->start_env.je_ret = -1;
961 coro->start_env.je_mustcatch = TRUE; 1008 coro->start_env.je_mustcatch = TRUE;
962 1009
963 RETVAL = coro; 1010 RETVAL = coro;
964 OUTPUT: 1011 OUTPUT:
… …
985 if (coro->mainstack && coro->mainstack != main_mainstack) 1032 if (coro->mainstack && coro->mainstack != main_mainstack)
986 { 1033 {
987 struct coro temp; 1034 struct coro temp;
988 1035
989 PUTBACK; 1036 PUTBACK;
990 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL); 1037 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL);
991 LOAD(aTHX_ coro); 1038 LOAD (aTHX_ coro);
992 SPAGAIN; 1039 SPAGAIN;
993 1040
994 destroy_stacks (aTHX); 1041 destroy_stacks (aTHX);
995 1042
996 LOAD((&temp)); /* this will get rid of defsv etc.. */ 1043 LOAD ((&temp)); /* this will get rid of defsv etc.. */
997 SPAGAIN; 1044 SPAGAIN;
998 1045
999 coro->mainstack = 0; 1046 coro->mainstack = 0;
1000 } 1047 }
1001 1048
… …
1006void 1053void
1007_exit(code) 1054_exit(code)
1008 int code 1055 int code
1009 PROTOTYPE: $ 1056 PROTOTYPE: $
1010 CODE: 1057 CODE:
1011#if defined(__GLIBC__) || _POSIX_C_SOURCE
1012 _exit (code); 1058 _exit (code);
1013#else
1014 signal (SIGTERM, SIG_DFL);
1015 raise (SIGTERM);
1016 exit (code);
1017#endif
1018 1059
1019MODULE = Coro::State PACKAGE = Coro::Cont 1060MODULE = Coro::State PACKAGE = Coro::Cont
1020 1061
1021# this is slightly dirty (should expose a c-level api) 1062# this is slightly dirty (should expose a c-level api)
1022 1063
1023void 1064void
1024yield(...) 1065yield(...)
1025 PROTOTYPE: @ 1066 PROTOTYPE: @
1026 CODE: 1067 CODE:
1027 static SV *returnstk; 1068 SV *yieldstack;
1028 SV *sv; 1069 SV *sv;
1029 AV *defav = GvAV (PL_defgv); 1070 AV *defav = GvAV (PL_defgv);
1030 struct coro *prev, *next; 1071 struct coro *prev, *next;
1031 1072
1032 if (!returnstk) 1073 yieldstack = *hv_fetch (
1033 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE)); 1074 (HV *)SvRV (GvSV (coro_current)),
1075 "yieldstack", sizeof ("yieldstack") - 1,
1076 0
1077 );
1034 1078
1035 /* set up @_ -- ugly */ 1079 /* set up @_ -- ugly */
1036 av_clear (defav); 1080 av_clear (defav);
1037 av_fill (defav, items - 1); 1081 av_fill (defav, items - 1);
1038 while (items--) 1082 while (items--)
1039 av_store (defav, items, SvREFCNT_inc (ST(items))); 1083 av_store (defav, items, SvREFCNT_inc (ST(items)));
1040 1084
1041 mg_get (returnstk); /* isn't documentation wrong for mg_get? */
1042 sv = av_pop ((AV *)SvRV (returnstk)); 1085 sv = av_pop ((AV *)SvRV (yieldstack));
1043 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0))); 1086 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))); 1087 next = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0)));
1045 SvREFCNT_dec (sv); 1088 SvREFCNT_dec (sv);
1046 1089
1047 transfer(aTHX_ prev, next, 0); 1090 transfer (aTHX_ prev, next, 0);
1048 1091
1049MODULE = Coro::State PACKAGE = Coro 1092MODULE = Coro::State PACKAGE = Coro
1050 1093
1051# this is slightly dirty (should expose a c-level api) 1094# this is slightly dirty (should expose a c-level api)
1052 1095
… …
1112cede(...) 1155cede(...)
1113 PROTOTYPE: 1156 PROTOTYPE:
1114 CODE: 1157 CODE:
1115 api_cede (); 1158 api_cede ();
1116 1159
1160# and these are hacks
1161SV *
1162_aio_get_state ()
1163 CODE:
1164{
1165 struct {
1166 int errorno;
1167 int laststype;
1168 int laststatval;
1169 Stat_t statcache;
1170 } data;
1171
1172 data.errorno = errno;
1173 data.laststype = PL_laststype;
1174 data.laststatval = PL_laststatval;
1175 data.statcache = PL_statcache;
1176
1177 RETVAL = newSVpvn ((char *)&data, sizeof data);
1178}
1179 OUTPUT:
1180 RETVAL
1181
1182void
1183_aio_set_state (char *data_)
1184 PROTOTYPE: $
1185 CODE:
1186{
1187 struct {
1188 int errorno;
1189 int laststype;
1190 int laststatval;
1191 Stat_t statcache;
1192 } *data = (void *)data_;
1193
1194 errno = data->errorno;
1195 PL_laststype = data->laststype;
1196 PL_laststatval = data->laststatval;
1197 PL_statcache = data->statcache;
1198}

Diff Legend

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