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.80 by root, Thu Nov 2 20:00:00 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#if PERL_VERSION < 9
169 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
170#else
171 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
172#endif
173 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
174 --AvFILLp (padlist);
175
176 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE)));
159 av_store (newpadlist, 1, (SV *) newpad); 177 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 178
226 return newpadlist; 179 return newpadlist;
227} 180}
228 181
229STATIC void 182static void
230free_padlist (AV *padlist) 183free_padlist (pTHX_ AV *padlist)
231{ 184{
232 /* may be during global destruction */ 185 /* may be during global destruction */
233 if (SvREFCNT (padlist)) 186 if (SvREFCNT (padlist))
234 { 187 {
235 I32 i = AvFILLp (padlist); 188 I32 i = AvFILLp (padlist);
… …
248 201
249 SvREFCNT_dec ((SV*)padlist); 202 SvREFCNT_dec ((SV*)padlist);
250 } 203 }
251} 204}
252 205
253STATIC int 206static int
254coro_cv_free (SV *sv, MAGIC *mg) 207coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
255{ 208{
256 AV *padlist; 209 AV *padlist;
257 AV *av = (AV *)mg->mg_obj; 210 AV *av = (AV *)mg->mg_obj;
258 211
259 /* casting is fun. */ 212 /* casting is fun. */
260 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 213 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
261 free_padlist (padlist); 214 free_padlist (aTHX_ padlist);
215
216 SvREFCNT_dec (av);
217
218 return 0;
262} 219}
263 220
264#define PERL_MAGIC_coro PERL_MAGIC_ext 221#define PERL_MAGIC_coro PERL_MAGIC_ext
265 222
266static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 223static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
267 224
268/* the next two functions merely cache the padlists */ 225/* the next two functions merely cache the padlists */
269STATIC void 226static void
270get_padlist (CV *cv) 227get_padlist (pTHX_ CV *cv)
271{ 228{
272 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 229 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
273 230
274 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0) 231 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
275 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj); 232 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
276 else 233 else
234 {
235#if 0
236 /* this should work - but it doesn't :( */
237 CV *cp = Perl_cv_clone (aTHX_ cv);
238 CvPADLIST (cv) = CvPADLIST (cp);
239 CvPADLIST (cp) = 0;
240 SvREFCNT_dec (cp);
241#else
277 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv)); 242 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
243#endif
244 }
278} 245}
279 246
280STATIC void 247static void
281put_padlist (CV *cv) 248put_padlist (pTHX_ CV *cv)
282{ 249{
283 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 250 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
284 251
285 if (!mg) 252 if (!mg)
286 { 253 {
… …
312 PL_mainstack = c->mainstack; 279 PL_mainstack = c->mainstack;
313 PL_stack_sp = c->stack_sp; 280 PL_stack_sp = c->stack_sp;
314 PL_op = c->op; 281 PL_op = c->op;
315 PL_curpad = c->curpad; 282 PL_curpad = c->curpad;
316 PL_comppad = c->comppad; 283 PL_comppad = c->comppad;
284 PL_compcv = c->compcv;
317 PL_stack_base = c->stack_base; 285 PL_stack_base = c->stack_base;
318 PL_stack_max = c->stack_max; 286 PL_stack_max = c->stack_max;
319 PL_tmps_stack = c->tmps_stack; 287 PL_tmps_stack = c->tmps_stack;
320 PL_tmps_floor = c->tmps_floor; 288 PL_tmps_floor = c->tmps_floor;
321 PL_tmps_ix = c->tmps_ix; 289 PL_tmps_ix = c->tmps_ix;
… …
327 PL_scopestack_ix = c->scopestack_ix; 295 PL_scopestack_ix = c->scopestack_ix;
328 PL_scopestack_max = c->scopestack_max; 296 PL_scopestack_max = c->scopestack_max;
329 PL_savestack = c->savestack; 297 PL_savestack = c->savestack;
330 PL_savestack_ix = c->savestack_ix; 298 PL_savestack_ix = c->savestack_ix;
331 PL_savestack_max = c->savestack_max; 299 PL_savestack_max = c->savestack_max;
300#if PERL_VERSION < 9
332 PL_retstack = c->retstack; 301 PL_retstack = c->retstack;
333 PL_retstack_ix = c->retstack_ix; 302 PL_retstack_ix = c->retstack_ix;
334 PL_retstack_max = c->retstack_max; 303 PL_retstack_max = c->retstack_max;
304#endif
305 PL_curpm = c->curpm;
335 PL_curcop = c->curcop; 306 PL_curcop = c->curcop;
336 PL_top_env = c->top_env; 307 PL_top_env = c->top_env;
337 308
338 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 309 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
339 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 310 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
… …
348 { 319 {
349 AV *padlist = (AV *)POPs; 320 AV *padlist = (AV *)POPs;
350 321
351 if (padlist) 322 if (padlist)
352 { 323 {
353 put_padlist (cv); /* mark this padlist as available */ 324 put_padlist (aTHX_ cv); /* mark this padlist as available */
354 CvPADLIST(cv) = padlist; 325 CvPADLIST(cv) = padlist;
355#ifdef USE_THREADS
356 /*CvOWNER(cv) = (struct perl_thread *)POPs;*/
357#endif
358 } 326 }
359 327
360 ++CvDEPTH(cv); 328 ++CvDEPTH(cv);
361 } 329 }
362 330
… …
389 if (CxTYPE(cx) == CXt_SUB) 357 if (CxTYPE(cx) == CXt_SUB)
390 { 358 {
391 CV *cv = cx->blk_sub.cv; 359 CV *cv = cx->blk_sub.cv;
392 if (CvDEPTH(cv)) 360 if (CvDEPTH(cv))
393 { 361 {
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); 362 EXTEND (SP, CvDEPTH(cv)*2);
400 363
401 while (--CvDEPTH(cv)) 364 while (--CvDEPTH(cv))
402 { 365 {
403 /* this tells the restore code to increment CvDEPTH */ 366 /* this tells the restore code to increment CvDEPTH */
… …
406 } 369 }
407 370
408 PUSHs ((SV *)CvPADLIST(cv)); 371 PUSHs ((SV *)CvPADLIST(cv));
409 PUSHs ((SV *)cv); 372 PUSHs ((SV *)cv);
410 373
411 get_padlist (cv); /* this is a monster */ 374 get_padlist (aTHX_ cv);
412 } 375 }
413 } 376 }
414#ifdef CXt_FORMAT 377#ifdef CXt_FORMAT
415 else if (CxTYPE(cx) == CXt_FORMAT) 378 else if (CxTYPE(cx) == CXt_FORMAT)
416 { 379 {
… …
444 c->mainstack = PL_mainstack; 407 c->mainstack = PL_mainstack;
445 c->stack_sp = PL_stack_sp; 408 c->stack_sp = PL_stack_sp;
446 c->op = PL_op; 409 c->op = PL_op;
447 c->curpad = PL_curpad; 410 c->curpad = PL_curpad;
448 c->comppad = PL_comppad; 411 c->comppad = PL_comppad;
412 c->compcv = PL_compcv;
449 c->stack_base = PL_stack_base; 413 c->stack_base = PL_stack_base;
450 c->stack_max = PL_stack_max; 414 c->stack_max = PL_stack_max;
451 c->tmps_stack = PL_tmps_stack; 415 c->tmps_stack = PL_tmps_stack;
452 c->tmps_floor = PL_tmps_floor; 416 c->tmps_floor = PL_tmps_floor;
453 c->tmps_ix = PL_tmps_ix; 417 c->tmps_ix = PL_tmps_ix;
… …
459 c->scopestack_ix = PL_scopestack_ix; 423 c->scopestack_ix = PL_scopestack_ix;
460 c->scopestack_max = PL_scopestack_max; 424 c->scopestack_max = PL_scopestack_max;
461 c->savestack = PL_savestack; 425 c->savestack = PL_savestack;
462 c->savestack_ix = PL_savestack_ix; 426 c->savestack_ix = PL_savestack_ix;
463 c->savestack_max = PL_savestack_max; 427 c->savestack_max = PL_savestack_max;
428#if PERL_VERSION < 9
464 c->retstack = PL_retstack; 429 c->retstack = PL_retstack;
465 c->retstack_ix = PL_retstack_ix; 430 c->retstack_ix = PL_retstack_ix;
466 c->retstack_max = PL_retstack_max; 431 c->retstack_max = PL_retstack_max;
432#endif
433 c->curpm = PL_curpm;
467 c->curcop = PL_curcop; 434 c->curcop = PL_curcop;
468 c->top_env = PL_top_env; 435 c->top_env = PL_top_env;
469} 436}
470 437
471/* 438/*
472 * allocate various perl stacks. This is an exact copy 439 * allocate various perl stacks. This is an exact copy
473 * of perl.c:init_stacks, except that it uses less memory 440 * of perl.c:init_stacks, except that it uses less memory
474 * on the assumption that coroutines do not usually need 441 * on the (sometimes correct) assumption that coroutines do
475 * a lot of stackspace. 442 * not usually need a lot of stackspace.
476 */ 443 */
477STATIC void 444static void
478coro_init_stacks (pTHX) 445coro_init_stacks (pTHX)
479{ 446{
447 LOCK;
448
480 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 449 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
481 PL_curstackinfo->si_type = PERLSI_MAIN; 450 PL_curstackinfo->si_type = PERLSI_MAIN;
482 PL_curstack = PL_curstackinfo->si_stack; 451 PL_curstack = PL_curstackinfo->si_stack;
483 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 452 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
484 453
… …
505 474
506 New(54,PL_savestack,96,ANY); 475 New(54,PL_savestack,96,ANY);
507 PL_savestack_ix = 0; 476 PL_savestack_ix = 0;
508 PL_savestack_max = 96; 477 PL_savestack_max = 96;
509 478
479#if PERL_VERSION < 9
510 New(54,PL_retstack,8,OP*); 480 New(54,PL_retstack,8,OP*);
511 PL_retstack_ix = 0; 481 PL_retstack_ix = 0;
512 PL_retstack_max = 8; 482 PL_retstack_max = 8;
483#endif
484
485 UNLOCK;
513} 486}
514 487
515/* 488/*
516 * destroy the stacks, the callchain etc... 489 * destroy the stacks, the callchain etc...
517 */ 490 */
518STATIC void 491static void
519destroy_stacks(pTHX) 492destroy_stacks(pTHX)
520{ 493{
521 if (!IN_DESTRUCT) 494 if (!IN_DESTRUCT)
522 { 495 {
523 /* is this ugly, I ask? */ 496 /* is this ugly, I ask? */
524 while (PL_scopestack_ix) 497 LEAVE_SCOPE (0);
525 LEAVE;
526 498
527 /* sure it is, but more important: is it correct?? :/ */ 499 /* 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; 500 FREETMPS;
501
502 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/
530 } 503 }
531 504
532 while (PL_curstackinfo->si_next) 505 while (PL_curstackinfo->si_next)
533 PL_curstackinfo = PL_curstackinfo->si_next; 506 PL_curstackinfo = PL_curstackinfo->si_next;
534 507
535 while (PL_curstackinfo) 508 while (PL_curstackinfo)
536 { 509 {
537 PERL_SI *p = PL_curstackinfo->si_prev; 510 PERL_SI *p = PL_curstackinfo->si_prev;
538 511
539 { 512 { /*D*//*remove*/
540 dSP; 513 dSP;
541 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack); 514 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
542 PUTBACK; /* possibly superfluous */ 515 PUTBACK; /* possibly superfluous */
543 } 516 }
544 517
545 if (!IN_DESTRUCT) 518 if (!IN_DESTRUCT)
546 { 519 {
547 dounwind(-1); 520 dounwind (-1);/*D*//*remove*/
548 SvREFCNT_dec(PL_curstackinfo->si_stack); 521 SvREFCNT_dec (PL_curstackinfo->si_stack);
549 } 522 }
550 523
551 Safefree(PL_curstackinfo->si_cxstack); 524 Safefree (PL_curstackinfo->si_cxstack);
552 Safefree(PL_curstackinfo); 525 Safefree (PL_curstackinfo);
553 PL_curstackinfo = p; 526 PL_curstackinfo = p;
554 } 527 }
555 528
556 Safefree(PL_tmps_stack); 529 Safefree (PL_tmps_stack);
557 Safefree(PL_markstack); 530 Safefree (PL_markstack);
558 Safefree(PL_scopestack); 531 Safefree (PL_scopestack);
559 Safefree(PL_savestack); 532 Safefree (PL_savestack);
533#if PERL_VERSION < 9
560 Safefree(PL_retstack); 534 Safefree (PL_retstack);
535#endif
561} 536}
562 537
563static void 538static void
564allocate_stack (Coro__State ctx, int alloc) 539allocate_stack (Coro__State ctx, int alloc)
565{ 540{
… …
568 New (0, stack, 1, coro_stack); 543 New (0, stack, 1, coro_stack);
569 544
570 stack->refcnt = 1; 545 stack->refcnt = 1;
571 stack->usecnt = 1; 546 stack->usecnt = 1;
572 stack->gencnt = ctx->gencnt = 0; 547 stack->gencnt = ctx->gencnt = 0;
548
573 if (alloc) 549 if (alloc)
574 { 550 {
575#if HAVE_MMAP 551#if HAVE_MMAP
576 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */ 552 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); 553 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
578 if (stack->sptr == (void *)-1) 554 if (stack->sptr != (void *)-1)
579#endif
580 { 555 {
581 /*FIXME*//*D*//* reasonable stack size! */ 556# if STACKGUARD
557 mprotect (stack->sptr, STACKGUARD * PAGESIZE, PROT_NONE);
558# endif
559 }
560 else
561#endif
562 {
582 stack->ssize = - (16384 * sizeof (long)); 563 stack->ssize = - (STACKSIZE * (long)sizeof (long));
583 New (0, stack->sptr, 16384, long); 564 New (0, stack->sptr, STACKSIZE, long);
584 } 565 }
585 } 566 }
586 else 567 else
587 stack->sptr = 0; 568 stack->sptr = 0;
588 569
… …
618setup_coro (void *arg) 599setup_coro (void *arg)
619{ 600{
620 /* 601 /*
621 * emulate part of the perl startup here. 602 * emulate part of the perl startup here.
622 */ 603 */
604 dTHX;
623 dSP; 605 dSP;
624 Coro__State ctx = (Coro__State)arg; 606 Coro__State ctx = (Coro__State)arg;
625 SV *sub_init = (SV*)get_cv(SUB_INIT, FALSE); 607 SV *sub_init = (SV *)get_cv (SUB_INIT, FALSE);
626 608
627 coro_init_stacks (aTHX); 609 coro_init_stacks (aTHX);
628 /*PL_curcop = 0;*/ 610 /*PL_curcop = 0;*/
629 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 611 /*PL_in_eval = PL_in_eval;*/ /* inherit */
630 SvREFCNT_dec (GvAV (PL_defgv)); 612 SvREFCNT_dec (GvAV (PL_defgv));
… …
647 } 629 }
648 else 630 else
649 { 631 {
650 UNOP myop; 632 UNOP myop;
651 633
652 PL_op = (OP *)&myop;
653
654 Zero(&myop, 1, UNOP); 634 Zero(&myop, 1, UNOP);
655 myop.op_next = Nullop; 635 myop.op_next = Nullop;
656 myop.op_flags = OPf_WANT_VOID; 636 myop.op_flags = OPf_WANT_VOID;
637
638 PL_op = (OP *)&myop;
657 639
658 PUSHMARK(SP); 640 PUSHMARK(SP);
659 XPUSHs (sub_init); 641 XPUSHs (sub_init);
660 /* 642 /*
661 * the next line is slightly wrong, as PL_op->op_next 643 * the next line is slightly wrong, as PL_op->op_next
… …
676continue_coro (void *arg) 658continue_coro (void *arg)
677{ 659{
678 /* 660 /*
679 * this is a _very_ stripped down perl interpreter ;) 661 * this is a _very_ stripped down perl interpreter ;)
680 */ 662 */
663 dTHX;
681 Coro__State ctx = (Coro__State)arg; 664 Coro__State ctx = (Coro__State)arg;
682 JMPENV coro_start_env;
683 665
684 PL_top_env = &ctx->start_env; 666 PL_top_env = &ctx->start_env;
685 667
686 ctx->cursp = 0; 668 ctx->cursp = 0;
687 PL_op = PL_op->op_next; 669 PL_op = PL_op->op_next;
688 CALLRUNOPS(aTHX); 670 CALLRUNOPS(aTHX);
689 671
690 abort (); 672 abort ();
691} 673}
692 674
693STATIC void 675static void
694transfer(pTHX_ struct coro *prev, struct coro *next, int flags) 676transfer (pTHX_ struct coro *prev, struct coro *next, int flags)
695{ 677{
696 dSTACKLEVEL; 678 dSTACKLEVEL;
697 static struct coro *xnext;
698 679
699 if (prev != next) 680 if (prev != next)
700 { 681 {
701 xnext = next;
702
703 if (next->mainstack) 682 if (next->mainstack)
704 { 683 {
684 LOCK;
705 SAVE (prev, flags); 685 SAVE (prev, flags);
706 LOAD (next); 686 LOAD (next);
687 UNLOCK;
707 688
708 /* mark this state as in-use */ 689 /* mark this state as in-use */
709 next->mainstack = 0; 690 next->mainstack = 0;
710 next->tmps_ix = -2; 691 next->tmps_ix = -2;
711 692
… …
730 continue_coro, (void *)next, 711 continue_coro, (void *)next,
731 next->stack->sptr, labs (next->stack->ssize)); 712 next->stack->sptr, labs (next->stack->ssize));
732 } 713 }
733 714
734 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 715 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
716 prev->cursp = stacklevel;
735 /* don't add any code here */ 717 /* don't add any code here */
736 } 718 }
737 719 else
720 next->cursp = stacklevel;
738 } 721 }
739 else if (next->tmps_ix == -2) 722 else if (next->tmps_ix == -2)
740 croak ("tried to transfer to running coroutine"); 723 croak ("tried to transfer to running coroutine");
741 else 724 else
742 { 725 {
726 LOCK;
743 SAVE (prev, -1); /* first get rid of the old state */ 727 SAVE (prev, -1); /* first get rid of the old state */
728 UNLOCK;
744 729
745 if (flags & TRANSFER_SAVE_CCTXT) 730 if (flags & TRANSFER_SAVE_CCTXT)
746 { 731 {
747 if (!prev->stack) 732 if (!prev->stack)
748 allocate_stack (prev, 0); 733 allocate_stack (prev, 0);
… …
750 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 735 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
751 { 736 {
752 PL_top_env = &next->start_env; 737 PL_top_env = &next->start_env;
753 738
754 setup_coro (next); 739 setup_coro (next);
740 next->cursp = stacklevel;
755 741
756 prev->stack->refcnt++; 742 prev->stack->refcnt++;
757 prev->stack->usecnt++; 743 prev->stack->usecnt++;
758 next->stack = prev->stack; 744 next->stack = prev->stack;
759 next->gencnt = prev->gencnt; 745 next->gencnt = prev->gencnt;
… …
764 allocate_stack (next, 1); 750 allocate_stack (next, 1);
765 coro_create (&(next->stack->cctx), 751 coro_create (&(next->stack->cctx),
766 setup_coro, (void *)next, 752 setup_coro, (void *)next,
767 next->stack->sptr, labs (next->stack->ssize)); 753 next->stack->sptr, labs (next->stack->ssize));
768 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 754 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
755 prev->cursp = stacklevel;
769 /* don't add any code here */ 756 /* don't add any code here */
770 } 757 }
771 } 758 }
772 else 759 else
760 {
773 setup_coro (next); 761 setup_coro (next);
762 next->cursp = stacklevel;
763 }
774 } 764 }
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 } 765 }
783 766
767 LOCK;
784 if (coro_mortal) 768 if (coro_mortal)
785 { 769 {
786 SvREFCNT_dec (coro_mortal); 770 SvREFCNT_dec (coro_mortal);
787 coro_mortal = 0; 771 coro_mortal = 0;
788 } 772 }
773 UNLOCK;
789} 774}
790 775
791#define SV_CORO(sv,func) \ 776#define SV_CORO(sv,func) \
792 do { \ 777 do { \
793 if (SvROK (sv)) \ 778 if (SvROK (sv)) \
794 sv = SvRV (sv); \ 779 sv = SvRV (sv); \
795 \ 780 \
796 if (SvTYPE(sv) == SVt_PVHV) \ 781 if (SvTYPE (sv) == SVt_PVHV) \
797 { \ 782 { \
798 HE *he = hv_fetch_ent((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \ 783 HE *he = hv_fetch_ent ((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \
799 \ 784 \
800 if (!he) \ 785 if (!he) \
801 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \ 786 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \
802 \ 787 \
803 (sv) = SvRV (HeVAL(he)); \ 788 (sv) = SvRV (HeVAL(he)); \
804 } \ 789 } \
805 \ 790 \
806 /* must also be changed inside Coro::Cont::yield */ \ 791 /* must also be changed inside Coro::Cont::yield */ \
807 if (!SvOBJECT(sv) || SvSTASH(sv) != coro_state_stash) \ 792 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
808 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \ 793 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
809 \ 794 \
810 } while(0) 795 } while(0)
811 796
812#define SvSTATE(sv) (struct coro *)SvIV (sv) 797#define SvSTATE(sv) INT2PTR (struct coro *, SvIV (sv))
813 798
814static void 799static void
815api_transfer(pTHX_ SV *prev, SV *next, int flags) 800api_transfer(pTHX_ SV *prev, SV *next, int flags)
816{ 801{
817 SV_CORO (prev, "Coro::transfer"); 802 SV_CORO (prev, "Coro::transfer");
818 SV_CORO (next, "Coro::transfer"); 803 SV_CORO (next, "Coro::transfer");
819 804
820 transfer(aTHX_ SvSTATE(prev), SvSTATE(next), flags); 805 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
821} 806}
822 807
823/** Coro ********************************************************************/ 808/** Coro ********************************************************************/
824 809
825#define PRIO_MAX 3 810#define PRIO_MAX 3
… …
833static GV *coro_current, *coro_idle; 818static GV *coro_current, *coro_idle;
834static AV *coro_ready[PRIO_MAX-PRIO_MIN+1]; 819static AV *coro_ready[PRIO_MAX-PRIO_MIN+1];
835static int coro_nready; 820static int coro_nready;
836 821
837static void 822static void
838coro_enq (SV *sv) 823coro_enq (pTHX_ SV *sv)
839{ 824{
825 SV **xprio;
826 int prio;
827
840 if (SvTYPE (sv) == SVt_PVHV) 828 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"); 829 croak ("Coro::ready tried to enqueue something that is not a coroutine");
830
831 xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
832 prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
833
834 prio = prio > PRIO_MAX ? PRIO_MAX
835 : prio < PRIO_MIN ? PRIO_MIN
836 : prio;
837
838 av_push (coro_ready [prio - PRIO_MIN], sv);
839 coro_nready++;
856} 840}
857 841
858static SV * 842static SV *
859coro_deq (int min_prio) 843coro_deq (pTHX_ int min_prio)
860{ 844{
861 int prio = PRIO_MAX - PRIO_MIN; 845 int prio = PRIO_MAX - PRIO_MIN;
862 846
863 min_prio -= PRIO_MIN; 847 min_prio -= PRIO_MIN;
864 if (min_prio < 0) 848 if (min_prio < 0)
… …
875} 859}
876 860
877static void 861static void
878api_ready (SV *coro) 862api_ready (SV *coro)
879{ 863{
864 dTHX;
865
880 if (SvROK (coro)) 866 if (SvROK (coro))
881 coro = SvRV (coro); 867 coro = SvRV (coro);
882 868
869 LOCK;
883 coro_enq (SvREFCNT_inc (coro)); 870 coro_enq (aTHX_ SvREFCNT_inc (coro));
871 UNLOCK;
884} 872}
885 873
886static void 874static void
887api_schedule (void) 875api_schedule (void)
888{ 876{
877 dTHX;
878
889 SV *prev, *next; 879 SV *prev, *next;
890 880
881 LOCK;
882
891 prev = SvRV (GvSV (coro_current)); 883 prev = SvRV (GvSV (coro_current));
892 next = coro_deq (PRIO_MIN); 884 next = coro_deq (aTHX_ PRIO_MIN);
893 885
894 if (!next) 886 if (!next)
895 next = SvREFCNT_inc (SvRV (GvSV (coro_idle))); 887 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
896 888
897 /* free this only after the transfer */ 889 /* free this only after the transfer */
… …
900 892
901 SvRV (GvSV (coro_current)) = next; 893 SvRV (GvSV (coro_current)) = next;
902 894
903 SV_CORO (next, "Coro::schedule"); 895 SV_CORO (next, "Coro::schedule");
904 896
897 UNLOCK;
898
905 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), 899 transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
906 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 900 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
907} 901}
908 902
909static void 903static void
910api_cede (void) 904api_cede (void)
911{ 905{
906 dTHX;
907
908 LOCK;
912 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current)))); 909 coro_enq (aTHX_ SvREFCNT_inc (SvRV (GvSV (coro_current))));
910 UNLOCK;
913 911
914 api_schedule (); 912 api_schedule ();
915} 913}
916 914
917MODULE = Coro::State PACKAGE = Coro::State 915MODULE = Coro::State PACKAGE = Coro::State
918 916
919PROTOTYPES: ENABLE 917PROTOTYPES: ENABLE
920 918
921BOOT: 919BOOT:
922{ /* {} necessary for stoopid perl-5.6.x */ 920{ /* {} necessary for stoopid perl-5.6.x */
921#ifdef USE_ITHREADS
922 MUTEX_INIT (&coro_mutex);
923#endif
924 BOOT_PAGESIZE;
925
923 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1); 926 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
924 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1); 927 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
925 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 928 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
926 929
927 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 930 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV));
928 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 931 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV));
929 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 932 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV));
930 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT)); 933 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT));
931
932 if (!padlist_cache)
933 padlist_cache = newHV ();
934 934
935 main_mainstack = PL_mainstack; 935 main_mainstack = PL_mainstack;
936 936
937 coroapi.ver = CORO_API_VERSION; 937 coroapi.ver = CORO_API_VERSION;
938 coroapi.transfer = api_transfer; 938 coroapi.transfer = api_transfer;
… …
949 croak ("Coro::State::_newprocess expects an arrayref"); 949 croak ("Coro::State::_newprocess expects an arrayref");
950 950
951 Newz (0, coro, 1, struct coro); 951 Newz (0, coro, 1, struct coro);
952 952
953 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 953 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
954 coro->mainstack = 0; /* actual work is done inside transfer */ 954 /*coro->mainstack = 0; *//*actual work is done inside transfer */
955 coro->stack = 0; 955 /*coro->stack = 0;*/
956 956
957 /* same as JMPENV_BOOTSTRAP */ 957 /* same as JMPENV_BOOTSTRAP */
958 /* we might be able to recycle start_env, but safe is safe */ 958 /* we might be able to recycle start_env, but safe is safe */
959 //Zero(&coro->start_env, 1, JMPENV); 959 /*Zero (&coro->start_env, 1, JMPENV);*/
960 coro->start_env.je_ret = -1; 960 coro->start_env.je_ret = -1;
961 coro->start_env.je_mustcatch = TRUE; 961 coro->start_env.je_mustcatch = TRUE;
962 962
963 RETVAL = coro; 963 RETVAL = coro;
964 OUTPUT: 964 OUTPUT:
… …
985 if (coro->mainstack && coro->mainstack != main_mainstack) 985 if (coro->mainstack && coro->mainstack != main_mainstack)
986 { 986 {
987 struct coro temp; 987 struct coro temp;
988 988
989 PUTBACK; 989 PUTBACK;
990 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL); 990 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL);
991 LOAD(aTHX_ coro); 991 LOAD (aTHX_ coro);
992 SPAGAIN; 992 SPAGAIN;
993 993
994 destroy_stacks (aTHX); 994 destroy_stacks (aTHX);
995 995
996 LOAD((&temp)); /* this will get rid of defsv etc.. */ 996 LOAD ((&temp)); /* this will get rid of defsv etc.. */
997 SPAGAIN; 997 SPAGAIN;
998 998
999 coro->mainstack = 0; 999 coro->mainstack = 0;
1000 } 1000 }
1001 1001
… …
1006void 1006void
1007_exit(code) 1007_exit(code)
1008 int code 1008 int code
1009 PROTOTYPE: $ 1009 PROTOTYPE: $
1010 CODE: 1010 CODE:
1011#if defined(__GLIBC__) || _POSIX_C_SOURCE
1012 _exit (code); 1011 _exit (code);
1013#else
1014 signal (SIGTERM, SIG_DFL);
1015 raise (SIGTERM);
1016 exit (code);
1017#endif
1018 1012
1019MODULE = Coro::State PACKAGE = Coro::Cont 1013MODULE = Coro::State PACKAGE = Coro::Cont
1020 1014
1021# this is slightly dirty (should expose a c-level api) 1015# this is slightly dirty (should expose a c-level api)
1022 1016
1023void 1017void
1024yield(...) 1018yield(...)
1025 PROTOTYPE: @ 1019 PROTOTYPE: @
1026 CODE: 1020 CODE:
1027 static SV *returnstk; 1021 SV *yieldstack;
1028 SV *sv; 1022 SV *sv;
1029 AV *defav = GvAV (PL_defgv); 1023 AV *defav = GvAV (PL_defgv);
1030 struct coro *prev, *next; 1024 struct coro *prev, *next;
1031 1025
1032 if (!returnstk) 1026 yieldstack = *hv_fetch (
1033 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE)); 1027 (HV *)SvRV (GvSV (coro_current)),
1028 "yieldstack", sizeof ("yieldstack") - 1,
1029 0
1030 );
1034 1031
1035 /* set up @_ -- ugly */ 1032 /* set up @_ -- ugly */
1036 av_clear (defav); 1033 av_clear (defav);
1037 av_fill (defav, items - 1); 1034 av_fill (defav, items - 1);
1038 while (items--) 1035 while (items--)
1039 av_store (defav, items, SvREFCNT_inc (ST(items))); 1036 av_store (defav, items, SvREFCNT_inc (ST(items)));
1040 1037
1041 mg_get (returnstk); /* isn't documentation wrong for mg_get? */
1042 sv = av_pop ((AV *)SvRV (returnstk)); 1038 sv = av_pop ((AV *)SvRV (yieldstack));
1043 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0))); 1039 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))); 1040 next = INT2PTR (struct coro *, SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0))));
1045 SvREFCNT_dec (sv); 1041 SvREFCNT_dec (sv);
1046 1042
1047 transfer(aTHX_ prev, next, 0); 1043 transfer (aTHX_ prev, next, 0);
1048 1044
1049MODULE = Coro::State PACKAGE = Coro 1045MODULE = Coro::State PACKAGE = Coro
1050 1046
1051# this is slightly dirty (should expose a c-level api) 1047# this is slightly dirty (should expose a c-level api)
1052 1048
… …
1112cede(...) 1108cede(...)
1113 PROTOTYPE: 1109 PROTOTYPE:
1114 CODE: 1110 CODE:
1115 api_cede (); 1111 api_cede ();
1116 1112
1113# and these are hacks
1114SV *
1115_aio_get_state ()
1116 CODE:
1117{
1118 struct {
1119 int errorno;
1120 int laststype;
1121 int laststatval;
1122 Stat_t statcache;
1123 } data;
1124
1125 data.errorno = errno;
1126 data.laststype = PL_laststype;
1127 data.laststatval = PL_laststatval;
1128 data.statcache = PL_statcache;
1129
1130 RETVAL = newSVpvn ((char *)&data, sizeof data);
1131}
1132 OUTPUT:
1133 RETVAL
1134
1135void
1136_aio_set_state (char *data_)
1137 PROTOTYPE: $
1138 CODE:
1139{
1140 struct {
1141 int errorno;
1142 int laststype;
1143 int laststatval;
1144 Stat_t statcache;
1145 } *data = (void *)data_;
1146
1147 errno = data->errorno;
1148 PL_laststype = data->laststype;
1149 PL_laststatval = data->laststatval;
1150 PL_statcache = data->statcache;
1151}

Diff Legend

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