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

Diff Legend

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