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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines