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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines