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.40 by root, Tue Nov 27 01:41:41 2001 UTC vs.
Revision 1.73 by root, Sat Feb 4 06:01:13 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
… …
68 AV *curstack; 109 AV *curstack;
69 AV *mainstack; 110 AV *mainstack;
70 SV **stack_sp; 111 SV **stack_sp;
71 OP *op; 112 OP *op;
72 SV **curpad; 113 SV **curpad;
114 AV *comppad;
115 CV *compcv;
73 SV **stack_base; 116 SV **stack_base;
74 SV **stack_max; 117 SV **stack_max;
75 SV **tmps_stack; 118 SV **tmps_stack;
76 I32 tmps_floor; 119 I32 tmps_floor;
77 I32 tmps_ix; 120 I32 tmps_ix;
… …
86 I32 savestack_ix; 129 I32 savestack_ix;
87 I32 savestack_max; 130 I32 savestack_max;
88 OP **retstack; 131 OP **retstack;
89 I32 retstack_ix; 132 I32 retstack_ix;
90 I32 retstack_max; 133 I32 retstack_max;
134 PMOP *curpm;
91 COP *curcop; 135 COP *curcop;
92 PMOP *curpm;
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#if PERL_VERSION < 9
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#if PERL_VERSION < 9
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#if PERL_VERSION < 9
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#if PERL_VERSION < 9
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_curpm = 0; /* segfault on first access */
604 /*PL_curcop = 0;*/ 656 /*PL_curcop = 0;*/
605 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 657 /*PL_in_eval = PL_in_eval;*/ /* inherit */
606 SvREFCNT_dec (GvAV (PL_defgv)); 658 SvREFCNT_dec (GvAV (PL_defgv));
607 GvAV (PL_defgv) = ctx->args; 659 GvAV (PL_defgv) = ctx->args; ctx->args = 0;
608 660
609 SPAGAIN; 661 SPAGAIN;
610 662
611 if (ctx->stack) 663 if (ctx->stack)
612 { 664 {
… …
639 * that doesn't matter, though, since it is only 691 * that doesn't matter, though, since it is only
640 * pp_nextstate and we never return... 692 * pp_nextstate and we never return...
641 * ah yes, and I don't care anyways ;) 693 * ah yes, and I don't care anyways ;)
642 */ 694 */
643 PUTBACK; 695 PUTBACK;
644 PL_op = pp_entersub(); 696 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
645 SPAGAIN; 697 SPAGAIN;
646 698
647 ENTER; /* necessary e.g. for dounwind */ 699 ENTER; /* necessary e.g. for dounwind */
648 } 700 }
649} 701}
… …
652continue_coro (void *arg) 704continue_coro (void *arg)
653{ 705{
654 /* 706 /*
655 * this is a _very_ stripped down perl interpreter ;) 707 * this is a _very_ stripped down perl interpreter ;)
656 */ 708 */
709 dTHX;
657 Coro__State ctx = (Coro__State)arg; 710 Coro__State ctx = (Coro__State)arg;
658 JMPENV coro_start_env; 711 JMPENV coro_start_env;
659 712
660 /* same as JMPENV_BOOTSTRAP */
661 Zero(&coro_start_env, 1, JMPENV);
662 coro_start_env.je_ret = -1;
663 coro_start_env.je_mustcatch = TRUE;
664 PL_top_env = &coro_start_env; 713 PL_top_env = &ctx->start_env;
665 714
666 ctx->cursp = 0; 715 ctx->cursp = 0;
667 PL_op = PL_op->op_next; 716 PL_op = PL_op->op_next;
668 CALLRUNOPS(aTHX); 717 CALLRUNOPS(aTHX);
669 718
670 abort (); 719 abort ();
671} 720}
672 721
673STATIC void 722STATIC void
674transfer(pTHX_ struct coro *prev, struct coro *next, int flags) 723transfer (pTHX_ struct coro *prev, struct coro *next, int flags)
675{ 724{
676 dSTACKLEVEL; 725 dSTACKLEVEL;
677 static struct coro *xnext;
678 726
679 if (prev != next) 727 if (prev != next)
680 { 728 {
681 xnext = next;
682
683 if (next->mainstack) 729 if (next->mainstack)
684 { 730 {
731 LOCK;
685 SAVE (prev, flags); 732 SAVE (prev, flags);
686 LOAD (next); 733 LOAD (next);
734 UNLOCK;
687 735
688 /* mark this state as in-use */ 736 /* mark this state as in-use */
689 next->mainstack = 0; 737 next->mainstack = 0;
690 next->tmps_ix = -2; 738 next->tmps_ix = -2;
691 739
… …
710 continue_coro, (void *)next, 758 continue_coro, (void *)next,
711 next->stack->sptr, labs (next->stack->ssize)); 759 next->stack->sptr, labs (next->stack->ssize));
712 } 760 }
713 761
714 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 762 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
763 prev->cursp = stacklevel;
715 /* don't add any code here */ 764 /* don't add any code here */
716 } 765 }
717 766 else
767 next->cursp = stacklevel;
718 } 768 }
719 else if (next->tmps_ix == -2) 769 else if (next->tmps_ix == -2)
720 croak ("tried to transfer to running coroutine"); 770 croak ("tried to transfer to running coroutine");
721 else 771 else
722 { 772 {
773 LOCK;
723 SAVE (prev, -1); /* first get rid of the old state */ 774 SAVE (prev, -1); /* first get rid of the old state */
775 UNLOCK;
724 776
725 if (flags & TRANSFER_SAVE_CCTXT) 777 if (flags & TRANSFER_SAVE_CCTXT)
726 { 778 {
727 if (!prev->stack) 779 if (!prev->stack)
728 allocate_stack (prev, 0); 780 allocate_stack (prev, 0);
729 781
730 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 782 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
731 { 783 {
784 PL_top_env = &next->start_env;
785
732 setup_coro (next); 786 setup_coro (next);
787 next->cursp = stacklevel;
733 788
734 prev->stack->refcnt++; 789 prev->stack->refcnt++;
735 prev->stack->usecnt++; 790 prev->stack->usecnt++;
736 next->stack = prev->stack; 791 next->stack = prev->stack;
737 next->gencnt = prev->gencnt; 792 next->gencnt = prev->gencnt;
738 } 793 }
739 else 794 else
740 { 795 {
796 assert (!next->stack);
741 allocate_stack (next, 1); 797 allocate_stack (next, 1);
742 coro_create (&(next->stack->cctx), 798 coro_create (&(next->stack->cctx),
743 setup_coro, (void *)next, 799 setup_coro, (void *)next,
744 next->stack->sptr, labs (next->stack->ssize)); 800 next->stack->sptr, labs (next->stack->ssize));
745 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 801 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
802 prev->cursp = stacklevel;
746 /* don't add any code here */ 803 /* don't add any code here */
747 } 804 }
748 } 805 }
749 else 806 else
807 {
750 setup_coro (next); 808 setup_coro (next);
809 next->cursp = stacklevel;
810 }
751 } 811 }
752
753 /*
754 * xnext is now either prev or next, depending on wether
755 * we switched the c stack or not. that's why i use a global
756 * variable, that should become thread-specific at one point.
757 */
758 xnext->cursp = stacklevel;
759 } 812 }
760 813
814 LOCK;
761 if (coro_mortal) 815 if (coro_mortal)
762 { 816 {
763 SvREFCNT_dec (coro_mortal); 817 SvREFCNT_dec (coro_mortal);
764 coro_mortal = 0; 818 coro_mortal = 0;
765 } 819 }
820 UNLOCK;
766} 821}
767 822
768#define SV_CORO(sv,func) \ 823#define SV_CORO(sv,func) \
769 do { \ 824 do { \
770 if (SvROK (sv)) \ 825 if (SvROK (sv)) \
771 sv = SvRV (sv); \ 826 sv = SvRV (sv); \
772 \ 827 \
773 if (SvTYPE(sv) == SVt_PVHV) \ 828 if (SvTYPE (sv) == SVt_PVHV) \
774 { \ 829 { \
775 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); \
776 \ 831 \
777 if (!he) \ 832 if (!he) \
778 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); \
779 \ 834 \
780 (sv) = SvRV (HeVAL(he)); \ 835 (sv) = SvRV (HeVAL(he)); \
781 } \ 836 } \
782 \ 837 \
783 /* must also be changed inside Coro::Cont::yield */ \ 838 /* must also be changed inside Coro::Cont::yield */ \
784 if (!SvOBJECT(sv) || SvSTASH(sv) != coro_state_stash) \ 839 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
785 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); \
786 \ 841 \
787 } while(0) 842 } while(0)
788 843
789#define SvSTATE(sv) (struct coro *)SvIV (sv) 844#define SvSTATE(sv) (struct coro *)SvIV (sv)
… …
792api_transfer(pTHX_ SV *prev, SV *next, int flags) 847api_transfer(pTHX_ SV *prev, SV *next, int flags)
793{ 848{
794 SV_CORO (prev, "Coro::transfer"); 849 SV_CORO (prev, "Coro::transfer");
795 SV_CORO (next, "Coro::transfer"); 850 SV_CORO (next, "Coro::transfer");
796 851
797 transfer(aTHX_ SvSTATE(prev), SvSTATE(next), flags); 852 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
798} 853}
799 854
800/** Coro ********************************************************************/ 855/** Coro ********************************************************************/
801 856
802#define PRIO_MAX 3 857#define PRIO_MAX 3
… …
810static GV *coro_current, *coro_idle; 865static GV *coro_current, *coro_idle;
811static AV *coro_ready[PRIO_MAX-PRIO_MIN+1]; 866static AV *coro_ready[PRIO_MAX-PRIO_MIN+1];
812static int coro_nready; 867static int coro_nready;
813 868
814static void 869static void
815coro_enq (SV *sv) 870coro_enq (pTHX_ SV *sv)
816{ 871{
817 if (SvTYPE (sv) == SVt_PVHV) 872 if (SvTYPE (sv) != SVt_PVHV)
818 {
819 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
820 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
821
822 prio = prio > PRIO_MAX ? PRIO_MAX
823 : prio < PRIO_MIN ? PRIO_MIN
824 : prio;
825
826 av_push (coro_ready [prio - PRIO_MIN], sv);
827 coro_nready++;
828
829 return;
830 }
831
832 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 873 croak ("Coro::ready tried to enqueue something that is not a coroutine");
874
875 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
876 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
877
878 prio = prio > PRIO_MAX ? PRIO_MAX
879 : prio < PRIO_MIN ? PRIO_MIN
880 : prio;
881
882 av_push (coro_ready [prio - PRIO_MIN], sv);
883 coro_nready++;
833} 884}
834 885
835static SV * 886static SV *
836coro_deq (int min_prio) 887coro_deq (pTHX_ int min_prio)
837{ 888{
838 int prio = PRIO_MAX - PRIO_MIN; 889 int prio = PRIO_MAX - PRIO_MIN;
839 890
840 min_prio -= PRIO_MIN; 891 min_prio -= PRIO_MIN;
841 if (min_prio < 0) 892 if (min_prio < 0)
… …
852} 903}
853 904
854static void 905static void
855api_ready (SV *coro) 906api_ready (SV *coro)
856{ 907{
908 dTHX;
909
857 if (SvROK (coro)) 910 if (SvROK (coro))
858 coro = SvRV (coro); 911 coro = SvRV (coro);
859 912
913 LOCK;
860 coro_enq (SvREFCNT_inc (coro)); 914 coro_enq (aTHX_ SvREFCNT_inc (coro));
915 UNLOCK;
861} 916}
862 917
863static void 918static void
864api_schedule (void) 919api_schedule (void)
865{ 920{
921 dTHX;
922
866 SV *prev, *next; 923 SV *prev, *next;
867 924
925 LOCK;
926
868 prev = SvRV (GvSV (coro_current)); 927 prev = SvRV (GvSV (coro_current));
869 next = coro_deq (PRIO_MIN); 928 next = coro_deq (aTHX_ PRIO_MIN);
870 929
871 if (!next) 930 if (!next)
872 next = SvREFCNT_inc (SvRV (GvSV (coro_idle))); 931 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
873 932
874 /* free this only after the transfer */ 933 /* free this only after the transfer */
… …
877 936
878 SvRV (GvSV (coro_current)) = next; 937 SvRV (GvSV (coro_current)) = next;
879 938
880 SV_CORO (next, "Coro::schedule"); 939 SV_CORO (next, "Coro::schedule");
881 940
941 UNLOCK;
942
882 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), 943 transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
883 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 944 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
884} 945}
885 946
886static void 947static void
887api_cede (void) 948api_cede (void)
888{ 949{
950 dTHX;
951
952 LOCK;
889 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current)))); 953 coro_enq (aTHX_ SvREFCNT_inc (SvRV (GvSV (coro_current))));
954 UNLOCK;
890 955
891 api_schedule (); 956 api_schedule ();
892} 957}
893 958
894MODULE = Coro::State PACKAGE = Coro::State 959MODULE = Coro::State PACKAGE = Coro::State
895 960
896PROTOTYPES: ENABLE 961PROTOTYPES: ENABLE
897 962
898BOOT: 963BOOT:
899{ /* {} necessary for stoopid perl-5.6.x */ 964{ /* {} necessary for stoopid perl-5.6.x */
965#ifdef USE_ITHREADS
966 MUTEX_INIT (&coro_mutex);
967#endif
968
900 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1); 969 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
901 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1); 970 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
902 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 971 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
903 972
904 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 973 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV));
905 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 974 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV));
906 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 975 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV));
907 newCONSTSUB (coro_state_stash, "SAVE_CURPM", newSViv (TRANSFER_SAVE_CURPM));
908 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT)); 976 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT));
909
910 if (!padlist_cache)
911 padlist_cache = newHV ();
912 977
913 main_mainstack = PL_mainstack; 978 main_mainstack = PL_mainstack;
914 979
915 coroapi.ver = CORO_API_VERSION; 980 coroapi.ver = CORO_API_VERSION;
916 coroapi.transfer = api_transfer; 981 coroapi.transfer = api_transfer;
… …
924 Coro__State coro; 989 Coro__State coro;
925 990
926 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV) 991 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV)
927 croak ("Coro::State::_newprocess expects an arrayref"); 992 croak ("Coro::State::_newprocess expects an arrayref");
928 993
929 New (0, coro, 1, struct coro); 994 Newz (0, coro, 1, struct coro);
930 995
931 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 996 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
932 coro->mainstack = 0; /* actual work is done inside transfer */ 997 /*coro->mainstack = 0; *//*actual work is done inside transfer */
933 coro->stack = 0; 998 /*coro->stack = 0;*/
999
1000 /* same as JMPENV_BOOTSTRAP */
1001 /* we might be able to recycle start_env, but safe is safe */
1002 /*Zero(&coro->start_env, 1, JMPENV);*/
1003 coro->start_env.je_ret = -1;
1004 coro->start_env.je_mustcatch = TRUE;
934 1005
935 RETVAL = coro; 1006 RETVAL = coro;
936 OUTPUT: 1007 OUTPUT:
937 RETVAL 1008 RETVAL
938 1009
… …
957 if (coro->mainstack && coro->mainstack != main_mainstack) 1028 if (coro->mainstack && coro->mainstack != main_mainstack)
958 { 1029 {
959 struct coro temp; 1030 struct coro temp;
960 1031
961 PUTBACK; 1032 PUTBACK;
962 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL); 1033 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL);
963 LOAD(aTHX_ coro); 1034 LOAD (aTHX_ coro);
964 SPAGAIN; 1035 SPAGAIN;
965 1036
966 destroy_stacks (aTHX); 1037 destroy_stacks (aTHX);
967 1038
968 LOAD((&temp)); /* this will get rid of defsv etc.. */ 1039 LOAD ((&temp)); /* this will get rid of defsv etc.. */
969 SPAGAIN; 1040 SPAGAIN;
970 1041
971 coro->mainstack = 0; 1042 coro->mainstack = 0;
972 } 1043 }
973 1044
974 deallocate_stack (coro); 1045 deallocate_stack (coro);
975 1046 SvREFCNT_dec (coro->args);
976 Safefree (coro); 1047 Safefree (coro);
977
978void
979flush()
980 CODE:
981#ifdef MAY_FLUSH
982 flush_padlist_cache ();
983#endif
984 1048
985void 1049void
986_exit(code) 1050_exit(code)
987 int code 1051 int code
988 PROTOTYPE: $ 1052 PROTOTYPE: $
989 CODE: 1053 CODE:
990#if defined(__GLIBC__) || _POSIX_C_SOURCE
991 _exit (code); 1054 _exit (code);
992#else
993 signal (SIGTERM, SIG_DFL);
994 raise (SIGTERM);
995 exit (code);
996#endif
997 1055
998MODULE = Coro::State PACKAGE = Coro::Cont 1056MODULE = Coro::State PACKAGE = Coro::Cont
999 1057
1000# this is slightly dirty (should expose a c-level api) 1058# this is slightly dirty (should expose a c-level api)
1001 1059
1002void 1060void
1003yield(...) 1061yield(...)
1004 PROTOTYPE: @ 1062 PROTOTYPE: @
1005 CODE: 1063 CODE:
1006 static SV *returnstk; 1064 SV *yieldstack;
1007 SV *sv; 1065 SV *sv;
1008 AV *defav = GvAV (PL_defgv); 1066 AV *defav = GvAV (PL_defgv);
1009 struct coro *prev, *next; 1067 struct coro *prev, *next;
1010 1068
1011 if (!returnstk) 1069 yieldstack = *hv_fetch (
1012 returnstk = SvRV (get_sv ("Coro::Cont::return", FALSE)); 1070 (HV *)SvRV (GvSV (coro_current)),
1071 "yieldstack", sizeof ("yieldstack") - 1,
1072 0
1073 );
1013 1074
1014 /* set up @_ -- ugly */ 1075 /* set up @_ -- ugly */
1015 av_clear (defav); 1076 av_clear (defav);
1016 av_fill (defav, items - 1); 1077 av_fill (defav, items - 1);
1017 while (items--) 1078 while (items--)
1018 av_store (defav, items, SvREFCNT_inc (ST(items))); 1079 av_store (defav, items, SvREFCNT_inc (ST(items)));
1019 1080
1020 mg_get (returnstk); /* isn't documentation wrong for mg_get? */
1021 sv = av_pop ((AV *)SvRV (returnstk)); 1081 sv = av_pop ((AV *)SvRV (yieldstack));
1022 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0))); 1082 prev = (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))); 1083 next = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0)));
1024 SvREFCNT_dec (sv); 1084 SvREFCNT_dec (sv);
1025 1085
1026 transfer(aTHX_ prev, next, 0); 1086 transfer (aTHX_ prev, next, 0);
1027 1087
1028MODULE = Coro::State PACKAGE = Coro 1088MODULE = Coro::State PACKAGE = Coro
1029 1089
1030# this is slightly dirty (should expose a c-level api) 1090# this is slightly dirty (should expose a c-level api)
1031 1091
… …
1060 sv_setiv(sv, (IV)&coroapi); 1120 sv_setiv(sv, (IV)&coroapi);
1061 SvREADONLY_on(sv); 1121 SvREADONLY_on(sv);
1062 } 1122 }
1063} 1123}
1064 1124
1125#if !PERL_MICRO
1126
1065void 1127void
1066ready(self) 1128ready(self)
1067 SV * self 1129 SV * self
1068 PROTOTYPE: $ 1130 PROTOTYPE: $
1069 CODE: 1131 CODE:
1070 api_ready (self); 1132 api_ready (self);
1133
1134#endif
1071 1135
1072int 1136int
1073nready(...) 1137nready(...)
1074 PROTOTYPE: 1138 PROTOTYPE:
1075 CODE: 1139 CODE:
… …
1087cede(...) 1151cede(...)
1088 PROTOTYPE: 1152 PROTOTYPE:
1089 CODE: 1153 CODE:
1090 api_cede (); 1154 api_cede ();
1091 1155
1156# and these are hacks
1157SV *
1158_aio_get_state ()
1159 CODE:
1160{
1161 struct {
1162 int errorno;
1163 int laststype;
1164 int laststatval;
1165 Stat_t statcache;
1166 } data;
1167
1168 data.errorno = errno;
1169 data.laststype = PL_laststype;
1170 data.laststatval = PL_laststatval;
1171 data.statcache = PL_statcache;
1172
1173 RETVAL = newSVpvn ((char *)&data, sizeof data);
1174}
1175 OUTPUT:
1176 RETVAL
1177
1178void
1179_aio_set_state (char *data_)
1180 PROTOTYPE: $
1181 CODE:
1182{
1183 struct {
1184 int errorno;
1185 int laststype;
1186 int laststatval;
1187 Stat_t statcache;
1188 } *data = (void *)data_;
1189
1190 errno = data->errorno;
1191 PL_laststype = data->laststype;
1192 PL_laststatval = data->laststatval;
1193 PL_statcache = data->statcache;
1194}

Diff Legend

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