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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines