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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines