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.31 by root, Sun Aug 26 16:36:08 2001 UTC vs.
Revision 1.77 by root, Tue Oct 31 23:55:33 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 "libcoro/coro.c" 9#include "patchlevel.h"
6 10
11#if PERL_VERSION < 6
12# ifndef PL_ppaddr
13# define PL_ppaddr ppaddr
14# endif
15# ifndef call_sv
16# define call_sv perl_call_sv
17# endif
18# ifndef get_sv
19# define get_sv perl_get_sv
20# endif
21# ifndef get_cv
22# define get_cv perl_get_cv
23# endif
24# ifndef IS_PADGV
25# define IS_PADGV(v) 0
26# endif
27# ifndef IS_PADCONST
28# define IS_PADCONST(v) 0
29# endif
30#endif
31
7#include <signal.h> 32#include <errno.h>
8 33
9#ifdef HAVE_MMAP 34#ifdef HAVE_MMAP
10# include <unistd.h> 35# include <unistd.h>
11# include <sys/mman.h> 36# include <sys/mman.h>
12# ifndef MAP_ANON
13# ifdef MAP_ANONYMOUS 37# ifndef MAP_ANONYMOUS
14# define MAP_ANON MAP_ANONYMOUS 38# ifdef MAP_ANON
39# define MAP_ANONYMOUS MAP_ANON
15# else 40# else
16# undef HAVE_MMAP 41# undef HAVE_MMAP
17# endif 42# endif
18# endif 43# endif
19#endif 44#endif
20 45
21#define MAY_FLUSH /* increases codesize and is rarely used */
22
23#define SUB_INIT "Coro::State::initialize" 46#define SUB_INIT "Coro::State::initialize"
24#define UCORO_STATE "_coro_state" 47#define UCORO_STATE "_coro_state"
25 48
26/* The next macro should declare a variable stacklevel that contains and approximation 49/* The next macro should declare a variable stacklevel that contains and approximation
27 * to the current C stack pointer. Its property is that it changes with each call 50 * to the current C stack pointer. Its property is that it changes with each call
28 * and should be unique. */ 51 * and should be unique. */
29#define dSTACKLEVEL void *stacklevel = &stacklevel 52#define dSTACKLEVEL void *stacklevel = &stacklevel
30 53
54#define IN_DESTRUCT (PL_main_cv == Nullcv)
55
31#define labs(l) ((l) >= 0 ? (l) : -(l)) 56#define labs(l) ((l) >= 0 ? (l) : -(l))
32 57
33#include "CoroAPI.h" 58#include "CoroAPI.h"
34 59
60#ifdef USE_ITHREADS
61static perl_mutex coro_mutex;
62# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0)
63# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0)
64#else
65# define LOCK (void)0
66# define UNLOCK (void)0
67#endif
68
35static struct CoroAPI coroapi; 69static struct CoroAPI coroapi;
70static AV *main_mainstack; /* used to differentiate between $main and others */
71static HV *coro_state_stash;
72static SV *ucoro_state_sv;
73static U32 ucoro_state_hash;
74static SV *coro_mortal; /* will be freed after next transfer */
36 75
37/* this is actually not only the c stack but also c registers etc... */ 76/* this is actually not only the c stack but also c registers etc... */
38typedef struct { 77typedef struct {
39 int refcnt; /* pointer reference counter */ 78 int refcnt; /* pointer reference counter */
40 int usecnt; /* shared by how many coroutines */ 79 int usecnt; /* shared by how many coroutines */
… …
45 void *sptr; 84 void *sptr;
46 long ssize; /* positive == mmap, otherwise malloc */ 85 long ssize; /* positive == mmap, otherwise malloc */
47} coro_stack; 86} coro_stack;
48 87
49struct coro { 88struct coro {
89 /* the top-level JMPENV for each coroutine, needed to catch dies. */
90 JMPENV start_env;
91
50 /* the optional C context */ 92 /* the optional C context */
51 coro_stack *stack; 93 coro_stack *stack;
52 void *cursp; 94 void *cursp;
53 int gencnt; 95 int gencnt;
54 96
… …
66 AV *curstack; 108 AV *curstack;
67 AV *mainstack; 109 AV *mainstack;
68 SV **stack_sp; 110 SV **stack_sp;
69 OP *op; 111 OP *op;
70 SV **curpad; 112 SV **curpad;
113 AV *comppad;
114 CV *compcv;
71 SV **stack_base; 115 SV **stack_base;
72 SV **stack_max; 116 SV **stack_max;
73 SV **tmps_stack; 117 SV **tmps_stack;
74 I32 tmps_floor; 118 I32 tmps_floor;
75 I32 tmps_ix; 119 I32 tmps_ix;
… …
84 I32 savestack_ix; 128 I32 savestack_ix;
85 I32 savestack_max; 129 I32 savestack_max;
86 OP **retstack; 130 OP **retstack;
87 I32 retstack_ix; 131 I32 retstack_ix;
88 I32 retstack_max; 132 I32 retstack_max;
133 PMOP *curpm;
89 COP *curcop; 134 COP *curcop;
90 JMPENV *top_env; 135 JMPENV *top_env;
91 136
92 /* data associated with this coroutine (initial args) */ 137 /* data associated with this coroutine (initial args) */
93 AV *args; 138 AV *args;
94}; 139};
95 140
96typedef struct coro *Coro__State; 141typedef struct coro *Coro__State;
97typedef struct coro *Coro__State_or_hashref; 142typedef struct coro *Coro__State_or_hashref;
98 143
99static AV *main_mainstack; /* used to differentiate between $main and others */ 144static AV *
100static HV *coro_state_stash; 145coro_clone_padlist (pTHX_ CV *cv)
101static SV *ucoro_state_sv;
102static U32 ucoro_state_hash;
103static HV *padlist_cache;
104
105/* mostly copied from op.c:cv_clone2 */
106STATIC AV *
107clone_padlist (AV *protopadlist)
108{ 146{
109 AV *av; 147 AV *padlist = CvPADLIST (cv);
110 I32 ix;
111 AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE);
112 AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE);
113 SV **pname = AvARRAY (protopad_name);
114 SV **ppad = AvARRAY (protopad);
115 I32 fname = AvFILLp (protopad_name);
116 I32 fpad = AvFILLp (protopad);
117 AV *newpadlist, *newpad_name, *newpad; 148 AV *newpadlist, *newpad;
118 SV **npad;
119
120 newpad_name = newAV ();
121 for (ix = fname; ix >= 0; ix--)
122 av_store (newpad_name, ix, SvREFCNT_inc (pname[ix]));
123
124 newpad = newAV ();
125 av_fill (newpad, AvFILLp (protopad));
126 npad = AvARRAY (newpad);
127 149
128 newpadlist = newAV (); 150 newpadlist = newAV ();
129 AvREAL_off (newpadlist); 151 AvREAL_off (newpadlist);
130 av_store (newpadlist, 0, (SV *) newpad_name); 152 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
153 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
154 --AvFILLp (padlist);
155
156 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE)));
131 av_store (newpadlist, 1, (SV *) newpad); 157 av_store (newpadlist, 1, (SV *)newpad);
132 158
133 av = newAV (); /* will be @_ */ 159 return newpadlist;
134 av_extend (av, 0); 160}
135 av_store (newpad, 0, (SV *) av);
136 AvFLAGS (av) = AVf_REIFY;
137 161
138 for (ix = fpad; ix > 0; ix--) 162static void
163free_padlist (pTHX_ AV *padlist)
164{
165 /* may be during global destruction */
166 if (SvREFCNT (padlist))
139 { 167 {
140 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv; 168 I32 i = AvFILLp (padlist);
141 if (namesv && namesv != &PL_sv_undef) 169 while (i >= 0)
142 { 170 {
143 char *name = SvPVX (namesv); /* XXX */ 171 SV **svp = av_fetch (padlist, i--, FALSE);
144 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&') 172 if (svp)
145 { /* lexical from outside? */
146 npad[ix] = SvREFCNT_inc (ppad[ix]);
147 } 173 {
148 else
149 { /* our own lexical */
150 SV *sv; 174 SV *sv;
151 if (*name == '&') 175 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp)))
152 sv = SvREFCNT_inc (ppad[ix]); 176 SvREFCNT_dec (sv);
153 else if (*name == '@') 177
154 sv = (SV *) newAV (); 178 SvREFCNT_dec (*svp);
155 else if (*name == '%')
156 sv = (SV *) newHV ();
157 else
158 sv = NEWSV (0, 0);
159 if (!SvPADBUSY (sv))
160 SvPADMY_on (sv);
161 npad[ix] = sv;
162 } 179 }
163 } 180 }
164 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix])) 181
165 { 182 SvREFCNT_dec ((SV*)padlist);
166 npad[ix] = SvREFCNT_inc (ppad[ix]);
167 }
168 else
169 {
170 SV *sv = NEWSV (0, 0);
171 SvPADTMP_on (sv);
172 npad[ix] = sv;
173 }
174 } 183 }
184}
175 185
176#if 0 /* return -ENOTUNDERSTOOD */ 186static int
177 /* Now that vars are all in place, clone nested closures. */ 187coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
188{
189 AV *padlist;
190 AV *av = (AV *)mg->mg_obj;
178 191
179 for (ix = fpad; ix > 0; ix--) { 192 /* casting is fun. */
180 SV* namesv = (ix <= fname) ? pname[ix] : Nullsv; 193 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
181 if (namesv 194 free_padlist (aTHX_ padlist);
182 && namesv != &PL_sv_undef 195
183 && !(SvFLAGS(namesv) & SVf_FAKE) 196 SvREFCNT_dec (av);
184 && *SvPVX(namesv) == '&' 197
185 && CvCLONE(ppad[ix])) 198 return 0;
186 { 199}
187 CV *kid = cv_clone((CV*)ppad[ix]); 200
188 SvREFCNT_dec(ppad[ix]); 201#define PERL_MAGIC_coro PERL_MAGIC_ext
189 CvCLONE_on(kid); 202
190 SvPADMY_on(kid); 203static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
191 npad[ix] = (SV*)kid; 204
192 } 205/* the next two functions merely cache the padlists */
206static void
207get_padlist (pTHX_ CV *cv)
208{
209 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
210
211 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
212 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
213 else
214 {
215#if 0
216 /* this should work - but it doesn't :( */
217 CV *cp = Perl_cv_clone (aTHX_ cv);
218 CvPADLIST (cv) = CvPADLIST (cp);
219 CvPADLIST (cp) = 0;
220 SvREFCNT_dec (cp);
221#else
222 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
223#endif
224 }
225}
226
227static void
228put_padlist (pTHX_ CV *cv)
229{
230 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
231
232 if (!mg)
233 {
234 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
235 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
236 mg->mg_virtual = &vtbl_coro;
237 mg->mg_obj = (SV *)newAV ();
193 } 238 }
194#endif
195 239
196 return newpadlist;
197}
198
199#ifdef MAY_FLUSH
200STATIC void
201free_padlist (AV *padlist)
202{
203 /* may be during global destruction */
204 if (SvREFCNT(padlist))
205 {
206 I32 i = AvFILLp(padlist);
207 while (i >= 0)
208 {
209 SV **svp = av_fetch(padlist, i--, FALSE);
210 SV *sv = svp ? *svp : Nullsv;
211 if (sv)
212 SvREFCNT_dec(sv);
213 }
214
215 SvREFCNT_dec((SV*)padlist);
216 }
217}
218#endif
219
220/* the next two functions merely cache the padlists */
221STATIC void
222get_padlist (CV *cv)
223{
224 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 0);
225
226 if (he && AvFILLp ((AV *)*he) >= 0)
227 CvPADLIST (cv) = (AV *)av_pop ((AV *)*he);
228 else
229 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv));
230}
231
232STATIC void
233put_padlist (CV *cv)
234{
235 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 1);
236
237 if (SvTYPE (*he) != SVt_PVAV)
238 {
239 SvREFCNT_dec (*he);
240 *he = (SV *)newAV ();
241 }
242
243 av_push ((AV *)*he, (SV *)CvPADLIST (cv)); 240 av_push ((AV *)mg->mg_obj, (SV *)CvPADLIST (cv));
244} 241}
245
246#ifdef MAY_FLUSH
247STATIC void
248flush_padlist_cache ()
249{
250 HV *hv = padlist_cache;
251 padlist_cache = newHV ();
252
253 if (hv_iterinit (hv))
254 {
255 HE *he;
256 AV *padlist;
257
258 while (!!(he = hv_iternext (hv)))
259 {
260 AV *av = (AV *)HeVAL(he);
261
262 /* casting is fun. */
263 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
264 free_padlist (padlist);
265 }
266 }
267
268 SvREFCNT_dec (hv);
269}
270#endif
271 242
272#define SB do { 243#define SB do {
273#define SE } while (0) 244#define SE } while (0)
274 245
275#define LOAD(state) load_state(aTHX_ (state)); 246#define LOAD(state) load_state(aTHX_ (state));
276#define SAVE(state,flags) save_state(aTHX_ (state),(flags)); 247#define SAVE(state,flags) save_state(aTHX_ (state),(flags));
277 248
278#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); SE 249#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE
279 250
280static void 251static void
281load_state(pTHX_ Coro__State c) 252load_state(pTHX_ Coro__State c)
282{ 253{
283 PL_dowarn = c->dowarn; 254 PL_dowarn = c->dowarn;
… …
287 PL_curstack = c->curstack; 258 PL_curstack = c->curstack;
288 PL_mainstack = c->mainstack; 259 PL_mainstack = c->mainstack;
289 PL_stack_sp = c->stack_sp; 260 PL_stack_sp = c->stack_sp;
290 PL_op = c->op; 261 PL_op = c->op;
291 PL_curpad = c->curpad; 262 PL_curpad = c->curpad;
263 PL_comppad = c->comppad;
264 PL_compcv = c->compcv;
292 PL_stack_base = c->stack_base; 265 PL_stack_base = c->stack_base;
293 PL_stack_max = c->stack_max; 266 PL_stack_max = c->stack_max;
294 PL_tmps_stack = c->tmps_stack; 267 PL_tmps_stack = c->tmps_stack;
295 PL_tmps_floor = c->tmps_floor; 268 PL_tmps_floor = c->tmps_floor;
296 PL_tmps_ix = c->tmps_ix; 269 PL_tmps_ix = c->tmps_ix;
… …
302 PL_scopestack_ix = c->scopestack_ix; 275 PL_scopestack_ix = c->scopestack_ix;
303 PL_scopestack_max = c->scopestack_max; 276 PL_scopestack_max = c->scopestack_max;
304 PL_savestack = c->savestack; 277 PL_savestack = c->savestack;
305 PL_savestack_ix = c->savestack_ix; 278 PL_savestack_ix = c->savestack_ix;
306 PL_savestack_max = c->savestack_max; 279 PL_savestack_max = c->savestack_max;
280#if PERL_VERSION < 9
307 PL_retstack = c->retstack; 281 PL_retstack = c->retstack;
308 PL_retstack_ix = c->retstack_ix; 282 PL_retstack_ix = c->retstack_ix;
309 PL_retstack_max = c->retstack_max; 283 PL_retstack_max = c->retstack_max;
284#endif
285 PL_curpm = c->curpm;
310 PL_curcop = c->curcop; 286 PL_curcop = c->curcop;
311 PL_top_env = c->top_env; 287 PL_top_env = c->top_env;
312 288
313 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 289 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
314 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 290 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
… …
323 { 299 {
324 AV *padlist = (AV *)POPs; 300 AV *padlist = (AV *)POPs;
325 301
326 if (padlist) 302 if (padlist)
327 { 303 {
328 put_padlist (cv); /* mark this padlist as available */ 304 put_padlist (aTHX_ cv); /* mark this padlist as available */
329 CvPADLIST(cv) = padlist; 305 CvPADLIST(cv) = padlist;
330#ifdef USE_THREADS
331 /*CvOWNER(cv) = (struct perl_thread *)POPs;*/
332#endif
333 } 306 }
334 307
335 ++CvDEPTH(cv); 308 ++CvDEPTH(cv);
336 } 309 }
337 310
… …
364 if (CxTYPE(cx) == CXt_SUB) 337 if (CxTYPE(cx) == CXt_SUB)
365 { 338 {
366 CV *cv = cx->blk_sub.cv; 339 CV *cv = cx->blk_sub.cv;
367 if (CvDEPTH(cv)) 340 if (CvDEPTH(cv))
368 { 341 {
369#ifdef USE_THREADS
370 /*XPUSHs ((SV *)CvOWNER(cv));*/
371 /*CvOWNER(cv) = 0;*/
372 /*error must unlock this cv etc.. etc...*/
373#endif
374 EXTEND (SP, CvDEPTH(cv)*2); 342 EXTEND (SP, CvDEPTH(cv)*2);
375 343
376 while (--CvDEPTH(cv)) 344 while (--CvDEPTH(cv))
377 { 345 {
378 /* this tells the restore code to increment CvDEPTH */ 346 /* this tells the restore code to increment CvDEPTH */
… …
381 } 349 }
382 350
383 PUSHs ((SV *)CvPADLIST(cv)); 351 PUSHs ((SV *)CvPADLIST(cv));
384 PUSHs ((SV *)cv); 352 PUSHs ((SV *)cv);
385 353
386 get_padlist (cv); /* this is a monster */ 354 get_padlist (aTHX_ cv);
387 } 355 }
388 } 356 }
357#ifdef CXt_FORMAT
389 else if (CxTYPE(cx) == CXt_FORMAT) 358 else if (CxTYPE(cx) == CXt_FORMAT)
390 { 359 {
391 /* I never used formats, so how should I know how these are implemented? */ 360 /* I never used formats, so how should I know how these are implemented? */
392 /* my bold guess is as a simple, plain sub... */ 361 /* my bold guess is as a simple, plain sub... */
393 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats"); 362 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
394 } 363 }
364#endif
395 } 365 }
396 366
397 if (top_si->si_type == PERLSI_MAIN) 367 if (top_si->si_type == PERLSI_MAIN)
398 break; 368 break;
399 369
… …
416 c->curstack = PL_curstack; 386 c->curstack = PL_curstack;
417 c->mainstack = PL_mainstack; 387 c->mainstack = PL_mainstack;
418 c->stack_sp = PL_stack_sp; 388 c->stack_sp = PL_stack_sp;
419 c->op = PL_op; 389 c->op = PL_op;
420 c->curpad = PL_curpad; 390 c->curpad = PL_curpad;
391 c->comppad = PL_comppad;
392 c->compcv = PL_compcv;
421 c->stack_base = PL_stack_base; 393 c->stack_base = PL_stack_base;
422 c->stack_max = PL_stack_max; 394 c->stack_max = PL_stack_max;
423 c->tmps_stack = PL_tmps_stack; 395 c->tmps_stack = PL_tmps_stack;
424 c->tmps_floor = PL_tmps_floor; 396 c->tmps_floor = PL_tmps_floor;
425 c->tmps_ix = PL_tmps_ix; 397 c->tmps_ix = PL_tmps_ix;
… …
431 c->scopestack_ix = PL_scopestack_ix; 403 c->scopestack_ix = PL_scopestack_ix;
432 c->scopestack_max = PL_scopestack_max; 404 c->scopestack_max = PL_scopestack_max;
433 c->savestack = PL_savestack; 405 c->savestack = PL_savestack;
434 c->savestack_ix = PL_savestack_ix; 406 c->savestack_ix = PL_savestack_ix;
435 c->savestack_max = PL_savestack_max; 407 c->savestack_max = PL_savestack_max;
408#if PERL_VERSION < 9
436 c->retstack = PL_retstack; 409 c->retstack = PL_retstack;
437 c->retstack_ix = PL_retstack_ix; 410 c->retstack_ix = PL_retstack_ix;
438 c->retstack_max = PL_retstack_max; 411 c->retstack_max = PL_retstack_max;
412#endif
413 c->curpm = PL_curpm;
439 c->curcop = PL_curcop; 414 c->curcop = PL_curcop;
440 c->top_env = PL_top_env; 415 c->top_env = PL_top_env;
441} 416}
442 417
443/* 418/*
444 * allocate various perl stacks. This is an exact copy 419 * allocate various perl stacks. This is an exact copy
445 * of perl.c:init_stacks, except that it uses less memory 420 * of perl.c:init_stacks, except that it uses less memory
446 * on the assumption that coroutines do not usually need 421 * on the (sometimes correct) assumption that coroutines do
447 * a lot of stackspace. 422 * not usually need a lot of stackspace.
448 */ 423 */
449STATIC void 424static void
450coro_init_stacks (pTHX) 425coro_init_stacks (pTHX)
451{ 426{
427 LOCK;
428
452 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 429 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
453 PL_curstackinfo->si_type = PERLSI_MAIN; 430 PL_curstackinfo->si_type = PERLSI_MAIN;
454 PL_curstack = PL_curstackinfo->si_stack; 431 PL_curstack = PL_curstackinfo->si_stack;
455 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 432 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
456 433
… …
465 442
466 New(54,PL_markstack,16,I32); 443 New(54,PL_markstack,16,I32);
467 PL_markstack_ptr = PL_markstack; 444 PL_markstack_ptr = PL_markstack;
468 PL_markstack_max = PL_markstack + 16; 445 PL_markstack_max = PL_markstack + 16;
469 446
447#ifdef SET_MARK_OFFSET
470 SET_MARK_OFFSET; 448 SET_MARK_OFFSET;
449#endif
471 450
472 New(54,PL_scopestack,16,I32); 451 New(54,PL_scopestack,16,I32);
473 PL_scopestack_ix = 0; 452 PL_scopestack_ix = 0;
474 PL_scopestack_max = 16; 453 PL_scopestack_max = 16;
475 454
476 New(54,PL_savestack,96,ANY); 455 New(54,PL_savestack,96,ANY);
477 PL_savestack_ix = 0; 456 PL_savestack_ix = 0;
478 PL_savestack_max = 96; 457 PL_savestack_max = 96;
479 458
459#if PERL_VERSION < 9
480 New(54,PL_retstack,8,OP*); 460 New(54,PL_retstack,8,OP*);
481 PL_retstack_ix = 0; 461 PL_retstack_ix = 0;
482 PL_retstack_max = 8; 462 PL_retstack_max = 8;
463#endif
464
465 UNLOCK;
483} 466}
484 467
485/* 468/*
486 * destroy the stacks, the callchain etc... 469 * destroy the stacks, the callchain etc...
487 * still there is a memleak of 128 bytes...
488 */ 470 */
489STATIC void 471static void
490destroy_stacks(pTHX) 472destroy_stacks(pTHX)
491{ 473{
492 int destruct = PL_main_cv != Nullcv; 474 if (!IN_DESTRUCT)
493
494 if (destruct)
495 { 475 {
496 /* is this ugly, I ask? */ 476 /* is this ugly, I ask? */
497 while (PL_scopestack_ix) 477 LEAVE_SCOPE (0);
498 LEAVE;
499 478
500 /* sure it is, but more important: is it correct?? :/ */ 479 /* sure it is, but more important: is it correct?? :/ */
501 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */
502 FREETMPS; 480 FREETMPS;
481
482 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/
503 } 483 }
504 484
505 while (PL_curstackinfo->si_next) 485 while (PL_curstackinfo->si_next)
506 PL_curstackinfo = PL_curstackinfo->si_next; 486 PL_curstackinfo = PL_curstackinfo->si_next;
507 487
508 while (PL_curstackinfo) 488 while (PL_curstackinfo)
509 { 489 {
510 PERL_SI *p = PL_curstackinfo->si_prev; 490 PERL_SI *p = PL_curstackinfo->si_prev;
511 491
512 { 492 { /*D*//*remove*/
513 dSP; 493 dSP;
514 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack); 494 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
515 PUTBACK; /* possibly superfluous */ 495 PUTBACK; /* possibly superfluous */
516 } 496 }
517 497
518 if (destruct) 498 if (!IN_DESTRUCT)
519 { 499 {
520 dounwind(-1); 500 dounwind (-1);/*D*//*remove*/
521 SvREFCNT_dec(PL_curstackinfo->si_stack); 501 SvREFCNT_dec (PL_curstackinfo->si_stack);
522 } 502 }
523 503
524 Safefree(PL_curstackinfo->si_cxstack); 504 Safefree (PL_curstackinfo->si_cxstack);
525 Safefree(PL_curstackinfo); 505 Safefree (PL_curstackinfo);
526 PL_curstackinfo = p; 506 PL_curstackinfo = p;
527 } 507 }
528 508
529 Safefree(PL_tmps_stack); 509 Safefree (PL_tmps_stack);
530 Safefree(PL_markstack); 510 Safefree (PL_markstack);
531 Safefree(PL_scopestack); 511 Safefree (PL_scopestack);
532 Safefree(PL_savestack); 512 Safefree (PL_savestack);
513#if PERL_VERSION < 9
533 Safefree(PL_retstack); 514 Safefree (PL_retstack);
515#endif
534} 516}
535 517
536static void 518static void
537allocate_stack (Coro__State ctx, int alloc) 519allocate_stack (Coro__State ctx, int alloc)
538{ 520{
… …
541 New (0, stack, 1, coro_stack); 523 New (0, stack, 1, coro_stack);
542 524
543 stack->refcnt = 1; 525 stack->refcnt = 1;
544 stack->usecnt = 1; 526 stack->usecnt = 1;
545 stack->gencnt = ctx->gencnt = 0; 527 stack->gencnt = ctx->gencnt = 0;
528
546 if (alloc) 529 if (alloc)
547 { 530 {
548#ifdef HAVE_MMAP 531#if HAVE_MMAP
549 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */ 532 stack->ssize = STACKSIZE * sizeof (long); /* mmap should do allocate-on-write for us */
550 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, 0, 0); 533 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
551 if (stack->sptr == (void *)-1) 534 if (stack->sptr == (void *)-1)
552#endif 535#endif
553 { 536 {
554 /*FIXME*//*D*//* reasonable stack size! */
555 stack->ssize = -4096 * sizeof (long); 537 stack->ssize = - (STACKSIZE * (long)sizeof (long));
556 New (0, stack->sptr, 4096, long); 538 New (0, stack->sptr, STACKSIZE, long);
557 } 539 }
558 } 540 }
559 else 541 else
560 stack->sptr = 0; 542 stack->sptr = 0;
561 543
… …
575 { 557 {
576#ifdef HAVE_MMAP 558#ifdef HAVE_MMAP
577 if (stack->ssize > 0 && stack->sptr) 559 if (stack->ssize > 0 && stack->sptr)
578 munmap (stack->sptr, stack->ssize); 560 munmap (stack->sptr, stack->ssize);
579 else 561 else
580#else 562#endif
581 Safefree (stack->sptr); 563 Safefree (stack->sptr);
582#endif 564
583 Safefree (stack); 565 Safefree (stack);
584 } 566 }
585 else if (ctx->gencnt == stack->gencnt) 567 else if (ctx->gencnt == stack->gencnt)
586 --stack->usecnt; 568 --stack->usecnt;
587 } 569 }
… …
591setup_coro (void *arg) 573setup_coro (void *arg)
592{ 574{
593 /* 575 /*
594 * emulate part of the perl startup here. 576 * emulate part of the perl startup here.
595 */ 577 */
578 dTHX;
596 dSP; 579 dSP;
597 Coro__State ctx = (Coro__State)arg; 580 Coro__State ctx = (Coro__State)arg;
598 SV *sub_init = (SV*)get_cv(SUB_INIT, FALSE); 581 SV *sub_init = (SV *)get_cv (SUB_INIT, FALSE);
599 582
600 coro_init_stacks (aTHX); 583 coro_init_stacks (aTHX);
601 /*PL_curcop = 0;*/ 584 /*PL_curcop = 0;*/
602 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 585 /*PL_in_eval = PL_in_eval;*/ /* inherit */
603 SvREFCNT_dec (GvAV (PL_defgv)); 586 SvREFCNT_dec (GvAV (PL_defgv));
604 GvAV (PL_defgv) = ctx->args; 587 GvAV (PL_defgv) = ctx->args; ctx->args = 0;
605 588
606 SPAGAIN; 589 SPAGAIN;
607 590
608 if (ctx->stack) 591 if (ctx->stack)
609 { 592 {
… …
636 * that doesn't matter, though, since it is only 619 * that doesn't matter, though, since it is only
637 * pp_nextstate and we never return... 620 * pp_nextstate and we never return...
638 * ah yes, and I don't care anyways ;) 621 * ah yes, and I don't care anyways ;)
639 */ 622 */
640 PUTBACK; 623 PUTBACK;
641 PL_op = pp_entersub(); 624 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
642 SPAGAIN; 625 SPAGAIN;
643 626
644 ENTER; /* necessary e.g. for dounwind */ 627 ENTER; /* necessary e.g. for dounwind */
645 } 628 }
646} 629}
… …
649continue_coro (void *arg) 632continue_coro (void *arg)
650{ 633{
651 /* 634 /*
652 * this is a _very_ stripped down perl interpreter ;) 635 * this is a _very_ stripped down perl interpreter ;)
653 */ 636 */
637 dTHX;
654 Coro__State ctx = (Coro__State)arg; 638 Coro__State ctx = (Coro__State)arg;
655 639
656 /*FIXME*//* must set up top_env here */ 640 PL_top_env = &ctx->start_env;
641
657 ctx->cursp = 0; 642 ctx->cursp = 0;
658 PL_op = PL_op->op_next; 643 PL_op = PL_op->op_next;
659 CALLRUNOPS(aTHX); 644 CALLRUNOPS(aTHX);
660 645
661 abort (); 646 abort ();
662} 647}
663 648
664STATIC void 649static void
665transfer(pTHX_ struct coro *prev, struct coro *next, int flags) 650transfer (pTHX_ struct coro *prev, struct coro *next, int flags)
666{ 651{
667 dSTACKLEVEL; 652 dSTACKLEVEL;
668 static struct coro *xnext;
669 653
670 if (prev != next) 654 if (prev != next)
671 { 655 {
672 xnext = next;
673
674 if (next->mainstack) 656 if (next->mainstack)
675 { 657 {
658 LOCK;
676 SAVE (prev, flags); 659 SAVE (prev, flags);
677 LOAD (next); 660 LOAD (next);
661 UNLOCK;
678 662
679 /* mark this state as in-use */ 663 /* mark this state as in-use */
680 next->mainstack = 0; 664 next->mainstack = 0;
681 next->tmps_ix = -2; 665 next->tmps_ix = -2;
682 666
… …
701 continue_coro, (void *)next, 685 continue_coro, (void *)next,
702 next->stack->sptr, labs (next->stack->ssize)); 686 next->stack->sptr, labs (next->stack->ssize));
703 } 687 }
704 688
705 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 689 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
690 prev->cursp = stacklevel;
706 /* don't add any code here */ 691 /* don't add any code here */
707 } 692 }
708 693 else
694 next->cursp = stacklevel;
709 } 695 }
710 else if (next->tmps_ix == -2) 696 else if (next->tmps_ix == -2)
711 croak ("tried to transfer to running coroutine"); 697 croak ("tried to transfer to running coroutine");
712 else 698 else
713 { 699 {
700 LOCK;
714 SAVE (prev, -1); /* first get rid of the old state */ 701 SAVE (prev, -1); /* first get rid of the old state */
702 UNLOCK;
715 703
716 if (flags & TRANSFER_SAVE_CCTXT) 704 if (flags & TRANSFER_SAVE_CCTXT)
717 { 705 {
718 if (!prev->stack) 706 if (!prev->stack)
719 allocate_stack (prev, 0); 707 allocate_stack (prev, 0);
720 708
721 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 709 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
722 { 710 {
711 PL_top_env = &next->start_env;
712
723 setup_coro (next); 713 setup_coro (next);
714 next->cursp = stacklevel;
724 715
725 prev->stack->refcnt++; 716 prev->stack->refcnt++;
726 prev->stack->usecnt++; 717 prev->stack->usecnt++;
727 next->stack = prev->stack; 718 next->stack = prev->stack;
728 next->gencnt = prev->gencnt; 719 next->gencnt = prev->gencnt;
729 } 720 }
730 else 721 else
731 { 722 {
723 assert (!next->stack);
732 allocate_stack (next, 1); 724 allocate_stack (next, 1);
733 coro_create (&(next->stack->cctx), 725 coro_create (&(next->stack->cctx),
734 setup_coro, (void *)next, 726 setup_coro, (void *)next,
735 next->stack->sptr, labs (next->stack->ssize)); 727 next->stack->sptr, labs (next->stack->ssize));
736 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 728 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
729 prev->cursp = stacklevel;
737 /* don't add any code here */ 730 /* don't add any code here */
738 } 731 }
739 } 732 }
740 else 733 else
734 {
741 setup_coro (next); 735 setup_coro (next);
736 next->cursp = stacklevel;
737 }
742 } 738 }
743 } 739 }
744 740
745 /* 741 LOCK;
746 * xnext is now either prev or next, depending on wether 742 if (coro_mortal)
747 * we switched the c stack or not. that's why i use a global
748 * variable, that should become thread-specific at one point.
749 */
750 xnext->cursp = stacklevel;
751}
752
753static struct coro *
754sv_to_coro (SV *arg, const char *funcname, const char *varname)
755{
756 if (SvROK(arg) && SvTYPE(SvRV(arg)) == SVt_PVHV)
757 { 743 {
758 HE *he = hv_fetch_ent((HV *)SvRV(arg), ucoro_state_sv, 0, ucoro_state_hash); 744 SvREFCNT_dec (coro_mortal);
759 745 coro_mortal = 0;
760 if (!he)
761 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", funcname, varname);
762
763 arg = HeVAL(he);
764 } 746 }
765 747 UNLOCK;
748}
749
750#define SV_CORO(sv,func) \
751 do { \
752 if (SvROK (sv)) \
753 sv = SvRV (sv); \
754 \
755 if (SvTYPE (sv) == SVt_PVHV) \
756 { \
757 HE *he = hv_fetch_ent ((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \
758 \
759 if (!he) \
760 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \
761 \
762 (sv) = SvRV (HeVAL(he)); \
763 } \
764 \
766 /* must also be changed inside Coro::Cont::yield */ 765 /* must also be changed inside Coro::Cont::yield */ \
767 if (SvROK(arg) && SvSTASH(SvRV(arg)) == coro_state_stash) 766 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
768 return (struct coro *) SvIV((SV*)SvRV(arg));
769
770 croak ("%s() -- %s is not (and contains not) a Coro::State object", funcname, varname); 767 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
771 /*NORETURN*/ 768 \
772} 769 } while(0)
770
771#define SvSTATE(sv) INT2PTR (struct coro *, SvIV (sv))
773 772
774static void 773static void
775api_transfer(pTHX_ SV *prev, SV *next, int flags) 774api_transfer(pTHX_ SV *prev, SV *next, int flags)
776{ 775{
777 transfer(aTHX_ 776 SV_CORO (prev, "Coro::transfer");
778 sv_to_coro (prev, "Coro::transfer", "prev"), 777 SV_CORO (next, "Coro::transfer");
779 sv_to_coro (next, "Coro::transfer", "next"), 778
780 flags); 779 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
781} 780}
782 781
783/** Coro ********************************************************************/ 782/** Coro ********************************************************************/
784 783
785#define PRIO_MAX 3 784#define PRIO_MAX 3
… …
793static GV *coro_current, *coro_idle; 792static GV *coro_current, *coro_idle;
794static AV *coro_ready[PRIO_MAX-PRIO_MIN+1]; 793static AV *coro_ready[PRIO_MAX-PRIO_MIN+1];
795static int coro_nready; 794static int coro_nready;
796 795
797static void 796static void
798coro_enq (SV *sv) 797coro_enq (pTHX_ SV *sv)
799{ 798{
800 if (SvROK (sv)) 799 SV **xprio;
801 { 800 int prio;
802 SV *hv = SvRV (sv); 801
803 if (SvTYPE (hv) == SVt_PVHV) 802 if (SvTYPE (sv) != SVt_PVHV)
804 {
805 SV **xprio = hv_fetch ((HV *)hv, "prio", 4, 0);
806 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
807
808 prio = prio > PRIO_MAX ? PRIO_MAX
809 : prio < PRIO_MIN ? PRIO_MIN
810 : prio;
811
812 av_push (coro_ready [prio - PRIO_MIN], sv);
813 coro_nready++;
814
815 return;
816 }
817 }
818
819 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 803 croak ("Coro::ready tried to enqueue something that is not a coroutine");
804
805 xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
806 prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
807
808 prio = prio > PRIO_MAX ? PRIO_MAX
809 : prio < PRIO_MIN ? PRIO_MIN
810 : prio;
811
812 av_push (coro_ready [prio - PRIO_MIN], sv);
813 coro_nready++;
820} 814}
821 815
822static SV * 816static SV *
823coro_deq (int min_prio) 817coro_deq (pTHX_ int min_prio)
824{ 818{
825 int prio = PRIO_MAX - PRIO_MIN; 819 int prio = PRIO_MAX - PRIO_MIN;
826 820
827 min_prio -= PRIO_MIN; 821 min_prio -= PRIO_MIN;
828 if (min_prio < 0) 822 if (min_prio < 0)
… …
839} 833}
840 834
841static void 835static void
842api_ready (SV *coro) 836api_ready (SV *coro)
843{ 837{
838 dTHX;
839
840 if (SvROK (coro))
841 coro = SvRV (coro);
842
843 LOCK;
844 coro_enq (SvREFCNT_inc (coro)); 844 coro_enq (aTHX_ SvREFCNT_inc (coro));
845 UNLOCK;
845} 846}
846 847
847static void 848static void
848api_schedule (int cede) 849api_schedule (void)
849{ 850{
851 dTHX;
852
850 SV *prev, *next; 853 SV *prev, *next;
851 854
855 LOCK;
856
852 prev = GvSV (coro_current); 857 prev = SvRV (GvSV (coro_current));
853
854 if (cede)
855 coro_enq (SvREFCNT_inc (prev));
856
857 next = coro_deq (PRIO_MIN); 858 next = coro_deq (aTHX_ PRIO_MIN);
858 859
859 if (!next) 860 if (!next)
860 next = SvREFCNT_inc (GvSV (coro_idle)); 861 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
861 862
862 GvSV (coro_current) = SvREFCNT_inc (next); 863 /* free this only after the transfer */
863 transfer (aTHX_ 864 coro_mortal = prev;
864 sv_to_coro (prev, "Coro::schedule", "current coroutine"), 865 SV_CORO (prev, "Coro::schedule");
865 sv_to_coro (next, "Coro::schedule", "next coroutine"), 866
867 SvRV (GvSV (coro_current)) = next;
868
869 SV_CORO (next, "Coro::schedule");
870
871 UNLOCK;
872
873 transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
866 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 874 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
867 SvREFCNT_dec (next); 875}
868 SvREFCNT_dec (prev); 876
877static void
878api_cede (void)
879{
880 dTHX;
881
882 LOCK;
883 coro_enq (aTHX_ SvREFCNT_inc (SvRV (GvSV (coro_current))));
884 UNLOCK;
885
886 api_schedule ();
869} 887}
870 888
871MODULE = Coro::State PACKAGE = Coro::State 889MODULE = Coro::State PACKAGE = Coro::State
872 890
873PROTOTYPES: ENABLE 891PROTOTYPES: ENABLE
874 892
875BOOT: 893BOOT:
876{ /* {} necessary for stoopid perl-5.6.x */ 894{ /* {} necessary for stoopid perl-5.6.x */
895#ifdef USE_ITHREADS
896 MUTEX_INIT (&coro_mutex);
897#endif
898
877 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1); 899 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
878 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1); 900 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
879 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 901 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
880 902
881 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 903 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV));
882 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 904 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV));
883 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 905 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV));
884 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT)); 906 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT));
885
886 if (!padlist_cache)
887 padlist_cache = newHV ();
888 907
889 main_mainstack = PL_mainstack; 908 main_mainstack = PL_mainstack;
890 909
891 coroapi.ver = CORO_API_VERSION; 910 coroapi.ver = CORO_API_VERSION;
892 coroapi.transfer = api_transfer; 911 coroapi.transfer = api_transfer;
… …
900 Coro__State coro; 919 Coro__State coro;
901 920
902 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV) 921 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV)
903 croak ("Coro::State::_newprocess expects an arrayref"); 922 croak ("Coro::State::_newprocess expects an arrayref");
904 923
905 New (0, coro, 1, struct coro); 924 Newz (0, coro, 1, struct coro);
906 925
907 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 926 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
908 coro->mainstack = 0; /* actual work is done inside transfer */ 927 /*coro->mainstack = 0; *//*actual work is done inside transfer */
909 coro->stack = 0; 928 /*coro->stack = 0;*/
929
930 /* same as JMPENV_BOOTSTRAP */
931 /* we might be able to recycle start_env, but safe is safe */
932 /*Zero(&coro->start_env, 1, JMPENV);*/
933 coro->start_env.je_ret = -1;
934 coro->start_env.je_mustcatch = TRUE;
910 935
911 RETVAL = coro; 936 RETVAL = coro;
912 OUTPUT: 937 OUTPUT:
913 RETVAL 938 RETVAL
914 939
915void 940void
916transfer(prev, next, flags) 941transfer(prev, next, flags)
917 Coro::State_or_hashref prev 942 SV *prev
918 Coro::State_or_hashref next 943 SV *next
919 int flags 944 int flags
920 PROTOTYPE: @ 945 PROTOTYPE: @
921 CODE: 946 CODE:
922 PUTBACK; 947 PUTBACK;
948 SV_CORO (next, "Coro::transfer");
949 SV_CORO (prev, "Coro::transfer");
923 transfer (aTHX_ prev, next, flags); 950 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
924 SPAGAIN; 951 SPAGAIN;
925 952
926void 953void
927DESTROY(coro) 954DESTROY(coro)
928 Coro::State coro 955 Coro::State coro
… …
931 if (coro->mainstack && coro->mainstack != main_mainstack) 958 if (coro->mainstack && coro->mainstack != main_mainstack)
932 { 959 {
933 struct coro temp; 960 struct coro temp;
934 961
935 PUTBACK; 962 PUTBACK;
936 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL); 963 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL);
937 LOAD(aTHX_ coro); 964 LOAD (aTHX_ coro);
938 SPAGAIN; 965 SPAGAIN;
939 966
940 destroy_stacks (aTHX); 967 destroy_stacks (aTHX);
941 968
942 LOAD((&temp)); /* this will get rid of defsv etc.. */ 969 LOAD ((&temp)); /* this will get rid of defsv etc.. */
943 SPAGAIN; 970 SPAGAIN;
944 971
945 coro->mainstack = 0; 972 coro->mainstack = 0;
946 } 973 }
947 974
948 deallocate_stack (coro); 975 deallocate_stack (coro);
949 976 SvREFCNT_dec (coro->args);
950 Safefree (coro); 977 Safefree (coro);
951
952void
953flush()
954 CODE:
955#ifdef MAY_FLUSH
956 flush_padlist_cache ();
957#endif
958 978
959void 979void
960_exit(code) 980_exit(code)
961 int code 981 int code
962 PROTOTYPE: $ 982 PROTOTYPE: $
963 CODE: 983 CODE:
964#if defined(__GLIBC__) || _POSIX_C_SOURCE
965 _exit (code); 984 _exit (code);
966#else
967 signal (SIGTERM, SIG_DFL);
968 raise (SIGTERM);
969 exit (code);
970#endif
971 985
972MODULE = Coro::State PACKAGE = Coro::Cont 986MODULE = Coro::State PACKAGE = Coro::Cont
973 987
974# this is slightly dirty (should expose a c-level api) 988# this is slightly dirty (should expose a c-level api)
975 989
976void 990void
977yield(...) 991yield(...)
978 PROTOTYPE: @ 992 PROTOTYPE: @
979 CODE: 993 CODE:
980 static SV *returnstk; 994 SV *yieldstack;
981 SV *sv; 995 SV *sv;
982 AV *defav = GvAV (PL_defgv); 996 AV *defav = GvAV (PL_defgv);
983 struct coro *prev, *next; 997 struct coro *prev, *next;
984 998
985 if (!returnstk) 999 yieldstack = *hv_fetch (
986 returnstk = SvRV (get_sv ("Coro::Cont::return", FALSE)); 1000 (HV *)SvRV (GvSV (coro_current)),
1001 "yieldstack", sizeof ("yieldstack") - 1,
1002 0
1003 );
987 1004
988 /* set up @_ -- ugly */ 1005 /* set up @_ -- ugly */
989 av_clear (defav); 1006 av_clear (defav);
990 av_fill (defav, items - 1); 1007 av_fill (defav, items - 1);
991 while (items--) 1008 while (items--)
992 av_store (defav, items, SvREFCNT_inc (ST(items))); 1009 av_store (defav, items, SvREFCNT_inc (ST(items)));
993 1010
994 mg_get (returnstk); /* isn't documentation wrong for mg_get? */
995 sv = av_pop ((AV *)SvRV (returnstk)); 1011 sv = av_pop ((AV *)SvRV (yieldstack));
996 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0))); 1012 prev = INT2PTR (struct coro *, SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0))));
997 next = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0))); 1013 next = INT2PTR (struct coro *, SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0))));
998 SvREFCNT_dec (sv); 1014 SvREFCNT_dec (sv);
999 1015
1000 transfer(aTHX_ prev, next, 0); 1016 transfer (aTHX_ prev, next, 0);
1001 1017
1002MODULE = Coro::State PACKAGE = Coro 1018MODULE = Coro::State PACKAGE = Coro
1003 1019
1004# this is slightly dirty (should expose a c-level api) 1020# this is slightly dirty (should expose a c-level api)
1005 1021
… …
1023 1039
1024 { 1040 {
1025 SV *sv = perl_get_sv("Coro::API", 1); 1041 SV *sv = perl_get_sv("Coro::API", 1);
1026 1042
1027 coroapi.schedule = api_schedule; 1043 coroapi.schedule = api_schedule;
1044 coroapi.cede = api_cede;
1028 coroapi.ready = api_ready; 1045 coroapi.ready = api_ready;
1029 coroapi.nready = &coro_nready; 1046 coroapi.nready = &coro_nready;
1030 coroapi.current = coro_current; 1047 coroapi.current = coro_current;
1031 1048
1032 GCoroAPI = &coroapi; 1049 GCoroAPI = &coroapi;
1033 sv_setiv(sv, (IV)&coroapi); 1050 sv_setiv(sv, (IV)&coroapi);
1034 SvREADONLY_on(sv); 1051 SvREADONLY_on(sv);
1035 } 1052 }
1036} 1053}
1037 1054
1055#if !PERL_MICRO
1056
1038void 1057void
1039ready(self) 1058ready(self)
1040 SV * self 1059 SV * self
1060 PROTOTYPE: $
1041 CODE: 1061 CODE:
1042 api_ready (self); 1062 api_ready (self);
1063
1064#endif
1043 1065
1044int 1066int
1045nready(...) 1067nready(...)
1046 PROTOTYPE: 1068 PROTOTYPE:
1047 CODE: 1069 CODE:
… …
1050 RETVAL 1072 RETVAL
1051 1073
1052void 1074void
1053schedule(...) 1075schedule(...)
1054 PROTOTYPE: 1076 PROTOTYPE:
1055 ALIAS:
1056 cede = 1
1057 CODE: 1077 CODE:
1058 api_schedule (ix); 1078 api_schedule ();
1059 1079
1080void
1081cede(...)
1082 PROTOTYPE:
1083 CODE:
1084 api_cede ();
1085
1086# and these are hacks
1087SV *
1088_aio_get_state ()
1089 CODE:
1090{
1091 struct {
1092 int errorno;
1093 int laststype;
1094 int laststatval;
1095 Stat_t statcache;
1096 } data;
1097
1098 data.errorno = errno;
1099 data.laststype = PL_laststype;
1100 data.laststatval = PL_laststatval;
1101 data.statcache = PL_statcache;
1102
1103 RETVAL = newSVpvn ((char *)&data, sizeof data);
1104}
1105 OUTPUT:
1106 RETVAL
1107
1108void
1109_aio_set_state (char *data_)
1110 PROTOTYPE: $
1111 CODE:
1112{
1113 struct {
1114 int errorno;
1115 int laststype;
1116 int laststatval;
1117 Stat_t statcache;
1118 } *data = (void *)data_;
1119
1120 errno = data->errorno;
1121 PL_laststype = data->laststype;
1122 PL_laststatval = data->laststatval;
1123 PL_statcache = data->statcache;
1124}

Diff Legend

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