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.34 by root, Fri Sep 14 15:40:56 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
… …
32 55
33#define labs(l) ((l) >= 0 ? (l) : -(l)) 56#define labs(l) ((l) >= 0 ? (l) : -(l))
34 57
35#include "CoroAPI.h" 58#include "CoroAPI.h"
36 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
37static 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 */
38 75
39/* 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... */
40typedef struct { 77typedef struct {
41 int refcnt; /* pointer reference counter */ 78 int refcnt; /* pointer reference counter */
42 int usecnt; /* shared by how many coroutines */ 79 int usecnt; /* shared by how many coroutines */
… …
47 void *sptr; 84 void *sptr;
48 long ssize; /* positive == mmap, otherwise malloc */ 85 long ssize; /* positive == mmap, otherwise malloc */
49} coro_stack; 86} coro_stack;
50 87
51struct coro { 88struct coro {
89 /* the top-level JMPENV for each coroutine, needed to catch dies. */
90 JMPENV start_env;
91
52 /* the optional C context */ 92 /* the optional C context */
53 coro_stack *stack; 93 coro_stack *stack;
54 void *cursp; 94 void *cursp;
55 int gencnt; 95 int gencnt;
56 96
… …
68 AV *curstack; 108 AV *curstack;
69 AV *mainstack; 109 AV *mainstack;
70 SV **stack_sp; 110 SV **stack_sp;
71 OP *op; 111 OP *op;
72 SV **curpad; 112 SV **curpad;
113 AV *comppad;
114 CV *compcv;
73 SV **stack_base; 115 SV **stack_base;
74 SV **stack_max; 116 SV **stack_max;
75 SV **tmps_stack; 117 SV **tmps_stack;
76 I32 tmps_floor; 118 I32 tmps_floor;
77 I32 tmps_ix; 119 I32 tmps_ix;
… …
86 I32 savestack_ix; 128 I32 savestack_ix;
87 I32 savestack_max; 129 I32 savestack_max;
88 OP **retstack; 130 OP **retstack;
89 I32 retstack_ix; 131 I32 retstack_ix;
90 I32 retstack_max; 132 I32 retstack_max;
133 PMOP *curpm;
91 COP *curcop; 134 COP *curcop;
92 JMPENV *top_env; 135 JMPENV *top_env;
93 136
94 /* data associated with this coroutine (initial args) */ 137 /* data associated with this coroutine (initial args) */
95 AV *args; 138 AV *args;
96}; 139};
97 140
98typedef struct coro *Coro__State; 141typedef struct coro *Coro__State;
99typedef struct coro *Coro__State_or_hashref; 142typedef struct coro *Coro__State_or_hashref;
100 143
101static AV *main_mainstack; /* used to differentiate between $main and others */ 144static AV *
102static HV *coro_state_stash; 145coro_clone_padlist (pTHX_ CV *cv)
103static SV *ucoro_state_sv;
104static U32 ucoro_state_hash;
105static HV *padlist_cache;
106
107/* mostly copied from op.c:cv_clone2 */
108STATIC AV *
109clone_padlist (AV *protopadlist)
110{ 146{
111 AV *av; 147 AV *padlist = CvPADLIST (cv);
112 I32 ix;
113 AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE);
114 AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE);
115 SV **pname = AvARRAY (protopad_name);
116 SV **ppad = AvARRAY (protopad);
117 I32 fname = AvFILLp (protopad_name);
118 I32 fpad = AvFILLp (protopad);
119 AV *newpadlist, *newpad_name, *newpad; 148 AV *newpadlist, *newpad;
120 SV **npad;
121
122 newpad_name = newAV ();
123 for (ix = fname; ix >= 0; ix--)
124 av_store (newpad_name, ix, SvREFCNT_inc (pname[ix]));
125
126 newpad = newAV ();
127 av_fill (newpad, AvFILLp (protopad));
128 npad = AvARRAY (newpad);
129 149
130 newpadlist = newAV (); 150 newpadlist = newAV ();
131 AvREAL_off (newpadlist); 151 AvREAL_off (newpadlist);
132 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)));
133 av_store (newpadlist, 1, (SV *) newpad); 157 av_store (newpadlist, 1, (SV *)newpad);
134 158
135 av = newAV (); /* will be @_ */ 159 return newpadlist;
136 av_extend (av, 0); 160}
137 av_store (newpad, 0, (SV *) av);
138 AvFLAGS (av) = AVf_REIFY;
139 161
140 for (ix = fpad; ix > 0; ix--) 162static void
163free_padlist (pTHX_ AV *padlist)
164{
165 /* may be during global destruction */
166 if (SvREFCNT (padlist))
141 { 167 {
142 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv; 168 I32 i = AvFILLp (padlist);
143 if (namesv && namesv != &PL_sv_undef) 169 while (i >= 0)
144 { 170 {
145 char *name = SvPVX (namesv); /* XXX */ 171 SV **svp = av_fetch (padlist, i--, FALSE);
146 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&') 172 if (svp)
147 { /* lexical from outside? */
148 npad[ix] = SvREFCNT_inc (ppad[ix]);
149 } 173 {
150 else
151 { /* our own lexical */
152 SV *sv; 174 SV *sv;
153 if (*name == '&') 175 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp)))
154 sv = SvREFCNT_inc (ppad[ix]); 176 SvREFCNT_dec (sv);
155 else if (*name == '@') 177
156 sv = (SV *) newAV (); 178 SvREFCNT_dec (*svp);
157 else if (*name == '%')
158 sv = (SV *) newHV ();
159 else
160 sv = NEWSV (0, 0);
161 if (!SvPADBUSY (sv))
162 SvPADMY_on (sv);
163 npad[ix] = sv;
164 } 179 }
165 } 180 }
166 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix])) 181
167 { 182 SvREFCNT_dec ((SV*)padlist);
168 npad[ix] = SvREFCNT_inc (ppad[ix]);
169 }
170 else
171 {
172 SV *sv = NEWSV (0, 0);
173 SvPADTMP_on (sv);
174 npad[ix] = sv;
175 }
176 } 183 }
184}
177 185
178#if 0 /* return -ENOTUNDERSTOOD */ 186static int
179 /* 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;
180 191
181 for (ix = fpad; ix > 0; ix--) { 192 /* casting is fun. */
182 SV* namesv = (ix <= fname) ? pname[ix] : Nullsv; 193 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
183 if (namesv 194 free_padlist (aTHX_ padlist);
184 && namesv != &PL_sv_undef 195
185 && !(SvFLAGS(namesv) & SVf_FAKE) 196 SvREFCNT_dec (av);
186 && *SvPVX(namesv) == '&' 197
187 && CvCLONE(ppad[ix])) 198 return 0;
188 { 199}
189 CV *kid = cv_clone((CV*)ppad[ix]); 200
190 SvREFCNT_dec(ppad[ix]); 201#define PERL_MAGIC_coro PERL_MAGIC_ext
191 CvCLONE_on(kid); 202
192 SvPADMY_on(kid); 203static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
193 npad[ix] = (SV*)kid; 204
194 } 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 ();
195 } 238 }
196#endif
197 239
198 return newpadlist;
199}
200
201#ifdef MAY_FLUSH
202STATIC void
203free_padlist (AV *padlist)
204{
205 /* may be during global destruction */
206 if (SvREFCNT(padlist))
207 {
208 I32 i = AvFILLp(padlist);
209 while (i >= 0)
210 {
211 SV **svp = av_fetch(padlist, i--, FALSE);
212 SV *sv = svp ? *svp : Nullsv;
213 if (sv)
214 SvREFCNT_dec(sv);
215 }
216
217 SvREFCNT_dec((SV*)padlist);
218 }
219}
220#endif
221
222/* the next two functions merely cache the padlists */
223STATIC void
224get_padlist (CV *cv)
225{
226 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 0);
227
228 if (he && AvFILLp ((AV *)*he) >= 0)
229 CvPADLIST (cv) = (AV *)av_pop ((AV *)*he);
230 else
231 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv));
232}
233
234STATIC void
235put_padlist (CV *cv)
236{
237 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 1);
238
239 if (SvTYPE (*he) != SVt_PVAV)
240 {
241 SvREFCNT_dec (*he);
242 *he = (SV *)newAV ();
243 }
244
245 av_push ((AV *)*he, (SV *)CvPADLIST (cv)); 240 av_push ((AV *)mg->mg_obj, (SV *)CvPADLIST (cv));
246} 241}
247
248#ifdef MAY_FLUSH
249STATIC void
250flush_padlist_cache ()
251{
252 HV *hv = padlist_cache;
253 padlist_cache = newHV ();
254
255 if (hv_iterinit (hv))
256 {
257 HE *he;
258 AV *padlist;
259
260 while (!!(he = hv_iternext (hv)))
261 {
262 AV *av = (AV *)HeVAL(he);
263
264 /* casting is fun. */
265 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
266 free_padlist (padlist);
267 }
268 }
269
270 SvREFCNT_dec (hv);
271}
272#endif
273 242
274#define SB do { 243#define SB do {
275#define SE } while (0) 244#define SE } while (0)
276 245
277#define LOAD(state) load_state(aTHX_ (state)); 246#define LOAD(state) load_state(aTHX_ (state));
278#define SAVE(state,flags) save_state(aTHX_ (state),(flags)); 247#define SAVE(state,flags) save_state(aTHX_ (state),(flags));
279 248
280#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
281 250
282static void 251static void
283load_state(pTHX_ Coro__State c) 252load_state(pTHX_ Coro__State c)
284{ 253{
285 PL_dowarn = c->dowarn; 254 PL_dowarn = c->dowarn;
… …
289 PL_curstack = c->curstack; 258 PL_curstack = c->curstack;
290 PL_mainstack = c->mainstack; 259 PL_mainstack = c->mainstack;
291 PL_stack_sp = c->stack_sp; 260 PL_stack_sp = c->stack_sp;
292 PL_op = c->op; 261 PL_op = c->op;
293 PL_curpad = c->curpad; 262 PL_curpad = c->curpad;
263 PL_comppad = c->comppad;
264 PL_compcv = c->compcv;
294 PL_stack_base = c->stack_base; 265 PL_stack_base = c->stack_base;
295 PL_stack_max = c->stack_max; 266 PL_stack_max = c->stack_max;
296 PL_tmps_stack = c->tmps_stack; 267 PL_tmps_stack = c->tmps_stack;
297 PL_tmps_floor = c->tmps_floor; 268 PL_tmps_floor = c->tmps_floor;
298 PL_tmps_ix = c->tmps_ix; 269 PL_tmps_ix = c->tmps_ix;
… …
304 PL_scopestack_ix = c->scopestack_ix; 275 PL_scopestack_ix = c->scopestack_ix;
305 PL_scopestack_max = c->scopestack_max; 276 PL_scopestack_max = c->scopestack_max;
306 PL_savestack = c->savestack; 277 PL_savestack = c->savestack;
307 PL_savestack_ix = c->savestack_ix; 278 PL_savestack_ix = c->savestack_ix;
308 PL_savestack_max = c->savestack_max; 279 PL_savestack_max = c->savestack_max;
280#if PERL_VERSION < 9
309 PL_retstack = c->retstack; 281 PL_retstack = c->retstack;
310 PL_retstack_ix = c->retstack_ix; 282 PL_retstack_ix = c->retstack_ix;
311 PL_retstack_max = c->retstack_max; 283 PL_retstack_max = c->retstack_max;
284#endif
285 PL_curpm = c->curpm;
312 PL_curcop = c->curcop; 286 PL_curcop = c->curcop;
313 PL_top_env = c->top_env; 287 PL_top_env = c->top_env;
314 288
315 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 289 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
316 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 290 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
… …
325 { 299 {
326 AV *padlist = (AV *)POPs; 300 AV *padlist = (AV *)POPs;
327 301
328 if (padlist) 302 if (padlist)
329 { 303 {
330 put_padlist (cv); /* mark this padlist as available */ 304 put_padlist (aTHX_ cv); /* mark this padlist as available */
331 CvPADLIST(cv) = padlist; 305 CvPADLIST(cv) = padlist;
332#ifdef USE_THREADS
333 /*CvOWNER(cv) = (struct perl_thread *)POPs;*/
334#endif
335 } 306 }
336 307
337 ++CvDEPTH(cv); 308 ++CvDEPTH(cv);
338 } 309 }
339 310
… …
366 if (CxTYPE(cx) == CXt_SUB) 337 if (CxTYPE(cx) == CXt_SUB)
367 { 338 {
368 CV *cv = cx->blk_sub.cv; 339 CV *cv = cx->blk_sub.cv;
369 if (CvDEPTH(cv)) 340 if (CvDEPTH(cv))
370 { 341 {
371#ifdef USE_THREADS
372 /*XPUSHs ((SV *)CvOWNER(cv));*/
373 /*CvOWNER(cv) = 0;*/
374 /*error must unlock this cv etc.. etc...*/
375#endif
376 EXTEND (SP, CvDEPTH(cv)*2); 342 EXTEND (SP, CvDEPTH(cv)*2);
377 343
378 while (--CvDEPTH(cv)) 344 while (--CvDEPTH(cv))
379 { 345 {
380 /* this tells the restore code to increment CvDEPTH */ 346 /* this tells the restore code to increment CvDEPTH */
… …
383 } 349 }
384 350
385 PUSHs ((SV *)CvPADLIST(cv)); 351 PUSHs ((SV *)CvPADLIST(cv));
386 PUSHs ((SV *)cv); 352 PUSHs ((SV *)cv);
387 353
388 get_padlist (cv); /* this is a monster */ 354 get_padlist (aTHX_ cv);
389 } 355 }
390 } 356 }
357#ifdef CXt_FORMAT
391 else if (CxTYPE(cx) == CXt_FORMAT) 358 else if (CxTYPE(cx) == CXt_FORMAT)
392 { 359 {
393 /* 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? */
394 /* my bold guess is as a simple, plain sub... */ 361 /* my bold guess is as a simple, plain sub... */
395 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");
396 } 363 }
364#endif
397 } 365 }
398 366
399 if (top_si->si_type == PERLSI_MAIN) 367 if (top_si->si_type == PERLSI_MAIN)
400 break; 368 break;
401 369
… …
418 c->curstack = PL_curstack; 386 c->curstack = PL_curstack;
419 c->mainstack = PL_mainstack; 387 c->mainstack = PL_mainstack;
420 c->stack_sp = PL_stack_sp; 388 c->stack_sp = PL_stack_sp;
421 c->op = PL_op; 389 c->op = PL_op;
422 c->curpad = PL_curpad; 390 c->curpad = PL_curpad;
391 c->comppad = PL_comppad;
392 c->compcv = PL_compcv;
423 c->stack_base = PL_stack_base; 393 c->stack_base = PL_stack_base;
424 c->stack_max = PL_stack_max; 394 c->stack_max = PL_stack_max;
425 c->tmps_stack = PL_tmps_stack; 395 c->tmps_stack = PL_tmps_stack;
426 c->tmps_floor = PL_tmps_floor; 396 c->tmps_floor = PL_tmps_floor;
427 c->tmps_ix = PL_tmps_ix; 397 c->tmps_ix = PL_tmps_ix;
… …
433 c->scopestack_ix = PL_scopestack_ix; 403 c->scopestack_ix = PL_scopestack_ix;
434 c->scopestack_max = PL_scopestack_max; 404 c->scopestack_max = PL_scopestack_max;
435 c->savestack = PL_savestack; 405 c->savestack = PL_savestack;
436 c->savestack_ix = PL_savestack_ix; 406 c->savestack_ix = PL_savestack_ix;
437 c->savestack_max = PL_savestack_max; 407 c->savestack_max = PL_savestack_max;
408#if PERL_VERSION < 9
438 c->retstack = PL_retstack; 409 c->retstack = PL_retstack;
439 c->retstack_ix = PL_retstack_ix; 410 c->retstack_ix = PL_retstack_ix;
440 c->retstack_max = PL_retstack_max; 411 c->retstack_max = PL_retstack_max;
412#endif
413 c->curpm = PL_curpm;
441 c->curcop = PL_curcop; 414 c->curcop = PL_curcop;
442 c->top_env = PL_top_env; 415 c->top_env = PL_top_env;
443} 416}
444 417
445/* 418/*
446 * allocate various perl stacks. This is an exact copy 419 * allocate various perl stacks. This is an exact copy
447 * of perl.c:init_stacks, except that it uses less memory 420 * of perl.c:init_stacks, except that it uses less memory
448 * on the assumption that coroutines do not usually need 421 * on the (sometimes correct) assumption that coroutines do
449 * a lot of stackspace. 422 * not usually need a lot of stackspace.
450 */ 423 */
451STATIC void 424static void
452coro_init_stacks (pTHX) 425coro_init_stacks (pTHX)
453{ 426{
427 LOCK;
428
454 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 429 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
455 PL_curstackinfo->si_type = PERLSI_MAIN; 430 PL_curstackinfo->si_type = PERLSI_MAIN;
456 PL_curstack = PL_curstackinfo->si_stack; 431 PL_curstack = PL_curstackinfo->si_stack;
457 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 432 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
458 433
… …
467 442
468 New(54,PL_markstack,16,I32); 443 New(54,PL_markstack,16,I32);
469 PL_markstack_ptr = PL_markstack; 444 PL_markstack_ptr = PL_markstack;
470 PL_markstack_max = PL_markstack + 16; 445 PL_markstack_max = PL_markstack + 16;
471 446
447#ifdef SET_MARK_OFFSET
472 SET_MARK_OFFSET; 448 SET_MARK_OFFSET;
449#endif
473 450
474 New(54,PL_scopestack,16,I32); 451 New(54,PL_scopestack,16,I32);
475 PL_scopestack_ix = 0; 452 PL_scopestack_ix = 0;
476 PL_scopestack_max = 16; 453 PL_scopestack_max = 16;
477 454
478 New(54,PL_savestack,96,ANY); 455 New(54,PL_savestack,96,ANY);
479 PL_savestack_ix = 0; 456 PL_savestack_ix = 0;
480 PL_savestack_max = 96; 457 PL_savestack_max = 96;
481 458
459#if PERL_VERSION < 9
482 New(54,PL_retstack,8,OP*); 460 New(54,PL_retstack,8,OP*);
483 PL_retstack_ix = 0; 461 PL_retstack_ix = 0;
484 PL_retstack_max = 8; 462 PL_retstack_max = 8;
463#endif
464
465 UNLOCK;
485} 466}
486 467
487/* 468/*
488 * destroy the stacks, the callchain etc... 469 * destroy the stacks, the callchain etc...
489 * still there is a memleak of 128 bytes...
490 */ 470 */
491STATIC void 471static void
492destroy_stacks(pTHX) 472destroy_stacks(pTHX)
493{ 473{
494 if (!IN_DESTRUCT) 474 if (!IN_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 (!IN_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 JMPENV coro_start_env;
656 639
657 /* same as JMPENV_BOOTSTRAP */
658 Zero(&coro_start_env, 1, JMPENV);
659 coro_start_env.je_ret = -1;
660 coro_start_env.je_mustcatch = TRUE;
661 PL_top_env = &coro_start_env; 640 PL_top_env = &ctx->start_env;
662 641
663 ctx->cursp = 0; 642 ctx->cursp = 0;
664 PL_op = PL_op->op_next; 643 PL_op = PL_op->op_next;
665 CALLRUNOPS(aTHX); 644 CALLRUNOPS(aTHX);
666 645
667 abort (); 646 abort ();
668} 647}
669 648
670STATIC void 649static void
671transfer(pTHX_ struct coro *prev, struct coro *next, int flags) 650transfer (pTHX_ struct coro *prev, struct coro *next, int flags)
672{ 651{
673 dSTACKLEVEL; 652 dSTACKLEVEL;
674 static struct coro *xnext;
675 653
676 if (prev != next) 654 if (prev != next)
677 { 655 {
678 xnext = next;
679
680 if (next->mainstack) 656 if (next->mainstack)
681 { 657 {
658 LOCK;
682 SAVE (prev, flags); 659 SAVE (prev, flags);
683 LOAD (next); 660 LOAD (next);
661 UNLOCK;
684 662
685 /* mark this state as in-use */ 663 /* mark this state as in-use */
686 next->mainstack = 0; 664 next->mainstack = 0;
687 next->tmps_ix = -2; 665 next->tmps_ix = -2;
688 666
… …
707 continue_coro, (void *)next, 685 continue_coro, (void *)next,
708 next->stack->sptr, labs (next->stack->ssize)); 686 next->stack->sptr, labs (next->stack->ssize));
709 } 687 }
710 688
711 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 689 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
690 prev->cursp = stacklevel;
712 /* don't add any code here */ 691 /* don't add any code here */
713 } 692 }
714 693 else
694 next->cursp = stacklevel;
715 } 695 }
716 else if (next->tmps_ix == -2) 696 else if (next->tmps_ix == -2)
717 croak ("tried to transfer to running coroutine"); 697 croak ("tried to transfer to running coroutine");
718 else 698 else
719 { 699 {
700 LOCK;
720 SAVE (prev, -1); /* first get rid of the old state */ 701 SAVE (prev, -1); /* first get rid of the old state */
702 UNLOCK;
721 703
722 if (flags & TRANSFER_SAVE_CCTXT) 704 if (flags & TRANSFER_SAVE_CCTXT)
723 { 705 {
724 if (!prev->stack) 706 if (!prev->stack)
725 allocate_stack (prev, 0); 707 allocate_stack (prev, 0);
726 708
727 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 709 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
728 { 710 {
711 PL_top_env = &next->start_env;
712
729 setup_coro (next); 713 setup_coro (next);
714 next->cursp = stacklevel;
730 715
731 prev->stack->refcnt++; 716 prev->stack->refcnt++;
732 prev->stack->usecnt++; 717 prev->stack->usecnt++;
733 next->stack = prev->stack; 718 next->stack = prev->stack;
734 next->gencnt = prev->gencnt; 719 next->gencnt = prev->gencnt;
735 } 720 }
736 else 721 else
737 { 722 {
723 assert (!next->stack);
738 allocate_stack (next, 1); 724 allocate_stack (next, 1);
739 coro_create (&(next->stack->cctx), 725 coro_create (&(next->stack->cctx),
740 setup_coro, (void *)next, 726 setup_coro, (void *)next,
741 next->stack->sptr, labs (next->stack->ssize)); 727 next->stack->sptr, labs (next->stack->ssize));
742 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 728 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
729 prev->cursp = stacklevel;
743 /* don't add any code here */ 730 /* don't add any code here */
744 } 731 }
745 } 732 }
746 else 733 else
734 {
747 setup_coro (next); 735 setup_coro (next);
736 next->cursp = stacklevel;
737 }
748 } 738 }
749
750 /*
751 * xnext is now either prev or next, depending on wether
752 * we switched the c stack or not. that's why i use a global
753 * variable, that should become thread-specific at one point.
754 */
755 xnext->cursp = stacklevel;
756 } 739 }
757}
758 740
759static struct coro * 741 LOCK;
760sv_to_coro (SV *arg, const char *funcname, const char *varname) 742 if (coro_mortal)
761{
762 if (SvROK(arg) && SvTYPE(SvRV(arg)) == SVt_PVHV)
763 { 743 {
764 HE *he = hv_fetch_ent((HV *)SvRV(arg), ucoro_state_sv, 0, ucoro_state_hash); 744 SvREFCNT_dec (coro_mortal);
765 745 coro_mortal = 0;
766 if (!he)
767 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", funcname, varname);
768
769 arg = HeVAL(he);
770 } 746 }
771 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 \
772 /* must also be changed inside Coro::Cont::yield */ 765 /* must also be changed inside Coro::Cont::yield */ \
773 if (SvROK(arg) && SvOBJECT(SvRV(arg)) 766 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
774 && SvSTASH(SvRV(arg)) == coro_state_stash)
775 return (struct coro *) SvIV((SV*)SvRV(arg));
776
777 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); \
778 /*NORETURN*/ 768 \
779} 769 } while(0)
770
771#define SvSTATE(sv) INT2PTR (struct coro *, SvIV (sv))
780 772
781static void 773static void
782api_transfer(pTHX_ SV *prev, SV *next, int flags) 774api_transfer(pTHX_ SV *prev, SV *next, int flags)
783{ 775{
784 transfer(aTHX_ 776 SV_CORO (prev, "Coro::transfer");
785 sv_to_coro (prev, "Coro::transfer", "prev"), 777 SV_CORO (next, "Coro::transfer");
786 sv_to_coro (next, "Coro::transfer", "next"), 778
787 flags); 779 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
788} 780}
789 781
790/** Coro ********************************************************************/ 782/** Coro ********************************************************************/
791 783
792#define PRIO_MAX 3 784#define PRIO_MAX 3
… …
800static GV *coro_current, *coro_idle; 792static GV *coro_current, *coro_idle;
801static AV *coro_ready[PRIO_MAX-PRIO_MIN+1]; 793static AV *coro_ready[PRIO_MAX-PRIO_MIN+1];
802static int coro_nready; 794static int coro_nready;
803 795
804static void 796static void
805coro_enq (SV *sv) 797coro_enq (pTHX_ SV *sv)
806{ 798{
807 if (SvROK (sv)) 799 SV **xprio;
808 { 800 int prio;
809 SV *hv = SvRV (sv); 801
810 if (SvTYPE (hv) == SVt_PVHV) 802 if (SvTYPE (sv) != SVt_PVHV)
811 {
812 SV **xprio = hv_fetch ((HV *)hv, "prio", 4, 0);
813 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
814
815 prio = prio > PRIO_MAX ? PRIO_MAX
816 : prio < PRIO_MIN ? PRIO_MIN
817 : prio;
818
819 av_push (coro_ready [prio - PRIO_MIN], sv);
820 coro_nready++;
821
822 return;
823 }
824 }
825
826 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++;
827} 814}
828 815
829static SV * 816static SV *
830coro_deq (int min_prio) 817coro_deq (pTHX_ int min_prio)
831{ 818{
832 int prio = PRIO_MAX - PRIO_MIN; 819 int prio = PRIO_MAX - PRIO_MIN;
833 820
834 min_prio -= PRIO_MIN; 821 min_prio -= PRIO_MIN;
835 if (min_prio < 0) 822 if (min_prio < 0)
… …
846} 833}
847 834
848static void 835static void
849api_ready (SV *coro) 836api_ready (SV *coro)
850{ 837{
838 dTHX;
839
840 if (SvROK (coro))
841 coro = SvRV (coro);
842
843 LOCK;
851 coro_enq (SvREFCNT_inc (coro)); 844 coro_enq (aTHX_ SvREFCNT_inc (coro));
845 UNLOCK;
852} 846}
853 847
854static void 848static void
855api_schedule (int cede) 849api_schedule (void)
856{ 850{
851 dTHX;
852
857 SV *prev, *next; 853 SV *prev, *next;
858 854
855 LOCK;
856
859 prev = GvSV (coro_current); 857 prev = SvRV (GvSV (coro_current));
860
861 if (cede)
862 coro_enq (SvREFCNT_inc (prev));
863
864 next = coro_deq (PRIO_MIN); 858 next = coro_deq (aTHX_ PRIO_MIN);
865 859
866 if (!next) 860 if (!next)
867 next = SvREFCNT_inc (GvSV (coro_idle)); 861 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
868 862
869 GvSV (coro_current) = SvREFCNT_inc (next); 863 /* free this only after the transfer */
870 transfer (aTHX_ 864 coro_mortal = prev;
871 sv_to_coro (prev, "Coro::schedule", "current coroutine"), 865 SV_CORO (prev, "Coro::schedule");
872 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),
873 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 874 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
874 SvREFCNT_dec (next); 875}
875 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 ();
876} 887}
877 888
878MODULE = Coro::State PACKAGE = Coro::State 889MODULE = Coro::State PACKAGE = Coro::State
879 890
880PROTOTYPES: ENABLE 891PROTOTYPES: ENABLE
881 892
882BOOT: 893BOOT:
883{ /* {} 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
884 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1); 899 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
885 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1); 900 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
886 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 901 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
887 902
888 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 903 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV));
889 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 904 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV));
890 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 905 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV));
891 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT)); 906 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT));
892
893 if (!padlist_cache)
894 padlist_cache = newHV ();
895 907
896 main_mainstack = PL_mainstack; 908 main_mainstack = PL_mainstack;
897 909
898 coroapi.ver = CORO_API_VERSION; 910 coroapi.ver = CORO_API_VERSION;
899 coroapi.transfer = api_transfer; 911 coroapi.transfer = api_transfer;
… …
907 Coro__State coro; 919 Coro__State coro;
908 920
909 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV) 921 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV)
910 croak ("Coro::State::_newprocess expects an arrayref"); 922 croak ("Coro::State::_newprocess expects an arrayref");
911 923
912 New (0, coro, 1, struct coro); 924 Newz (0, coro, 1, struct coro);
913 925
914 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 926 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
915 coro->mainstack = 0; /* actual work is done inside transfer */ 927 /*coro->mainstack = 0; *//*actual work is done inside transfer */
916 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;
917 935
918 RETVAL = coro; 936 RETVAL = coro;
919 OUTPUT: 937 OUTPUT:
920 RETVAL 938 RETVAL
921 939
922void 940void
923transfer(prev, next, flags) 941transfer(prev, next, flags)
924 Coro::State_or_hashref prev 942 SV *prev
925 Coro::State_or_hashref next 943 SV *next
926 int flags 944 int flags
927 PROTOTYPE: @ 945 PROTOTYPE: @
928 CODE: 946 CODE:
929 PUTBACK; 947 PUTBACK;
948 SV_CORO (next, "Coro::transfer");
949 SV_CORO (prev, "Coro::transfer");
930 transfer (aTHX_ prev, next, flags); 950 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
931 SPAGAIN; 951 SPAGAIN;
932 952
933void 953void
934DESTROY(coro) 954DESTROY(coro)
935 Coro::State coro 955 Coro::State coro
… …
938 if (coro->mainstack && coro->mainstack != main_mainstack) 958 if (coro->mainstack && coro->mainstack != main_mainstack)
939 { 959 {
940 struct coro temp; 960 struct coro temp;
941 961
942 PUTBACK; 962 PUTBACK;
943 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL); 963 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL);
944 LOAD(aTHX_ coro); 964 LOAD (aTHX_ coro);
945 SPAGAIN; 965 SPAGAIN;
946 966
947 destroy_stacks (aTHX); 967 destroy_stacks (aTHX);
948 968
949 LOAD((&temp)); /* this will get rid of defsv etc.. */ 969 LOAD ((&temp)); /* this will get rid of defsv etc.. */
950 SPAGAIN; 970 SPAGAIN;
951 971
952 coro->mainstack = 0; 972 coro->mainstack = 0;
953 } 973 }
954 974
955 deallocate_stack (coro); 975 deallocate_stack (coro);
956 976 SvREFCNT_dec (coro->args);
957 Safefree (coro); 977 Safefree (coro);
958
959void
960flush()
961 CODE:
962#ifdef MAY_FLUSH
963 flush_padlist_cache ();
964#endif
965 978
966void 979void
967_exit(code) 980_exit(code)
968 int code 981 int code
969 PROTOTYPE: $ 982 PROTOTYPE: $
970 CODE: 983 CODE:
971#if defined(__GLIBC__) || _POSIX_C_SOURCE
972 _exit (code); 984 _exit (code);
973#else
974 signal (SIGTERM, SIG_DFL);
975 raise (SIGTERM);
976 exit (code);
977#endif
978 985
979MODULE = Coro::State PACKAGE = Coro::Cont 986MODULE = Coro::State PACKAGE = Coro::Cont
980 987
981# this is slightly dirty (should expose a c-level api) 988# this is slightly dirty (should expose a c-level api)
982 989
983void 990void
984yield(...) 991yield(...)
985 PROTOTYPE: @ 992 PROTOTYPE: @
986 CODE: 993 CODE:
987 static SV *returnstk; 994 SV *yieldstack;
988 SV *sv; 995 SV *sv;
989 AV *defav = GvAV (PL_defgv); 996 AV *defav = GvAV (PL_defgv);
990 struct coro *prev, *next; 997 struct coro *prev, *next;
991 998
992 if (!returnstk) 999 yieldstack = *hv_fetch (
993 returnstk = SvRV (get_sv ("Coro::Cont::return", FALSE)); 1000 (HV *)SvRV (GvSV (coro_current)),
1001 "yieldstack", sizeof ("yieldstack") - 1,
1002 0
1003 );
994 1004
995 /* set up @_ -- ugly */ 1005 /* set up @_ -- ugly */
996 av_clear (defav); 1006 av_clear (defav);
997 av_fill (defav, items - 1); 1007 av_fill (defav, items - 1);
998 while (items--) 1008 while (items--)
999 av_store (defav, items, SvREFCNT_inc (ST(items))); 1009 av_store (defav, items, SvREFCNT_inc (ST(items)));
1000 1010
1001 mg_get (returnstk); /* isn't documentation wrong for mg_get? */
1002 sv = av_pop ((AV *)SvRV (returnstk)); 1011 sv = av_pop ((AV *)SvRV (yieldstack));
1003 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))));
1004 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))));
1005 SvREFCNT_dec (sv); 1014 SvREFCNT_dec (sv);
1006 1015
1007 transfer(aTHX_ prev, next, 0); 1016 transfer (aTHX_ prev, next, 0);
1008 1017
1009MODULE = Coro::State PACKAGE = Coro 1018MODULE = Coro::State PACKAGE = Coro
1010 1019
1011# this is slightly dirty (should expose a c-level api) 1020# this is slightly dirty (should expose a c-level api)
1012 1021
… …
1030 1039
1031 { 1040 {
1032 SV *sv = perl_get_sv("Coro::API", 1); 1041 SV *sv = perl_get_sv("Coro::API", 1);
1033 1042
1034 coroapi.schedule = api_schedule; 1043 coroapi.schedule = api_schedule;
1044 coroapi.cede = api_cede;
1035 coroapi.ready = api_ready; 1045 coroapi.ready = api_ready;
1036 coroapi.nready = &coro_nready; 1046 coroapi.nready = &coro_nready;
1037 coroapi.current = coro_current; 1047 coroapi.current = coro_current;
1038 1048
1039 GCoroAPI = &coroapi; 1049 GCoroAPI = &coroapi;
1040 sv_setiv(sv, (IV)&coroapi); 1050 sv_setiv(sv, (IV)&coroapi);
1041 SvREADONLY_on(sv); 1051 SvREADONLY_on(sv);
1042 } 1052 }
1043} 1053}
1044 1054
1055#if !PERL_MICRO
1056
1045void 1057void
1046ready(self) 1058ready(self)
1047 SV * self 1059 SV * self
1060 PROTOTYPE: $
1048 CODE: 1061 CODE:
1049 api_ready (self); 1062 api_ready (self);
1063
1064#endif
1050 1065
1051int 1066int
1052nready(...) 1067nready(...)
1053 PROTOTYPE: 1068 PROTOTYPE:
1054 CODE: 1069 CODE:
… …
1057 RETVAL 1072 RETVAL
1058 1073
1059void 1074void
1060schedule(...) 1075schedule(...)
1061 PROTOTYPE: 1076 PROTOTYPE:
1062 ALIAS:
1063 cede = 1
1064 CODE: 1077 CODE:
1065 api_schedule (ix); 1078 api_schedule ();
1066 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