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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines