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.28 by root, Sat Aug 25 21:32: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
… …
355 397
356 PUSHs (Nullsv); 398 PUSHs (Nullsv);
357 /* this loop was inspired by pp_caller */ 399 /* this loop was inspired by pp_caller */
358 for (;;) 400 for (;;)
359 { 401 {
360 do 402 while (cxix >= 0)
361 { 403 {
362 PERL_CONTEXT *cx = &ccstk[cxix--]; 404 PERL_CONTEXT *cx = &ccstk[cxix--];
363 405
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 while (cxix >= 0);
397 435
398 if (top_si->si_type == PERLSI_MAIN) 436 if (top_si->si_type == PERLSI_MAIN)
399 break; 437 break;
400 438
401 top_si = top_si->si_prev; 439 top_si = top_si->si_prev;
… …
417 c->curstack = PL_curstack; 455 c->curstack = PL_curstack;
418 c->mainstack = PL_mainstack; 456 c->mainstack = PL_mainstack;
419 c->stack_sp = PL_stack_sp; 457 c->stack_sp = PL_stack_sp;
420 c->op = PL_op; 458 c->op = PL_op;
421 c->curpad = PL_curpad; 459 c->curpad = PL_curpad;
460 c->comppad = PL_comppad;
461 c->compcv = PL_compcv;
422 c->stack_base = PL_stack_base; 462 c->stack_base = PL_stack_base;
423 c->stack_max = PL_stack_max; 463 c->stack_max = PL_stack_max;
424 c->tmps_stack = PL_tmps_stack; 464 c->tmps_stack = PL_tmps_stack;
425 c->tmps_floor = PL_tmps_floor; 465 c->tmps_floor = PL_tmps_floor;
426 c->tmps_ix = PL_tmps_ix; 466 c->tmps_ix = PL_tmps_ix;
… …
435 c->savestack_ix = PL_savestack_ix; 475 c->savestack_ix = PL_savestack_ix;
436 c->savestack_max = PL_savestack_max; 476 c->savestack_max = PL_savestack_max;
437 c->retstack = PL_retstack; 477 c->retstack = PL_retstack;
438 c->retstack_ix = PL_retstack_ix; 478 c->retstack_ix = PL_retstack_ix;
439 c->retstack_max = PL_retstack_max; 479 c->retstack_max = PL_retstack_max;
480 c->curpm = PL_curpm;
440 c->curcop = PL_curcop; 481 c->curcop = PL_curcop;
441 c->top_env = PL_top_env; 482 c->top_env = PL_top_env;
442} 483}
443 484
444/* 485/*
445 * allocate various perl stacks. This is an exact copy 486 * allocate various perl stacks. This is an exact copy
446 * of perl.c:init_stacks, except that it uses less memory 487 * of perl.c:init_stacks, except that it uses less memory
447 * on the assumption that coroutines do not usually need 488 * on the (sometimes correct) assumption that coroutines do
448 * a lot of stackspace. 489 * not usually need a lot of stackspace.
449 */ 490 */
450STATIC void 491STATIC void
451coro_init_stacks (pTHX) 492coro_init_stacks (pTHX)
452{ 493{
494 LOCK;
495
453 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 496 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
454 PL_curstackinfo->si_type = PERLSI_MAIN; 497 PL_curstackinfo->si_type = PERLSI_MAIN;
455 PL_curstack = PL_curstackinfo->si_stack; 498 PL_curstack = PL_curstackinfo->si_stack;
456 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 499 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
457 500
… …
466 509
467 New(54,PL_markstack,16,I32); 510 New(54,PL_markstack,16,I32);
468 PL_markstack_ptr = PL_markstack; 511 PL_markstack_ptr = PL_markstack;
469 PL_markstack_max = PL_markstack + 16; 512 PL_markstack_max = PL_markstack + 16;
470 513
514#ifdef SET_MARK_OFFSET
471 SET_MARK_OFFSET; 515 SET_MARK_OFFSET;
516#endif
472 517
473 New(54,PL_scopestack,16,I32); 518 New(54,PL_scopestack,16,I32);
474 PL_scopestack_ix = 0; 519 PL_scopestack_ix = 0;
475 PL_scopestack_max = 16; 520 PL_scopestack_max = 16;
476 521
… …
479 PL_savestack_max = 96; 524 PL_savestack_max = 96;
480 525
481 New(54,PL_retstack,8,OP*); 526 New(54,PL_retstack,8,OP*);
482 PL_retstack_ix = 0; 527 PL_retstack_ix = 0;
483 PL_retstack_max = 8; 528 PL_retstack_max = 8;
529
530 UNLOCK;
484} 531}
485 532
486/* 533/*
487 * destroy the stacks, the callchain etc... 534 * destroy the stacks, the callchain etc...
488 * still there is a memleak of 128 bytes...
489 */ 535 */
490STATIC void 536STATIC void
491destroy_stacks(pTHX) 537destroy_stacks(pTHX)
492{ 538{
539 if (!IN_DESTRUCT)
540 {
493 /* is this ugly, I ask? */ 541 /* is this ugly, I ask? */
494 while (PL_scopestack_ix) 542 LEAVE_SCOPE (0);
495 LEAVE;
496 543
497 /* sure it is, but more important: is it correct?? :/ */ 544 /* sure it is, but more important: is it correct?? :/ */
498 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */
499 FREETMPS; 545 FREETMPS;
546
547 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/
548 }
500 549
501 while (PL_curstackinfo->si_next) 550 while (PL_curstackinfo->si_next)
502 PL_curstackinfo = PL_curstackinfo->si_next; 551 PL_curstackinfo = PL_curstackinfo->si_next;
503 552
504 while (PL_curstackinfo) 553 while (PL_curstackinfo)
505 { 554 {
506 PERL_SI *p = PL_curstackinfo->si_prev; 555 PERL_SI *p = PL_curstackinfo->si_prev;
507 556
508 { 557 { /*D*//*remove*/
509 dSP; 558 dSP;
510 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack); 559 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
511 PUTBACK; /* possibly superfluous */ 560 PUTBACK; /* possibly superfluous */
512 } 561 }
513 562
514 if (PL_main_cv != Nullcv) /* don't during destruction. hack? */ 563 if (!IN_DESTRUCT)
515 dounwind(-1); 564 {
516 565 dounwind (-1);/*D*//*remove*/
517 SvREFCNT_dec(PL_curstackinfo->si_stack); 566 SvREFCNT_dec (PL_curstackinfo->si_stack);
567 }
568
518 Safefree(PL_curstackinfo->si_cxstack); 569 Safefree (PL_curstackinfo->si_cxstack);
519 Safefree(PL_curstackinfo); 570 Safefree (PL_curstackinfo);
520 PL_curstackinfo = p; 571 PL_curstackinfo = p;
521 } 572 }
522 573
523 Safefree(PL_tmps_stack); 574 Safefree (PL_tmps_stack);
524 Safefree(PL_markstack); 575 Safefree (PL_markstack);
525 Safefree(PL_scopestack); 576 Safefree (PL_scopestack);
526 Safefree(PL_savestack); 577 Safefree (PL_savestack);
527 Safefree(PL_retstack); 578 Safefree (PL_retstack);
528} 579}
529 580
530static void 581static void
531allocate_stack (Coro__State ctx, int alloc) 582allocate_stack (Coro__State ctx, int alloc)
532{ 583{
… …
535 New (0, stack, 1, coro_stack); 586 New (0, stack, 1, coro_stack);
536 587
537 stack->refcnt = 1; 588 stack->refcnt = 1;
538 stack->usecnt = 1; 589 stack->usecnt = 1;
539 stack->gencnt = ctx->gencnt = 0; 590 stack->gencnt = ctx->gencnt = 0;
591
540 if (alloc) 592 if (alloc)
541 { 593 {
542#ifdef HAVE_MMAP 594#if HAVE_MMAP
543 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 */
544 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);
545 if (stack->sptr == (void *)-1) 597 if (stack->sptr == (void *)-1)
546#endif 598#endif
547 { 599 {
548 /*FIXME*//*D*//* reasonable stack size! */ 600 /*FIXME*//*D*//* reasonable stack size! */
549 stack->ssize = -4096 * sizeof (long); 601 stack->ssize = - (STACKSIZE * sizeof (long));
550 New (0, stack->sptr, 4096, long); 602 New (0, stack->sptr, STACKSIZE, long);
551 } 603 }
552 } 604 }
553 else 605 else
554 stack->sptr = 0; 606 stack->sptr = 0;
555 607
… …
563 615
564 ctx->stack = 0; 616 ctx->stack = 0;
565 617
566 if (stack) 618 if (stack)
567 { 619 {
568 printf ("deallocating stack %p %d\n", stack, stack->refcnt);/*D*/
569 if (!--stack->refcnt) 620 if (!--stack->refcnt)
570 { 621 {
571#ifdef HAVE_MMAP 622#ifdef HAVE_MMAP
572 if (stack->ssize > 0 && stack->sptr) 623 if (stack->ssize > 0 && stack->sptr)
573 munmap (stack->sptr, stack->ssize); 624 munmap (stack->sptr, stack->ssize);
574 else 625 else
575#else 626#endif
576 Safefree (stack->sptr); 627 Safefree (stack->sptr);
577#endif 628
578 Safefree (stack); 629 Safefree (stack);
579 } 630 }
580 else if (ctx->gencnt == stack->gencnt) 631 else if (ctx->gencnt == stack->gencnt)
581 --stack->usecnt; 632 --stack->usecnt;
582 } 633 }
… …
586setup_coro (void *arg) 637setup_coro (void *arg)
587{ 638{
588 /* 639 /*
589 * emulate part of the perl startup here. 640 * emulate part of the perl startup here.
590 */ 641 */
642 dTHX;
591 dSP; 643 dSP;
592 Coro__State ctx = (Coro__State)arg; 644 Coro__State ctx = (Coro__State)arg;
593 SV *sub_init = (SV*)get_cv(SUB_INIT, FALSE); 645 SV *sub_init = (SV *)get_cv (SUB_INIT, FALSE);
594 646
595 coro_init_stacks (aTHX); 647 coro_init_stacks (aTHX);
596 /*PL_curcop = 0;*/ 648 /*PL_curcop = 0;*/
597 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 649 /*PL_in_eval = PL_in_eval;*/ /* inherit */
598 SvREFCNT_dec (GvAV (PL_defgv)); 650 SvREFCNT_dec (GvAV (PL_defgv));
599 GvAV (PL_defgv) = ctx->args; 651 GvAV (PL_defgv) = ctx->args; ctx->args = 0;
600 652
601 SPAGAIN; 653 SPAGAIN;
602 654
603 if (ctx->stack) 655 if (ctx->stack)
604 { 656 {
… …
631 * that doesn't matter, though, since it is only 683 * that doesn't matter, though, since it is only
632 * pp_nextstate and we never return... 684 * pp_nextstate and we never return...
633 * ah yes, and I don't care anyways ;) 685 * ah yes, and I don't care anyways ;)
634 */ 686 */
635 PUTBACK; 687 PUTBACK;
636 PL_op = pp_entersub(); 688 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
637 SPAGAIN; 689 SPAGAIN;
638 690
639 ENTER; /* necessary e.g. for dounwind */ 691 ENTER; /* necessary e.g. for dounwind */
640 } 692 }
641} 693}
… …
644continue_coro (void *arg) 696continue_coro (void *arg)
645{ 697{
646 /* 698 /*
647 * this is a _very_ stripped down perl interpreter ;) 699 * this is a _very_ stripped down perl interpreter ;)
648 */ 700 */
701 dTHX;
649 Coro__State ctx = (Coro__State)arg; 702 Coro__State ctx = (Coro__State)arg;
703 JMPENV coro_start_env;
650 704
651 /*FIXME*//* must set up top_env here */ 705 PL_top_env = &ctx->start_env;
706
652 ctx->cursp = 0; 707 ctx->cursp = 0;
653 PL_op = PL_op->op_next; 708 PL_op = PL_op->op_next;
654 CALLRUNOPS(aTHX); 709 CALLRUNOPS(aTHX);
655 710
656 abort (); 711 abort ();
657} 712}
658 713
659STATIC void 714STATIC void
660transfer(pTHX_ struct coro *prev, struct coro *next, int flags) 715transfer (pTHX_ struct coro *prev, struct coro *next, int flags)
661{ 716{
662 dSTACKLEVEL; 717 dSTACKLEVEL;
663 static struct coro *xnext;
664 718
665 printf ("%p => %p\n", prev, next);/*D*/
666 if (prev != next) 719 if (prev != next)
667 { 720 {
668 xnext = next;
669
670 if (next->mainstack) 721 if (next->mainstack)
671 { 722 {
723 LOCK;
672 SAVE (prev, flags); 724 SAVE (prev, flags);
673 LOAD (next); 725 LOAD (next);
726 UNLOCK;
674 727
675 /* mark this state as in-use */ 728 /* mark this state as in-use */
676 next->mainstack = 0; 729 next->mainstack = 0;
677 next->tmps_ix = -2; 730 next->tmps_ix = -2;
678 731
… …
697 continue_coro, (void *)next, 750 continue_coro, (void *)next,
698 next->stack->sptr, labs (next->stack->ssize)); 751 next->stack->sptr, labs (next->stack->ssize));
699 } 752 }
700 753
701 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 754 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
755 prev->cursp = stacklevel;
702 /* don't add any code here */ 756 /* don't add any code here */
703 } 757 }
704 758 else
759 next->cursp = stacklevel;
705 } 760 }
706 else if (next->tmps_ix == -2) 761 else if (next->tmps_ix == -2)
707 croak ("tried to transfer to running coroutine"); 762 croak ("tried to transfer to running coroutine");
708 else 763 else
709 { 764 {
765 LOCK;
710 SAVE (prev, -1); /* first get rid of the old state */ 766 SAVE (prev, -1); /* first get rid of the old state */
767 UNLOCK;
711 768
712 if (flags & TRANSFER_SAVE_CCTXT) 769 if (flags & TRANSFER_SAVE_CCTXT)
713 { 770 {
714 if (!prev->stack) 771 if (!prev->stack)
715 allocate_stack (prev, 0); 772 allocate_stack (prev, 0);
716 773
717 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 774 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
718 { 775 {
776 PL_top_env = &next->start_env;
777
719 setup_coro (next); 778 setup_coro (next);
779 next->cursp = stacklevel;
720 780
721 prev->stack->refcnt++; 781 prev->stack->refcnt++;
722 prev->stack->usecnt++; 782 prev->stack->usecnt++;
723 next->stack = prev->stack; 783 next->stack = prev->stack;
724 next->gencnt = prev->gencnt; 784 next->gencnt = prev->gencnt;
725 } 785 }
726 else 786 else
727 { 787 {
788 assert (!next->stack);
728 allocate_stack (next, 1); 789 allocate_stack (next, 1);
729 coro_create (&(next->stack->cctx), 790 coro_create (&(next->stack->cctx),
730 setup_coro, (void *)next, 791 setup_coro, (void *)next,
731 next->stack->sptr, labs (next->stack->ssize)); 792 next->stack->sptr, labs (next->stack->ssize));
732 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 793 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
794 prev->cursp = stacklevel;
733 /* don't add any code here */ 795 /* don't add any code here */
734 } 796 }
735 } 797 }
736 else 798 else
799 {
737 setup_coro (next); 800 setup_coro (next);
801 next->cursp = stacklevel;
802 }
738 } 803 }
739 } 804 }
740 805
741 xnext->cursp = stacklevel; 806 LOCK;
742} 807 if (coro_mortal)
743
744static struct coro *
745sv_to_coro (SV *arg, const char *funcname, const char *varname)
746{
747 if (SvROK(arg) && SvTYPE(SvRV(arg)) == SVt_PVHV)
748 { 808 {
749 HE *he = hv_fetch_ent((HV *)SvRV(arg), ucoro_state_sv, 0, ucoro_state_hash); 809 SvREFCNT_dec (coro_mortal);
750 810 coro_mortal = 0;
751 if (!he)
752 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", funcname, varname);
753
754 arg = HeVAL(he);
755 } 811 }
756 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 \
757 /* must also be changed inside Coro::Cont::yield */ 830 /* must also be changed inside Coro::Cont::yield */ \
758 if (SvROK(arg) && SvSTASH(SvRV(arg)) == coro_state_stash) 831 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
759 return (struct coro *) SvIV((SV*)SvRV(arg));
760
761 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); \
762 /*NORETURN*/ 833 \
763} 834 } while(0)
835
836#define SvSTATE(sv) (struct coro *)SvIV (sv)
764 837
765static void 838static void
766api_transfer(pTHX_ SV *prev, SV *next, int flags) 839api_transfer(pTHX_ SV *prev, SV *next, int flags)
767{ 840{
768 transfer(aTHX_ 841 SV_CORO (prev, "Coro::transfer");
769 sv_to_coro (prev, "Coro::transfer", "prev"), 842 SV_CORO (next, "Coro::transfer");
770 sv_to_coro (next, "Coro::transfer", "next"), 843
771 flags); 844 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
772} 845}
773 846
774/** Coro ********************************************************************/ 847/** Coro ********************************************************************/
775 848
776#define PRIO_MAX 3 849#define PRIO_MAX 3
… …
784static GV *coro_current, *coro_idle; 857static GV *coro_current, *coro_idle;
785static AV *coro_ready[PRIO_MAX-PRIO_MIN+1]; 858static AV *coro_ready[PRIO_MAX-PRIO_MIN+1];
786static int coro_nready; 859static int coro_nready;
787 860
788static void 861static void
789coro_enq (SV *sv) 862coro_enq (pTHX_ SV *sv)
790{ 863{
791 if (SvROK (sv)) 864 if (SvTYPE (sv) == SVt_PVHV)
792 { 865 {
793 SV *hv = SvRV (sv);
794 if (SvTYPE (hv) == SVt_PVHV)
795 {
796 SV **xprio = hv_fetch ((HV *)hv, "prio", 4, 0); 866 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
797 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL; 867 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
798 868
799 prio = prio > PRIO_MAX ? PRIO_MAX 869 prio = prio > PRIO_MAX ? PRIO_MAX
800 : prio < PRIO_MIN ? PRIO_MIN 870 : prio < PRIO_MIN ? PRIO_MIN
801 : prio; 871 : prio;
802 872
803 av_push (coro_ready [prio - PRIO_MIN], sv); 873 av_push (coro_ready [prio - PRIO_MIN], sv);
804 coro_nready++; 874 coro_nready++;
805 875
806 return; 876 return;
807 }
808 } 877 }
809 878
810 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");
811} 880}
812 881
813static SV * 882static SV *
814coro_deq (int min_prio) 883coro_deq (pTHX_ int min_prio)
815{ 884{
816 int prio = PRIO_MAX - PRIO_MIN; 885 int prio = PRIO_MAX - PRIO_MIN;
817 886
818 min_prio -= PRIO_MIN; 887 min_prio -= PRIO_MIN;
819 if (min_prio < 0) 888 if (min_prio < 0)
… …
830} 899}
831 900
832static void 901static void
833api_ready (SV *coro) 902api_ready (SV *coro)
834{ 903{
904 dTHX;
905
906 if (SvROK (coro))
907 coro = SvRV (coro);
908
909 LOCK;
835 coro_enq (SvREFCNT_inc (coro)); 910 coro_enq (aTHX_ SvREFCNT_inc (coro));
911 UNLOCK;
836} 912}
837 913
838static void 914static void
839api_schedule (int cede) 915api_schedule (void)
840{ 916{
917 dTHX;
918
841 SV *prev, *next; 919 SV *prev, *next;
842 920
921 LOCK;
922
843 prev = GvSV (coro_current); 923 prev = SvRV (GvSV (coro_current));
844
845 if (cede)
846 coro_enq (SvREFCNT_inc (prev));
847
848 next = coro_deq (PRIO_MIN); 924 next = coro_deq (aTHX_ PRIO_MIN);
849 925
850 if (!next) 926 if (!next)
851 next = SvREFCNT_inc (GvSV (coro_idle)); 927 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
852 928
853 GvSV (coro_current) = SvREFCNT_inc (next); 929 /* free this only after the transfer */
854 transfer (aTHX_ 930 coro_mortal = prev;
855 sv_to_coro (prev, "Coro::schedule", "current coroutine"), 931 SV_CORO (prev, "Coro::schedule");
856 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),
857 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 940 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
858 SvREFCNT_dec (next); 941}
859 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 ();
860} 953}
861 954
862MODULE = Coro::State PACKAGE = Coro::State 955MODULE = Coro::State PACKAGE = Coro::State
863 956
864PROTOTYPES: ENABLE 957PROTOTYPES: ENABLE
865 958
866BOOT: 959BOOT:
867{ /* {} 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
868 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1); 965 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
869 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1); 966 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
870 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 967 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
871 968
872 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 969 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV));
873 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 970 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV));
874 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 971 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV));
875 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT)); 972 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT));
876
877 if (!padlist_cache)
878 padlist_cache = newHV ();
879 973
880 main_mainstack = PL_mainstack; 974 main_mainstack = PL_mainstack;
881 975
882 coroapi.ver = CORO_API_VERSION; 976 coroapi.ver = CORO_API_VERSION;
883 coroapi.transfer = api_transfer; 977 coroapi.transfer = api_transfer;
… …
891 Coro__State coro; 985 Coro__State coro;
892 986
893 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV) 987 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV)
894 croak ("Coro::State::_newprocess expects an arrayref"); 988 croak ("Coro::State::_newprocess expects an arrayref");
895 989
896 New (0, coro, 1, struct coro); 990 Newz (0, coro, 1, struct coro);
897 991
898 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 992 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
899 coro->mainstack = 0; /* actual work is done inside transfer */ 993 /*coro->mainstack = 0; *//*actual work is done inside transfer */
900 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;
901 1001
902 RETVAL = coro; 1002 RETVAL = coro;
903 OUTPUT: 1003 OUTPUT:
904 RETVAL 1004 RETVAL
905 1005
906void 1006void
907transfer(prev, next, flags) 1007transfer(prev, next, flags)
908 Coro::State_or_hashref prev 1008 SV *prev
909 Coro::State_or_hashref next 1009 SV *next
910 int flags 1010 int flags
911 PROTOTYPE: @ 1011 PROTOTYPE: @
912 CODE: 1012 CODE:
913 PUTBACK; 1013 PUTBACK;
1014 SV_CORO (next, "Coro::transfer");
1015 SV_CORO (prev, "Coro::transfer");
914 transfer (aTHX_ prev, next, flags); 1016 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
915 SPAGAIN; 1017 SPAGAIN;
916 1018
917void 1019void
918DESTROY(coro) 1020DESTROY(coro)
919 Coro::State coro 1021 Coro::State coro
… …
922 if (coro->mainstack && coro->mainstack != main_mainstack) 1024 if (coro->mainstack && coro->mainstack != main_mainstack)
923 { 1025 {
924 struct coro temp; 1026 struct coro temp;
925 1027
926 PUTBACK; 1028 PUTBACK;
927 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL); 1029 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL);
928 LOAD(aTHX_ coro); 1030 LOAD (aTHX_ coro);
929 SPAGAIN; 1031 SPAGAIN;
930 1032
931 destroy_stacks (aTHX); 1033 destroy_stacks (aTHX);
932 1034
933 LOAD((&temp)); /* this will get rid of defsv etc.. */ 1035 LOAD ((&temp)); /* this will get rid of defsv etc.. */
934 SPAGAIN; 1036 SPAGAIN;
935 1037
936 coro->mainstack = 0; 1038 coro->mainstack = 0;
937 } 1039 }
938 1040
939 deallocate_stack (coro); 1041 deallocate_stack (coro);
940 1042 SvREFCNT_dec (coro->args);
941 Safefree (coro); 1043 Safefree (coro);
942
943void
944flush()
945 CODE:
946#ifdef MAY_FLUSH
947 flush_padlist_cache ();
948#endif
949 1044
950void 1045void
951_exit(code) 1046_exit(code)
952 int code 1047 int code
953 PROTOTYPE: $ 1048 PROTOTYPE: $
954 CODE: 1049 CODE:
955#if defined(__GLIBC__) || _POSIX_C_SOURCE
956 _exit (code); 1050 _exit (code);
957#else
958 signal (SIGTERM, SIG_DFL);
959 raise (SIGTERM);
960 exit (code);
961#endif
962 1051
963MODULE = Coro::State PACKAGE = Coro::Cont 1052MODULE = Coro::State PACKAGE = Coro::Cont
964 1053
965# this is slightly dirty (should expose a c-level api) 1054# this is slightly dirty (should expose a c-level api)
966 1055
967void 1056void
968yield(...) 1057yield(...)
969 PROTOTYPE: @ 1058 PROTOTYPE: @
970 CODE: 1059 CODE:
971 static SV *returnstk; 1060 SV *yieldstack;
972 SV *sv; 1061 SV *sv;
973 AV *defav = GvAV (PL_defgv); 1062 AV *defav = GvAV (PL_defgv);
974 struct coro *prev, *next; 1063 struct coro *prev, *next;
975 1064
976 if (!returnstk) 1065 yieldstack = *hv_fetch (
977 returnstk = SvRV (get_sv ("Coro::Cont::return", FALSE)); 1066 (HV *)SvRV (GvSV (coro_current)),
1067 "yieldstack", sizeof ("yieldstack") - 1,
1068 0
1069 );
978 1070
979 /* set up @_ -- ugly */ 1071 /* set up @_ -- ugly */
980 av_clear (defav); 1072 av_clear (defav);
981 av_fill (defav, items - 1); 1073 av_fill (defav, items - 1);
982 while (items--) 1074 while (items--)
983 av_store (defav, items, SvREFCNT_inc (ST(items))); 1075 av_store (defav, items, SvREFCNT_inc (ST(items)));
984 1076
985 mg_get (returnstk); /* isn't documentation wrong for mg_get? */
986 sv = av_pop ((AV *)SvRV (returnstk)); 1077 sv = av_pop ((AV *)SvRV (yieldstack));
987 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)));
988 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)));
989 SvREFCNT_dec (sv); 1080 SvREFCNT_dec (sv);
990 1081
991 transfer(aTHX_ prev, next, 0); 1082 transfer (aTHX_ prev, next, 0);
992 1083
993MODULE = Coro::State PACKAGE = Coro 1084MODULE = Coro::State PACKAGE = Coro
994 1085
995# this is slightly dirty (should expose a c-level api) 1086# this is slightly dirty (should expose a c-level api)
996 1087
… …
1014 1105
1015 { 1106 {
1016 SV *sv = perl_get_sv("Coro::API", 1); 1107 SV *sv = perl_get_sv("Coro::API", 1);
1017 1108
1018 coroapi.schedule = api_schedule; 1109 coroapi.schedule = api_schedule;
1110 coroapi.cede = api_cede;
1019 coroapi.ready = api_ready; 1111 coroapi.ready = api_ready;
1020 coroapi.nready = &coro_nready; 1112 coroapi.nready = &coro_nready;
1021 coroapi.current = coro_current; 1113 coroapi.current = coro_current;
1022 1114
1023 GCoroAPI = &coroapi; 1115 GCoroAPI = &coroapi;
1024 sv_setiv(sv, (IV)&coroapi); 1116 sv_setiv(sv, (IV)&coroapi);
1025 SvREADONLY_on(sv); 1117 SvREADONLY_on(sv);
1026 } 1118 }
1027} 1119}
1028 1120
1121#if !PERL_MICRO
1122
1029void 1123void
1030ready(self) 1124ready(self)
1031 SV * self 1125 SV * self
1126 PROTOTYPE: $
1032 CODE: 1127 CODE:
1033 api_ready (self); 1128 api_ready (self);
1129
1130#endif
1034 1131
1035int 1132int
1036nready(...) 1133nready(...)
1037 PROTOTYPE: 1134 PROTOTYPE:
1038 CODE: 1135 CODE:
… …
1041 RETVAL 1138 RETVAL
1042 1139
1043void 1140void
1044schedule(...) 1141schedule(...)
1045 PROTOTYPE: 1142 PROTOTYPE:
1046 ALIAS:
1047 cede = 1
1048 CODE: 1143 CODE:
1049 api_schedule (ix); 1144 api_schedule ();
1050 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