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.175 by root, Sun Sep 30 13:43:45 2007 UTC vs.
Revision 1.240 by root, Sun Jun 29 00:28:17 2008 UTC

1#include "libcoro/coro.c" 1#include "libcoro/coro.c"
2 2
3#define PERL_NO_GET_CONTEXT 3#define PERL_NO_GET_CONTEXT
4#define PERL_EXT
4 5
5#include "EXTERN.h" 6#include "EXTERN.h"
6#include "perl.h" 7#include "perl.h"
7#include "XSUB.h" 8#include "XSUB.h"
8 9
9#include "patchlevel.h" 10#include "patchlevel.h"
10 11
11#include <stdio.h> 12#include <stdio.h>
12#include <errno.h> 13#include <errno.h>
13#include <assert.h> 14#include <assert.h>
15
16#ifdef WIN32
17# undef setjmp
18# undef longjmp
19# undef _exit
20# define setjmp _setjmp // deep magic, don't ask
21#else
22# include <inttypes.h> /* most portable stdint.h */
23#endif
14 24
15#ifdef HAVE_MMAP 25#ifdef HAVE_MMAP
16# include <unistd.h> 26# include <unistd.h>
17# include <sys/mman.h> 27# include <sys/mman.h>
18# ifndef MAP_ANONYMOUS 28# ifndef MAP_ANONYMOUS
70# ifndef IS_PADCONST 80# ifndef IS_PADCONST
71# define IS_PADCONST(v) 0 81# define IS_PADCONST(v) 0
72# endif 82# endif
73#endif 83#endif
74 84
85/* 5.8.8 */
86#ifndef GV_NOTQUAL
87# define GV_NOTQUAL 0
88#endif
89#ifndef newSV
90# define newSV(l) NEWSV(0,l)
91#endif
92
93/* 5.11 */
94#ifndef CxHASARGS
95# define CxHASARGS(cx) (cx)->blk_sub.hasargs
96#endif
97
75/* 5.8.7 */ 98/* 5.8.7 */
76#ifndef SvRV_set 99#ifndef SvRV_set
77# define SvRV_set(s,v) SvRV(s) = (v) 100# define SvRV_set(s,v) SvRV(s) = (v)
78#endif 101#endif
79 102
98#define IN_DESTRUCT (PL_main_cv == Nullcv) 121#define IN_DESTRUCT (PL_main_cv == Nullcv)
99 122
100#if __GNUC__ >= 3 123#if __GNUC__ >= 3
101# define attribute(x) __attribute__(x) 124# define attribute(x) __attribute__(x)
102# define BARRIER __asm__ __volatile__ ("" : : : "memory") 125# define BARRIER __asm__ __volatile__ ("" : : : "memory")
126# define expect(expr,value) __builtin_expect ((expr),(value))
103#else 127#else
104# define attribute(x) 128# define attribute(x)
105# define BARRIER 129# define BARRIER
130# define expect(expr,value) (expr)
106#endif 131#endif
132
133#define expect_false(expr) expect ((expr) != 0, 0)
134#define expect_true(expr) expect ((expr) != 0, 1)
107 135
108#define NOINLINE attribute ((noinline)) 136#define NOINLINE attribute ((noinline))
109 137
110#include "CoroAPI.h" 138#include "CoroAPI.h"
111 139
130static size_t coro_stacksize = CORO_STACKSIZE; 158static size_t coro_stacksize = CORO_STACKSIZE;
131static struct CoroAPI coroapi; 159static struct CoroAPI coroapi;
132static AV *main_mainstack; /* used to differentiate between $main and others */ 160static AV *main_mainstack; /* used to differentiate between $main and others */
133static JMPENV *main_top_env; 161static JMPENV *main_top_env;
134static HV *coro_state_stash, *coro_stash; 162static HV *coro_state_stash, *coro_stash;
135static SV *coro_mortal; /* will be freed after next transfer */ 163static volatile SV *coro_mortal; /* will be freed after next transfer */
164
165static GV *irsgv; /* $/ */
166static GV *stdoutgv; /* *STDOUT */
167static SV *rv_diehook;
168static SV *rv_warnhook;
169static HV *hv_sig; /* %SIG */
136 170
137/* async_pool helper stuff */ 171/* async_pool helper stuff */
138static SV *sv_pool_rss; 172static SV *sv_pool_rss;
139static SV *sv_pool_size; 173static SV *sv_pool_size;
140static AV *av_async_pool; 174static AV *av_async_pool;
175
176/* Coro::AnyEvent */
177static SV *sv_activity;
141 178
142static struct coro_cctx *cctx_first; 179static struct coro_cctx *cctx_first;
143static int cctx_count, cctx_idle; 180static int cctx_count, cctx_idle;
144 181
145enum { 182enum {
176 CF_READY = 0x0002, /* coroutine is ready */ 213 CF_READY = 0x0002, /* coroutine is ready */
177 CF_NEW = 0x0004, /* has never been switched to */ 214 CF_NEW = 0x0004, /* has never been switched to */
178 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 215 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
179}; 216};
180 217
218/* the structure where most of the perl state is stored, overlaid on the cxstack */
219typedef struct {
220 SV *defsv;
221 AV *defav;
222 SV *errsv;
223 SV *irsgv;
224#define VAR(name,type) type name;
225# include "state.h"
226#undef VAR
227} perl_slots;
228
229#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
230
181/* this is a structure representing a perl-level coroutine */ 231/* this is a structure representing a perl-level coroutine */
182struct coro { 232struct coro {
183 /* the c coroutine allocated to this perl coroutine, if any */ 233 /* the c coroutine allocated to this perl coroutine, if any */
184 coro_cctx *cctx; 234 coro_cctx *cctx;
185 235
236 /* process data */
237 AV *mainstack;
238 perl_slots *slot; /* basically the saved sp */
239
186 /* data associated with this coroutine (initial args) */ 240 AV *args; /* data associated with this coroutine (initial args) */
187 AV *args; 241 int refcnt; /* coroutines are refcounted, yes */
188 int refcnt;
189 int save; /* CORO_SAVE flags */
190 int flags; /* CF_ flags */ 242 int flags; /* CF_ flags */
191 243 HV *hv; /* the perl hash associated with this coro, if any */
192 /* optionally saved, might be zero */
193 AV *defav; /* @_ */
194 SV *defsv; /* $_ */
195 SV *errsv; /* $@ */
196 GV *deffh; /* default filehandle */
197 SV *irssv; /* $/ */
198 SV *irssv_sv; /* real $/ cache */
199
200#define VAR(name,type) type name;
201# include "state.h"
202#undef VAR
203 244
204 /* statistics */ 245 /* statistics */
205 int usecount; /* number of switches to this coro */ 246 int usecount; /* number of transfers to this coro */
206 247
207 /* coro process data */ 248 /* coro process data */
208 int prio; 249 int prio;
250 SV *throw; /* exception to be thrown */
251
252 /* async_pool */
253 SV *saved_deffh;
209 254
210 /* linked list */ 255 /* linked list */
211 struct coro *next, *prev; 256 struct coro *next, *prev;
212 HV *hv; /* the perl hash associated with this coro, if any */
213}; 257};
214 258
215typedef struct coro *Coro__State; 259typedef struct coro *Coro__State;
216typedef struct coro *Coro__State_or_hashref; 260typedef struct coro *Coro__State_or_hashref;
217 261
224#define PRIO_IDLE -3 268#define PRIO_IDLE -3
225#define PRIO_MIN -4 269#define PRIO_MIN -4
226 270
227/* for Coro.pm */ 271/* for Coro.pm */
228static SV *coro_current; 272static SV *coro_current;
273static SV *coro_readyhook;
229static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 274static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
230static int coro_nready; 275static int coro_nready;
231static struct coro *coro_first; 276static struct coro *coro_first;
232 277
233/** lowlevel stuff **********************************************************/ 278/** lowlevel stuff **********************************************************/
234 279
280static SV *
281coro_get_sv (pTHX_ const char *name, int create)
282{
283#if PERL_VERSION_ATLEAST (5,10,0)
284 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
285 get_sv (name, create);
286#endif
287 return get_sv (name, create);
288}
289
290static AV *
291coro_get_av (pTHX_ const char *name, int create)
292{
293#if PERL_VERSION_ATLEAST (5,10,0)
294 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
295 get_av (name, create);
296#endif
297 return get_av (name, create);
298}
299
300static HV *
301coro_get_hv (pTHX_ const char *name, int create)
302{
303#if PERL_VERSION_ATLEAST (5,10,0)
304 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
305 get_hv (name, create);
306#endif
307 return get_hv (name, create);
308}
309
235static AV * 310static AV *
236coro_clone_padlist (pTHX_ CV *cv) 311coro_clone_padlist (pTHX_ CV *cv)
237{ 312{
238 AV *padlist = CvPADLIST (cv); 313 AV *padlist = CvPADLIST (cv);
239 AV *newpadlist, *newpad; 314 AV *newpadlist, *newpad;
240 315
241 newpadlist = newAV (); 316 newpadlist = newAV ();
242 AvREAL_off (newpadlist); 317 AvREAL_off (newpadlist);
243#if PERL_VERSION_ATLEAST (5,9,0) 318#if PERL_VERSION_ATLEAST (5,10,0)
244 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 319 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
245#else 320#else
246 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 321 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
247#endif 322#endif
248 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 323 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
286 361
287 /* casting is fun. */ 362 /* casting is fun. */
288 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 363 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
289 free_padlist (aTHX_ padlist); 364 free_padlist (aTHX_ padlist);
290 365
291 SvREFCNT_dec (av);
292
293 return 0; 366 return 0;
294} 367}
295 368
296#define PERL_MAGIC_coro PERL_MAGIC_ext 369#define CORO_MAGIC_type_cv PERL_MAGIC_ext
370#define CORO_MAGIC_type_state PERL_MAGIC_ext
297 371
298static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 372static MGVTBL coro_cv_vtbl = {
373 0, 0, 0, 0,
374 coro_cv_free
375};
299 376
300#define CORO_MAGIC(cv) \ 377#define CORO_MAGIC(sv,type) \
301 SvMAGIC (cv) \ 378 SvMAGIC (sv) \
302 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 379 ? SvMAGIC (sv)->mg_type == type \
303 ? SvMAGIC (cv) \ 380 ? SvMAGIC (sv) \
304 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 381 : mg_find (sv, type) \
305 : 0 382 : 0
383
384#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
385#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
306 386
307static struct coro * 387static struct coro *
308SvSTATE_ (pTHX_ SV *coro) 388SvSTATE_ (pTHX_ SV *coro)
309{ 389{
310 HV *stash; 390 HV *stash;
311 MAGIC *mg; 391 MAGIC *mg;
312 392
313 if (SvROK (coro)) 393 if (SvROK (coro))
314 coro = SvRV (coro); 394 coro = SvRV (coro);
315 395
316 if (SvTYPE (coro) != SVt_PVHV) 396 if (expect_false (SvTYPE (coro) != SVt_PVHV))
317 croak ("Coro::State object required"); 397 croak ("Coro::State object required");
318 398
319 stash = SvSTASH (coro); 399 stash = SvSTASH (coro);
320 if (stash != coro_stash && stash != coro_state_stash) 400 if (expect_false (stash != coro_stash && stash != coro_state_stash))
321 { 401 {
322 /* very slow, but rare, check */ 402 /* very slow, but rare, check */
323 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 403 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
324 croak ("Coro::State object required"); 404 croak ("Coro::State object required");
325 } 405 }
326 406
327 mg = CORO_MAGIC (coro); 407 mg = CORO_MAGIC_state (coro);
328 return (struct coro *)mg->mg_ptr; 408 return (struct coro *)mg->mg_ptr;
329} 409}
330 410
331#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 411#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
332 412
333/* the next two functions merely cache the padlists */ 413/* the next two functions merely cache the padlists */
334static void 414static void
335get_padlist (pTHX_ CV *cv) 415get_padlist (pTHX_ CV *cv)
336{ 416{
337 MAGIC *mg = CORO_MAGIC (cv); 417 MAGIC *mg = CORO_MAGIC_cv (cv);
338 AV *av; 418 AV *av;
339 419
340 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 420 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
341 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 421 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
342 else 422 else
343 { 423 {
344#if CORO_PREFER_PERL_FUNCTIONS 424#if CORO_PREFER_PERL_FUNCTIONS
345 /* this is probably cleaner, but also slower? */ 425 /* this is probably cleaner, but also slower? */
354} 434}
355 435
356static void 436static void
357put_padlist (pTHX_ CV *cv) 437put_padlist (pTHX_ CV *cv)
358{ 438{
359 MAGIC *mg = CORO_MAGIC (cv); 439 MAGIC *mg = CORO_MAGIC_cv (cv);
360 AV *av; 440 AV *av;
361 441
362 if (!mg) 442 if (expect_false (!mg))
363 { 443 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
364 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
365 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
366 mg->mg_virtual = &vtbl_coro;
367 mg->mg_obj = (SV *)newAV ();
368 }
369 444
370 av = (AV *)mg->mg_obj; 445 av = (AV *)mg->mg_obj;
371 446
372 if (AvFILLp (av) >= AvMAX (av)) 447 if (expect_false (AvFILLp (av) >= AvMAX (av)))
373 av_extend (av, AvMAX (av) + 1); 448 av_extend (av, AvMAX (av) + 1);
374 449
375 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 450 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
376} 451}
377 452
378/** load & save, init *******************************************************/ 453/** load & save, init *******************************************************/
379
380#define SB do {
381#define SE } while (0)
382
383#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
384 454
385static void 455static void
386load_perl (pTHX_ Coro__State c) 456load_perl (pTHX_ Coro__State c)
387{ 457{
458 perl_slots *slot = c->slot;
459 c->slot = 0;
460
461 PL_mainstack = c->mainstack;
462
463 GvSV (PL_defgv) = slot->defsv;
464 GvAV (PL_defgv) = slot->defav;
465 GvSV (PL_errgv) = slot->errsv;
466 GvSV (irsgv) = slot->irsgv;
467
388#define VAR(name,type) PL_ ## name = c->name; 468 #define VAR(name,type) PL_ ## name = slot->name;
389# include "state.h" 469 # include "state.h"
390#undef VAR 470 #undef VAR
391
392 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
393 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
394 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
395 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh);
396
397 if (c->irssv)
398 {
399 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
400 {
401 SvREFCNT_dec (c->irssv);
402 c->irssv = 0;
403 }
404 else
405 {
406 REPLACE_SV (PL_rs, c->irssv);
407 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
408 sv_setsv (c->irssv_sv, PL_rs);
409 }
410 }
411 471
412 { 472 {
413 dSP; 473 dSP;
474
414 CV *cv; 475 CV *cv;
415 476
416 /* now do the ugly restore mess */ 477 /* now do the ugly restore mess */
417 while ((cv = (CV *)POPs)) 478 while (expect_true (cv = (CV *)POPs))
418 { 479 {
419 put_padlist (aTHX_ cv); /* mark this padlist as available */ 480 put_padlist (aTHX_ cv); /* mark this padlist as available */
420 CvDEPTH (cv) = PTR2IV (POPs); 481 CvDEPTH (cv) = PTR2IV (POPs);
421 CvPADLIST (cv) = (AV *)POPs; 482 CvPADLIST (cv) = (AV *)POPs;
422 } 483 }
441 502
442 XPUSHs (Nullsv); 503 XPUSHs (Nullsv);
443 /* this loop was inspired by pp_caller */ 504 /* this loop was inspired by pp_caller */
444 for (;;) 505 for (;;)
445 { 506 {
446 while (cxix >= 0) 507 while (expect_true (cxix >= 0))
447 { 508 {
448 PERL_CONTEXT *cx = &ccstk[cxix--]; 509 PERL_CONTEXT *cx = &ccstk[cxix--];
449 510
450 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 511 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
451 { 512 {
452 CV *cv = cx->blk_sub.cv; 513 CV *cv = cx->blk_sub.cv;
453 514
454 if (CvDEPTH (cv)) 515 if (expect_true (CvDEPTH (cv)))
455 { 516 {
456 EXTEND (SP, 3); 517 EXTEND (SP, 3);
457 PUSHs ((SV *)CvPADLIST (cv)); 518 PUSHs ((SV *)CvPADLIST (cv));
458 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 519 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
459 PUSHs ((SV *)cv); 520 PUSHs ((SV *)cv);
460 521
461 CvDEPTH (cv) = 0; 522 CvDEPTH (cv) = 0;
462 get_padlist (aTHX_ cv); 523 get_padlist (aTHX_ cv);
463 } 524 }
464 } 525 }
465 } 526 }
466 527
467 if (top_si->si_type == PERLSI_MAIN) 528 if (expect_true (top_si->si_type == PERLSI_MAIN))
468 break; 529 break;
469 530
470 top_si = top_si->si_prev; 531 top_si = top_si->si_prev;
471 ccstk = top_si->si_cxstack; 532 ccstk = top_si->si_cxstack;
472 cxix = top_si->si_cxix; 533 cxix = top_si->si_cxix;
473 } 534 }
474 535
475 PUTBACK; 536 PUTBACK;
476 } 537 }
477 538
478 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 539 /* allocate some space on the context stack for our purposes */
479 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 540 /* we manually unroll here, as usually 2 slots is enough */
480 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 541 if (SLOT_COUNT >= 1) CXINC;
481 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 542 if (SLOT_COUNT >= 2) CXINC;
482 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0; 543 if (SLOT_COUNT >= 3) CXINC;
544 {
545 int i;
546 for (i = 3; i < SLOT_COUNT; ++i)
547 CXINC;
548 }
549 cxstack_ix -= SLOT_COUNT; /* undo allocation */
483 550
551 c->mainstack = PL_mainstack;
552
553 {
554 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
555
556 slot->defav = GvAV (PL_defgv);
557 slot->defsv = DEFSV;
558 slot->errsv = ERRSV;
559 slot->irsgv = GvSV (irsgv);
560
484#define VAR(name,type)c->name = PL_ ## name; 561 #define VAR(name,type) slot->name = PL_ ## name;
485# include "state.h" 562 # include "state.h"
486#undef VAR 563 #undef VAR
564 }
487} 565}
488 566
489/* 567/*
490 * allocate various perl stacks. This is an exact copy 568 * allocate various perl stacks. This is an exact copy
491 * of perl.c:init_stacks, except that it uses less memory 569 * of perl.c:init_stacks, except that it uses less memory
496# define coro_init_stacks init_stacks 574# define coro_init_stacks init_stacks
497#else 575#else
498static void 576static void
499coro_init_stacks (pTHX) 577coro_init_stacks (pTHX)
500{ 578{
501 PL_curstackinfo = new_stackinfo(64, 6); 579 PL_curstackinfo = new_stackinfo(32, 8);
502 PL_curstackinfo->si_type = PERLSI_MAIN; 580 PL_curstackinfo->si_type = PERLSI_MAIN;
503 PL_curstack = PL_curstackinfo->si_stack; 581 PL_curstack = PL_curstackinfo->si_stack;
504 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 582 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
505 583
506 PL_stack_base = AvARRAY(PL_curstack); 584 PL_stack_base = AvARRAY(PL_curstack);
507 PL_stack_sp = PL_stack_base; 585 PL_stack_sp = PL_stack_base;
508 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 586 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
509 587
510 New(50,PL_tmps_stack,64,SV*); 588 New(50,PL_tmps_stack,32,SV*);
511 PL_tmps_floor = -1; 589 PL_tmps_floor = -1;
512 PL_tmps_ix = -1; 590 PL_tmps_ix = -1;
513 PL_tmps_max = 64; 591 PL_tmps_max = 32;
514 592
515 New(54,PL_markstack,16,I32); 593 New(54,PL_markstack,16,I32);
516 PL_markstack_ptr = PL_markstack; 594 PL_markstack_ptr = PL_markstack;
517 PL_markstack_max = PL_markstack + 16; 595 PL_markstack_max = PL_markstack + 16;
518 596
519#ifdef SET_MARK_OFFSET 597#ifdef SET_MARK_OFFSET
520 SET_MARK_OFFSET; 598 SET_MARK_OFFSET;
521#endif 599#endif
522 600
523 New(54,PL_scopestack,16,I32); 601 New(54,PL_scopestack,8,I32);
524 PL_scopestack_ix = 0; 602 PL_scopestack_ix = 0;
525 PL_scopestack_max = 16; 603 PL_scopestack_max = 8;
526 604
527 New(54,PL_savestack,64,ANY); 605 New(54,PL_savestack,24,ANY);
528 PL_savestack_ix = 0; 606 PL_savestack_ix = 0;
529 PL_savestack_max = 64; 607 PL_savestack_max = 24;
530 608
531#if !PERL_VERSION_ATLEAST (5,9,0) 609#if !PERL_VERSION_ATLEAST (5,10,0)
532 New(54,PL_retstack,4,OP*); 610 New(54,PL_retstack,4,OP*);
533 PL_retstack_ix = 0; 611 PL_retstack_ix = 0;
534 PL_retstack_max = 4; 612 PL_retstack_max = 4;
535#endif 613#endif
536} 614}
540 * destroy the stacks, the callchain etc... 618 * destroy the stacks, the callchain etc...
541 */ 619 */
542static void 620static void
543coro_destroy_stacks (pTHX) 621coro_destroy_stacks (pTHX)
544{ 622{
545 if (!IN_DESTRUCT)
546 {
547 /* restore all saved variables and stuff */
548 LEAVE_SCOPE (0);
549 assert (PL_tmps_floor == -1);
550
551 /* free all temporaries */
552 FREETMPS;
553 assert (PL_tmps_ix == -1);
554
555 /* unwind all extra stacks */
556 POPSTACK_TO (PL_mainstack);
557
558 /* unwind main stack */
559 dounwind (-1);
560 }
561
562 while (PL_curstackinfo->si_next) 623 while (PL_curstackinfo->si_next)
563 PL_curstackinfo = PL_curstackinfo->si_next; 624 PL_curstackinfo = PL_curstackinfo->si_next;
564 625
565 while (PL_curstackinfo) 626 while (PL_curstackinfo)
566 { 627 {
576 637
577 Safefree (PL_tmps_stack); 638 Safefree (PL_tmps_stack);
578 Safefree (PL_markstack); 639 Safefree (PL_markstack);
579 Safefree (PL_scopestack); 640 Safefree (PL_scopestack);
580 Safefree (PL_savestack); 641 Safefree (PL_savestack);
581#if !PERL_VERSION_ATLEAST (5,9,0) 642#if !PERL_VERSION_ATLEAST (5,10,0)
582 Safefree (PL_retstack); 643 Safefree (PL_retstack);
583#endif 644#endif
584} 645}
585 646
586static size_t 647static size_t
587coro_rss (pTHX_ struct coro *coro) 648coro_rss (pTHX_ struct coro *coro)
588{ 649{
589 size_t rss = sizeof (coro); 650 size_t rss = sizeof (*coro);
590 651
591 if (coro->mainstack) 652 if (coro->mainstack)
592 { 653 {
654 perl_slots tmp_slot;
655 perl_slots *slot;
656
593 if (coro->flags & CF_RUNNING) 657 if (coro->flags & CF_RUNNING)
594 { 658 {
659 slot = &tmp_slot;
660
595 #define VAR(name,type)coro->name = PL_ ## name; 661 #define VAR(name,type) slot->name = PL_ ## name;
596 # include "state.h" 662 # include "state.h"
597 #undef VAR 663 #undef VAR
598 } 664 }
665 else
666 slot = coro->slot;
599 667
600 rss += sizeof (coro->curstackinfo); 668 rss += sizeof (slot->curstackinfo);
601 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
602 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 669 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
603 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 670 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
604 rss += coro->tmps_max * sizeof (SV *); 671 rss += slot->tmps_max * sizeof (SV *);
605 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 672 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
606 rss += coro->scopestack_max * sizeof (I32); 673 rss += slot->scopestack_max * sizeof (I32);
607 rss += coro->savestack_max * sizeof (ANY); 674 rss += slot->savestack_max * sizeof (ANY);
608 675
609#if !PERL_VERSION_ATLEAST (5,9,0) 676#if !PERL_VERSION_ATLEAST (5,10,0)
610 rss += coro->retstack_max * sizeof (OP *); 677 rss += slot->retstack_max * sizeof (OP *);
611#endif 678#endif
612 } 679 }
613 680
614 return rss; 681 return rss;
615} 682}
616 683
617/** coroutine stack handling ************************************************/ 684/** coroutine stack handling ************************************************/
618 685
686static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
687static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
688static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
689
690/* apparently < 5.8.8 */
691#undef MgPV_nolen_const
692#ifndef MgPV_nolen_const
693#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
694 SvPV_nolen_const((SV*)((mg)->mg_ptr)) : \
695 (const char*)(mg)->mg_ptr)
696#endif
697
698/*
699 * This overrides the default magic get method of %SIG elements.
700 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
701 * and instead of tryign to save and restore the hash elements, we just provide
702 * readback here.
703 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
704 * not expecting this to actually change the hook. This is a potential problem
705 * when a schedule happens then, but we ignore this.
706 */
707static int
708coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
709{
710 const char *s = MgPV_nolen_const (mg);
711
712 if (*s == '_')
713 {
714 SV **svp = 0;
715
716 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
717 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
718
719 if (svp)
720 {
721 sv_setsv (sv, *svp ? *svp : &PL_sv_undef);
722 return 0;
723 }
724 }
725
726 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
727}
728
729static int
730coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
731{
732 const char *s = MgPV_nolen_const (mg);
733
734 if (*s == '_')
735 {
736 SV **svp = 0;
737
738 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
739 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
740
741 if (svp)
742 {
743 SV *old = *svp;
744 *svp = 0;
745 SvREFCNT_dec (old);
746 return 0;
747 }
748 }
749
750 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
751}
752
753static int
754coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
755{
756 const char *s = MgPV_nolen_const (mg);
757
758 if (*s == '_')
759 {
760 SV **svp = 0;
761
762 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
763 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
764
765 if (svp)
766 {
767 SV *old = *svp;
768 *svp = newSVsv (sv);
769 SvREFCNT_dec (old);
770 return 0;
771 }
772 }
773
774 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
775}
776
619static void 777static void
620setup_coro (pTHX_ struct coro *coro) 778coro_setup (pTHX_ struct coro *coro)
621{ 779{
622 /* 780 /*
623 * emulate part of the perl startup here. 781 * emulate part of the perl startup here.
624 */ 782 */
625 coro_init_stacks (aTHX); 783 coro_init_stacks (aTHX);
627 PL_runops = RUNOPS_DEFAULT; 785 PL_runops = RUNOPS_DEFAULT;
628 PL_curcop = &PL_compiling; 786 PL_curcop = &PL_compiling;
629 PL_in_eval = EVAL_NULL; 787 PL_in_eval = EVAL_NULL;
630 PL_comppad = 0; 788 PL_comppad = 0;
631 PL_curpm = 0; 789 PL_curpm = 0;
790 PL_curpad = 0;
632 PL_localizing = 0; 791 PL_localizing = 0;
633 PL_dirty = 0; 792 PL_dirty = 0;
634 PL_restartop = 0; 793 PL_restartop = 0;
794#if PERL_VERSION_ATLEAST (5,10,0)
795 PL_parser = 0;
796#endif
797
798 /* recreate the die/warn hooks */
799 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
800 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
801
802 GvSV (PL_defgv) = newSV (0);
803 GvAV (PL_defgv) = coro->args; coro->args = 0;
804 GvSV (PL_errgv) = newSV (0);
805 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
806 PL_rs = newSVsv (GvSV (irsgv));
807 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
635 808
636 { 809 {
637 dSP; 810 dSP;
638 LOGOP myop; 811 LOGOP myop;
639 812
640 SvREFCNT_dec (GvAV (PL_defgv));
641 GvAV (PL_defgv) = coro->args; coro->args = 0;
642
643 Zero (&myop, 1, LOGOP); 813 Zero (&myop, 1, LOGOP);
644 myop.op_next = Nullop; 814 myop.op_next = Nullop;
645 myop.op_flags = OPf_WANT_VOID; 815 myop.op_flags = OPf_WANT_VOID;
646 816
647 PUSHMARK (SP); 817 PUSHMARK (SP);
648 XPUSHs (av_shift (GvAV (PL_defgv))); 818 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
649 PUTBACK; 819 PUTBACK;
650 PL_op = (OP *)&myop; 820 PL_op = (OP *)&myop;
651 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 821 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
652 SPAGAIN; 822 SPAGAIN;
653 } 823 }
654 824
655 ENTER; /* necessary e.g. for dounwind */ 825 /* this newly created coroutine might be run on an existing cctx which most
826 * likely was suspended in set_stacklevel, called from entersub.
827 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
828 * so we ENTER here for symmetry
829 */
830 ENTER;
831}
832
833static void
834coro_destroy (pTHX_ struct coro *coro)
835{
836 if (!IN_DESTRUCT)
837 {
838 /* restore all saved variables and stuff */
839 LEAVE_SCOPE (0);
840 assert (PL_tmps_floor == -1);
841
842 /* free all temporaries */
843 FREETMPS;
844 assert (PL_tmps_ix == -1);
845
846 /* unwind all extra stacks */
847 POPSTACK_TO (PL_mainstack);
848
849 /* unwind main stack */
850 dounwind (-1);
851 }
852
853 SvREFCNT_dec (GvSV (PL_defgv));
854 SvREFCNT_dec (GvAV (PL_defgv));
855 SvREFCNT_dec (GvSV (PL_errgv));
856 SvREFCNT_dec (PL_defoutgv);
857 SvREFCNT_dec (PL_rs);
858 SvREFCNT_dec (GvSV (irsgv));
859
860 SvREFCNT_dec (PL_diehook);
861 SvREFCNT_dec (PL_warnhook);
862
863 SvREFCNT_dec (coro->saved_deffh);
864 SvREFCNT_dec (coro->throw);
865
866 coro_destroy_stacks (aTHX);
656} 867}
657 868
658static void 869static void
659free_coro_mortal (pTHX) 870free_coro_mortal (pTHX)
660{ 871{
661 if (coro_mortal) 872 if (expect_true (coro_mortal))
662 { 873 {
663 SvREFCNT_dec (coro_mortal); 874 SvREFCNT_dec (coro_mortal);
664 coro_mortal = 0; 875 coro_mortal = 0;
665 } 876 }
666} 877}
695 bot = PL_stack_base + cx->blk_oldsp + 1; 906 bot = PL_stack_base + cx->blk_oldsp + 1;
696 top = cx->blk_gimme == G_ARRAY ? SP + 1 907 top = cx->blk_gimme == G_ARRAY ? SP + 1
697 : cx->blk_gimme == G_SCALAR ? bot + 1 908 : cx->blk_gimme == G_SCALAR ? bot + 1
698 : bot; 909 : bot;
699 910
911 av_extend (av, top - bot);
700 while (bot < top) 912 while (bot < top)
701 av_push (av, SvREFCNT_inc (*bot++)); 913 av_push (av, SvREFCNT_inc (*bot++));
702 914
703 PL_runops = RUNOPS_DEFAULT; 915 PL_runops = RUNOPS_DEFAULT;
704 ENTER; 916 ENTER;
744 SAVETMPS; 956 SAVETMPS;
745 EXTEND (SP, 3); 957 EXTEND (SP, 3);
746 PUSHMARK (SP); 958 PUSHMARK (SP);
747 PUSHs (&PL_sv_yes); 959 PUSHs (&PL_sv_yes);
748 PUSHs (fullname); 960 PUSHs (fullname);
749 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 961 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
750 PUTBACK; 962 PUTBACK;
751 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 963 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
752 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 964 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
753 SPAGAIN; 965 SPAGAIN;
754 FREETMPS; 966 FREETMPS;
790 1002
791/* inject a fake call to Coro::State::_cctx_init into the execution */ 1003/* inject a fake call to Coro::State::_cctx_init into the execution */
792/* _cctx_init should be careful, as it could be called at almost any time */ 1004/* _cctx_init should be careful, as it could be called at almost any time */
793/* during execution of a perl program */ 1005/* during execution of a perl program */
794static void NOINLINE 1006static void NOINLINE
795prepare_cctx (pTHX_ coro_cctx *cctx) 1007cctx_prepare (pTHX_ coro_cctx *cctx)
796{ 1008{
797 dSP; 1009 dSP;
798 LOGOP myop; 1010 LOGOP myop;
799 1011
800 PL_top_env = &PL_start_env; 1012 PL_top_env = &PL_start_env;
818 1030
819/* 1031/*
820 * this is a _very_ stripped down perl interpreter ;) 1032 * this is a _very_ stripped down perl interpreter ;)
821 */ 1033 */
822static void 1034static void
823coro_run (void *arg) 1035cctx_run (void *arg)
824{ 1036{
825 dTHX; 1037 dTHX;
826 1038
827 /* coro_run is the alternative tail of transfer(), so unlock here. */ 1039 /* cctx_run is the alternative tail of transfer(), so unlock here. */
828 UNLOCK; 1040 UNLOCK;
829 1041
830 /* we now skip the entersub that lead to transfer() */ 1042 /* we now skip the entersub that lead to transfer() */
831 PL_op = PL_op->op_next; 1043 PL_op = PL_op->op_next;
832 1044
833 /* inject a fake subroutine call to cctx_init */ 1045 /* inject a fake subroutine call to cctx_init */
834 prepare_cctx (aTHX_ (coro_cctx *)arg); 1046 cctx_prepare (aTHX_ (coro_cctx *)arg);
835 1047
836 /* somebody or something will hit me for both perl_run and PL_restartop */ 1048 /* somebody or something will hit me for both perl_run and PL_restartop */
837 PL_restartop = PL_op; 1049 PL_restartop = PL_op;
838 perl_run (PL_curinterp); 1050 perl_run (PL_curinterp);
839 1051
858 ++cctx_count; 1070 ++cctx_count;
859 1071
860 Newz (0, cctx, 1, coro_cctx); 1072 Newz (0, cctx, 1, coro_cctx);
861 1073
862#if HAVE_MMAP 1074#if HAVE_MMAP
863
864 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1075 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
865 /* mmap supposedly does allocate-on-write for us */ 1076 /* mmap supposedly does allocate-on-write for us */
866 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1077 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
867 1078
868 if (cctx->sptr != (void *)-1) 1079 if (cctx->sptr != (void *)-1)
889 stack_start = cctx->sptr; 1100 stack_start = cctx->sptr;
890 stack_size = cctx->ssize; 1101 stack_size = cctx->ssize;
891 } 1102 }
892 1103
893 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1104 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
894 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1105 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
895 1106
896 return cctx; 1107 return cctx;
897} 1108}
898 1109
899static void 1110static void
916 Safefree (cctx->sptr); 1127 Safefree (cctx->sptr);
917 1128
918 Safefree (cctx); 1129 Safefree (cctx);
919} 1130}
920 1131
1132/* wether this cctx should be destructed */
1133#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1134
921static coro_cctx * 1135static coro_cctx *
922cctx_get (pTHX) 1136cctx_get (pTHX)
923{ 1137{
924 while (cctx_first) 1138 while (expect_true (cctx_first))
925 { 1139 {
926 coro_cctx *cctx = cctx_first; 1140 coro_cctx *cctx = cctx_first;
927 cctx_first = cctx->next; 1141 cctx_first = cctx->next;
928 --cctx_idle; 1142 --cctx_idle;
929 1143
930 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1144 if (expect_true (!CCTX_EXPIRED (cctx)))
931 return cctx; 1145 return cctx;
932 1146
933 cctx_destroy (cctx); 1147 cctx_destroy (cctx);
934 } 1148 }
935 1149
938 1152
939static void 1153static void
940cctx_put (coro_cctx *cctx) 1154cctx_put (coro_cctx *cctx)
941{ 1155{
942 /* free another cctx if overlimit */ 1156 /* free another cctx if overlimit */
943 if (cctx_idle >= MAX_IDLE_CCTX) 1157 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
944 { 1158 {
945 coro_cctx *first = cctx_first; 1159 coro_cctx *first = cctx_first;
946 cctx_first = first->next; 1160 cctx_first = first->next;
947 --cctx_idle; 1161 --cctx_idle;
948 1162
954 cctx_first = cctx; 1168 cctx_first = cctx;
955} 1169}
956 1170
957/** coroutine switching *****************************************************/ 1171/** coroutine switching *****************************************************/
958 1172
959static void NOINLINE 1173static void
960transfer_check (pTHX_ struct coro *prev, struct coro *next) 1174transfer_check (pTHX_ struct coro *prev, struct coro *next)
961{ 1175{
962 if (prev != next) 1176 if (expect_true (prev != next))
963 { 1177 {
964 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1178 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
965 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1179 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
966 1180
967 if (next->flags & CF_RUNNING) 1181 if (expect_false (next->flags & CF_RUNNING))
968 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1182 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
969 1183
970 if (next->flags & CF_DESTROYED) 1184 if (expect_false (next->flags & CF_DESTROYED))
971 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1185 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
972 1186
1187#if !PERL_VERSION_ATLEAST (5,10,0)
973 if (PL_lex_state != LEX_NOTPARSING) 1188 if (expect_false (PL_lex_state != LEX_NOTPARSING))
974 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1189 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1190#endif
975 } 1191 }
976} 1192}
977 1193
978/* always use the TRANSFER macro */ 1194/* always use the TRANSFER macro */
979static void NOINLINE 1195static void NOINLINE
980transfer (pTHX_ struct coro *prev, struct coro *next) 1196transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
981{ 1197{
982 dSTACKLEVEL; 1198 dSTACKLEVEL;
1199 static volatile int has_throw;
983 1200
984 /* sometimes transfer is only called to set idle_sp */ 1201 /* sometimes transfer is only called to set idle_sp */
985 if (!next) 1202 if (expect_false (!next))
986 { 1203 {
987 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1204 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
988 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1205 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
989 } 1206 }
990 else if (prev != next) 1207 else if (expect_true (prev != next))
991 { 1208 {
992 coro_cctx *prev__cctx; 1209 coro_cctx *prev__cctx;
993 1210
994 if (prev->flags & CF_NEW) 1211 if (expect_false (prev->flags & CF_NEW))
995 { 1212 {
996 /* create a new empty context */ 1213 /* create a new empty context */
997 Newz (0, prev->cctx, 1, coro_cctx); 1214 Newz (0, prev->cctx, 1, coro_cctx);
998 prev->flags &= ~CF_NEW; 1215 prev->flags &= ~CF_NEW;
999 prev->flags |= CF_RUNNING; 1216 prev->flags |= CF_RUNNING;
1002 prev->flags &= ~CF_RUNNING; 1219 prev->flags &= ~CF_RUNNING;
1003 next->flags |= CF_RUNNING; 1220 next->flags |= CF_RUNNING;
1004 1221
1005 LOCK; 1222 LOCK;
1006 1223
1224 /* first get rid of the old state */
1225 save_perl (aTHX_ prev);
1226
1007 if (next->flags & CF_NEW) 1227 if (expect_false (next->flags & CF_NEW))
1008 { 1228 {
1009 /* need to start coroutine */ 1229 /* need to start coroutine */
1010 next->flags &= ~CF_NEW; 1230 next->flags &= ~CF_NEW;
1011 /* first get rid of the old state */
1012 save_perl (aTHX_ prev);
1013 /* setup coroutine call */ 1231 /* setup coroutine call */
1014 setup_coro (aTHX_ next); 1232 coro_setup (aTHX_ next);
1015 } 1233 }
1016 else 1234 else
1017 {
1018 /* coroutine already started */
1019 save_perl (aTHX_ prev);
1020 load_perl (aTHX_ next); 1235 load_perl (aTHX_ next);
1021 }
1022 1236
1023 prev__cctx = prev->cctx; 1237 prev__cctx = prev->cctx;
1024 1238
1025 /* possibly "free" the cctx */ 1239 /* possibly "free" the cctx */
1026 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1240 if (expect_true (
1241 prev__cctx->idle_sp == STACKLEVEL
1242 && !(prev__cctx->flags & CC_TRACE)
1243 && !force_cctx
1244 ))
1027 { 1245 {
1028 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1246 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1029 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1247 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1030 1248
1031 prev->cctx = 0; 1249 prev->cctx = 0;
1032 1250
1251 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1252 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1253 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1254 if (!next->cctx)
1255 next->cctx = cctx_get (aTHX);
1256
1033 cctx_put (prev__cctx); 1257 cctx_put (prev__cctx);
1034 } 1258 }
1035 1259
1036 ++next->usecount; 1260 ++next->usecount;
1037 1261
1038 if (!next->cctx) 1262 if (expect_true (!next->cctx))
1039 next->cctx = cctx_get (aTHX); 1263 next->cctx = cctx_get (aTHX);
1040 1264
1265 has_throw = !!next->throw;
1266
1041 if (prev__cctx != next->cctx) 1267 if (expect_false (prev__cctx != next->cctx))
1042 { 1268 {
1043 prev__cctx->top_env = PL_top_env; 1269 prev__cctx->top_env = PL_top_env;
1044 PL_top_env = next->cctx->top_env; 1270 PL_top_env = next->cctx->top_env;
1045 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1271 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1046 } 1272 }
1047 1273
1048 free_coro_mortal (aTHX); 1274 free_coro_mortal (aTHX);
1049 UNLOCK; 1275 UNLOCK;
1276
1277 if (expect_false (has_throw))
1278 {
1279 struct coro *coro = SvSTATE (coro_current);
1280
1281 if (coro->throw)
1282 {
1283 SV *exception = coro->throw;
1284 coro->throw = 0;
1285 sv_setsv (ERRSV, exception);
1286 croak (0);
1287 }
1288 }
1050 } 1289 }
1051} 1290}
1052 1291
1053struct transfer_args 1292struct transfer_args
1054{ 1293{
1055 struct coro *prev, *next; 1294 struct coro *prev, *next;
1056}; 1295};
1057 1296
1058#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1297#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1059#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1298#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1060 1299
1061/** high level stuff ********************************************************/ 1300/** high level stuff ********************************************************/
1062 1301
1063static int 1302static int
1081 1320
1082 if (coro->mainstack && coro->mainstack != main_mainstack) 1321 if (coro->mainstack && coro->mainstack != main_mainstack)
1083 { 1322 {
1084 struct coro temp; 1323 struct coro temp;
1085 1324
1086 assert (!(coro->flags & CF_RUNNING));
1087
1088 Zero (&temp, 1, struct coro);
1089 temp.save = CORO_SAVE_ALL;
1090
1091 if (coro->flags & CF_RUNNING) 1325 if (coro->flags & CF_RUNNING)
1092 croak ("FATAL: tried to destroy currently running coroutine"); 1326 croak ("FATAL: tried to destroy currently running coroutine");
1093 1327
1094 save_perl (aTHX_ &temp); 1328 save_perl (aTHX_ &temp);
1095 load_perl (aTHX_ coro); 1329 load_perl (aTHX_ coro);
1096 1330
1097 coro_destroy_stacks (aTHX); 1331 coro_destroy (aTHX_ coro);
1098 1332
1099 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1333 load_perl (aTHX_ &temp);
1100 1334
1101 coro->mainstack = 0; 1335 coro->slot = 0;
1102 } 1336 }
1103 1337
1104 cctx_destroy (coro->cctx); 1338 cctx_destroy (coro->cctx);
1105 SvREFCNT_dec (coro->args); 1339 SvREFCNT_dec (coro->args);
1106 1340
1162{ 1396{
1163 dTHX; 1397 dTHX;
1164 struct transfer_args ta; 1398 struct transfer_args ta;
1165 1399
1166 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1400 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1167 TRANSFER (ta); 1401 TRANSFER (ta, 1);
1168}
1169
1170static int
1171api_save (SV *coro_sv, int new_save)
1172{
1173 dTHX;
1174 struct coro *coro = SvSTATE (coro_sv);
1175 int old_save = coro->save;
1176
1177 if (new_save >= 0)
1178 coro->save = new_save;
1179
1180 return old_save;
1181} 1402}
1182 1403
1183/** Coro ********************************************************************/ 1404/** Coro ********************************************************************/
1184 1405
1185static void 1406static void
1187{ 1408{
1188 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1409 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1189} 1410}
1190 1411
1191static SV * 1412static SV *
1192coro_deq (pTHX_ int min_prio) 1413coro_deq (pTHX)
1193{ 1414{
1194 int prio = PRIO_MAX - PRIO_MIN; 1415 int prio;
1195 1416
1196 min_prio -= PRIO_MIN;
1197 if (min_prio < 0)
1198 min_prio = 0;
1199
1200 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1417 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1201 if (AvFILLp (coro_ready [prio]) >= 0) 1418 if (AvFILLp (coro_ready [prio]) >= 0)
1202 return av_shift (coro_ready [prio]); 1419 return av_shift (coro_ready [prio]);
1203 1420
1204 return 0; 1421 return 0;
1205} 1422}
1207static int 1424static int
1208api_ready (SV *coro_sv) 1425api_ready (SV *coro_sv)
1209{ 1426{
1210 dTHX; 1427 dTHX;
1211 struct coro *coro; 1428 struct coro *coro;
1429 SV *sv_hook;
1430 void (*xs_hook)(void);
1212 1431
1213 if (SvROK (coro_sv)) 1432 if (SvROK (coro_sv))
1214 coro_sv = SvRV (coro_sv); 1433 coro_sv = SvRV (coro_sv);
1215 1434
1216 coro = SvSTATE (coro_sv); 1435 coro = SvSTATE (coro_sv);
1219 return 0; 1438 return 0;
1220 1439
1221 coro->flags |= CF_READY; 1440 coro->flags |= CF_READY;
1222 1441
1223 LOCK; 1442 LOCK;
1443
1444 sv_hook = coro_nready ? 0 : coro_readyhook;
1445 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1446
1224 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1447 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1225 ++coro_nready; 1448 ++coro_nready;
1449
1226 UNLOCK; 1450 UNLOCK;
1451
1452 if (sv_hook)
1453 {
1454 dSP;
1455
1456 ENTER;
1457 SAVETMPS;
1458
1459 PUSHMARK (SP);
1460 PUTBACK;
1461 call_sv (sv_hook, G_DISCARD);
1462 SPAGAIN;
1463
1464 FREETMPS;
1465 LEAVE;
1466 }
1467
1468 if (xs_hook)
1469 xs_hook ();
1227 1470
1228 return 1; 1471 return 1;
1229} 1472}
1230 1473
1231static int 1474static int
1241 SV *prev_sv, *next_sv; 1484 SV *prev_sv, *next_sv;
1242 1485
1243 for (;;) 1486 for (;;)
1244 { 1487 {
1245 LOCK; 1488 LOCK;
1246 next_sv = coro_deq (aTHX_ PRIO_MIN); 1489 next_sv = coro_deq (aTHX);
1247 1490
1248 /* nothing to schedule: call the idle handler */ 1491 /* nothing to schedule: call the idle handler */
1249 if (!next_sv) 1492 if (expect_false (!next_sv))
1250 { 1493 {
1251 dSP; 1494 dSP;
1252 UNLOCK; 1495 UNLOCK;
1253 1496
1254 ENTER; 1497 ENTER;
1255 SAVETMPS; 1498 SAVETMPS;
1256 1499
1257 PUSHMARK (SP); 1500 PUSHMARK (SP);
1258 PUTBACK; 1501 PUTBACK;
1259 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1502 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1503 SPAGAIN;
1260 1504
1261 FREETMPS; 1505 FREETMPS;
1262 LEAVE; 1506 LEAVE;
1263 continue; 1507 continue;
1264 } 1508 }
1265 1509
1266 ta->next = SvSTATE (next_sv); 1510 ta->next = SvSTATE (next_sv);
1267 1511
1268 /* cannot transfer to destroyed coros, skip and look for next */ 1512 /* cannot transfer to destroyed coros, skip and look for next */
1269 if (ta->next->flags & CF_DESTROYED) 1513 if (expect_false (ta->next->flags & CF_DESTROYED))
1270 { 1514 {
1271 UNLOCK; 1515 UNLOCK;
1272 SvREFCNT_dec (next_sv); 1516 SvREFCNT_dec (next_sv);
1273 /* coro_nready is already taken care of by destroy */ 1517 /* coro_nready is already taken care of by destroy */
1274 continue; 1518 continue;
1319{ 1563{
1320 dTHX; 1564 dTHX;
1321 struct transfer_args ta; 1565 struct transfer_args ta;
1322 1566
1323 prepare_schedule (aTHX_ &ta); 1567 prepare_schedule (aTHX_ &ta);
1324 TRANSFER (ta); 1568 TRANSFER (ta, 1);
1325} 1569}
1326 1570
1327static int 1571static int
1328api_cede (void) 1572api_cede (void)
1329{ 1573{
1330 dTHX; 1574 dTHX;
1331 struct transfer_args ta; 1575 struct transfer_args ta;
1332 1576
1333 prepare_cede (aTHX_ &ta); 1577 prepare_cede (aTHX_ &ta);
1334 1578
1335 if (ta.prev != ta.next) 1579 if (expect_true (ta.prev != ta.next))
1336 { 1580 {
1337 TRANSFER (ta); 1581 TRANSFER (ta, 1);
1338 return 1; 1582 return 1;
1339 } 1583 }
1340 else 1584 else
1341 return 0; 1585 return 0;
1342} 1586}
1347 dTHX; 1591 dTHX;
1348 struct transfer_args ta; 1592 struct transfer_args ta;
1349 1593
1350 if (prepare_cede_notself (aTHX_ &ta)) 1594 if (prepare_cede_notself (aTHX_ &ta))
1351 { 1595 {
1352 TRANSFER (ta); 1596 TRANSFER (ta, 1);
1353 return 1; 1597 return 1;
1354 } 1598 }
1355 else 1599 else
1356 return 0; 1600 return 0;
1357} 1601}
1376 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1620 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1377 1621
1378 if (coro->flags & CF_RUNNING) 1622 if (coro->flags & CF_RUNNING)
1379 PL_runops = RUNOPS_DEFAULT; 1623 PL_runops = RUNOPS_DEFAULT;
1380 else 1624 else
1381 coro->runops = RUNOPS_DEFAULT; 1625 coro->slot->runops = RUNOPS_DEFAULT;
1382 } 1626 }
1383} 1627}
1384 1628
1385MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1629MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1386 1630
1390{ 1634{
1391#ifdef USE_ITHREADS 1635#ifdef USE_ITHREADS
1392 MUTEX_INIT (&coro_mutex); 1636 MUTEX_INIT (&coro_mutex);
1393#endif 1637#endif
1394 BOOT_PAGESIZE; 1638 BOOT_PAGESIZE;
1639
1640 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1641 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1642
1643 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1644 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1645 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1646
1647 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1648 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1649 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1395 1650
1396 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1651 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1397 1652
1398 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1653 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1399 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1654 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1400 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1655 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1401 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1656 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1402 1657
1403 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1404 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1405 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1406 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1407 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1408 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1409 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1410
1411 main_mainstack = PL_mainstack; 1658 main_mainstack = PL_mainstack;
1412 main_top_env = PL_top_env; 1659 main_top_env = PL_top_env;
1413 1660
1414 while (main_top_env->je_prev) 1661 while (main_top_env->je_prev)
1415 main_top_env = main_top_env->je_prev; 1662 main_top_env = main_top_env->je_prev;
1416 1663
1417 coroapi.ver = CORO_API_VERSION; 1664 coroapi.ver = CORO_API_VERSION;
1665 coroapi.rev = CORO_API_REVISION;
1418 coroapi.transfer = api_transfer; 1666 coroapi.transfer = api_transfer;
1419 1667
1420 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1668 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1421} 1669}
1422 1670
1423SV * 1671SV *
1424new (char *klass, ...) 1672new (char *klass, ...)
1425 CODE: 1673 CODE:
1426{ 1674{
1427 struct coro *coro; 1675 struct coro *coro;
1676 MAGIC *mg;
1428 HV *hv; 1677 HV *hv;
1429 int i; 1678 int i;
1430 1679
1431 Newz (0, coro, 1, struct coro); 1680 Newz (0, coro, 1, struct coro);
1432 coro->args = newAV (); 1681 coro->args = newAV ();
1433 coro->save = CORO_SAVE_DEF;
1434 coro->flags = CF_NEW; 1682 coro->flags = CF_NEW;
1435 1683
1436 if (coro_first) coro_first->prev = coro; 1684 if (coro_first) coro_first->prev = coro;
1437 coro->next = coro_first; 1685 coro->next = coro_first;
1438 coro_first = coro; 1686 coro_first = coro;
1439 1687
1440 coro->hv = hv = newHV (); 1688 coro->hv = hv = newHV ();
1441 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1689 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1690 mg->mg_flags |= MGf_DUP;
1442 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1691 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1443 1692
1693 av_extend (coro->args, items - 1);
1444 for (i = 1; i < items; i++) 1694 for (i = 1; i < items; i++)
1445 av_push (coro->args, newSVsv (ST (i))); 1695 av_push (coro->args, newSVsv (ST (i)));
1446} 1696}
1447 OUTPUT: 1697 OUTPUT:
1448 RETVAL 1698 RETVAL
1449 1699
1450int 1700# these not obviously related functions are all rolled into the same xs
1451save (SV *coro, int new_save = -1) 1701# function to increase chances that they all will call transfer with the same
1452 CODE: 1702# stack offset
1453 RETVAL = api_save (coro, new_save);
1454 OUTPUT:
1455 RETVAL
1456
1457int
1458save_also (SV *coro_sv, int save_also)
1459 CODE:
1460{
1461 struct coro *coro = SvSTATE (coro_sv);
1462 RETVAL = coro->save;
1463 coro->save |= save_also;
1464}
1465 OUTPUT:
1466 RETVAL
1467
1468void 1703void
1469_set_stacklevel (...) 1704_set_stacklevel (...)
1470 ALIAS: 1705 ALIAS:
1471 Coro::State::transfer = 1 1706 Coro::State::transfer = 1
1472 Coro::schedule = 2 1707 Coro::schedule = 2
1474 Coro::cede_notself = 4 1709 Coro::cede_notself = 4
1475 CODE: 1710 CODE:
1476{ 1711{
1477 struct transfer_args ta; 1712 struct transfer_args ta;
1478 1713
1714 PUTBACK;
1479 switch (ix) 1715 switch (ix)
1480 { 1716 {
1481 case 0: 1717 case 0:
1482 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1718 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1483 ta.next = 0; 1719 ta.next = 0;
1502 if (!prepare_cede_notself (aTHX_ &ta)) 1738 if (!prepare_cede_notself (aTHX_ &ta))
1503 XSRETURN_EMPTY; 1739 XSRETURN_EMPTY;
1504 1740
1505 break; 1741 break;
1506 } 1742 }
1743 SPAGAIN;
1507 1744
1508 BARRIER; 1745 BARRIER;
1746 PUTBACK;
1509 TRANSFER (ta); 1747 TRANSFER (ta, 0);
1510 1748 SPAGAIN; /* might be the sp of a different coroutine now */
1511 if (GIMME_V != G_VOID && ta.next != ta.prev) 1749 /* be extra careful not to ever do anything after TRANSFER */
1512 XSRETURN_YES;
1513} 1750}
1514 1751
1515bool 1752bool
1516_destroy (SV *coro_sv) 1753_destroy (SV *coro_sv)
1517 CODE: 1754 CODE:
1518 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 1755 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1519 OUTPUT: 1756 OUTPUT:
1520 RETVAL 1757 RETVAL
1521 1758
1522void 1759void
1523_exit (code) 1760_exit (int code)
1524 int code
1525 PROTOTYPE: $ 1761 PROTOTYPE: $
1526 CODE: 1762 CODE:
1527 _exit (code); 1763 _exit (code);
1528 1764
1529int 1765int
1566 CODE: 1802 CODE:
1567{ 1803{
1568 if (coro->mainstack) 1804 if (coro->mainstack)
1569 { 1805 {
1570 struct coro temp; 1806 struct coro temp;
1571 Zero (&temp, 1, struct coro);
1572 temp.save = CORO_SAVE_ALL;
1573 1807
1574 if (!(coro->flags & CF_RUNNING)) 1808 if (!(coro->flags & CF_RUNNING))
1575 { 1809 {
1810 PUTBACK;
1576 save_perl (aTHX_ &temp); 1811 save_perl (aTHX_ &temp);
1577 load_perl (aTHX_ coro); 1812 load_perl (aTHX_ coro);
1578 } 1813 }
1579 1814
1580 { 1815 {
1581 dSP; 1816 dSP;
1582 ENTER; 1817 ENTER;
1583 SAVETMPS; 1818 SAVETMPS;
1819 PUTBACK;
1820 PUSHSTACK;
1584 PUSHMARK (SP); 1821 PUSHMARK (SP);
1585 PUTBACK; 1822
1586 if (ix) 1823 if (ix)
1587 eval_sv (coderef, 0); 1824 eval_sv (coderef, 0);
1588 else 1825 else
1589 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1826 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1827
1828 POPSTACK;
1590 SPAGAIN; 1829 SPAGAIN;
1591 FREETMPS; 1830 FREETMPS;
1592 LEAVE; 1831 LEAVE;
1593 PUTBACK; 1832 PUTBACK;
1594 } 1833 }
1595 1834
1596 if (!(coro->flags & CF_RUNNING)) 1835 if (!(coro->flags & CF_RUNNING))
1597 { 1836 {
1598 save_perl (aTHX_ coro); 1837 save_perl (aTHX_ coro);
1599 load_perl (aTHX_ &temp); 1838 load_perl (aTHX_ &temp);
1839 SPAGAIN;
1600 } 1840 }
1601 } 1841 }
1602} 1842}
1603 1843
1604SV * 1844SV *
1616 1856
1617void 1857void
1618api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 1858api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1619 1859
1620SV * 1860SV *
1621has_stack (Coro::State coro) 1861has_cctx (Coro::State coro)
1622 PROTOTYPE: $ 1862 PROTOTYPE: $
1623 CODE: 1863 CODE:
1624 RETVAL = boolSV (!!coro->cctx); 1864 RETVAL = boolSV (!!coro->cctx);
1625 OUTPUT: 1865 OUTPUT:
1626 RETVAL 1866 RETVAL
1645 case 1: RETVAL = coro->usecount; break; 1885 case 1: RETVAL = coro->usecount; break;
1646 } 1886 }
1647 OUTPUT: 1887 OUTPUT:
1648 RETVAL 1888 RETVAL
1649 1889
1890void
1891force_cctx ()
1892 CODE:
1893 struct coro *coro = SvSTATE (coro_current);
1894 coro->cctx->idle_sp = 0;
1650 1895
1651MODULE = Coro::State PACKAGE = Coro 1896MODULE = Coro::State PACKAGE = Coro
1652 1897
1653BOOT: 1898BOOT:
1654{ 1899{
1655 int i; 1900 int i;
1656 1901
1657 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1658 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1659 av_async_pool = get_av ("Coro::async_pool", TRUE); 1902 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1903 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1904 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1660 1905
1661 coro_current = get_sv ("Coro::current", FALSE); 1906 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1662 SvREADONLY_on (coro_current); 1907 SvREADONLY_on (coro_current);
1663 1908
1664 coro_stash = gv_stashpv ("Coro", TRUE); 1909 coro_stash = gv_stashpv ("Coro", TRUE);
1665 1910
1666 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1911 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1667 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1912 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1668 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1913 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1669 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1914 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1672 1917
1673 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1918 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1674 coro_ready[i] = newAV (); 1919 coro_ready[i] = newAV ();
1675 1920
1676 { 1921 {
1677 SV *sv = perl_get_sv("Coro::API", 1); 1922 SV *sv = perl_get_sv ("Coro::API", TRUE);
1923 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1678 1924
1679 coroapi.schedule = api_schedule; 1925 coroapi.schedule = api_schedule;
1680 coroapi.save = api_save;
1681 coroapi.cede = api_cede; 1926 coroapi.cede = api_cede;
1682 coroapi.cede_notself = api_cede_notself; 1927 coroapi.cede_notself = api_cede_notself;
1683 coroapi.ready = api_ready; 1928 coroapi.ready = api_ready;
1684 coroapi.is_ready = api_is_ready; 1929 coroapi.is_ready = api_is_ready;
1685 coroapi.nready = &coro_nready; 1930 coroapi.nready = &coro_nready;
1695_set_current (SV *current) 1940_set_current (SV *current)
1696 PROTOTYPE: $ 1941 PROTOTYPE: $
1697 CODE: 1942 CODE:
1698 SvREFCNT_dec (SvRV (coro_current)); 1943 SvREFCNT_dec (SvRV (coro_current));
1699 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 1944 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1945
1946void
1947_set_readyhook (SV *hook)
1948 PROTOTYPE: $
1949 CODE:
1950 LOCK;
1951 SvREFCNT_dec (coro_readyhook);
1952 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
1953 UNLOCK;
1700 1954
1701int 1955int
1702prio (Coro::State coro, int newprio = 0) 1956prio (Coro::State coro, int newprio = 0)
1703 ALIAS: 1957 ALIAS:
1704 nice = 1 1958 nice = 1
1734 CODE: 1988 CODE:
1735 RETVAL = coro_nready; 1989 RETVAL = coro_nready;
1736 OUTPUT: 1990 OUTPUT:
1737 RETVAL 1991 RETVAL
1738 1992
1993void
1994throw (Coro::State self, SV *throw = &PL_sv_undef)
1995 PROTOTYPE: $;$
1996 CODE:
1997 SvREFCNT_dec (self->throw);
1998 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1999
2000void
2001swap_defsv (Coro::State self)
2002 PROTOTYPE: $
2003 ALIAS:
2004 swap_defav = 1
2005 CODE:
2006 if (!self->slot)
2007 croak ("cannot swap state with coroutine that has no saved state");
2008 else
2009 {
2010 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
2011 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2012
2013 SV *tmp = *src; *src = *dst; *dst = tmp;
2014 }
2015
1739# for async_pool speedup 2016# for async_pool speedup
1740void 2017void
1741_pool_1 (SV *cb) 2018_pool_1 (SV *cb)
1742 CODE: 2019 CODE:
1743{ 2020{
1744 int i, len; 2021 struct coro *coro = SvSTATE (coro_current);
1745 HV *hv = (HV *)SvRV (coro_current); 2022 HV *hv = (HV *)SvRV (coro_current);
1746 AV *defav = GvAV (PL_defgv); 2023 AV *defav = GvAV (PL_defgv);
1747 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 2024 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1748 AV *invoke_av; 2025 AV *invoke_av;
2026 int i, len;
1749 2027
1750 if (!invoke) 2028 if (!invoke)
2029 {
2030 SV *old = PL_diehook;
2031 PL_diehook = 0;
2032 SvREFCNT_dec (old);
1751 croak ("\3terminate\2\n"); 2033 croak ("\3async_pool terminate\2\n");
2034 }
2035
2036 SvREFCNT_dec (coro->saved_deffh);
2037 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1752 2038
1753 hv_store (hv, "desc", sizeof ("desc") - 1, 2039 hv_store (hv, "desc", sizeof ("desc") - 1,
1754 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 2040 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1755 2041
1756 invoke_av = (AV *)SvRV (invoke); 2042 invoke_av = (AV *)SvRV (invoke);
1774{ 2060{
1775 struct coro *coro = SvSTATE (coro_current); 2061 struct coro *coro = SvSTATE (coro_current);
1776 2062
1777 sv_setsv (cb, &PL_sv_undef); 2063 sv_setsv (cb, &PL_sv_undef);
1778 2064
2065 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2066 coro->saved_deffh = 0;
2067
1779 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2068 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1780 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2069 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2070 {
2071 SV *old = PL_diehook;
2072 PL_diehook = 0;
2073 SvREFCNT_dec (old);
1781 croak ("\3terminate\2\n"); 2074 croak ("\3async_pool terminate\2\n");
2075 }
1782 2076
1783 av_clear (GvAV (PL_defgv)); 2077 av_clear (GvAV (PL_defgv));
1784 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2078 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1785 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2079 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1786 2080
1787 coro->save = CORO_SAVE_DEF;
1788 coro->prio = 0; 2081 coro->prio = 0;
1789 2082
1790 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2083 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1791 api_trace (coro_current, 0); 2084 api_trace (coro_current, 0);
1792 2085
1826 PL_laststype = data->laststype; 2119 PL_laststype = data->laststype;
1827 PL_laststatval = data->laststatval; 2120 PL_laststatval = data->laststatval;
1828 PL_statcache = data->statcache; 2121 PL_statcache = data->statcache;
1829} 2122}
1830 2123
2124
2125MODULE = Coro::State PACKAGE = Coro::AnyEvent
2126
2127BOOT:
2128 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2129
2130SV *
2131_schedule (...)
2132 PROTOTYPE: @
2133 CODE:
2134{
2135 static int incede;
2136
2137 api_cede_notself ();
2138
2139 ++incede;
2140 while (coro_nready >= incede && api_cede ())
2141 ;
2142
2143 sv_setsv (sv_activity, &PL_sv_undef);
2144 if (coro_nready >= incede)
2145 {
2146 PUSHMARK (SP);
2147 PUTBACK;
2148 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2149 SPAGAIN;
2150 }
2151
2152 --incede;
2153}
2154

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines