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.23 by root, Tue Aug 14 04:33:58 2001 UTC vs.
Revision 1.65 by root, Mon Dec 5 23:50:48 2005 UTC

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

Diff Legend

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