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.78 by root, Wed Nov 1 01:21:21 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"
29
30#include <signal.h> 32#include <errno.h>
33
34#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
35# undef STACKGUARD
36#endif
37
38#ifndef STACKGUARD
39# define STACKGUARD 0
40#endif
31 41
32#ifdef HAVE_MMAP 42#ifdef HAVE_MMAP
33# include <unistd.h> 43# include <unistd.h>
34# include <sys/mman.h> 44# include <sys/mman.h>
35# ifndef MAP_ANONYMOUS 45# ifndef MAP_ANONYMOUS
… …
37# define MAP_ANONYMOUS MAP_ANON 47# define MAP_ANONYMOUS MAP_ANON
38# else 48# else
39# undef HAVE_MMAP 49# undef HAVE_MMAP
40# endif 50# endif
41# endif 51# endif
52# include <limits.h>
53# ifndef PAGESIZE
54# define PAGESIZE pagesize
55# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
56static long pagesize;
57# else
58# define BOOT_PAGESIZE
59# endif
42#endif 60#endif
43 61
44#define SUB_INIT "Coro::State::initialize" 62#define SUB_INIT "Coro::State::initialize"
45#define UCORO_STATE "_coro_state" 63#define UCORO_STATE "_coro_state"
46 64
… …
53 71
54#define labs(l) ((l) >= 0 ? (l) : -(l)) 72#define labs(l) ((l) >= 0 ? (l) : -(l))
55 73
56#include "CoroAPI.h" 74#include "CoroAPI.h"
57 75
76#ifdef USE_ITHREADS
77static perl_mutex coro_mutex;
78# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0)
79# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0)
80#else
81# define LOCK (void)0
82# define UNLOCK (void)0
83#endif
84
58static struct CoroAPI coroapi; 85static struct CoroAPI coroapi;
86static AV *main_mainstack; /* used to differentiate between $main and others */
87static HV *coro_state_stash;
88static SV *ucoro_state_sv;
89static U32 ucoro_state_hash;
90static SV *coro_mortal; /* will be freed after next transfer */
59 91
60/* this is actually not only the c stack but also c registers etc... */ 92/* this is actually not only the c stack but also c registers etc... */
61typedef struct { 93typedef struct {
62 int refcnt; /* pointer reference counter */ 94 int refcnt; /* pointer reference counter */
63 int usecnt; /* shared by how many coroutines */ 95 int usecnt; /* shared by how many coroutines */
… …
93 AV *mainstack; 125 AV *mainstack;
94 SV **stack_sp; 126 SV **stack_sp;
95 OP *op; 127 OP *op;
96 SV **curpad; 128 SV **curpad;
97 AV *comppad; 129 AV *comppad;
130 CV *compcv;
98 SV **stack_base; 131 SV **stack_base;
99 SV **stack_max; 132 SV **stack_max;
100 SV **tmps_stack; 133 SV **tmps_stack;
101 I32 tmps_floor; 134 I32 tmps_floor;
102 I32 tmps_ix; 135 I32 tmps_ix;
… …
111 I32 savestack_ix; 144 I32 savestack_ix;
112 I32 savestack_max; 145 I32 savestack_max;
113 OP **retstack; 146 OP **retstack;
114 I32 retstack_ix; 147 I32 retstack_ix;
115 I32 retstack_max; 148 I32 retstack_max;
149 PMOP *curpm;
116 COP *curcop; 150 COP *curcop;
117 JMPENV *top_env; 151 JMPENV *top_env;
118 152
119 /* data associated with this coroutine (initial args) */ 153 /* data associated with this coroutine (initial args) */
120 AV *args; 154 AV *args;
121}; 155};
122 156
123typedef struct coro *Coro__State; 157typedef struct coro *Coro__State;
124typedef struct coro *Coro__State_or_hashref; 158typedef struct coro *Coro__State_or_hashref;
125 159
126static AV *main_mainstack; /* used to differentiate between $main and others */ 160static AV *
127static HV *coro_state_stash; 161coro_clone_padlist (pTHX_ CV *cv)
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 */
134STATIC AV *
135clone_padlist (AV *protopadlist)
136{ 162{
137 AV *av; 163 AV *padlist = CvPADLIST (cv);
138 I32 ix;
139 AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE);
140 AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE);
141 SV **pname = AvARRAY (protopad_name);
142 SV **ppad = AvARRAY (protopad);
143 I32 fname = AvFILLp (protopad_name);
144 I32 fpad = AvFILLp (protopad);
145 AV *newpadlist, *newpad_name, *newpad; 164 AV *newpadlist, *newpad;
146 SV **npad;
147
148 newpad_name = newAV ();
149 for (ix = fname; ix >= 0; ix--)
150 av_store (newpad_name, ix, SvREFCNT_inc (pname[ix]));
151
152 newpad = newAV ();
153 av_fill (newpad, AvFILLp (protopad));
154 npad = AvARRAY (newpad);
155 165
156 newpadlist = newAV (); 166 newpadlist = newAV ();
157 AvREAL_off (newpadlist); 167 AvREAL_off (newpadlist);
158 av_store (newpadlist, 0, (SV *) newpad_name); 168 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
169 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
170 --AvFILLp (padlist);
171
172 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE)));
159 av_store (newpadlist, 1, (SV *) newpad); 173 av_store (newpadlist, 1, (SV *)newpad);
160
161 av = newAV (); /* will be @_ */
162 av_extend (av, 0);
163 av_store (newpad, 0, (SV *) av);
164 AvFLAGS (av) = AVf_REIFY;
165
166 for (ix = fpad; ix > 0; ix--)
167 {
168 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv;
169 if (namesv && namesv != &PL_sv_undef)
170 {
171 char *name = SvPVX (namesv); /* XXX */
172 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&')
173 { /* lexical from outside? */
174 npad[ix] = SvREFCNT_inc (ppad[ix]);
175 }
176 else
177 { /* our own lexical */
178 SV *sv;
179 if (*name == '&')
180 sv = SvREFCNT_inc (ppad[ix]);
181 else if (*name == '@')
182 sv = (SV *) newAV ();
183 else if (*name == '%')
184 sv = (SV *) newHV ();
185 else
186 sv = NEWSV (0, 0);
187#ifdef SvPADBUSY
188 if (!SvPADBUSY (sv))
189#endif
190 SvPADMY_on (sv);
191 npad[ix] = sv;
192 }
193 }
194 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix]))
195 {
196 npad[ix] = SvREFCNT_inc (ppad[ix]);
197 }
198 else
199 {
200 SV *sv = NEWSV (0, 0);
201 SvPADTMP_on (sv);
202 npad[ix] = sv;
203 }
204 }
205
206#if 0 /* return -ENOTUNDERSTOOD */
207 /* Now that vars are all in place, clone nested closures. */
208
209 for (ix = fpad; ix > 0; ix--) {
210 SV* namesv = (ix <= fname) ? pname[ix] : Nullsv;
211 if (namesv
212 && namesv != &PL_sv_undef
213 && !(SvFLAGS(namesv) & SVf_FAKE)
214 && *SvPVX(namesv) == '&'
215 && CvCLONE(ppad[ix]))
216 {
217 CV *kid = cv_clone((CV*)ppad[ix]);
218 SvREFCNT_dec(ppad[ix]);
219 CvCLONE_on(kid);
220 SvPADMY_on(kid);
221 npad[ix] = (SV*)kid;
222 }
223 }
224#endif
225 174
226 return newpadlist; 175 return newpadlist;
227} 176}
228 177
229STATIC void 178static void
230free_padlist (AV *padlist) 179free_padlist (pTHX_ AV *padlist)
231{ 180{
232 /* may be during global destruction */ 181 /* may be during global destruction */
233 if (SvREFCNT (padlist)) 182 if (SvREFCNT (padlist))
234 { 183 {
235 I32 i = AvFILLp (padlist); 184 I32 i = AvFILLp (padlist);
… …
248 197
249 SvREFCNT_dec ((SV*)padlist); 198 SvREFCNT_dec ((SV*)padlist);
250 } 199 }
251} 200}
252 201
253STATIC int 202static int
254coro_cv_free (SV *sv, MAGIC *mg) 203coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
255{ 204{
256 AV *padlist; 205 AV *padlist;
257 AV *av = (AV *)mg->mg_obj; 206 AV *av = (AV *)mg->mg_obj;
258 207
259 /* casting is fun. */ 208 /* casting is fun. */
260 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 209 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
261 free_padlist (padlist); 210 free_padlist (aTHX_ padlist);
211
212 SvREFCNT_dec (av);
213
214 return 0;
262} 215}
263 216
264#define PERL_MAGIC_coro PERL_MAGIC_ext 217#define PERL_MAGIC_coro PERL_MAGIC_ext
265 218
266static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 219static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
267 220
268/* the next two functions merely cache the padlists */ 221/* the next two functions merely cache the padlists */
269STATIC void 222static void
270get_padlist (CV *cv) 223get_padlist (pTHX_ CV *cv)
271{ 224{
272 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 225 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
273 226
274 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0) 227 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
275 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj); 228 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
276 else 229 else
230 {
231#if 0
232 /* this should work - but it doesn't :( */
233 CV *cp = Perl_cv_clone (aTHX_ cv);
234 CvPADLIST (cv) = CvPADLIST (cp);
235 CvPADLIST (cp) = 0;
236 SvREFCNT_dec (cp);
237#else
277 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv)); 238 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
239#endif
240 }
278} 241}
279 242
280STATIC void 243static void
281put_padlist (CV *cv) 244put_padlist (pTHX_ CV *cv)
282{ 245{
283 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 246 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
284 247
285 if (!mg) 248 if (!mg)
286 { 249 {
… …
312 PL_mainstack = c->mainstack; 275 PL_mainstack = c->mainstack;
313 PL_stack_sp = c->stack_sp; 276 PL_stack_sp = c->stack_sp;
314 PL_op = c->op; 277 PL_op = c->op;
315 PL_curpad = c->curpad; 278 PL_curpad = c->curpad;
316 PL_comppad = c->comppad; 279 PL_comppad = c->comppad;
280 PL_compcv = c->compcv;
317 PL_stack_base = c->stack_base; 281 PL_stack_base = c->stack_base;
318 PL_stack_max = c->stack_max; 282 PL_stack_max = c->stack_max;
319 PL_tmps_stack = c->tmps_stack; 283 PL_tmps_stack = c->tmps_stack;
320 PL_tmps_floor = c->tmps_floor; 284 PL_tmps_floor = c->tmps_floor;
321 PL_tmps_ix = c->tmps_ix; 285 PL_tmps_ix = c->tmps_ix;
… …
327 PL_scopestack_ix = c->scopestack_ix; 291 PL_scopestack_ix = c->scopestack_ix;
328 PL_scopestack_max = c->scopestack_max; 292 PL_scopestack_max = c->scopestack_max;
329 PL_savestack = c->savestack; 293 PL_savestack = c->savestack;
330 PL_savestack_ix = c->savestack_ix; 294 PL_savestack_ix = c->savestack_ix;
331 PL_savestack_max = c->savestack_max; 295 PL_savestack_max = c->savestack_max;
296#if PERL_VERSION < 9
332 PL_retstack = c->retstack; 297 PL_retstack = c->retstack;
333 PL_retstack_ix = c->retstack_ix; 298 PL_retstack_ix = c->retstack_ix;
334 PL_retstack_max = c->retstack_max; 299 PL_retstack_max = c->retstack_max;
300#endif
301 PL_curpm = c->curpm;
335 PL_curcop = c->curcop; 302 PL_curcop = c->curcop;
336 PL_top_env = c->top_env; 303 PL_top_env = c->top_env;
337 304
338 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 305 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
339 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 306 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
… …
348 { 315 {
349 AV *padlist = (AV *)POPs; 316 AV *padlist = (AV *)POPs;
350 317
351 if (padlist) 318 if (padlist)
352 { 319 {
353 put_padlist (cv); /* mark this padlist as available */ 320 put_padlist (aTHX_ cv); /* mark this padlist as available */
354 CvPADLIST(cv) = padlist; 321 CvPADLIST(cv) = padlist;
355#ifdef USE_THREADS
356 /*CvOWNER(cv) = (struct perl_thread *)POPs;*/
357#endif
358 } 322 }
359 323
360 ++CvDEPTH(cv); 324 ++CvDEPTH(cv);
361 } 325 }
362 326
… …
389 if (CxTYPE(cx) == CXt_SUB) 353 if (CxTYPE(cx) == CXt_SUB)
390 { 354 {
391 CV *cv = cx->blk_sub.cv; 355 CV *cv = cx->blk_sub.cv;
392 if (CvDEPTH(cv)) 356 if (CvDEPTH(cv))
393 { 357 {
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); 358 EXTEND (SP, CvDEPTH(cv)*2);
400 359
401 while (--CvDEPTH(cv)) 360 while (--CvDEPTH(cv))
402 { 361 {
403 /* this tells the restore code to increment CvDEPTH */ 362 /* this tells the restore code to increment CvDEPTH */
… …
406 } 365 }
407 366
408 PUSHs ((SV *)CvPADLIST(cv)); 367 PUSHs ((SV *)CvPADLIST(cv));
409 PUSHs ((SV *)cv); 368 PUSHs ((SV *)cv);
410 369
411 get_padlist (cv); /* this is a monster */ 370 get_padlist (aTHX_ cv);
412 } 371 }
413 } 372 }
414#ifdef CXt_FORMAT 373#ifdef CXt_FORMAT
415 else if (CxTYPE(cx) == CXt_FORMAT) 374 else if (CxTYPE(cx) == CXt_FORMAT)
416 { 375 {
… …
444 c->mainstack = PL_mainstack; 403 c->mainstack = PL_mainstack;
445 c->stack_sp = PL_stack_sp; 404 c->stack_sp = PL_stack_sp;
446 c->op = PL_op; 405 c->op = PL_op;
447 c->curpad = PL_curpad; 406 c->curpad = PL_curpad;
448 c->comppad = PL_comppad; 407 c->comppad = PL_comppad;
408 c->compcv = PL_compcv;
449 c->stack_base = PL_stack_base; 409 c->stack_base = PL_stack_base;
450 c->stack_max = PL_stack_max; 410 c->stack_max = PL_stack_max;
451 c->tmps_stack = PL_tmps_stack; 411 c->tmps_stack = PL_tmps_stack;
452 c->tmps_floor = PL_tmps_floor; 412 c->tmps_floor = PL_tmps_floor;
453 c->tmps_ix = PL_tmps_ix; 413 c->tmps_ix = PL_tmps_ix;
… …
459 c->scopestack_ix = PL_scopestack_ix; 419 c->scopestack_ix = PL_scopestack_ix;
460 c->scopestack_max = PL_scopestack_max; 420 c->scopestack_max = PL_scopestack_max;
461 c->savestack = PL_savestack; 421 c->savestack = PL_savestack;
462 c->savestack_ix = PL_savestack_ix; 422 c->savestack_ix = PL_savestack_ix;
463 c->savestack_max = PL_savestack_max; 423 c->savestack_max = PL_savestack_max;
424#if PERL_VERSION < 9
464 c->retstack = PL_retstack; 425 c->retstack = PL_retstack;
465 c->retstack_ix = PL_retstack_ix; 426 c->retstack_ix = PL_retstack_ix;
466 c->retstack_max = PL_retstack_max; 427 c->retstack_max = PL_retstack_max;
428#endif
429 c->curpm = PL_curpm;
467 c->curcop = PL_curcop; 430 c->curcop = PL_curcop;
468 c->top_env = PL_top_env; 431 c->top_env = PL_top_env;
469} 432}
470 433
471/* 434/*
472 * allocate various perl stacks. This is an exact copy 435 * allocate various perl stacks. This is an exact copy
473 * of perl.c:init_stacks, except that it uses less memory 436 * of perl.c:init_stacks, except that it uses less memory
474 * on the assumption that coroutines do not usually need 437 * on the (sometimes correct) assumption that coroutines do
475 * a lot of stackspace. 438 * not usually need a lot of stackspace.
476 */ 439 */
477STATIC void 440static void
478coro_init_stacks (pTHX) 441coro_init_stacks (pTHX)
479{ 442{
443 LOCK;
444
480 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 445 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
481 PL_curstackinfo->si_type = PERLSI_MAIN; 446 PL_curstackinfo->si_type = PERLSI_MAIN;
482 PL_curstack = PL_curstackinfo->si_stack; 447 PL_curstack = PL_curstackinfo->si_stack;
483 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 448 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
484 449
… …
505 470
506 New(54,PL_savestack,96,ANY); 471 New(54,PL_savestack,96,ANY);
507 PL_savestack_ix = 0; 472 PL_savestack_ix = 0;
508 PL_savestack_max = 96; 473 PL_savestack_max = 96;
509 474
475#if PERL_VERSION < 9
510 New(54,PL_retstack,8,OP*); 476 New(54,PL_retstack,8,OP*);
511 PL_retstack_ix = 0; 477 PL_retstack_ix = 0;
512 PL_retstack_max = 8; 478 PL_retstack_max = 8;
479#endif
480
481 UNLOCK;
513} 482}
514 483
515/* 484/*
516 * destroy the stacks, the callchain etc... 485 * destroy the stacks, the callchain etc...
517 */ 486 */
518STATIC void 487static void
519destroy_stacks(pTHX) 488destroy_stacks(pTHX)
520{ 489{
521 if (!IN_DESTRUCT) 490 if (!IN_DESTRUCT)
522 { 491 {
523 /* is this ugly, I ask? */ 492 /* is this ugly, I ask? */
524 while (PL_scopestack_ix) 493 LEAVE_SCOPE (0);
525 LEAVE;
526 494
527 /* sure it is, but more important: is it correct?? :/ */ 495 /* 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; 496 FREETMPS;
497
498 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/
530 } 499 }
531 500
532 while (PL_curstackinfo->si_next) 501 while (PL_curstackinfo->si_next)
533 PL_curstackinfo = PL_curstackinfo->si_next; 502 PL_curstackinfo = PL_curstackinfo->si_next;
534 503
535 while (PL_curstackinfo) 504 while (PL_curstackinfo)
536 { 505 {
537 PERL_SI *p = PL_curstackinfo->si_prev; 506 PERL_SI *p = PL_curstackinfo->si_prev;
538 507
539 { 508 { /*D*//*remove*/
540 dSP; 509 dSP;
541 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack); 510 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
542 PUTBACK; /* possibly superfluous */ 511 PUTBACK; /* possibly superfluous */
543 } 512 }
544 513
545 if (!IN_DESTRUCT) 514 if (!IN_DESTRUCT)
546 { 515 {
547 dounwind(-1); 516 dounwind (-1);/*D*//*remove*/
548 SvREFCNT_dec(PL_curstackinfo->si_stack); 517 SvREFCNT_dec (PL_curstackinfo->si_stack);
549 } 518 }
550 519
551 Safefree(PL_curstackinfo->si_cxstack); 520 Safefree (PL_curstackinfo->si_cxstack);
552 Safefree(PL_curstackinfo); 521 Safefree (PL_curstackinfo);
553 PL_curstackinfo = p; 522 PL_curstackinfo = p;
554 } 523 }
555 524
556 Safefree(PL_tmps_stack); 525 Safefree (PL_tmps_stack);
557 Safefree(PL_markstack); 526 Safefree (PL_markstack);
558 Safefree(PL_scopestack); 527 Safefree (PL_scopestack);
559 Safefree(PL_savestack); 528 Safefree (PL_savestack);
529#if PERL_VERSION < 9
560 Safefree(PL_retstack); 530 Safefree (PL_retstack);
531#endif
561} 532}
562 533
563static void 534static void
564allocate_stack (Coro__State ctx, int alloc) 535allocate_stack (Coro__State ctx, int alloc)
565{ 536{
… …
568 New (0, stack, 1, coro_stack); 539 New (0, stack, 1, coro_stack);
569 540
570 stack->refcnt = 1; 541 stack->refcnt = 1;
571 stack->usecnt = 1; 542 stack->usecnt = 1;
572 stack->gencnt = ctx->gencnt = 0; 543 stack->gencnt = ctx->gencnt = 0;
544
573 if (alloc) 545 if (alloc)
574 { 546 {
575#if HAVE_MMAP 547#if HAVE_MMAP
576 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */ 548 stack->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; /* 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); 549 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
578 if (stack->sptr == (void *)-1) 550 if (stack->sptr != (void *)-1)
579#endif
580 { 551 {
581 /*FIXME*//*D*//* reasonable stack size! */ 552# if STACKGUARD
553 mprotect (stack->sptr, STACKGUARD * PAGESIZE, PROT_NONE);
554# endif
555 }
556 else
557#endif
558 {
582 stack->ssize = -4096 * sizeof (long); 559 stack->ssize = - (STACKSIZE * (long)sizeof (long));
583 New (0, stack->sptr, 4096, long); 560 New (0, stack->sptr, STACKSIZE, long);
584 } 561 }
585 } 562 }
586 else 563 else
587 stack->sptr = 0; 564 stack->sptr = 0;
588 565
… …
618setup_coro (void *arg) 595setup_coro (void *arg)
619{ 596{
620 /* 597 /*
621 * emulate part of the perl startup here. 598 * emulate part of the perl startup here.
622 */ 599 */
600 dTHX;
623 dSP; 601 dSP;
624 Coro__State ctx = (Coro__State)arg; 602 Coro__State ctx = (Coro__State)arg;
625 SV *sub_init = (SV*)get_cv(SUB_INIT, FALSE); 603 SV *sub_init = (SV *)get_cv (SUB_INIT, FALSE);
626 604
627 coro_init_stacks (aTHX); 605 coro_init_stacks (aTHX);
628 /*PL_curcop = 0;*/ 606 /*PL_curcop = 0;*/
629 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 607 /*PL_in_eval = PL_in_eval;*/ /* inherit */
630 SvREFCNT_dec (GvAV (PL_defgv)); 608 SvREFCNT_dec (GvAV (PL_defgv));
… …
676continue_coro (void *arg) 654continue_coro (void *arg)
677{ 655{
678 /* 656 /*
679 * this is a _very_ stripped down perl interpreter ;) 657 * this is a _very_ stripped down perl interpreter ;)
680 */ 658 */
659 dTHX;
681 Coro__State ctx = (Coro__State)arg; 660 Coro__State ctx = (Coro__State)arg;
682 JMPENV coro_start_env;
683 661
684 PL_top_env = &ctx->start_env; 662 PL_top_env = &ctx->start_env;
685 663
686 ctx->cursp = 0; 664 ctx->cursp = 0;
687 PL_op = PL_op->op_next; 665 PL_op = PL_op->op_next;
688 CALLRUNOPS(aTHX); 666 CALLRUNOPS(aTHX);
689 667
690 abort (); 668 abort ();
691} 669}
692 670
693STATIC void 671static void
694transfer(pTHX_ struct coro *prev, struct coro *next, int flags) 672transfer (pTHX_ struct coro *prev, struct coro *next, int flags)
695{ 673{
696 dSTACKLEVEL; 674 dSTACKLEVEL;
697 static struct coro *xnext;
698 675
699 if (prev != next) 676 if (prev != next)
700 { 677 {
701 xnext = next;
702
703 if (next->mainstack) 678 if (next->mainstack)
704 { 679 {
680 LOCK;
705 SAVE (prev, flags); 681 SAVE (prev, flags);
706 LOAD (next); 682 LOAD (next);
683 UNLOCK;
707 684
708 /* mark this state as in-use */ 685 /* mark this state as in-use */
709 next->mainstack = 0; 686 next->mainstack = 0;
710 next->tmps_ix = -2; 687 next->tmps_ix = -2;
711 688
… …
730 continue_coro, (void *)next, 707 continue_coro, (void *)next,
731 next->stack->sptr, labs (next->stack->ssize)); 708 next->stack->sptr, labs (next->stack->ssize));
732 } 709 }
733 710
734 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 711 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
712 prev->cursp = stacklevel;
735 /* don't add any code here */ 713 /* don't add any code here */
736 } 714 }
737 715 else
716 next->cursp = stacklevel;
738 } 717 }
739 else if (next->tmps_ix == -2) 718 else if (next->tmps_ix == -2)
740 croak ("tried to transfer to running coroutine"); 719 croak ("tried to transfer to running coroutine");
741 else 720 else
742 { 721 {
722 LOCK;
743 SAVE (prev, -1); /* first get rid of the old state */ 723 SAVE (prev, -1); /* first get rid of the old state */
724 UNLOCK;
744 725
745 if (flags & TRANSFER_SAVE_CCTXT) 726 if (flags & TRANSFER_SAVE_CCTXT)
746 { 727 {
747 if (!prev->stack) 728 if (!prev->stack)
748 allocate_stack (prev, 0); 729 allocate_stack (prev, 0);
… …
750 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 731 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
751 { 732 {
752 PL_top_env = &next->start_env; 733 PL_top_env = &next->start_env;
753 734
754 setup_coro (next); 735 setup_coro (next);
736 next->cursp = stacklevel;
755 737
756 prev->stack->refcnt++; 738 prev->stack->refcnt++;
757 prev->stack->usecnt++; 739 prev->stack->usecnt++;
758 next->stack = prev->stack; 740 next->stack = prev->stack;
759 next->gencnt = prev->gencnt; 741 next->gencnt = prev->gencnt;
… …
764 allocate_stack (next, 1); 746 allocate_stack (next, 1);
765 coro_create (&(next->stack->cctx), 747 coro_create (&(next->stack->cctx),
766 setup_coro, (void *)next, 748 setup_coro, (void *)next,
767 next->stack->sptr, labs (next->stack->ssize)); 749 next->stack->sptr, labs (next->stack->ssize));
768 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 750 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
751 prev->cursp = stacklevel;
769 /* don't add any code here */ 752 /* don't add any code here */
770 } 753 }
771 } 754 }
772 else 755 else
756 {
773 setup_coro (next); 757 setup_coro (next);
758 next->cursp = stacklevel;
759 }
774 } 760 }
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 } 761 }
783 762
763 LOCK;
784 if (coro_mortal) 764 if (coro_mortal)
785 { 765 {
786 SvREFCNT_dec (coro_mortal); 766 SvREFCNT_dec (coro_mortal);
787 coro_mortal = 0; 767 coro_mortal = 0;
788 } 768 }
769 UNLOCK;
789} 770}
790 771
791#define SV_CORO(sv,func) \ 772#define SV_CORO(sv,func) \
792 do { \ 773 do { \
793 if (SvROK (sv)) \ 774 if (SvROK (sv)) \
794 sv = SvRV (sv); \ 775 sv = SvRV (sv); \
795 \ 776 \
796 if (SvTYPE(sv) == SVt_PVHV) \ 777 if (SvTYPE (sv) == SVt_PVHV) \
797 { \ 778 { \
798 HE *he = hv_fetch_ent((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \ 779 HE *he = hv_fetch_ent ((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \
799 \ 780 \
800 if (!he) \ 781 if (!he) \
801 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \ 782 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \
802 \ 783 \
803 (sv) = SvRV (HeVAL(he)); \ 784 (sv) = SvRV (HeVAL(he)); \
804 } \ 785 } \
805 \ 786 \
806 /* must also be changed inside Coro::Cont::yield */ \ 787 /* must also be changed inside Coro::Cont::yield */ \
807 if (!SvOBJECT(sv) || SvSTASH(sv) != coro_state_stash) \ 788 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
808 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \ 789 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
809 \ 790 \
810 } while(0) 791 } while(0)
811 792
812#define SvSTATE(sv) (struct coro *)SvIV (sv) 793#define SvSTATE(sv) INT2PTR (struct coro *, SvIV (sv))
813 794
814static void 795static void
815api_transfer(pTHX_ SV *prev, SV *next, int flags) 796api_transfer(pTHX_ SV *prev, SV *next, int flags)
816{ 797{
817 SV_CORO (prev, "Coro::transfer"); 798 SV_CORO (prev, "Coro::transfer");
818 SV_CORO (next, "Coro::transfer"); 799 SV_CORO (next, "Coro::transfer");
819 800
820 transfer(aTHX_ SvSTATE(prev), SvSTATE(next), flags); 801 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
821} 802}
822 803
823/** Coro ********************************************************************/ 804/** Coro ********************************************************************/
824 805
825#define PRIO_MAX 3 806#define PRIO_MAX 3
… …
833static GV *coro_current, *coro_idle; 814static GV *coro_current, *coro_idle;
834static AV *coro_ready[PRIO_MAX-PRIO_MIN+1]; 815static AV *coro_ready[PRIO_MAX-PRIO_MIN+1];
835static int coro_nready; 816static int coro_nready;
836 817
837static void 818static void
838coro_enq (SV *sv) 819coro_enq (pTHX_ SV *sv)
839{ 820{
821 SV **xprio;
822 int prio;
823
840 if (SvTYPE (sv) == SVt_PVHV) 824 if (SvTYPE (sv) != SVt_PVHV)
841 {
842 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
843 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
844
845 prio = prio > PRIO_MAX ? PRIO_MAX
846 : prio < PRIO_MIN ? PRIO_MIN
847 : prio;
848
849 av_push (coro_ready [prio - PRIO_MIN], sv);
850 coro_nready++;
851
852 return;
853 }
854
855 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 825 croak ("Coro::ready tried to enqueue something that is not a coroutine");
826
827 xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
828 prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
829
830 prio = prio > PRIO_MAX ? PRIO_MAX
831 : prio < PRIO_MIN ? PRIO_MIN
832 : prio;
833
834 av_push (coro_ready [prio - PRIO_MIN], sv);
835 coro_nready++;
856} 836}
857 837
858static SV * 838static SV *
859coro_deq (int min_prio) 839coro_deq (pTHX_ int min_prio)
860{ 840{
861 int prio = PRIO_MAX - PRIO_MIN; 841 int prio = PRIO_MAX - PRIO_MIN;
862 842
863 min_prio -= PRIO_MIN; 843 min_prio -= PRIO_MIN;
864 if (min_prio < 0) 844 if (min_prio < 0)
… …
875} 855}
876 856
877static void 857static void
878api_ready (SV *coro) 858api_ready (SV *coro)
879{ 859{
860 dTHX;
861
880 if (SvROK (coro)) 862 if (SvROK (coro))
881 coro = SvRV (coro); 863 coro = SvRV (coro);
882 864
865 LOCK;
883 coro_enq (SvREFCNT_inc (coro)); 866 coro_enq (aTHX_ SvREFCNT_inc (coro));
867 UNLOCK;
884} 868}
885 869
886static void 870static void
887api_schedule (void) 871api_schedule (void)
888{ 872{
873 dTHX;
874
889 SV *prev, *next; 875 SV *prev, *next;
890 876
877 LOCK;
878
891 prev = SvRV (GvSV (coro_current)); 879 prev = SvRV (GvSV (coro_current));
892 next = coro_deq (PRIO_MIN); 880 next = coro_deq (aTHX_ PRIO_MIN);
893 881
894 if (!next) 882 if (!next)
895 next = SvREFCNT_inc (SvRV (GvSV (coro_idle))); 883 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
896 884
897 /* free this only after the transfer */ 885 /* free this only after the transfer */
… …
900 888
901 SvRV (GvSV (coro_current)) = next; 889 SvRV (GvSV (coro_current)) = next;
902 890
903 SV_CORO (next, "Coro::schedule"); 891 SV_CORO (next, "Coro::schedule");
904 892
893 UNLOCK;
894
905 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), 895 transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
906 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 896 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
907} 897}
908 898
909static void 899static void
910api_cede (void) 900api_cede (void)
911{ 901{
902 dTHX;
903
904 LOCK;
912 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current)))); 905 coro_enq (aTHX_ SvREFCNT_inc (SvRV (GvSV (coro_current))));
906 UNLOCK;
913 907
914 api_schedule (); 908 api_schedule ();
915} 909}
916 910
917MODULE = Coro::State PACKAGE = Coro::State 911MODULE = Coro::State PACKAGE = Coro::State
918 912
919PROTOTYPES: ENABLE 913PROTOTYPES: ENABLE
920 914
921BOOT: 915BOOT:
922{ /* {} necessary for stoopid perl-5.6.x */ 916{ /* {} necessary for stoopid perl-5.6.x */
917#ifdef USE_ITHREADS
918 MUTEX_INIT (&coro_mutex);
919#endif
920 BOOT_PAGESIZE;
921
923 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1); 922 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
924 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1); 923 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
925 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 924 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
926 925
927 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 926 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV));
928 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 927 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV));
929 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 928 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV));
930 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT)); 929 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT));
931
932 if (!padlist_cache)
933 padlist_cache = newHV ();
934 930
935 main_mainstack = PL_mainstack; 931 main_mainstack = PL_mainstack;
936 932
937 coroapi.ver = CORO_API_VERSION; 933 coroapi.ver = CORO_API_VERSION;
938 coroapi.transfer = api_transfer; 934 coroapi.transfer = api_transfer;
… …
949 croak ("Coro::State::_newprocess expects an arrayref"); 945 croak ("Coro::State::_newprocess expects an arrayref");
950 946
951 Newz (0, coro, 1, struct coro); 947 Newz (0, coro, 1, struct coro);
952 948
953 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 949 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
954 coro->mainstack = 0; /* actual work is done inside transfer */ 950 /*coro->mainstack = 0; *//*actual work is done inside transfer */
955 coro->stack = 0; 951 /*coro->stack = 0;*/
956 952
957 /* same as JMPENV_BOOTSTRAP */ 953 /* same as JMPENV_BOOTSTRAP */
958 /* we might be able to recycle start_env, but safe is safe */ 954 /* we might be able to recycle start_env, but safe is safe */
959 //Zero(&coro->start_env, 1, JMPENV); 955 /*Zero(&coro->start_env, 1, JMPENV);*/
960 coro->start_env.je_ret = -1; 956 coro->start_env.je_ret = -1;
961 coro->start_env.je_mustcatch = TRUE; 957 coro->start_env.je_mustcatch = TRUE;
962 958
963 RETVAL = coro; 959 RETVAL = coro;
964 OUTPUT: 960 OUTPUT:
… …
985 if (coro->mainstack && coro->mainstack != main_mainstack) 981 if (coro->mainstack && coro->mainstack != main_mainstack)
986 { 982 {
987 struct coro temp; 983 struct coro temp;
988 984
989 PUTBACK; 985 PUTBACK;
990 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL); 986 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL);
991 LOAD(aTHX_ coro); 987 LOAD (aTHX_ coro);
992 SPAGAIN; 988 SPAGAIN;
993 989
994 destroy_stacks (aTHX); 990 destroy_stacks (aTHX);
995 991
996 LOAD((&temp)); /* this will get rid of defsv etc.. */ 992 LOAD ((&temp)); /* this will get rid of defsv etc.. */
997 SPAGAIN; 993 SPAGAIN;
998 994
999 coro->mainstack = 0; 995 coro->mainstack = 0;
1000 } 996 }
1001 997
… …
1006void 1002void
1007_exit(code) 1003_exit(code)
1008 int code 1004 int code
1009 PROTOTYPE: $ 1005 PROTOTYPE: $
1010 CODE: 1006 CODE:
1011#if defined(__GLIBC__) || _POSIX_C_SOURCE
1012 _exit (code); 1007 _exit (code);
1013#else
1014 signal (SIGTERM, SIG_DFL);
1015 raise (SIGTERM);
1016 exit (code);
1017#endif
1018 1008
1019MODULE = Coro::State PACKAGE = Coro::Cont 1009MODULE = Coro::State PACKAGE = Coro::Cont
1020 1010
1021# this is slightly dirty (should expose a c-level api) 1011# this is slightly dirty (should expose a c-level api)
1022 1012
1023void 1013void
1024yield(...) 1014yield(...)
1025 PROTOTYPE: @ 1015 PROTOTYPE: @
1026 CODE: 1016 CODE:
1027 static SV *returnstk; 1017 SV *yieldstack;
1028 SV *sv; 1018 SV *sv;
1029 AV *defav = GvAV (PL_defgv); 1019 AV *defav = GvAV (PL_defgv);
1030 struct coro *prev, *next; 1020 struct coro *prev, *next;
1031 1021
1032 if (!returnstk) 1022 yieldstack = *hv_fetch (
1033 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE)); 1023 (HV *)SvRV (GvSV (coro_current)),
1024 "yieldstack", sizeof ("yieldstack") - 1,
1025 0
1026 );
1034 1027
1035 /* set up @_ -- ugly */ 1028 /* set up @_ -- ugly */
1036 av_clear (defav); 1029 av_clear (defav);
1037 av_fill (defav, items - 1); 1030 av_fill (defav, items - 1);
1038 while (items--) 1031 while (items--)
1039 av_store (defav, items, SvREFCNT_inc (ST(items))); 1032 av_store (defav, items, SvREFCNT_inc (ST(items)));
1040 1033
1041 mg_get (returnstk); /* isn't documentation wrong for mg_get? */
1042 sv = av_pop ((AV *)SvRV (returnstk)); 1034 sv = av_pop ((AV *)SvRV (yieldstack));
1043 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0))); 1035 prev = INT2PTR (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))); 1036 next = INT2PTR (struct coro *, SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0))));
1045 SvREFCNT_dec (sv); 1037 SvREFCNT_dec (sv);
1046 1038
1047 transfer(aTHX_ prev, next, 0); 1039 transfer (aTHX_ prev, next, 0);
1048 1040
1049MODULE = Coro::State PACKAGE = Coro 1041MODULE = Coro::State PACKAGE = Coro
1050 1042
1051# this is slightly dirty (should expose a c-level api) 1043# this is slightly dirty (should expose a c-level api)
1052 1044
… …
1112cede(...) 1104cede(...)
1113 PROTOTYPE: 1105 PROTOTYPE:
1114 CODE: 1106 CODE:
1115 api_cede (); 1107 api_cede ();
1116 1108
1109# and these are hacks
1110SV *
1111_aio_get_state ()
1112 CODE:
1113{
1114 struct {
1115 int errorno;
1116 int laststype;
1117 int laststatval;
1118 Stat_t statcache;
1119 } data;
1120
1121 data.errorno = errno;
1122 data.laststype = PL_laststype;
1123 data.laststatval = PL_laststatval;
1124 data.statcache = PL_statcache;
1125
1126 RETVAL = newSVpvn ((char *)&data, sizeof data);
1127}
1128 OUTPUT:
1129 RETVAL
1130
1131void
1132_aio_set_state (char *data_)
1133 PROTOTYPE: $
1134 CODE:
1135{
1136 struct {
1137 int errorno;
1138 int laststype;
1139 int laststatval;
1140 Stat_t statcache;
1141 } *data = (void *)data_;
1142
1143 errno = data->errorno;
1144 PL_laststype = data->laststype;
1145 PL_laststatval = data->laststatval;
1146 PL_statcache = data->statcache;
1147}

Diff Legend

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