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