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