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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines