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.132 by root, Fri Dec 29 13:03:05 2006 UTC vs.
Revision 1.155 by root, Fri Sep 21 01:09:36 2007 UTC

1#include "libcoro/coro.c" 1#include "libcoro/coro.c"
2
3#define PERL_NO_GET_CONTEXT
2 4
3#include "EXTERN.h" 5#include "EXTERN.h"
4#include "perl.h" 6#include "perl.h"
5#include "XSUB.h" 7#include "XSUB.h"
6 8
31#else 33#else
32# define PAGESIZE 0 34# define PAGESIZE 0
33# define BOOT_PAGESIZE (void)0 35# define BOOT_PAGESIZE (void)0
34#endif 36#endif
35 37
36#if USE_VALGRIND 38#if CORO_USE_VALGRIND
37# include <valgrind/valgrind.h> 39# include <valgrind/valgrind.h>
40# define REGISTER_STACK(cctx,start,end) (cctx)->valgrind_id = VALGRIND_STACK_REGISTER ((start), (end))
41#else
42# define REGISTER_STACK(cctx,start,end)
38#endif 43#endif
39 44
40/* the maximum number of idle cctx that will be pooled */ 45/* the maximum number of idle cctx that will be pooled */
41#define MAX_IDLE_CCTX 8 46#define MAX_IDLE_CCTX 8
42 47
71#ifndef SvRV_set 76#ifndef SvRV_set
72# define SvRV_set(s,v) SvRV(s) = (v) 77# define SvRV_set(s,v) SvRV(s) = (v)
73#endif 78#endif
74 79
75#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 80#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
76# undef STACKGUARD 81# undef CORO_STACKGUARD
77#endif 82#endif
78 83
79#ifndef STACKGUARD 84#ifndef CORO_STACKGUARD
80# define STACKGUARD 0 85# define CORO_STACKGUARD 0
81#endif 86#endif
82 87
83/* prefer perl internal functions over our own? */ 88/* prefer perl internal functions over our own? */
84#ifndef PREFER_PERL_FUNCTIONS 89#ifndef CORO_PREFER_PERL_FUNCTIONS
85# define PREFER_PERL_FUNCTIONS 0 90# define CORO_PREFER_PERL_FUNCTIONS 0
86#endif 91#endif
87 92
88/* The next macro should declare a variable stacklevel that contains and approximation 93/* The next macro should declare a variable stacklevel that contains and approximation
89 * to the current C stack pointer. Its property is that it changes with each call 94 * to the current C stack pointer. Its property is that it changes with each call
90 * and should be unique. */ 95 * and should be unique. */
112#else 117#else
113# define LOCK (void)0 118# define LOCK (void)0
114# define UNLOCK (void)0 119# define UNLOCK (void)0
115#endif 120#endif
116 121
122/* helper storage struct for Coro::AIO */
117struct io_state 123struct io_state
118{ 124{
119 int errorno; 125 int errorno;
120 I32 laststype; 126 I32 laststype;
121 int laststatval; 127 int laststatval;
122 Stat_t statcache; 128 Stat_t statcache;
123}; 129};
124 130
131static size_t coro_stacksize = CORO_STACKSIZE;
125static struct CoroAPI coroapi; 132static struct CoroAPI coroapi;
126static AV *main_mainstack; /* used to differentiate between $main and others */ 133static AV *main_mainstack; /* used to differentiate between $main and others */
134static JMPENV *main_top_env;
127static HV *coro_state_stash, *coro_stash; 135static HV *coro_state_stash, *coro_stash;
128static SV *coro_mortal; /* will be freed after next transfer */ 136static SV *coro_mortal; /* will be freed after next transfer */
129 137
130static struct coro_cctx *cctx_first; 138static struct coro_cctx *cctx_first;
131static int cctx_count, cctx_idle; 139static int cctx_count, cctx_idle;
134typedef struct coro_cctx { 142typedef struct coro_cctx {
135 struct coro_cctx *next; 143 struct coro_cctx *next;
136 144
137 /* the stack */ 145 /* the stack */
138 void *sptr; 146 void *sptr;
139 long ssize; /* positive == mmap, otherwise malloc */ 147 size_t ssize;
140 148
141 /* cpu state */ 149 /* cpu state */
142 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 150 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
143 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 151 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */
144 JMPENV *top_env; 152 JMPENV *top_env;
145 coro_context cctx; 153 coro_context cctx;
146 154
147 int inuse;
148
149#if USE_VALGRIND 155#if CORO_USE_VALGRIND
150 int valgrind_id; 156 int valgrind_id;
151#endif 157#endif
158 char inuse, mapped;
152} coro_cctx; 159} coro_cctx;
153 160
154enum { 161enum {
155 CF_RUNNING = 0x0001, /* coroutine is running */ 162 CF_RUNNING = 0x0001, /* coroutine is running */
156 CF_READY = 0x0002, /* coroutine is ready */ 163 CF_READY = 0x0002, /* coroutine is ready */
157 CF_NEW = 0x0004, /* ahs never been switched to */ 164 CF_NEW = 0x0004, /* has never been switched to */
165 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
158}; 166};
159 167
160/* this is a structure representing a perl-level coroutine */ 168/* this is a structure representing a perl-level coroutine */
161struct coro { 169struct coro {
162 /* the c coroutine allocated to this perl coroutine, if any */ 170 /* the c coroutine allocated to this perl coroutine, if any */
170 178
171 /* optionally saved, might be zero */ 179 /* optionally saved, might be zero */
172 AV *defav; /* @_ */ 180 AV *defav; /* @_ */
173 SV *defsv; /* $_ */ 181 SV *defsv; /* $_ */
174 SV *errsv; /* $@ */ 182 SV *errsv; /* $@ */
183 GV *deffh; /* default filehandle */
175 SV *irssv; /* $/ */ 184 SV *irssv; /* $/ */
176 SV *irssv_sv; /* real $/ cache */ 185 SV *irssv_sv; /* real $/ cache */
177 186
178#define VAR(name,type) type name; 187#define VAR(name,type) type name;
179# include "state.h" 188# include "state.h"
180#undef VAR 189#undef VAR
181 190
182 /* coro process data */ 191 /* coro process data */
183 int prio; 192 int prio;
193
194 /* linked list */
195 struct coro *next, *prev;
196 HV *hv; /* the perl hash associated with this coro, if any */
184}; 197};
185 198
186typedef struct coro *Coro__State; 199typedef struct coro *Coro__State;
187typedef struct coro *Coro__State_or_hashref; 200typedef struct coro *Coro__State_or_hashref;
188 201
202/** Coro ********************************************************************/
203
204#define PRIO_MAX 3
205#define PRIO_HIGH 1
206#define PRIO_NORMAL 0
207#define PRIO_LOW -1
208#define PRIO_IDLE -3
209#define PRIO_MIN -4
210
211/* for Coro.pm */
212static SV *coro_current;
213static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
214static int coro_nready;
215static struct coro *coro_first;
216
217/** lowlevel stuff **********************************************************/
218
189static AV * 219static AV *
190coro_clone_padlist (CV *cv) 220coro_clone_padlist (pTHX_ CV *cv)
191{ 221{
192 AV *padlist = CvPADLIST (cv); 222 AV *padlist = CvPADLIST (cv);
193 AV *newpadlist, *newpad; 223 AV *newpadlist, *newpad;
194 224
195 newpadlist = newAV (); 225 newpadlist = newAV ();
207 237
208 return newpadlist; 238 return newpadlist;
209} 239}
210 240
211static void 241static void
212free_padlist (AV *padlist) 242free_padlist (pTHX_ AV *padlist)
213{ 243{
214 /* may be during global destruction */ 244 /* may be during global destruction */
215 if (SvREFCNT (padlist)) 245 if (SvREFCNT (padlist))
216 { 246 {
217 I32 i = AvFILLp (padlist); 247 I32 i = AvFILLp (padlist);
238 AV *padlist; 268 AV *padlist;
239 AV *av = (AV *)mg->mg_obj; 269 AV *av = (AV *)mg->mg_obj;
240 270
241 /* casting is fun. */ 271 /* casting is fun. */
242 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 272 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
243 free_padlist (padlist); 273 free_padlist (aTHX_ padlist);
244 274
245 SvREFCNT_dec (av); 275 SvREFCNT_dec (av);
246 276
247 return 0; 277 return 0;
248} 278}
258 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 288 : mg_find ((SV *)cv, PERL_MAGIC_coro) \
259 : 0 289 : 0
260 290
261/* the next two functions merely cache the padlists */ 291/* the next two functions merely cache the padlists */
262static void 292static void
263get_padlist (CV *cv) 293get_padlist (pTHX_ CV *cv)
264{ 294{
265 MAGIC *mg = CORO_MAGIC (cv); 295 MAGIC *mg = CORO_MAGIC (cv);
266 AV *av; 296 AV *av;
267 297
268 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 298 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)
269 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 299 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
270 else 300 else
271 { 301 {
272#if PREFER_PERL_FUNCTIONS 302#if CORO_PREFER_PERL_FUNCTIONS
273 /* this is probably cleaner, but also slower? */ 303 /* this is probably cleaner, but also slower? */
274 CV *cp = Perl_cv_clone (cv); 304 CV *cp = Perl_cv_clone (cv);
275 CvPADLIST (cv) = CvPADLIST (cp); 305 CvPADLIST (cv) = CvPADLIST (cp);
276 CvPADLIST (cp) = 0; 306 CvPADLIST (cp) = 0;
277 SvREFCNT_dec (cp); 307 SvREFCNT_dec (cp);
278#else 308#else
279 CvPADLIST (cv) = coro_clone_padlist (cv); 309 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
280#endif 310#endif
281 } 311 }
282} 312}
283 313
284static void 314static void
285put_padlist (CV *cv) 315put_padlist (pTHX_ CV *cv)
286{ 316{
287 MAGIC *mg = CORO_MAGIC (cv); 317 MAGIC *mg = CORO_MAGIC (cv);
288 AV *av; 318 AV *av;
289 319
290 if (!mg) 320 if (!mg)
301 av_extend (av, AvMAX (av) + 1); 331 av_extend (av, AvMAX (av) + 1);
302 332
303 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 333 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
304} 334}
305 335
336/** load & save, init *******************************************************/
337
306#define SB do { 338#define SB do {
307#define SE } while (0) 339#define SE } while (0)
308 340
309#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE 341#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
310 342
311static void 343static void
312load_perl (Coro__State c) 344load_perl (pTHX_ Coro__State c)
313{ 345{
314#define VAR(name,type) PL_ ## name = c->name; 346#define VAR(name,type) PL_ ## name = c->name;
315# include "state.h" 347# include "state.h"
316#undef VAR 348#undef VAR
317 349
318 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 350 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
319 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 351 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
320 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 352 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
353 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh);
354
321 if (c->irssv) 355 if (c->irssv)
322 { 356 {
323 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv)) 357 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
358 {
324 SvREFCNT_dec (c->irssv); 359 SvREFCNT_dec (c->irssv);
360 c->irssv = 0;
361 }
325 else 362 else
326 { 363 {
327 REPLACE_SV (PL_rs, c->irssv); 364 REPLACE_SV (PL_rs, c->irssv);
328 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0); 365 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
329 sv_setsv (c->irssv_sv, PL_rs); 366 sv_setsv (c->irssv_sv, PL_rs);
335 CV *cv; 372 CV *cv;
336 373
337 /* now do the ugly restore mess */ 374 /* now do the ugly restore mess */
338 while ((cv = (CV *)POPs)) 375 while ((cv = (CV *)POPs))
339 { 376 {
340 put_padlist (cv); /* mark this padlist as available */ 377 put_padlist (aTHX_ cv); /* mark this padlist as available */
341 CvDEPTH (cv) = PTR2IV (POPs); 378 CvDEPTH (cv) = PTR2IV (POPs);
342 CvPADLIST (cv) = (AV *)POPs; 379 CvPADLIST (cv) = (AV *)POPs;
343 } 380 }
344 381
345 PUTBACK; 382 PUTBACK;
346 } 383 }
347} 384}
348 385
349static void 386static void
350save_perl (Coro__State c) 387save_perl (pTHX_ Coro__State c)
351{ 388{
352 { 389 {
353 dSP; 390 dSP;
354 I32 cxix = cxstack_ix; 391 I32 cxix = cxstack_ix;
355 PERL_CONTEXT *ccstk = cxstack; 392 PERL_CONTEXT *ccstk = cxstack;
367 { 404 {
368 while (cxix >= 0) 405 while (cxix >= 0)
369 { 406 {
370 PERL_CONTEXT *cx = &ccstk[cxix--]; 407 PERL_CONTEXT *cx = &ccstk[cxix--];
371 408
372 if (CxTYPE (cx) == CXt_SUB) 409 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)
373 { 410 {
374 CV *cv = cx->blk_sub.cv; 411 CV *cv = cx->blk_sub.cv;
375 412
376 if (CvDEPTH (cv)) 413 if (CvDEPTH (cv))
377 { 414 {
379 PUSHs ((SV *)CvPADLIST (cv)); 416 PUSHs ((SV *)CvPADLIST (cv));
380 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 417 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
381 PUSHs ((SV *)cv); 418 PUSHs ((SV *)cv);
382 419
383 CvDEPTH (cv) = 0; 420 CvDEPTH (cv) = 0;
384 get_padlist (cv); 421 get_padlist (aTHX_ cv);
385 } 422 }
386 } 423 }
387 } 424 }
388 425
389 if (top_si->si_type == PERLSI_MAIN) 426 if (top_si->si_type == PERLSI_MAIN)
398 } 435 }
399 436
400 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 437 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0;
401 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 438 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0;
402 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 439 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0;
440 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0;
403 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0; 441 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0;
404 442
405#define VAR(name,type)c->name = PL_ ## name; 443#define VAR(name,type)c->name = PL_ ## name;
406# include "state.h" 444# include "state.h"
407#undef VAR 445#undef VAR
411 * allocate various perl stacks. This is an exact copy 449 * allocate various perl stacks. This is an exact copy
412 * of perl.c:init_stacks, except that it uses less memory 450 * of perl.c:init_stacks, except that it uses less memory
413 * on the (sometimes correct) assumption that coroutines do 451 * on the (sometimes correct) assumption that coroutines do
414 * not usually need a lot of stackspace. 452 * not usually need a lot of stackspace.
415 */ 453 */
416#if PREFER_PERL_FUNCTIONS 454#if CORO_PREFER_PERL_FUNCTIONS
417# define coro_init_stacks init_stacks 455# define coro_init_stacks init_stacks
418#else 456#else
419static void 457static void
420coro_init_stacks () 458coro_init_stacks (pTHX)
421{ 459{
422 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT)); 460 PL_curstackinfo = new_stackinfo(64, 4);
423 PL_curstackinfo->si_type = PERLSI_MAIN; 461 PL_curstackinfo->si_type = PERLSI_MAIN;
424 PL_curstack = PL_curstackinfo->si_stack; 462 PL_curstack = PL_curstackinfo->si_stack;
425 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 463 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
426 464
427 PL_stack_base = AvARRAY(PL_curstack); 465 PL_stack_base = AvARRAY(PL_curstack);
428 PL_stack_sp = PL_stack_base; 466 PL_stack_sp = PL_stack_base;
429 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 467 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
430 468
431 New(50,PL_tmps_stack,128,SV*); 469 New(50,PL_tmps_stack,64,SV*);
432 PL_tmps_floor = -1; 470 PL_tmps_floor = -1;
433 PL_tmps_ix = -1; 471 PL_tmps_ix = -1;
434 PL_tmps_max = 128; 472 PL_tmps_max = 64;
435 473
436 New(54,PL_markstack,32,I32); 474 New(54,PL_markstack,16,I32);
437 PL_markstack_ptr = PL_markstack; 475 PL_markstack_ptr = PL_markstack;
438 PL_markstack_max = PL_markstack + 32; 476 PL_markstack_max = PL_markstack + 16;
439 477
440#ifdef SET_MARK_OFFSET 478#ifdef SET_MARK_OFFSET
441 SET_MARK_OFFSET; 479 SET_MARK_OFFSET;
442#endif 480#endif
443 481
444 New(54,PL_scopestack,32,I32); 482 New(54,PL_scopestack,16,I32);
445 PL_scopestack_ix = 0; 483 PL_scopestack_ix = 0;
446 PL_scopestack_max = 32; 484 PL_scopestack_max = 16;
447 485
448 New(54,PL_savestack,64,ANY); 486 New(54,PL_savestack,64,ANY);
449 PL_savestack_ix = 0; 487 PL_savestack_ix = 0;
450 PL_savestack_max = 64; 488 PL_savestack_max = 64;
451 489
452#if !PERL_VERSION_ATLEAST (5,9,0) 490#if !PERL_VERSION_ATLEAST (5,9,0)
453 New(54,PL_retstack,16,OP*); 491 New(54,PL_retstack,8,OP*);
454 PL_retstack_ix = 0; 492 PL_retstack_ix = 0;
455 PL_retstack_max = 16; 493 PL_retstack_max = 8;
456#endif 494#endif
457} 495}
458#endif 496#endif
459 497
460/* 498/*
461 * destroy the stacks, the callchain etc... 499 * destroy the stacks, the callchain etc...
462 */ 500 */
463static void 501static void
464coro_destroy_stacks () 502coro_destroy_stacks (pTHX)
465{ 503{
466 if (!IN_DESTRUCT) 504 if (!IN_DESTRUCT)
467 { 505 {
468 /* restore all saved variables and stuff */ 506 /* restore all saved variables and stuff */
469 LEAVE_SCOPE (0); 507 LEAVE_SCOPE (0);
471 509
472 /* free all temporaries */ 510 /* free all temporaries */
473 FREETMPS; 511 FREETMPS;
474 assert (PL_tmps_ix == -1); 512 assert (PL_tmps_ix == -1);
475 513
514 /* unwind all extra stacks */
476 POPSTACK_TO (PL_mainstack); 515 POPSTACK_TO (PL_mainstack);
516
517 /* unwind main stack */
518 dounwind (-1);
477 } 519 }
478 520
479 while (PL_curstackinfo->si_next) 521 while (PL_curstackinfo->si_next)
480 PL_curstackinfo = PL_curstackinfo->si_next; 522 PL_curstackinfo = PL_curstackinfo->si_next;
481 523
498#if !PERL_VERSION_ATLEAST (5,9,0) 540#if !PERL_VERSION_ATLEAST (5,9,0)
499 Safefree (PL_retstack); 541 Safefree (PL_retstack);
500#endif 542#endif
501} 543}
502 544
545static size_t
546coro_rss (struct coro *coro)
547{
548 size_t rss = sizeof (coro);
549
550 if (coro->mainstack)
551 {
552 if (coro->flags & CF_RUNNING)
553 {
554 #define VAR(name,type)coro->name = PL_ ## name;
555 # include "state.h"
556 #undef VAR
557 }
558
559 rss += sizeof (coro->curstackinfo);
560 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
561 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
562 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *);
563 rss += coro->tmps_max * sizeof (SV *);
564 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32);
565 rss += coro->scopestack_max * sizeof (I32);
566 rss += coro->savestack_max * sizeof (ANY);
567
568#if !PERL_VERSION_ATLEAST (5,9,0)
569 rss += coro->retstack_max * sizeof (OP *);
570#endif
571 }
572
573 return rss;
574}
575
576/** coroutine stack handling ************************************************/
577
503static void 578static void
504setup_coro (struct coro *coro) 579setup_coro (pTHX_ struct coro *coro)
505{ 580{
506 /* 581 /*
507 * emulate part of the perl startup here. 582 * emulate part of the perl startup here.
508 */ 583 */
509
510 coro_init_stacks (); 584 coro_init_stacks (aTHX);
511 585
512 PL_curcop = &PL_compiling; 586 PL_curcop = &PL_compiling;
513 PL_in_eval = EVAL_NULL; 587 PL_in_eval = EVAL_NULL;
588 PL_comppad = 0;
514 PL_curpm = 0; 589 PL_curpm = 0;
515 PL_localizing = 0; 590 PL_localizing = 0;
516 PL_dirty = 0; 591 PL_dirty = 0;
517 PL_restartop = 0; 592 PL_restartop = 0;
518 593
526 Zero (&myop, 1, LOGOP); 601 Zero (&myop, 1, LOGOP);
527 myop.op_next = Nullop; 602 myop.op_next = Nullop;
528 myop.op_flags = OPf_WANT_VOID; 603 myop.op_flags = OPf_WANT_VOID;
529 604
530 PUSHMARK (SP); 605 PUSHMARK (SP);
531 XPUSHs ((SV *)get_cv ("Coro::State::_coro_init", FALSE)); 606 XPUSHs (av_shift (GvAV (PL_defgv)));
532 PUTBACK; 607 PUTBACK;
533 PL_op = (OP *)&myop; 608 PL_op = (OP *)&myop;
534 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 609 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
535 SPAGAIN; 610 SPAGAIN;
536 } 611 }
537 612
538 ENTER; /* necessary e.g. for dounwind */ 613 ENTER; /* necessary e.g. for dounwind */
539} 614}
540 615
541static void 616static void
542free_coro_mortal () 617free_coro_mortal (pTHX)
543{ 618{
544 if (coro_mortal) 619 if (coro_mortal)
545 { 620 {
546 SvREFCNT_dec (coro_mortal); 621 SvREFCNT_dec (coro_mortal);
547 coro_mortal = 0; 622 coro_mortal = 0;
548 } 623 }
549} 624}
550 625
551/* inject a fake call to Coro::State::_cctx_init into the execution */ 626/* inject a fake call to Coro::State::_cctx_init into the execution */
627/* _cctx_init should be careful, as it could be called at almost any time */
628/* during execution of a perl program */
552static void NOINLINE 629static void NOINLINE
553prepare_cctx (coro_cctx *cctx) 630prepare_cctx (pTHX_ coro_cctx *cctx)
554{ 631{
555 dSP; 632 dSP;
556 LOGOP myop; 633 LOGOP myop;
557 634
558 Zero (&myop, 1, LOGOP); 635 Zero (&myop, 1, LOGOP);
567 PL_op = (OP *)&myop; 644 PL_op = (OP *)&myop;
568 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 645 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
569 SPAGAIN; 646 SPAGAIN;
570} 647}
571 648
649/*
650 * this is a _very_ stripped down perl interpreter ;)
651 */
572static void 652static void
573coro_run (void *arg) 653coro_run (void *arg)
574{ 654{
655 dTHX;
656
575 /* coro_run is the alternative tail of transfer(), so unlock here. */ 657 /* coro_run is the alternative tail of transfer(), so unlock here. */
576 UNLOCK; 658 UNLOCK;
577 659
578 /*
579 * this is a _very_ stripped down perl interpreter ;)
580 */
581 PL_top_env = &PL_start_env; 660 PL_top_env = &PL_start_env;
582 661
583 /* inject call to cctx_init */ 662 /* inject a fake subroutine call to cctx_init */
584 prepare_cctx ((coro_cctx *)arg); 663 prepare_cctx (aTHX_ (coro_cctx *)arg);
585 664
586 /* somebody will hit me for both perl_run and PL_restartop */ 665 /* somebody or something will hit me for both perl_run and PL_restartop */
587 PL_restartop = PL_op; 666 PL_restartop = PL_op;
588 perl_run (PL_curinterp); 667 perl_run (PL_curinterp);
589 668
590 fputs ("FATAL: C coroutine fell over the edge of the world, aborting. Did you call exit in a coroutine?\n", stderr); 669 /*
591 abort (); 670 * If perl-run returns we assume exit() was being called or the coro
671 * fell off the end, which seems to be the only valid (non-bug)
672 * reason for perl_run to return. We try to exit by jumping to the
673 * bootstrap-time "top" top_env, as we cannot restore the "main"
674 * coroutine as Coro has no such concept
675 */
676 PL_top_env = main_top_env;
677 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
592} 678}
593 679
594static coro_cctx * 680static coro_cctx *
595cctx_new () 681cctx_new ()
596{ 682{
597 coro_cctx *cctx; 683 coro_cctx *cctx;
684 void *stack_start;
685 size_t stack_size;
598 686
599 ++cctx_count; 687 ++cctx_count;
600 688
601 Newz (0, cctx, 1, coro_cctx); 689 Newz (0, cctx, 1, coro_cctx);
602 690
603#if HAVE_MMAP 691#if HAVE_MMAP
604 692
605 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; 693 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
606 /* mmap supposedly does allocate-on-write for us */ 694 /* mmap supposedly does allocate-on-write for us */
607 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 695 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
608 696
609 if (cctx->sptr == (void *)-1) 697 if (cctx->sptr != (void *)-1)
610 {
611 perror ("FATAL: unable to mmap stack for coroutine");
612 _exit (EXIT_FAILURE);
613 } 698 {
614
615# if STACKGUARD 699# if CORO_STACKGUARD
616 mprotect (cctx->sptr, STACKGUARD * PAGESIZE, PROT_NONE); 700 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
617# endif 701# endif
702 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr;
703 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
704 cctx->mapped = 1;
705 }
706 else
707#endif
708 {
709 cctx->ssize = coro_stacksize * (long)sizeof (long);
710 New (0, cctx->sptr, coro_stacksize, long);
618 711
619#else
620
621 cctx->ssize = STACKSIZE * (long)sizeof (long);
622 New (0, cctx->sptr, STACKSIZE, long);
623
624 if (!cctx->sptr) 712 if (!cctx->sptr)
625 { 713 {
626 perror ("FATAL: unable to malloc stack for coroutine"); 714 perror ("FATAL: unable to allocate stack for coroutine");
627 _exit (EXIT_FAILURE); 715 _exit (EXIT_FAILURE);
628 } 716 }
629 717
630#endif 718 stack_start = cctx->sptr;
719 stack_size = cctx->ssize;
720 }
631 721
632#if USE_VALGRIND 722 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
633 cctx->valgrind_id = VALGRIND_STACK_REGISTER (
634 STACKGUARD * PAGESIZE + (char *)cctx->sptr,
635 cctx->ssize + (char *)cctx->sptr
636 );
637#endif
638
639 coro_create (&cctx->cctx, coro_run, (void *)cctx, cctx->sptr, cctx->ssize); 723 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size);
640 724
641 return cctx; 725 return cctx;
642} 726}
643 727
644static void 728static void
647 if (!cctx) 731 if (!cctx)
648 return; 732 return;
649 733
650 --cctx_count; 734 --cctx_count;
651 735
652#if USE_VALGRIND 736#if CORO_USE_VALGRIND
653 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 737 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
654#endif 738#endif
655 739
656#if HAVE_MMAP 740#if HAVE_MMAP
741 if (cctx->mapped)
657 munmap (cctx->sptr, cctx->ssize); 742 munmap (cctx->sptr, cctx->ssize);
658#else 743 else
744#endif
659 Safefree (cctx->sptr); 745 Safefree (cctx->sptr);
660#endif
661 746
662 Safefree (cctx); 747 Safefree (cctx);
663} 748}
664 749
665static coro_cctx * 750static coro_cctx *
666cctx_get () 751cctx_get (pTHX)
667{ 752{
668 coro_cctx *cctx;
669
670 if (cctx_first) 753 while (cctx_first)
671 { 754 {
672 cctx = cctx_first; 755 coro_cctx *cctx = cctx_first;
673 cctx_first = cctx->next; 756 cctx_first = cctx->next;
674 --cctx_idle; 757 --cctx_idle;
758
759 if (cctx->ssize >= coro_stacksize)
760 return cctx;
761
762 cctx_destroy (cctx);
675 } 763 }
676 else 764
677 {
678 cctx = cctx_new ();
679 PL_op = PL_op->op_next; 765 PL_op = PL_op->op_next;
680 }
681
682 return cctx; 766 return cctx_new ();
683} 767}
684 768
685static void 769static void
686cctx_put (coro_cctx *cctx) 770cctx_put (coro_cctx *cctx)
687{ 771{
699 ++cctx_idle; 783 ++cctx_idle;
700 cctx->next = cctx_first; 784 cctx->next = cctx_first;
701 cctx_first = cctx; 785 cctx_first = cctx;
702} 786}
703 787
788/** coroutine switching *****************************************************/
789
704/* never call directly, always through the coro_state_transfer global variable */ 790/* never call directly, always through the coro_state_transfer global variable */
705static void NOINLINE 791static void NOINLINE
706transfer (struct coro *prev, struct coro *next) 792transfer (pTHX_ struct coro *prev, struct coro *next)
707{ 793{
708 dSTACKLEVEL; 794 dSTACKLEVEL;
709 795
710 /* sometimes transfer is only called to set idle_sp */ 796 /* sometimes transfer is only called to set idle_sp */
711 if (!next) 797 if (!next)
731 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states"); 817 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states");
732 818
733 if (next->flags & CF_RUNNING) 819 if (next->flags & CF_RUNNING)
734 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 820 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
735 821
822 if (next->flags & CF_DESTROYED)
823 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
824
736 prev->flags &= ~CF_RUNNING; 825 prev->flags &= ~CF_RUNNING;
737 next->flags |= CF_RUNNING; 826 next->flags |= CF_RUNNING;
738 827
739 LOCK; 828 LOCK;
740 829
741 if (next->flags & CF_NEW) 830 if (next->flags & CF_NEW)
742 { 831 {
743 /* need to start coroutine */ 832 /* need to start coroutine */
744 next->flags &= ~CF_NEW; 833 next->flags &= ~CF_NEW;
745 /* first get rid of the old state */ 834 /* first get rid of the old state */
746 save_perl (prev); 835 save_perl (aTHX_ prev);
747 /* setup coroutine call */ 836 /* setup coroutine call */
748 setup_coro (next); 837 setup_coro (aTHX_ next);
749 /* need a new stack */ 838 /* need a new stack */
750 assert (!next->cctx); 839 assert (!next->cctx);
751 } 840 }
752 else 841 else
753 { 842 {
754 /* coroutine already started */ 843 /* coroutine already started */
755 save_perl (prev); 844 save_perl (aTHX_ prev);
756 load_perl (next); 845 load_perl (aTHX_ next);
757 } 846 }
758 847
759 prev__cctx = prev->cctx; 848 prev__cctx = prev->cctx;
760 849
761 /* possibly "free" the cctx */ 850 /* possibly "free" the cctx */
770 prev__cctx->inuse = 0; 859 prev__cctx->inuse = 0;
771 } 860 }
772 861
773 if (!next->cctx) 862 if (!next->cctx)
774 { 863 {
775 next->cctx = cctx_get (); 864 next->cctx = cctx_get (aTHX);
776 assert (!next->cctx->inuse); 865 assert (!next->cctx->inuse);
777 next->cctx->inuse = 1; 866 next->cctx->inuse = 1;
778 } 867 }
779 868
780 if (prev__cctx != next->cctx) 869 if (prev__cctx != next->cctx)
782 prev__cctx->top_env = PL_top_env; 871 prev__cctx->top_env = PL_top_env;
783 PL_top_env = next->cctx->top_env; 872 PL_top_env = next->cctx->top_env;
784 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 873 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
785 } 874 }
786 875
787 free_coro_mortal (); 876 free_coro_mortal (aTHX);
788
789 UNLOCK; 877 UNLOCK;
790 } 878 }
791} 879}
792 880
793struct transfer_args 881struct transfer_args
794{ 882{
795 struct coro *prev, *next; 883 struct coro *prev, *next;
796}; 884};
797 885
798#define TRANSFER(ta) transfer ((ta).prev, (ta).next) 886#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next)
799 887
888/** high level stuff ********************************************************/
889
800static void 890static int
801coro_state_destroy (struct coro *coro) 891coro_state_destroy (pTHX_ struct coro *coro)
802{ 892{
803 if (coro->refcnt--) 893 if (coro->flags & CF_DESTROYED)
804 return; 894 return 0;
895
896 coro->flags |= CF_DESTROYED;
897
898 if (coro->flags & CF_READY)
899 {
900 /* reduce nready, as destroying a ready coro effectively unreadies it */
901 /* alternative: look through all ready queues and remove the coro */
902 LOCK;
903 --coro_nready;
904 UNLOCK;
905 }
906 else
907 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
805 908
806 if (coro->mainstack && coro->mainstack != main_mainstack) 909 if (coro->mainstack && coro->mainstack != main_mainstack)
807 { 910 {
808 struct coro temp; 911 struct coro temp;
912
913 assert (!(coro->flags & CF_RUNNING));
914
809 Zero (&temp, 1, struct coro); 915 Zero (&temp, 1, struct coro);
810 temp.save = CORO_SAVE_ALL; 916 temp.save = CORO_SAVE_ALL;
811 917
812 if (coro->flags & CF_RUNNING) 918 if (coro->flags & CF_RUNNING)
813 croak ("FATAL: tried to destroy currently running coroutine"); 919 croak ("FATAL: tried to destroy currently running coroutine");
814 920
815 save_perl (&temp); 921 save_perl (aTHX_ &temp);
816 load_perl (coro); 922 load_perl (aTHX_ coro);
817 923
818 coro_destroy_stacks (); 924 coro_destroy_stacks (aTHX);
819 925
820 load_perl (&temp); /* this will get rid of defsv etc.. */ 926 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */
821 927
822 coro->mainstack = 0; 928 coro->mainstack = 0;
823 } 929 }
824 930
825 cctx_destroy (coro->cctx); 931 cctx_destroy (coro->cctx);
826 SvREFCNT_dec (coro->args); 932 SvREFCNT_dec (coro->args);
827 Safefree (coro); 933
934 if (coro->next) coro->next->prev = coro->prev;
935 if (coro->prev) coro->prev->next = coro->next;
936 if (coro == coro_first) coro_first = coro->next;
937
938 return 1;
828} 939}
829 940
830static int 941static int
831coro_state_clear (pTHX_ SV *sv, MAGIC *mg) 942coro_state_free (pTHX_ SV *sv, MAGIC *mg)
832{ 943{
833 struct coro *coro = (struct coro *)mg->mg_ptr; 944 struct coro *coro = (struct coro *)mg->mg_ptr;
834 mg->mg_ptr = 0; 945 mg->mg_ptr = 0;
835 946
947 coro->hv = 0;
948
949 if (--coro->refcnt < 0)
950 {
836 coro_state_destroy (coro); 951 coro_state_destroy (aTHX_ coro);
952 Safefree (coro);
953 }
837 954
838 return 0; 955 return 0;
839} 956}
840 957
841static int 958static int
848 return 0; 965 return 0;
849} 966}
850 967
851static MGVTBL coro_state_vtbl = { 968static MGVTBL coro_state_vtbl = {
852 0, 0, 0, 0, 969 0, 0, 0, 0,
853 coro_state_clear, 970 coro_state_free,
854 0, 971 0,
855#ifdef MGf_DUP 972#ifdef MGf_DUP
856 coro_state_dup, 973 coro_state_dup,
857#else 974#else
858# define MGf_DUP 0 975# define MGf_DUP 0
859#endif 976#endif
860}; 977};
861 978
862static struct coro * 979static struct coro *
863SvSTATE (SV *coro) 980SvSTATE_ (pTHX_ SV *coro)
864{ 981{
865 HV *stash; 982 HV *stash;
866 MAGIC *mg; 983 MAGIC *mg;
867 984
868 if (SvROK (coro)) 985 if (SvROK (coro))
874 /* very slow, but rare, check */ 991 /* very slow, but rare, check */
875 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 992 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
876 croak ("Coro::State object required"); 993 croak ("Coro::State object required");
877 } 994 }
878 995
879 mg = SvMAGIC (coro); 996 mg = CORO_MAGIC (coro);
880 assert (mg->mg_type == PERL_MAGIC_ext);
881 return (struct coro *)mg->mg_ptr; 997 return (struct coro *)mg->mg_ptr;
882} 998}
883 999
1000#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
1001
884static void 1002static void
885prepare_transfer (struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1003prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
886{ 1004{
887 ta->prev = SvSTATE (prev_sv); 1005 ta->prev = SvSTATE (prev_sv);
888 ta->next = SvSTATE (next_sv); 1006 ta->next = SvSTATE (next_sv);
889} 1007}
890 1008
891static void 1009static void
892api_transfer (SV *prev_sv, SV *next_sv) 1010api_transfer (SV *prev_sv, SV *next_sv)
893{ 1011{
1012 dTHX;
894 struct transfer_args ta; 1013 struct transfer_args ta;
895 1014
896 prepare_transfer (&ta, prev_sv, next_sv); 1015 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
897 TRANSFER (ta); 1016 TRANSFER (ta);
898} 1017}
899 1018
900static int 1019static int
901api_save (SV *coro_sv, int new_save) 1020api_save (SV *coro_sv, int new_save)
902{ 1021{
1022 dTHX;
903 struct coro *coro = SvSTATE (coro_sv); 1023 struct coro *coro = SvSTATE (coro_sv);
904 int old_save = coro->save; 1024 int old_save = coro->save;
905 1025
906 if (new_save >= 0) 1026 if (new_save >= 0)
907 coro->save = new_save; 1027 coro->save = new_save;
909 return old_save; 1029 return old_save;
910} 1030}
911 1031
912/** Coro ********************************************************************/ 1032/** Coro ********************************************************************/
913 1033
914#define PRIO_MAX 3
915#define PRIO_HIGH 1
916#define PRIO_NORMAL 0
917#define PRIO_LOW -1
918#define PRIO_IDLE -3
919#define PRIO_MIN -4
920
921/* for Coro.pm */
922static SV *coro_current;
923static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
924static int coro_nready;
925
926static void 1034static void
927coro_enq (SV *coro_sv) 1035coro_enq (pTHX_ SV *coro_sv)
928{ 1036{
929 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1037 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
930 coro_nready++;
931} 1038}
932 1039
933static SV * 1040static SV *
934coro_deq (int min_prio) 1041coro_deq (pTHX_ int min_prio)
935{ 1042{
936 int prio = PRIO_MAX - PRIO_MIN; 1043 int prio = PRIO_MAX - PRIO_MIN;
937 1044
938 min_prio -= PRIO_MIN; 1045 min_prio -= PRIO_MIN;
939 if (min_prio < 0) 1046 if (min_prio < 0)
940 min_prio = 0; 1047 min_prio = 0;
941 1048
942 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1049 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; )
943 if (AvFILLp (coro_ready [prio]) >= 0) 1050 if (AvFILLp (coro_ready [prio]) >= 0)
944 {
945 coro_nready--;
946 return av_shift (coro_ready [prio]); 1051 return av_shift (coro_ready [prio]);
947 }
948 1052
949 return 0; 1053 return 0;
950} 1054}
951 1055
952static int 1056static int
953api_ready (SV *coro_sv) 1057api_ready (SV *coro_sv)
954{ 1058{
1059 dTHX;
955 struct coro *coro; 1060 struct coro *coro;
956 1061
957 if (SvROK (coro_sv)) 1062 if (SvROK (coro_sv))
958 coro_sv = SvRV (coro_sv); 1063 coro_sv = SvRV (coro_sv);
959 1064
963 return 0; 1068 return 0;
964 1069
965 coro->flags |= CF_READY; 1070 coro->flags |= CF_READY;
966 1071
967 LOCK; 1072 LOCK;
968 coro_enq (SvREFCNT_inc (coro_sv)); 1073 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1074 ++coro_nready;
969 UNLOCK; 1075 UNLOCK;
970 1076
971 return 1; 1077 return 1;
972} 1078}
973 1079
974static int 1080static int
975api_is_ready (SV *coro_sv) 1081api_is_ready (SV *coro_sv)
976{ 1082{
1083 dTHX;
977 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1084 return !!(SvSTATE (coro_sv)->flags & CF_READY);
978} 1085}
979 1086
980static void 1087static void
981prepare_schedule (struct transfer_args *ta) 1088prepare_schedule (pTHX_ struct transfer_args *ta)
982{ 1089{
983 SV *prev, *next; 1090 SV *prev_sv, *next_sv;
984 1091
985 for (;;) 1092 for (;;)
986 { 1093 {
987 LOCK; 1094 LOCK;
988 next = coro_deq (PRIO_MIN); 1095 next_sv = coro_deq (aTHX_ PRIO_MIN);
1096
1097 /* nothing to schedule: call the idle handler */
1098 if (!next_sv)
1099 {
1100 dSP;
1101 UNLOCK;
1102
1103 ENTER;
1104 SAVETMPS;
1105
1106 PUSHMARK (SP);
1107 PUTBACK;
1108 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1109
1110 FREETMPS;
1111 LEAVE;
1112 continue;
1113 }
1114
1115 ta->next = SvSTATE (next_sv);
1116
1117 /* cannot transfer to destroyed coros, skip and look for next */
1118 if (ta->next->flags & CF_DESTROYED)
1119 {
1120 UNLOCK;
1121 SvREFCNT_dec (next_sv);
1122 /* coro_nready is already taken care of by destroy */
1123 continue;
1124 }
1125
1126 --coro_nready;
989 UNLOCK; 1127 UNLOCK;
990
991 if (next)
992 break; 1128 break;
993
994 {
995 dSP;
996
997 ENTER;
998 SAVETMPS;
999
1000 PUSHMARK (SP);
1001 PUTBACK;
1002 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1003
1004 FREETMPS;
1005 LEAVE;
1006 } 1129 }
1007 }
1008
1009 prev = SvRV (coro_current);
1010 SvRV_set (coro_current, next);
1011 1130
1012 /* free this only after the transfer */ 1131 /* free this only after the transfer */
1013 LOCK; 1132 prev_sv = SvRV (coro_current);
1014 free_coro_mortal (); 1133 SvRV_set (coro_current, next_sv);
1015 UNLOCK;
1016 coro_mortal = prev;
1017
1018 assert (!SvROK(prev));//D
1019 assert (!SvROK(next));//D
1020
1021 ta->prev = SvSTATE (prev); 1134 ta->prev = SvSTATE (prev_sv);
1022 ta->next = SvSTATE (next);
1023 1135
1024 assert (ta->next->flags & CF_READY); 1136 assert (ta->next->flags & CF_READY);
1025 ta->next->flags &= ~CF_READY; 1137 ta->next->flags &= ~CF_READY;
1026}
1027 1138
1139 LOCK;
1140 free_coro_mortal (aTHX);
1141 coro_mortal = prev_sv;
1142 UNLOCK;
1143}
1144
1028static void 1145static void
1029prepare_cede (struct transfer_args *ta) 1146prepare_cede (pTHX_ struct transfer_args *ta)
1030{ 1147{
1031 api_ready (coro_current); 1148 api_ready (coro_current);
1032 prepare_schedule (ta); 1149 prepare_schedule (aTHX_ ta);
1033} 1150}
1034 1151
1035static int 1152static int
1036prepare_cede_notself (struct transfer_args *ta) 1153prepare_cede_notself (pTHX_ struct transfer_args *ta)
1037{ 1154{
1038 if (coro_nready) 1155 if (coro_nready)
1039 { 1156 {
1040 SV *prev = SvRV (coro_current); 1157 SV *prev = SvRV (coro_current);
1041 prepare_schedule (ta); 1158 prepare_schedule (aTHX_ ta);
1042 api_ready (prev); 1159 api_ready (prev);
1043 return 1; 1160 return 1;
1044 } 1161 }
1045 else 1162 else
1046 return 0; 1163 return 0;
1047} 1164}
1048 1165
1049static void 1166static void
1050api_schedule (void) 1167api_schedule (void)
1051{ 1168{
1169 dTHX;
1052 struct transfer_args ta; 1170 struct transfer_args ta;
1053 1171
1054 prepare_schedule (&ta); 1172 prepare_schedule (aTHX_ &ta);
1055 TRANSFER (ta); 1173 TRANSFER (ta);
1056} 1174}
1057 1175
1058static int 1176static int
1059api_cede (void) 1177api_cede (void)
1060{ 1178{
1179 dTHX;
1061 struct transfer_args ta; 1180 struct transfer_args ta;
1062 1181
1063 prepare_cede (&ta); 1182 prepare_cede (aTHX_ &ta);
1064 1183
1065 if (ta.prev != ta.next) 1184 if (ta.prev != ta.next)
1066 { 1185 {
1067 TRANSFER (ta); 1186 TRANSFER (ta);
1068 return 1; 1187 return 1;
1072} 1191}
1073 1192
1074static int 1193static int
1075api_cede_notself (void) 1194api_cede_notself (void)
1076{ 1195{
1196 dTHX;
1077 struct transfer_args ta; 1197 struct transfer_args ta;
1078 1198
1079 if (prepare_cede_notself (&ta)) 1199 if (prepare_cede_notself (aTHX_ &ta))
1080 { 1200 {
1081 TRANSFER (ta); 1201 TRANSFER (ta);
1082 return 1; 1202 return 1;
1083 } 1203 }
1084 else 1204 else
1100 1220
1101 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV)); 1221 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1102 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV)); 1222 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1103 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV)); 1223 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1104 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV)); 1224 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1225 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1226 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1105 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL)); 1227 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1106 1228
1107 main_mainstack = PL_mainstack; 1229 main_mainstack = PL_mainstack;
1230 main_top_env = PL_top_env;
1231
1232 while (main_top_env->je_prev)
1233 main_top_env = main_top_env->je_prev;
1108 1234
1109 coroapi.ver = CORO_API_VERSION; 1235 coroapi.ver = CORO_API_VERSION;
1110 coroapi.transfer = api_transfer; 1236 coroapi.transfer = api_transfer;
1111 1237
1112 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1238 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1120 HV *hv; 1246 HV *hv;
1121 int i; 1247 int i;
1122 1248
1123 Newz (0, coro, 1, struct coro); 1249 Newz (0, coro, 1, struct coro);
1124 coro->args = newAV (); 1250 coro->args = newAV ();
1125 coro->save = CORO_SAVE_ALL; 1251 coro->save = CORO_SAVE_DEF;
1126 coro->flags = CF_NEW; 1252 coro->flags = CF_NEW;
1127 1253
1254 if (coro_first) coro_first->prev = coro;
1255 coro->next = coro_first;
1256 coro_first = coro;
1257
1128 hv = newHV (); 1258 coro->hv = hv = newHV ();
1129 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1259 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1130 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1260 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1131 1261
1132 for (i = 1; i < items; i++) 1262 for (i = 1; i < items; i++)
1133 av_push (coro->args, newSVsv (ST (i))); 1263 av_push (coro->args, newSVsv (ST (i)));
1137 1267
1138int 1268int
1139save (SV *coro, int new_save = -1) 1269save (SV *coro, int new_save = -1)
1140 CODE: 1270 CODE:
1141 RETVAL = api_save (coro, new_save); 1271 RETVAL = api_save (coro, new_save);
1272 OUTPUT:
1273 RETVAL
1274
1275int
1276save_also (SV *coro_sv, int save_also)
1277 CODE:
1278{
1279 struct coro *coro = SvSTATE (coro_sv);
1280 RETVAL = coro->save;
1281 coro->save |= save_also;
1282}
1142 OUTPUT: 1283 OUTPUT:
1143 RETVAL 1284 RETVAL
1144 1285
1145void 1286void
1146_set_stacklevel (...) 1287_set_stacklevel (...)
1162 1303
1163 case 1: 1304 case 1:
1164 if (items != 2) 1305 if (items != 2)
1165 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items); 1306 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1166 1307
1167 prepare_transfer (&ta, ST (0), ST (1)); 1308 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1168 break; 1309 break;
1169 1310
1170 case 2: 1311 case 2:
1171 prepare_schedule (&ta); 1312 prepare_schedule (aTHX_ &ta);
1172 break; 1313 break;
1173 1314
1174 case 3: 1315 case 3:
1175 prepare_cede (&ta); 1316 prepare_cede (aTHX_ &ta);
1176 break; 1317 break;
1177 1318
1178 case 4: 1319 case 4:
1179 if (!prepare_cede_notself (&ta)) 1320 if (!prepare_cede_notself (aTHX_ &ta))
1180 XSRETURN_EMPTY; 1321 XSRETURN_EMPTY;
1181 1322
1182 break; 1323 break;
1183 } 1324 }
1184 1325
1185 BARRIER; 1326 BARRIER;
1186 TRANSFER (ta); 1327 TRANSFER (ta);
1187}
1188 1328
1189void 1329 if (GIMME_V != G_VOID && ta.next != ta.prev)
1190_clone_state_from (SV *dst, SV *src) 1330 XSRETURN_YES;
1331}
1332
1333bool
1334_destroy (SV *coro_sv)
1191 CODE: 1335 CODE:
1192{ 1336 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1193 struct coro *coro_src = SvSTATE (src); 1337 OUTPUT:
1194 1338 RETVAL
1195 sv_unmagic (SvRV (dst), PERL_MAGIC_ext);
1196
1197 ++coro_src->refcnt;
1198 sv_magicext (SvRV (dst), 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro_src, 0)->mg_flags |= MGf_DUP;
1199}
1200 1339
1201void 1340void
1202_exit (code) 1341_exit (code)
1203 int code 1342 int code
1204 PROTOTYPE: $ 1343 PROTOTYPE: $
1205 CODE: 1344 CODE:
1206 _exit (code); 1345 _exit (code);
1207 1346
1208int 1347int
1348cctx_stacksize (int new_stacksize = 0)
1349 CODE:
1350 RETVAL = coro_stacksize;
1351 if (new_stacksize)
1352 coro_stacksize = new_stacksize;
1353 OUTPUT:
1354 RETVAL
1355
1356int
1209cctx_count () 1357cctx_count ()
1210 CODE: 1358 CODE:
1211 RETVAL = cctx_count; 1359 RETVAL = cctx_count;
1212 OUTPUT: 1360 OUTPUT:
1213 RETVAL 1361 RETVAL
1216cctx_idle () 1364cctx_idle ()
1217 CODE: 1365 CODE:
1218 RETVAL = cctx_idle; 1366 RETVAL = cctx_idle;
1219 OUTPUT: 1367 OUTPUT:
1220 RETVAL 1368 RETVAL
1369
1370void
1371list ()
1372 PPCODE:
1373{
1374 struct coro *coro;
1375 for (coro = coro_first; coro; coro = coro->next)
1376 if (coro->hv)
1377 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
1378}
1379
1380void
1381_eval (Coro::State coro, SV *coderef)
1382 CODE:
1383{
1384 if (coro->mainstack)
1385 {
1386 struct coro temp;
1387 Zero (&temp, 1, struct coro);
1388 temp.save = CORO_SAVE_ALL;
1389
1390 if (!(coro->flags & CF_RUNNING))
1391 {
1392 save_perl (aTHX_ &temp);
1393 load_perl (aTHX_ coro);
1394 }
1395
1396 {
1397 dSP;
1398 ENTER;
1399 SAVETMPS;
1400 PUSHMARK (SP);
1401 PUTBACK;
1402 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1403 SPAGAIN;
1404 FREETMPS;
1405 LEAVE;
1406 PUTBACK;
1407 }
1408
1409 if (!(coro->flags & CF_RUNNING))
1410 {
1411 save_perl (aTHX_ coro);
1412 load_perl (aTHX_ &temp);
1413 }
1414 }
1415}
1416
1417SV *
1418is_ready (Coro::State coro)
1419 PROTOTYPE: $
1420 ALIAS:
1421 is_ready = CF_READY
1422 is_running = CF_RUNNING
1423 is_new = CF_NEW
1424 is_destroyed = CF_DESTROYED
1425 CODE:
1426 RETVAL = boolSV (coro->flags & ix);
1427 OUTPUT:
1428 RETVAL
1429
1430IV
1431rss (Coro::State coro)
1432 PROTOTYPE: $
1433 CODE:
1434 RETVAL = coro_rss (coro);
1435 OUTPUT:
1436 RETVAL
1437
1221 1438
1222MODULE = Coro::State PACKAGE = Coro 1439MODULE = Coro::State PACKAGE = Coro
1223 1440
1224BOOT: 1441BOOT:
1225{ 1442{
1293 CODE: 1510 CODE:
1294 RETVAL = boolSV (api_ready (self)); 1511 RETVAL = boolSV (api_ready (self));
1295 OUTPUT: 1512 OUTPUT:
1296 RETVAL 1513 RETVAL
1297 1514
1298SV *
1299is_ready (SV *self)
1300 PROTOTYPE: $
1301 CODE:
1302 RETVAL = boolSV (api_is_ready (self));
1303 OUTPUT:
1304 RETVAL
1305
1306int 1515int
1307nready (...) 1516nready (...)
1308 PROTOTYPE: 1517 PROTOTYPE:
1309 CODE: 1518 CODE:
1310 RETVAL = coro_nready; 1519 RETVAL = coro_nready;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines