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.182 by root, Wed Oct 3 18:37:48 2007 UTC vs.
Revision 1.245 by root, Mon Sep 22 05:40:21 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 */
136 164
137static GV *irsgv; /* $/ */ 165static GV *irsgv; /* $/ */
166static GV *stdoutgv; /* *STDOUT */
167static SV *rv_diehook;
168static SV *rv_warnhook;
169static HV *hv_sig; /* %SIG */
138 170
139/* async_pool helper stuff */ 171/* async_pool helper stuff */
140static SV *sv_pool_rss; 172static SV *sv_pool_rss;
141static SV *sv_pool_size; 173static SV *sv_pool_size;
142static AV *av_async_pool; 174static AV *av_async_pool;
175
176/* Coro::AnyEvent */
177static SV *sv_activity;
143 178
144static struct coro_cctx *cctx_first; 179static struct coro_cctx *cctx_first;
145static int cctx_count, cctx_idle; 180static int cctx_count, cctx_idle;
146 181
147enum { 182enum {
178 CF_READY = 0x0002, /* coroutine is ready */ 213 CF_READY = 0x0002, /* coroutine is ready */
179 CF_NEW = 0x0004, /* has never been switched to */ 214 CF_NEW = 0x0004, /* has never been switched to */
180 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 215 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
181}; 216};
182 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
183/* this is a structure representing a perl-level coroutine */ 231/* this is a structure representing a perl-level coroutine */
184struct coro { 232struct coro {
185 /* the c coroutine allocated to this perl coroutine, if any */ 233 /* the c coroutine allocated to this perl coroutine, if any */
186 coro_cctx *cctx; 234 coro_cctx *cctx;
187 235
236 /* process data */
237 AV *mainstack;
238 perl_slots *slot; /* basically the saved sp */
239
188 /* data associated with this coroutine (initial args) */ 240 AV *args; /* data associated with this coroutine (initial args) */
189 AV *args; 241 int refcnt; /* coroutines are refcounted, yes */
190 int refcnt;
191 int flags; /* CF_ flags */ 242 int flags; /* CF_ flags */
192 243 HV *hv; /* the perl hash associated with this coro, if any */
193 /* optionally saved, might be zero */
194 AV *defav; /* @_ */
195 SV *defsv; /* $_ */
196 SV *errsv; /* $@ */
197 GV *deffh; /* default filehandle */
198 SV *irssv; /* $/ */
199 SV *irssv_sv; /* real $/ cache */
200
201#define VAR(name,type) type name;
202# include "state.h"
203#undef VAR
204 244
205 /* statistics */ 245 /* statistics */
206 int usecount; /* number of transfers to this coro */ 246 int usecount; /* number of transfers to this coro */
207 247
208 /* coro process data */ 248 /* coro process data */
209 int prio; 249 int prio;
210 //SV *throw; 250 SV *throw; /* exception to be thrown */
211 251
212 /* async_pool */ 252 /* async_pool */
213 GV *asp_deffh; 253 SV *saved_deffh;
214 254
215 /* linked list */ 255 /* linked list */
216 struct coro *next, *prev; 256 struct coro *next, *prev;
217 HV *hv; /* the perl hash associated with this coro, if any */
218}; 257};
219 258
220typedef struct coro *Coro__State; 259typedef struct coro *Coro__State;
221typedef struct coro *Coro__State_or_hashref; 260typedef struct coro *Coro__State_or_hashref;
222 261
229#define PRIO_IDLE -3 268#define PRIO_IDLE -3
230#define PRIO_MIN -4 269#define PRIO_MIN -4
231 270
232/* for Coro.pm */ 271/* for Coro.pm */
233static SV *coro_current; 272static SV *coro_current;
273static SV *coro_readyhook;
234static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 274static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
235static int coro_nready; 275static int coro_nready;
236static struct coro *coro_first; 276static struct coro *coro_first;
237 277
238/** lowlevel stuff **********************************************************/ 278/** lowlevel stuff **********************************************************/
239 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
240static AV * 310static AV *
241coro_clone_padlist (pTHX_ CV *cv) 311coro_clone_padlist (pTHX_ CV *cv)
242{ 312{
243 AV *padlist = CvPADLIST (cv); 313 AV *padlist = CvPADLIST (cv);
244 AV *newpadlist, *newpad; 314 AV *newpadlist, *newpad;
245 315
246 newpadlist = newAV (); 316 newpadlist = newAV ();
247 AvREAL_off (newpadlist); 317 AvREAL_off (newpadlist);
248#if PERL_VERSION_ATLEAST (5,9,0) 318#if PERL_VERSION_ATLEAST (5,10,0)
249 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 319 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
250#else 320#else
251 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 321 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
252#endif 322#endif
253 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 323 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
291 361
292 /* casting is fun. */ 362 /* casting is fun. */
293 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 363 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
294 free_padlist (aTHX_ padlist); 364 free_padlist (aTHX_ padlist);
295 365
296 SvREFCNT_dec (av); 366 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
297 367
298 return 0; 368 return 0;
299} 369}
300 370
301#define PERL_MAGIC_coro PERL_MAGIC_ext 371#define CORO_MAGIC_type_cv PERL_MAGIC_ext
372#define CORO_MAGIC_type_state PERL_MAGIC_ext
302 373
303static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 374static MGVTBL coro_cv_vtbl = {
375 0, 0, 0, 0,
376 coro_cv_free
377};
304 378
305#define CORO_MAGIC(cv) \ 379#define CORO_MAGIC(sv,type) \
306 SvMAGIC (cv) \ 380 SvMAGIC (sv) \
307 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 381 ? SvMAGIC (sv)->mg_type == type \
308 ? SvMAGIC (cv) \ 382 ? SvMAGIC (sv) \
309 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 383 : mg_find (sv, type) \
310 : 0 384 : 0
385
386#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
387#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
311 388
312static struct coro * 389static struct coro *
313SvSTATE_ (pTHX_ SV *coro) 390SvSTATE_ (pTHX_ SV *coro)
314{ 391{
315 HV *stash; 392 HV *stash;
316 MAGIC *mg; 393 MAGIC *mg;
317 394
318 if (SvROK (coro)) 395 if (SvROK (coro))
319 coro = SvRV (coro); 396 coro = SvRV (coro);
320 397
321 if (SvTYPE (coro) != SVt_PVHV) 398 if (expect_false (SvTYPE (coro) != SVt_PVHV))
322 croak ("Coro::State object required"); 399 croak ("Coro::State object required");
323 400
324 stash = SvSTASH (coro); 401 stash = SvSTASH (coro);
325 if (stash != coro_stash && stash != coro_state_stash) 402 if (expect_false (stash != coro_stash && stash != coro_state_stash))
326 { 403 {
327 /* very slow, but rare, check */ 404 /* very slow, but rare, check */
328 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 405 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
329 croak ("Coro::State object required"); 406 croak ("Coro::State object required");
330 } 407 }
331 408
332 mg = CORO_MAGIC (coro); 409 mg = CORO_MAGIC_state (coro);
333 return (struct coro *)mg->mg_ptr; 410 return (struct coro *)mg->mg_ptr;
334} 411}
335 412
336#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 413#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
337 414
338/* the next two functions merely cache the padlists */ 415/* the next two functions merely cache the padlists */
339static void 416static void
340get_padlist (pTHX_ CV *cv) 417get_padlist (pTHX_ CV *cv)
341{ 418{
342 MAGIC *mg = CORO_MAGIC (cv); 419 MAGIC *mg = CORO_MAGIC_cv (cv);
343 AV *av; 420 AV *av;
344 421
345 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 422 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
346 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 423 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
347 else 424 else
348 { 425 {
349#if CORO_PREFER_PERL_FUNCTIONS 426#if CORO_PREFER_PERL_FUNCTIONS
350 /* this is probably cleaner, but also slower? */ 427 /* this is probably cleaner? but also slower! */
428 /* in practise, it seems to be less stable */
351 CV *cp = Perl_cv_clone (cv); 429 CV *cp = Perl_cv_clone (cv);
352 CvPADLIST (cv) = CvPADLIST (cp); 430 CvPADLIST (cv) = CvPADLIST (cp);
353 CvPADLIST (cp) = 0; 431 CvPADLIST (cp) = 0;
354 SvREFCNT_dec (cp); 432 SvREFCNT_dec (cp);
355#else 433#else
359} 437}
360 438
361static void 439static void
362put_padlist (pTHX_ CV *cv) 440put_padlist (pTHX_ CV *cv)
363{ 441{
364 MAGIC *mg = CORO_MAGIC (cv); 442 MAGIC *mg = CORO_MAGIC_cv (cv);
365 AV *av; 443 AV *av;
366 444
367 if (!mg) 445 if (expect_false (!mg))
368 { 446 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
369 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
370 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
371 mg->mg_virtual = &vtbl_coro;
372 mg->mg_obj = (SV *)newAV ();
373 }
374 447
375 av = (AV *)mg->mg_obj; 448 av = (AV *)mg->mg_obj;
376 449
377 if (AvFILLp (av) >= AvMAX (av)) 450 if (expect_false (AvFILLp (av) >= AvMAX (av)))
378 av_extend (av, AvMAX (av) + 1); 451 av_extend (av, AvMAX (av) + 1);
379 452
380 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 453 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
381} 454}
382 455
383/** load & save, init *******************************************************/ 456/** load & save, init *******************************************************/
384 457
385static void 458static void
386load_perl (pTHX_ Coro__State c) 459load_perl (pTHX_ Coro__State c)
387{ 460{
461 perl_slots *slot = c->slot;
462 c->slot = 0;
463
464 PL_mainstack = c->mainstack;
465
466 GvSV (PL_defgv) = slot->defsv;
467 GvAV (PL_defgv) = slot->defav;
468 GvSV (PL_errgv) = slot->errsv;
469 GvSV (irsgv) = slot->irsgv;
470
388#define VAR(name,type) PL_ ## name = c->name; 471 #define VAR(name,type) PL_ ## name = slot->name;
389# include "state.h" 472 # include "state.h"
390#undef VAR 473 #undef VAR
391
392 GvSV (PL_defgv) = c->defsv;
393 GvAV (PL_defgv) = c->defav;
394 GvSV (PL_errgv) = c->errsv;
395 PL_defoutgv = c->deffh;
396 PL_rs = c->irssv;
397 GvSV (irsgv) = c->irssv_sv;
398 474
399 { 475 {
400 dSP; 476 dSP;
477
401 CV *cv; 478 CV *cv;
402 479
403 /* now do the ugly restore mess */ 480 /* now do the ugly restore mess */
404 while ((cv = (CV *)POPs)) 481 while (expect_true (cv = (CV *)POPs))
405 { 482 {
406 put_padlist (aTHX_ cv); /* mark this padlist as available */ 483 put_padlist (aTHX_ cv); /* mark this padlist as available */
407 CvDEPTH (cv) = PTR2IV (POPs); 484 CvDEPTH (cv) = PTR2IV (POPs);
408 CvPADLIST (cv) = (AV *)POPs; 485 CvPADLIST (cv) = (AV *)POPs;
409 } 486 }
428 505
429 XPUSHs (Nullsv); 506 XPUSHs (Nullsv);
430 /* this loop was inspired by pp_caller */ 507 /* this loop was inspired by pp_caller */
431 for (;;) 508 for (;;)
432 { 509 {
433 while (cxix >= 0) 510 while (expect_true (cxix >= 0))
434 { 511 {
435 PERL_CONTEXT *cx = &ccstk[cxix--]; 512 PERL_CONTEXT *cx = &ccstk[cxix--];
436 513
437 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 514 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
438 { 515 {
439 CV *cv = cx->blk_sub.cv; 516 CV *cv = cx->blk_sub.cv;
440 517
441 if (CvDEPTH (cv)) 518 if (expect_true (CvDEPTH (cv)))
442 { 519 {
443 EXTEND (SP, 3); 520 EXTEND (SP, 3);
444 PUSHs ((SV *)CvPADLIST (cv)); 521 PUSHs ((SV *)CvPADLIST (cv));
445 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 522 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
446 PUSHs ((SV *)cv); 523 PUSHs ((SV *)cv);
447 524
448 CvDEPTH (cv) = 0; 525 CvDEPTH (cv) = 0;
449 get_padlist (aTHX_ cv); 526 get_padlist (aTHX_ cv);
450 } 527 }
451 } 528 }
452 } 529 }
453 530
454 if (top_si->si_type == PERLSI_MAIN) 531 if (expect_true (top_si->si_type == PERLSI_MAIN))
455 break; 532 break;
456 533
457 top_si = top_si->si_prev; 534 top_si = top_si->si_prev;
458 ccstk = top_si->si_cxstack; 535 ccstk = top_si->si_cxstack;
459 cxix = top_si->si_cxix; 536 cxix = top_si->si_cxix;
460 } 537 }
461 538
462 PUTBACK; 539 PUTBACK;
463 } 540 }
464 541
542 /* allocate some space on the context stack for our purposes */
543 /* we manually unroll here, as usually 2 slots is enough */
544 if (SLOT_COUNT >= 1) CXINC;
545 if (SLOT_COUNT >= 2) CXINC;
546 if (SLOT_COUNT >= 3) CXINC;
547 {
548 int i;
549 for (i = 3; i < SLOT_COUNT; ++i)
550 CXINC;
551 }
552 cxstack_ix -= SLOT_COUNT; /* undo allocation */
553
554 c->mainstack = PL_mainstack;
555
556 {
557 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
558
465 c->defav = GvAV (PL_defgv); 559 slot->defav = GvAV (PL_defgv);
466 c->defsv = DEFSV; 560 slot->defsv = DEFSV;
467 c->errsv = ERRSV; 561 slot->errsv = ERRSV;
468 c->deffh = PL_defoutgv;
469 c->irssv = PL_rs;
470 c->irssv_sv = GvSV (irsgv); 562 slot->irsgv = GvSV (irsgv);
471 563
472#define VAR(name,type)c->name = PL_ ## name; 564 #define VAR(name,type) slot->name = PL_ ## name;
473# include "state.h" 565 # include "state.h"
474#undef VAR 566 #undef VAR
567 }
475} 568}
476 569
477/* 570/*
478 * allocate various perl stacks. This is an exact copy 571 * allocate various perl stacks. This is an exact copy
479 * of perl.c:init_stacks, except that it uses less memory 572 * of perl.c:init_stacks, except that it uses less memory
484# define coro_init_stacks init_stacks 577# define coro_init_stacks init_stacks
485#else 578#else
486static void 579static void
487coro_init_stacks (pTHX) 580coro_init_stacks (pTHX)
488{ 581{
489 PL_curstackinfo = new_stackinfo(64, 6); 582 PL_curstackinfo = new_stackinfo(32, 8);
490 PL_curstackinfo->si_type = PERLSI_MAIN; 583 PL_curstackinfo->si_type = PERLSI_MAIN;
491 PL_curstack = PL_curstackinfo->si_stack; 584 PL_curstack = PL_curstackinfo->si_stack;
492 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 585 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
493 586
494 PL_stack_base = AvARRAY(PL_curstack); 587 PL_stack_base = AvARRAY(PL_curstack);
495 PL_stack_sp = PL_stack_base; 588 PL_stack_sp = PL_stack_base;
496 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 589 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
497 590
498 New(50,PL_tmps_stack,64,SV*); 591 New(50,PL_tmps_stack,32,SV*);
499 PL_tmps_floor = -1; 592 PL_tmps_floor = -1;
500 PL_tmps_ix = -1; 593 PL_tmps_ix = -1;
501 PL_tmps_max = 64; 594 PL_tmps_max = 32;
502 595
503 New(54,PL_markstack,16,I32); 596 New(54,PL_markstack,16,I32);
504 PL_markstack_ptr = PL_markstack; 597 PL_markstack_ptr = PL_markstack;
505 PL_markstack_max = PL_markstack + 16; 598 PL_markstack_max = PL_markstack + 16;
506 599
507#ifdef SET_MARK_OFFSET 600#ifdef SET_MARK_OFFSET
508 SET_MARK_OFFSET; 601 SET_MARK_OFFSET;
509#endif 602#endif
510 603
511 New(54,PL_scopestack,16,I32); 604 New(54,PL_scopestack,8,I32);
512 PL_scopestack_ix = 0; 605 PL_scopestack_ix = 0;
513 PL_scopestack_max = 16; 606 PL_scopestack_max = 8;
514 607
515 New(54,PL_savestack,64,ANY); 608 New(54,PL_savestack,24,ANY);
516 PL_savestack_ix = 0; 609 PL_savestack_ix = 0;
517 PL_savestack_max = 64; 610 PL_savestack_max = 24;
518 611
519#if !PERL_VERSION_ATLEAST (5,9,0) 612#if !PERL_VERSION_ATLEAST (5,10,0)
520 New(54,PL_retstack,4,OP*); 613 New(54,PL_retstack,4,OP*);
521 PL_retstack_ix = 0; 614 PL_retstack_ix = 0;
522 PL_retstack_max = 4; 615 PL_retstack_max = 4;
523#endif 616#endif
524} 617}
547 640
548 Safefree (PL_tmps_stack); 641 Safefree (PL_tmps_stack);
549 Safefree (PL_markstack); 642 Safefree (PL_markstack);
550 Safefree (PL_scopestack); 643 Safefree (PL_scopestack);
551 Safefree (PL_savestack); 644 Safefree (PL_savestack);
552#if !PERL_VERSION_ATLEAST (5,9,0) 645#if !PERL_VERSION_ATLEAST (5,10,0)
553 Safefree (PL_retstack); 646 Safefree (PL_retstack);
554#endif 647#endif
555} 648}
556 649
557static size_t 650static size_t
558coro_rss (pTHX_ struct coro *coro) 651coro_rss (pTHX_ struct coro *coro)
559{ 652{
560 size_t rss = sizeof (coro); 653 size_t rss = sizeof (*coro);
561 654
562 if (coro->mainstack) 655 if (coro->mainstack)
563 { 656 {
657 perl_slots tmp_slot;
658 perl_slots *slot;
659
564 if (coro->flags & CF_RUNNING) 660 if (coro->flags & CF_RUNNING)
565 { 661 {
662 slot = &tmp_slot;
663
566 #define VAR(name,type)coro->name = PL_ ## name; 664 #define VAR(name,type) slot->name = PL_ ## name;
567 # include "state.h" 665 # include "state.h"
568 #undef VAR 666 #undef VAR
569 } 667 }
668 else
669 slot = coro->slot;
570 670
671 if (slot)
672 {
571 rss += sizeof (coro->curstackinfo); 673 rss += sizeof (slot->curstackinfo);
572 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
573 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 674 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
574 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 675 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
575 rss += coro->tmps_max * sizeof (SV *); 676 rss += slot->tmps_max * sizeof (SV *);
576 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 677 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
577 rss += coro->scopestack_max * sizeof (I32); 678 rss += slot->scopestack_max * sizeof (I32);
578 rss += coro->savestack_max * sizeof (ANY); 679 rss += slot->savestack_max * sizeof (ANY);
579 680
580#if !PERL_VERSION_ATLEAST (5,9,0) 681#if !PERL_VERSION_ATLEAST (5,10,0)
581 rss += coro->retstack_max * sizeof (OP *); 682 rss += slot->retstack_max * sizeof (OP *);
582#endif 683#endif
684 }
583 } 685 }
584 686
585 return rss; 687 return rss;
586} 688}
587 689
588/** coroutine stack handling ************************************************/ 690/** coroutine stack handling ************************************************/
691
692static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
693static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
694static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
695
696/* apparently < 5.8.8 */
697#ifndef MgPV_nolen_const
698#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
699 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
700 (const char*)(mg)->mg_ptr)
701#endif
702
703/*
704 * This overrides the default magic get method of %SIG elements.
705 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
706 * and instead of tryign to save and restore the hash elements, we just provide
707 * readback here.
708 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
709 * not expecting this to actually change the hook. This is a potential problem
710 * when a schedule happens then, but we ignore this.
711 */
712static int
713coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
714{
715 const char *s = MgPV_nolen_const (mg);
716
717 if (*s == '_')
718 {
719 SV **svp = 0;
720
721 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
722 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
723
724 if (svp)
725 {
726 sv_setsv (sv, *svp ? *svp : &PL_sv_undef);
727 return 0;
728 }
729 }
730
731 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
732}
733
734static int
735coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
736{
737 const char *s = MgPV_nolen_const (mg);
738
739 if (*s == '_')
740 {
741 SV **svp = 0;
742
743 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
744 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
745
746 if (svp)
747 {
748 SV *old = *svp;
749 *svp = 0;
750 SvREFCNT_dec (old);
751 return 0;
752 }
753 }
754
755 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
756}
757
758static int
759coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
760{
761 const char *s = MgPV_nolen_const (mg);
762
763 if (*s == '_')
764 {
765 SV **svp = 0;
766
767 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
768 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
769
770 if (svp)
771 {
772 SV *old = *svp;
773 *svp = newSVsv (sv);
774 SvREFCNT_dec (old);
775 return 0;
776 }
777 }
778
779 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
780}
589 781
590static void 782static void
591coro_setup (pTHX_ struct coro *coro) 783coro_setup (pTHX_ struct coro *coro)
592{ 784{
593 /* 785 /*
598 PL_runops = RUNOPS_DEFAULT; 790 PL_runops = RUNOPS_DEFAULT;
599 PL_curcop = &PL_compiling; 791 PL_curcop = &PL_compiling;
600 PL_in_eval = EVAL_NULL; 792 PL_in_eval = EVAL_NULL;
601 PL_comppad = 0; 793 PL_comppad = 0;
602 PL_curpm = 0; 794 PL_curpm = 0;
795 PL_curpad = 0;
603 PL_localizing = 0; 796 PL_localizing = 0;
604 PL_dirty = 0; 797 PL_dirty = 0;
605 PL_restartop = 0; 798 PL_restartop = 0;
799#if PERL_VERSION_ATLEAST (5,10,0)
800 PL_parser = 0;
801#endif
802
803 /* recreate the die/warn hooks */
804 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
805 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
606 806
607 GvSV (PL_defgv) = NEWSV (0, 0); 807 GvSV (PL_defgv) = newSV (0);
608 GvAV (PL_defgv) = coro->args; coro->args = 0; 808 GvAV (PL_defgv) = coro->args; coro->args = 0;
609 GvSV (PL_errgv) = NEWSV (0, 0); 809 GvSV (PL_errgv) = newSV (0);
610 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 810 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
611 PL_rs = newSVsv (GvSV (irsgv)); 811 PL_rs = newSVsv (GvSV (irsgv));
612 812 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
613 {
614 IO *io = newIO ();
615 PL_defoutgv = newGVgen ("Coro");
616 GvIOp(PL_defoutgv) = io;
617 IoTYPE (io) = IoTYPE_WRONLY;
618 IoOFP (io) = IoIFP (io) = PerlIO_stdout ();
619 IoFLAGS (io) |= IOf_FLUSH;
620 }
621 813
622 { 814 {
623 dSP; 815 dSP;
624 LOGOP myop; 816 LOGOP myop;
625 817
626 Zero (&myop, 1, LOGOP); 818 Zero (&myop, 1, LOGOP);
627 myop.op_next = Nullop; 819 myop.op_next = Nullop;
628 myop.op_flags = OPf_WANT_VOID; 820 myop.op_flags = OPf_WANT_VOID;
629 821
630 PUSHMARK (SP); 822 PUSHMARK (SP);
631 XPUSHs (av_shift (GvAV (PL_defgv))); 823 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
632 PUTBACK; 824 PUTBACK;
633 PL_op = (OP *)&myop; 825 PL_op = (OP *)&myop;
634 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 826 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
635 SPAGAIN; 827 SPAGAIN;
636 } 828 }
637 829
638 ENTER; /* necessary e.g. for dounwind */ 830 /* this newly created coroutine might be run on an existing cctx which most
831 * likely was suspended in set_stacklevel, called from entersub.
832 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
833 * so we ENTER here for symmetry
834 */
835 ENTER;
639} 836}
640 837
641static void 838static void
642coro_destroy (pTHX_ struct coro *coro) 839coro_destroy (pTHX_ struct coro *coro)
643{ 840{
663 SvREFCNT_dec (GvSV (PL_errgv)); 860 SvREFCNT_dec (GvSV (PL_errgv));
664 SvREFCNT_dec (PL_defoutgv); 861 SvREFCNT_dec (PL_defoutgv);
665 SvREFCNT_dec (PL_rs); 862 SvREFCNT_dec (PL_rs);
666 SvREFCNT_dec (GvSV (irsgv)); 863 SvREFCNT_dec (GvSV (irsgv));
667 864
865 SvREFCNT_dec (PL_diehook);
866 SvREFCNT_dec (PL_warnhook);
867
668 SvREFCNT_dec (coro->asp_deffh); 868 SvREFCNT_dec (coro->saved_deffh);
669 //SvREFCNT_dec (coro->throw); 869 SvREFCNT_dec (coro->throw);
670 870
671 coro_destroy_stacks (aTHX); 871 coro_destroy_stacks (aTHX);
672} 872}
673 873
674static void 874static void
675free_coro_mortal (pTHX) 875free_coro_mortal (pTHX)
676{ 876{
677 if (coro_mortal) 877 if (expect_true (coro_mortal))
678 { 878 {
679 SvREFCNT_dec (coro_mortal); 879 SvREFCNT_dec (coro_mortal);
680 coro_mortal = 0; 880 coro_mortal = 0;
681 } 881 }
682} 882}
711 bot = PL_stack_base + cx->blk_oldsp + 1; 911 bot = PL_stack_base + cx->blk_oldsp + 1;
712 top = cx->blk_gimme == G_ARRAY ? SP + 1 912 top = cx->blk_gimme == G_ARRAY ? SP + 1
713 : cx->blk_gimme == G_SCALAR ? bot + 1 913 : cx->blk_gimme == G_SCALAR ? bot + 1
714 : bot; 914 : bot;
715 915
916 av_extend (av, top - bot);
716 while (bot < top) 917 while (bot < top)
717 av_push (av, SvREFCNT_inc (*bot++)); 918 av_push (av, SvREFCNT_inc (*bot++));
718 919
719 PL_runops = RUNOPS_DEFAULT; 920 PL_runops = RUNOPS_DEFAULT;
720 ENTER; 921 ENTER;
760 SAVETMPS; 961 SAVETMPS;
761 EXTEND (SP, 3); 962 EXTEND (SP, 3);
762 PUSHMARK (SP); 963 PUSHMARK (SP);
763 PUSHs (&PL_sv_yes); 964 PUSHs (&PL_sv_yes);
764 PUSHs (fullname); 965 PUSHs (fullname);
765 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 966 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
766 PUTBACK; 967 PUTBACK;
767 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 968 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
768 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 969 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
769 SPAGAIN; 970 SPAGAIN;
770 FREETMPS; 971 FREETMPS;
806 1007
807/* inject a fake call to Coro::State::_cctx_init into the execution */ 1008/* inject a fake call to Coro::State::_cctx_init into the execution */
808/* _cctx_init should be careful, as it could be called at almost any time */ 1009/* _cctx_init should be careful, as it could be called at almost any time */
809/* during execution of a perl program */ 1010/* during execution of a perl program */
810static void NOINLINE 1011static void NOINLINE
811prepare_cctx (pTHX_ coro_cctx *cctx) 1012cctx_prepare (pTHX_ coro_cctx *cctx)
812{ 1013{
813 dSP; 1014 dSP;
814 LOGOP myop; 1015 LOGOP myop;
815 1016
816 PL_top_env = &PL_start_env; 1017 PL_top_env = &PL_start_env;
834 1035
835/* 1036/*
836 * this is a _very_ stripped down perl interpreter ;) 1037 * this is a _very_ stripped down perl interpreter ;)
837 */ 1038 */
838static void 1039static void
839coro_run (void *arg) 1040cctx_run (void *arg)
840{ 1041{
841 dTHX; 1042 dTHX;
842 1043
843 /* coro_run is the alternative tail of transfer(), so unlock here. */ 1044 /* cctx_run is the alternative tail of transfer(), so unlock here. */
844 UNLOCK; 1045 UNLOCK;
845 1046
846 /* we now skip the entersub that lead to transfer() */ 1047 /* we now skip the entersub that lead to transfer() */
847 PL_op = PL_op->op_next; 1048 PL_op = PL_op->op_next;
848 1049
849 /* inject a fake subroutine call to cctx_init */ 1050 /* inject a fake subroutine call to cctx_init */
850 prepare_cctx (aTHX_ (coro_cctx *)arg); 1051 cctx_prepare (aTHX_ (coro_cctx *)arg);
851 1052
852 /* somebody or something will hit me for both perl_run and PL_restartop */ 1053 /* somebody or something will hit me for both perl_run and PL_restartop */
853 PL_restartop = PL_op; 1054 PL_restartop = PL_op;
854 perl_run (PL_curinterp); 1055 perl_run (PL_curinterp);
855 1056
874 ++cctx_count; 1075 ++cctx_count;
875 1076
876 Newz (0, cctx, 1, coro_cctx); 1077 Newz (0, cctx, 1, coro_cctx);
877 1078
878#if HAVE_MMAP 1079#if HAVE_MMAP
879
880 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1080 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
881 /* mmap supposedly does allocate-on-write for us */ 1081 /* mmap supposedly does allocate-on-write for us */
882 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1082 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
883 1083
884 if (cctx->sptr != (void *)-1) 1084 if (cctx->sptr != (void *)-1)
905 stack_start = cctx->sptr; 1105 stack_start = cctx->sptr;
906 stack_size = cctx->ssize; 1106 stack_size = cctx->ssize;
907 } 1107 }
908 1108
909 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1109 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
910 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1110 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
911 1111
912 return cctx; 1112 return cctx;
913} 1113}
914 1114
915static void 1115static void
932 Safefree (cctx->sptr); 1132 Safefree (cctx->sptr);
933 1133
934 Safefree (cctx); 1134 Safefree (cctx);
935} 1135}
936 1136
1137/* wether this cctx should be destructed */
1138#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1139
937static coro_cctx * 1140static coro_cctx *
938cctx_get (pTHX) 1141cctx_get (pTHX)
939{ 1142{
940 while (cctx_first) 1143 while (expect_true (cctx_first))
941 { 1144 {
942 coro_cctx *cctx = cctx_first; 1145 coro_cctx *cctx = cctx_first;
943 cctx_first = cctx->next; 1146 cctx_first = cctx->next;
944 --cctx_idle; 1147 --cctx_idle;
945 1148
946 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1149 if (expect_true (!CCTX_EXPIRED (cctx)))
947 return cctx; 1150 return cctx;
948 1151
949 cctx_destroy (cctx); 1152 cctx_destroy (cctx);
950 } 1153 }
951 1154
954 1157
955static void 1158static void
956cctx_put (coro_cctx *cctx) 1159cctx_put (coro_cctx *cctx)
957{ 1160{
958 /* free another cctx if overlimit */ 1161 /* free another cctx if overlimit */
959 if (cctx_idle >= MAX_IDLE_CCTX) 1162 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
960 { 1163 {
961 coro_cctx *first = cctx_first; 1164 coro_cctx *first = cctx_first;
962 cctx_first = first->next; 1165 cctx_first = first->next;
963 --cctx_idle; 1166 --cctx_idle;
964 1167
970 cctx_first = cctx; 1173 cctx_first = cctx;
971} 1174}
972 1175
973/** coroutine switching *****************************************************/ 1176/** coroutine switching *****************************************************/
974 1177
975static void NOINLINE 1178static void
976transfer_check (pTHX_ struct coro *prev, struct coro *next) 1179transfer_check (pTHX_ struct coro *prev, struct coro *next)
977{ 1180{
978 if (prev != next) 1181 if (expect_true (prev != next))
979 { 1182 {
980 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1183 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
981 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1184 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
982 1185
983 if (next->flags & CF_RUNNING) 1186 if (expect_false (next->flags & CF_RUNNING))
984 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1187 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
985 1188
986 if (next->flags & CF_DESTROYED) 1189 if (expect_false (next->flags & CF_DESTROYED))
987 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1190 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
988 1191
1192#if !PERL_VERSION_ATLEAST (5,10,0)
989 if (PL_lex_state != LEX_NOTPARSING) 1193 if (expect_false (PL_lex_state != LEX_NOTPARSING))
990 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1194 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1195#endif
991 } 1196 }
992} 1197}
993 1198
994/* always use the TRANSFER macro */ 1199/* always use the TRANSFER macro */
995static void NOINLINE 1200static void NOINLINE
996transfer (pTHX_ struct coro *prev, struct coro *next) 1201transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
997{ 1202{
998 dSTACKLEVEL; 1203 dSTACKLEVEL;
1204 static volatile int has_throw;
999 1205
1000 /* sometimes transfer is only called to set idle_sp */ 1206 /* sometimes transfer is only called to set idle_sp */
1001 if (!next) 1207 if (expect_false (!next))
1002 { 1208 {
1003 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1209 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1004 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1210 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1005 } 1211 }
1006 else if (prev != next) 1212 else if (expect_true (prev != next))
1007 { 1213 {
1008 coro_cctx *prev__cctx; 1214 coro_cctx *prev__cctx;
1009 1215
1010 if (prev->flags & CF_NEW) 1216 if (expect_false (prev->flags & CF_NEW))
1011 { 1217 {
1012 /* create a new empty context */ 1218 /* create a new empty context */
1013 Newz (0, prev->cctx, 1, coro_cctx); 1219 Newz (0, prev->cctx, 1, coro_cctx);
1014 prev->flags &= ~CF_NEW; 1220 prev->flags &= ~CF_NEW;
1015 prev->flags |= CF_RUNNING; 1221 prev->flags |= CF_RUNNING;
1018 prev->flags &= ~CF_RUNNING; 1224 prev->flags &= ~CF_RUNNING;
1019 next->flags |= CF_RUNNING; 1225 next->flags |= CF_RUNNING;
1020 1226
1021 LOCK; 1227 LOCK;
1022 1228
1229 /* first get rid of the old state */
1230 save_perl (aTHX_ prev);
1231
1023 if (next->flags & CF_NEW) 1232 if (expect_false (next->flags & CF_NEW))
1024 { 1233 {
1025 /* need to start coroutine */ 1234 /* need to start coroutine */
1026 next->flags &= ~CF_NEW; 1235 next->flags &= ~CF_NEW;
1027 /* first get rid of the old state */
1028 save_perl (aTHX_ prev);
1029 /* setup coroutine call */ 1236 /* setup coroutine call */
1030 coro_setup (aTHX_ next); 1237 coro_setup (aTHX_ next);
1031 } 1238 }
1032 else 1239 else
1033 {
1034 /* coroutine already started */
1035 save_perl (aTHX_ prev);
1036 load_perl (aTHX_ next); 1240 load_perl (aTHX_ next);
1037 }
1038 1241
1039 prev__cctx = prev->cctx; 1242 prev__cctx = prev->cctx;
1040 1243
1041 /* possibly "free" the cctx */ 1244 /* possibly "free" the cctx */
1042 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1245 if (expect_true (
1246 prev__cctx->idle_sp == STACKLEVEL
1247 && !(prev__cctx->flags & CC_TRACE)
1248 && !force_cctx
1249 ))
1043 { 1250 {
1044 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1251 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1045 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1252 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1046 1253
1047 prev->cctx = 0; 1254 prev->cctx = 0;
1048 1255
1256 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1257 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1258 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1259 if (!next->cctx)
1260 next->cctx = cctx_get (aTHX);
1261
1049 cctx_put (prev__cctx); 1262 cctx_put (prev__cctx);
1050 } 1263 }
1051 1264
1052 ++next->usecount; 1265 ++next->usecount;
1053 1266
1054 if (!next->cctx) 1267 if (expect_true (!next->cctx))
1055 next->cctx = cctx_get (aTHX); 1268 next->cctx = cctx_get (aTHX);
1056 1269
1270 has_throw = !!next->throw;
1271
1057 if (prev__cctx != next->cctx) 1272 if (expect_false (prev__cctx != next->cctx))
1058 { 1273 {
1059 prev__cctx->top_env = PL_top_env; 1274 prev__cctx->top_env = PL_top_env;
1060 PL_top_env = next->cctx->top_env; 1275 PL_top_env = next->cctx->top_env;
1061 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1276 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1062 } 1277 }
1063 1278
1064 free_coro_mortal (aTHX); 1279 free_coro_mortal (aTHX);
1065 UNLOCK; 1280 UNLOCK;
1281
1282 if (expect_false (has_throw))
1283 {
1284 struct coro *coro = SvSTATE (coro_current);
1285
1286 if (coro->throw)
1287 {
1288 SV *exception = coro->throw;
1289 coro->throw = 0;
1290 sv_setsv (ERRSV, exception);
1291 croak (0);
1292 }
1293 }
1066 } 1294 }
1067} 1295}
1068 1296
1069struct transfer_args 1297struct transfer_args
1070{ 1298{
1071 struct coro *prev, *next; 1299 struct coro *prev, *next;
1072}; 1300};
1073 1301
1074#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1302#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1075#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1303#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1076 1304
1077/** high level stuff ********************************************************/ 1305/** high level stuff ********************************************************/
1078 1306
1079static int 1307static int
1105 save_perl (aTHX_ &temp); 1333 save_perl (aTHX_ &temp);
1106 load_perl (aTHX_ coro); 1334 load_perl (aTHX_ coro);
1107 1335
1108 coro_destroy (aTHX_ coro); 1336 coro_destroy (aTHX_ coro);
1109 1337
1110 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1338 load_perl (aTHX_ &temp);
1111 1339
1112 coro->mainstack = 0; 1340 coro->slot = 0;
1113 } 1341 }
1114 1342
1115 cctx_destroy (coro->cctx); 1343 cctx_destroy (coro->cctx);
1116 SvREFCNT_dec (coro->args); 1344 SvREFCNT_dec (coro->args);
1117 1345
1173{ 1401{
1174 dTHX; 1402 dTHX;
1175 struct transfer_args ta; 1403 struct transfer_args ta;
1176 1404
1177 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1405 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1178 TRANSFER (ta); 1406 TRANSFER (ta, 1);
1179} 1407}
1180 1408
1181/** Coro ********************************************************************/ 1409/** Coro ********************************************************************/
1182 1410
1183static void 1411static void
1185{ 1413{
1186 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1414 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1187} 1415}
1188 1416
1189static SV * 1417static SV *
1190coro_deq (pTHX_ int min_prio) 1418coro_deq (pTHX)
1191{ 1419{
1192 int prio = PRIO_MAX - PRIO_MIN; 1420 int prio;
1193 1421
1194 min_prio -= PRIO_MIN;
1195 if (min_prio < 0)
1196 min_prio = 0;
1197
1198 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1422 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1199 if (AvFILLp (coro_ready [prio]) >= 0) 1423 if (AvFILLp (coro_ready [prio]) >= 0)
1200 return av_shift (coro_ready [prio]); 1424 return av_shift (coro_ready [prio]);
1201 1425
1202 return 0; 1426 return 0;
1203} 1427}
1205static int 1429static int
1206api_ready (SV *coro_sv) 1430api_ready (SV *coro_sv)
1207{ 1431{
1208 dTHX; 1432 dTHX;
1209 struct coro *coro; 1433 struct coro *coro;
1434 SV *sv_hook;
1435 void (*xs_hook)(void);
1210 1436
1211 if (SvROK (coro_sv)) 1437 if (SvROK (coro_sv))
1212 coro_sv = SvRV (coro_sv); 1438 coro_sv = SvRV (coro_sv);
1213 1439
1214 coro = SvSTATE (coro_sv); 1440 coro = SvSTATE (coro_sv);
1217 return 0; 1443 return 0;
1218 1444
1219 coro->flags |= CF_READY; 1445 coro->flags |= CF_READY;
1220 1446
1221 LOCK; 1447 LOCK;
1448
1449 sv_hook = coro_nready ? 0 : coro_readyhook;
1450 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1451
1222 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1452 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1223 ++coro_nready; 1453 ++coro_nready;
1454
1224 UNLOCK; 1455 UNLOCK;
1456
1457 if (sv_hook)
1458 {
1459 dSP;
1460
1461 ENTER;
1462 SAVETMPS;
1463
1464 PUSHMARK (SP);
1465 PUTBACK;
1466 call_sv (sv_hook, G_DISCARD);
1467 SPAGAIN;
1468
1469 FREETMPS;
1470 LEAVE;
1471 }
1472
1473 if (xs_hook)
1474 xs_hook ();
1225 1475
1226 return 1; 1476 return 1;
1227} 1477}
1228 1478
1229static int 1479static int
1239 SV *prev_sv, *next_sv; 1489 SV *prev_sv, *next_sv;
1240 1490
1241 for (;;) 1491 for (;;)
1242 { 1492 {
1243 LOCK; 1493 LOCK;
1244 next_sv = coro_deq (aTHX_ PRIO_MIN); 1494 next_sv = coro_deq (aTHX);
1245 1495
1246 /* nothing to schedule: call the idle handler */ 1496 /* nothing to schedule: call the idle handler */
1247 if (!next_sv) 1497 if (expect_false (!next_sv))
1248 { 1498 {
1249 dSP; 1499 dSP;
1250 UNLOCK; 1500 UNLOCK;
1251 1501
1252 ENTER; 1502 ENTER;
1253 SAVETMPS; 1503 SAVETMPS;
1254 1504
1255 PUSHMARK (SP); 1505 PUSHMARK (SP);
1256 PUTBACK; 1506 PUTBACK;
1257 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1507 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1508 SPAGAIN;
1258 1509
1259 FREETMPS; 1510 FREETMPS;
1260 LEAVE; 1511 LEAVE;
1261 continue; 1512 continue;
1262 } 1513 }
1263 1514
1264 ta->next = SvSTATE (next_sv); 1515 ta->next = SvSTATE (next_sv);
1265 1516
1266 /* cannot transfer to destroyed coros, skip and look for next */ 1517 /* cannot transfer to destroyed coros, skip and look for next */
1267 if (ta->next->flags & CF_DESTROYED) 1518 if (expect_false (ta->next->flags & CF_DESTROYED))
1268 { 1519 {
1269 UNLOCK; 1520 UNLOCK;
1270 SvREFCNT_dec (next_sv); 1521 SvREFCNT_dec (next_sv);
1271 /* coro_nready is already taken care of by destroy */ 1522 /* coro_nready is already taken care of by destroy */
1272 continue; 1523 continue;
1317{ 1568{
1318 dTHX; 1569 dTHX;
1319 struct transfer_args ta; 1570 struct transfer_args ta;
1320 1571
1321 prepare_schedule (aTHX_ &ta); 1572 prepare_schedule (aTHX_ &ta);
1322 TRANSFER (ta); 1573 TRANSFER (ta, 1);
1323} 1574}
1324 1575
1325static int 1576static int
1326api_cede (void) 1577api_cede (void)
1327{ 1578{
1328 dTHX; 1579 dTHX;
1329 struct transfer_args ta; 1580 struct transfer_args ta;
1330 1581
1331 prepare_cede (aTHX_ &ta); 1582 prepare_cede (aTHX_ &ta);
1332 1583
1333 if (ta.prev != ta.next) 1584 if (expect_true (ta.prev != ta.next))
1334 { 1585 {
1335 TRANSFER (ta); 1586 TRANSFER (ta, 1);
1336 return 1; 1587 return 1;
1337 } 1588 }
1338 else 1589 else
1339 return 0; 1590 return 0;
1340} 1591}
1345 dTHX; 1596 dTHX;
1346 struct transfer_args ta; 1597 struct transfer_args ta;
1347 1598
1348 if (prepare_cede_notself (aTHX_ &ta)) 1599 if (prepare_cede_notself (aTHX_ &ta))
1349 { 1600 {
1350 TRANSFER (ta); 1601 TRANSFER (ta, 1);
1351 return 1; 1602 return 1;
1352 } 1603 }
1353 else 1604 else
1354 return 0; 1605 return 0;
1355} 1606}
1374 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1625 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1375 1626
1376 if (coro->flags & CF_RUNNING) 1627 if (coro->flags & CF_RUNNING)
1377 PL_runops = RUNOPS_DEFAULT; 1628 PL_runops = RUNOPS_DEFAULT;
1378 else 1629 else
1379 coro->runops = RUNOPS_DEFAULT; 1630 coro->slot->runops = RUNOPS_DEFAULT;
1380 } 1631 }
1381} 1632}
1633
1634static int
1635coro_gensub_free (pTHX_ SV *sv, MAGIC *mg)
1636{
1637 AV *padlist;
1638 AV *av = (AV *)mg->mg_obj;
1639
1640 abort ();
1641
1642 return 0;
1643}
1644
1645static MGVTBL coro_gensub_vtbl = {
1646 0, 0, 0, 0,
1647 coro_gensub_free
1648};
1382 1649
1383MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1650MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1384 1651
1385PROTOTYPES: DISABLE 1652PROTOTYPES: DISABLE
1386 1653
1389#ifdef USE_ITHREADS 1656#ifdef USE_ITHREADS
1390 MUTEX_INIT (&coro_mutex); 1657 MUTEX_INIT (&coro_mutex);
1391#endif 1658#endif
1392 BOOT_PAGESIZE; 1659 BOOT_PAGESIZE;
1393 1660
1394 irsgv = gv_fetchpv ("/", 1, SVt_PV); 1661 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1662 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1663
1664 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1665 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1666 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1667
1668 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1669 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1670 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1395 1671
1396 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1672 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1397 1673
1398 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1674 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1399 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1675 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1404 main_top_env = PL_top_env; 1680 main_top_env = PL_top_env;
1405 1681
1406 while (main_top_env->je_prev) 1682 while (main_top_env->je_prev)
1407 main_top_env = main_top_env->je_prev; 1683 main_top_env = main_top_env->je_prev;
1408 1684
1409 coroapi.ver = CORO_API_VERSION; 1685 coroapi.ver = CORO_API_VERSION;
1686 coroapi.rev = CORO_API_REVISION;
1410 coroapi.transfer = api_transfer; 1687 coroapi.transfer = api_transfer;
1411 1688
1412 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1689 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1413} 1690}
1414 1691
1415SV * 1692SV *
1416new (char *klass, ...) 1693new (char *klass, ...)
1417 CODE: 1694 CODE:
1418{ 1695{
1419 struct coro *coro; 1696 struct coro *coro;
1697 MAGIC *mg;
1420 HV *hv; 1698 HV *hv;
1421 int i; 1699 int i;
1422 1700
1423 Newz (0, coro, 1, struct coro); 1701 Newz (0, coro, 1, struct coro);
1424 coro->args = newAV (); 1702 coro->args = newAV ();
1427 if (coro_first) coro_first->prev = coro; 1705 if (coro_first) coro_first->prev = coro;
1428 coro->next = coro_first; 1706 coro->next = coro_first;
1429 coro_first = coro; 1707 coro_first = coro;
1430 1708
1431 coro->hv = hv = newHV (); 1709 coro->hv = hv = newHV ();
1432 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1710 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1711 mg->mg_flags |= MGf_DUP;
1433 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1712 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1434 1713
1714 av_extend (coro->args, items - 1);
1435 for (i = 1; i < items; i++) 1715 for (i = 1; i < items; i++)
1436 av_push (coro->args, newSVsv (ST (i))); 1716 av_push (coro->args, newSVsv (ST (i)));
1437} 1717}
1438 OUTPUT: 1718 OUTPUT:
1439 RETVAL 1719 RETVAL
1450 Coro::cede_notself = 4 1730 Coro::cede_notself = 4
1451 CODE: 1731 CODE:
1452{ 1732{
1453 struct transfer_args ta; 1733 struct transfer_args ta;
1454 1734
1735 PUTBACK;
1455 switch (ix) 1736 switch (ix)
1456 { 1737 {
1457 case 0: 1738 case 0:
1458 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1739 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1459 ta.next = 0; 1740 ta.next = 0;
1478 if (!prepare_cede_notself (aTHX_ &ta)) 1759 if (!prepare_cede_notself (aTHX_ &ta))
1479 XSRETURN_EMPTY; 1760 XSRETURN_EMPTY;
1480 1761
1481 break; 1762 break;
1482 } 1763 }
1764 SPAGAIN;
1483 1765
1484 BARRIER; 1766 BARRIER;
1767 PUTBACK;
1485 TRANSFER (ta); 1768 TRANSFER (ta, 0);
1486 1769 SPAGAIN; /* might be the sp of a different coroutine now */
1487 if (GIMME_V != G_VOID && ta.next != ta.prev) 1770 /* be extra careful not to ever do anything after TRANSFER */
1488 XSRETURN_YES;
1489} 1771}
1490 1772
1491bool 1773bool
1492_destroy (SV *coro_sv) 1774_destroy (SV *coro_sv)
1493 CODE: 1775 CODE:
1494 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 1776 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1495 OUTPUT: 1777 OUTPUT:
1496 RETVAL 1778 RETVAL
1497 1779
1498void 1780void
1499_exit (code) 1781_exit (int code)
1500 int code
1501 PROTOTYPE: $ 1782 PROTOTYPE: $
1502 CODE: 1783 CODE:
1503 _exit (code); 1784 _exit (code);
1504 1785
1505int 1786int
1539call (Coro::State coro, SV *coderef) 1820call (Coro::State coro, SV *coderef)
1540 ALIAS: 1821 ALIAS:
1541 eval = 1 1822 eval = 1
1542 CODE: 1823 CODE:
1543{ 1824{
1544 if (coro->mainstack) 1825 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
1545 { 1826 {
1546 struct coro temp; 1827 struct coro temp;
1547 Zero (&temp, 1, struct coro);
1548 1828
1549 if (!(coro->flags & CF_RUNNING)) 1829 if (!(coro->flags & CF_RUNNING))
1550 { 1830 {
1831 PUTBACK;
1551 save_perl (aTHX_ &temp); 1832 save_perl (aTHX_ &temp);
1552 load_perl (aTHX_ coro); 1833 load_perl (aTHX_ coro);
1553 } 1834 }
1554 1835
1555 { 1836 {
1556 dSP; 1837 dSP;
1557 ENTER; 1838 ENTER;
1558 SAVETMPS; 1839 SAVETMPS;
1840 PUTBACK;
1841 PUSHSTACK;
1559 PUSHMARK (SP); 1842 PUSHMARK (SP);
1560 PUTBACK; 1843
1561 if (ix) 1844 if (ix)
1562 eval_sv (coderef, 0); 1845 eval_sv (coderef, 0);
1563 else 1846 else
1564 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1847 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1848
1849 POPSTACK;
1565 SPAGAIN; 1850 SPAGAIN;
1566 FREETMPS; 1851 FREETMPS;
1567 LEAVE; 1852 LEAVE;
1568 PUTBACK; 1853 PUTBACK;
1569 } 1854 }
1570 1855
1571 if (!(coro->flags & CF_RUNNING)) 1856 if (!(coro->flags & CF_RUNNING))
1572 { 1857 {
1573 save_perl (aTHX_ coro); 1858 save_perl (aTHX_ coro);
1574 load_perl (aTHX_ &temp); 1859 load_perl (aTHX_ &temp);
1860 SPAGAIN;
1575 } 1861 }
1576 } 1862 }
1577} 1863}
1578 1864
1579SV * 1865SV *
1591 1877
1592void 1878void
1593api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 1879api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1594 1880
1595SV * 1881SV *
1596has_stack (Coro::State coro) 1882has_cctx (Coro::State coro)
1597 PROTOTYPE: $ 1883 PROTOTYPE: $
1598 CODE: 1884 CODE:
1599 RETVAL = boolSV (!!coro->cctx); 1885 RETVAL = boolSV (!!coro->cctx);
1600 OUTPUT: 1886 OUTPUT:
1601 RETVAL 1887 RETVAL
1620 case 1: RETVAL = coro->usecount; break; 1906 case 1: RETVAL = coro->usecount; break;
1621 } 1907 }
1622 OUTPUT: 1908 OUTPUT:
1623 RETVAL 1909 RETVAL
1624 1910
1911void
1912force_cctx ()
1913 CODE:
1914 struct coro *coro = SvSTATE (coro_current);
1915 coro->cctx->idle_sp = 0;
1916
1917void
1918throw (Coro::State self, SV *throw = &PL_sv_undef)
1919 PROTOTYPE: $;$
1920 CODE:
1921 SvREFCNT_dec (self->throw);
1922 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1923
1924void
1925swap_defsv (Coro::State self)
1926 PROTOTYPE: $
1927 ALIAS:
1928 swap_defav = 1
1929 CODE:
1930 if (!self->slot)
1931 croak ("cannot swap state with coroutine that has no saved state");
1932 else
1933 {
1934 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1935 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1936
1937 SV *tmp = *src; *src = *dst; *dst = tmp;
1938 }
1625 1939
1626MODULE = Coro::State PACKAGE = Coro 1940MODULE = Coro::State PACKAGE = Coro
1627 1941
1628BOOT: 1942BOOT:
1629{ 1943{
1630 int i; 1944 int i;
1631 1945
1632 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1633 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1634 av_async_pool = get_av ("Coro::async_pool", TRUE); 1946 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1947 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1948 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1635 1949
1636 coro_current = get_sv ("Coro::current", FALSE); 1950 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1637 SvREADONLY_on (coro_current); 1951 SvREADONLY_on (coro_current);
1638 1952
1639 coro_stash = gv_stashpv ("Coro", TRUE); 1953 coro_stash = gv_stashpv ("Coro", TRUE);
1640 1954
1641 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1955 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1642 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1956 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1643 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1957 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1644 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1958 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1647 1961
1648 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1962 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1649 coro_ready[i] = newAV (); 1963 coro_ready[i] = newAV ();
1650 1964
1651 { 1965 {
1652 SV *sv = perl_get_sv("Coro::API", 1); 1966 SV *sv = perl_get_sv ("Coro::API", TRUE);
1967 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1653 1968
1654 coroapi.schedule = api_schedule; 1969 coroapi.schedule = api_schedule;
1655 coroapi.cede = api_cede; 1970 coroapi.cede = api_cede;
1656 coroapi.cede_notself = api_cede_notself; 1971 coroapi.cede_notself = api_cede_notself;
1657 coroapi.ready = api_ready; 1972 coroapi.ready = api_ready;
1670 PROTOTYPE: $ 1985 PROTOTYPE: $
1671 CODE: 1986 CODE:
1672 SvREFCNT_dec (SvRV (coro_current)); 1987 SvREFCNT_dec (SvRV (coro_current));
1673 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 1988 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1674 1989
1990void
1991_set_readyhook (SV *hook)
1992 PROTOTYPE: $
1993 CODE:
1994 LOCK;
1995 SvREFCNT_dec (coro_readyhook);
1996 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
1997 UNLOCK;
1998
1675int 1999int
1676prio (Coro::State coro, int newprio = 0) 2000prio (Coro::State coro, int newprio = 0)
1677 ALIAS: 2001 ALIAS:
1678 nice = 1 2002 nice = 1
1679 CODE: 2003 CODE:
1721 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 2045 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1722 AV *invoke_av; 2046 AV *invoke_av;
1723 int i, len; 2047 int i, len;
1724 2048
1725 if (!invoke) 2049 if (!invoke)
2050 {
2051 SV *old = PL_diehook;
2052 PL_diehook = 0;
2053 SvREFCNT_dec (old);
1726 croak ("\3terminate\2\n"); 2054 croak ("\3async_pool terminate\2\n");
2055 }
1727 2056
1728 SvREFCNT_dec (coro->asp_deffh); 2057 SvREFCNT_dec (coro->saved_deffh);
1729 coro->asp_deffh = SvREFCNT_inc (PL_defoutgv); 2058 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1730 2059
1731 hv_store (hv, "desc", sizeof ("desc") - 1, 2060 hv_store (hv, "desc", sizeof ("desc") - 1,
1732 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 2061 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1733 2062
1734 invoke_av = (AV *)SvRV (invoke); 2063 invoke_av = (AV *)SvRV (invoke);
1752{ 2081{
1753 struct coro *coro = SvSTATE (coro_current); 2082 struct coro *coro = SvSTATE (coro_current);
1754 2083
1755 sv_setsv (cb, &PL_sv_undef); 2084 sv_setsv (cb, &PL_sv_undef);
1756 2085
1757 SvREFCNT_dec (PL_defoutgv); PL_defoutgv = coro->asp_deffh; 2086 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1758 coro->asp_deffh = 0; 2087 coro->saved_deffh = 0;
1759 2088
1760 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2089 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1761 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2090 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2091 {
2092 SV *old = PL_diehook;
2093 PL_diehook = 0;
2094 SvREFCNT_dec (old);
1762 croak ("\3terminate\2\n"); 2095 croak ("\3async_pool terminate\2\n");
2096 }
1763 2097
1764 av_clear (GvAV (PL_defgv)); 2098 av_clear (GvAV (PL_defgv));
1765 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2099 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1766 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2100 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1767 2101
1770 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2104 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1771 api_trace (coro_current, 0); 2105 api_trace (coro_current, 0);
1772 2106
1773 av_push (av_async_pool, newSVsv (coro_current)); 2107 av_push (av_async_pool, newSVsv (coro_current));
1774} 2108}
2109
2110#if 0
2111
2112void
2113_generator_call (...)
2114 PROTOTYPE: @
2115 PPCODE:
2116 fprintf (stderr, "call %p\n", CvXSUBANY(cv).any_ptr);
2117 xxxx
2118 abort ();
2119
2120SV *
2121gensub (SV *sub, ...)
2122 PROTOTYPE: &;@
2123 CODE:
2124{
2125 struct coro *coro;
2126 MAGIC *mg;
2127 CV *xcv;
2128 CV *ncv = (CV *)newSV_type (SVt_PVCV);
2129 int i;
2130
2131 CvGV (ncv) = CvGV (cv);
2132 CvFILE (ncv) = CvFILE (cv);
2133
2134 Newz (0, coro, 1, struct coro);
2135 coro->args = newAV ();
2136 coro->flags = CF_NEW;
2137
2138 av_extend (coro->args, items - 1);
2139 for (i = 1; i < items; i++)
2140 av_push (coro->args, newSVsv (ST (i)));
2141
2142 CvISXSUB_on (ncv);
2143 CvXSUBANY (ncv).any_ptr = (void *)coro;
2144
2145 xcv = GvCV (gv_fetchpv ("Coro::_generator_call", 0, SVt_PVCV));
2146
2147 CvXSUB (ncv) = CvXSUB (xcv);
2148 CvANON_on (ncv);
2149
2150 mg = sv_magicext ((SV *)ncv, 0, CORO_MAGIC_type_state, &coro_gensub_vtbl, (char *)coro, 0);
2151 RETVAL = newRV_noinc ((SV *)ncv);
2152}
2153 OUTPUT:
2154 RETVAL
2155
2156#endif
1775 2157
1776 2158
1777MODULE = Coro::State PACKAGE = Coro::AIO 2159MODULE = Coro::State PACKAGE = Coro::AIO
1778 2160
1779SV * 2161SV *
1806 PL_laststype = data->laststype; 2188 PL_laststype = data->laststype;
1807 PL_laststatval = data->laststatval; 2189 PL_laststatval = data->laststatval;
1808 PL_statcache = data->statcache; 2190 PL_statcache = data->statcache;
1809} 2191}
1810 2192
2193
2194MODULE = Coro::State PACKAGE = Coro::AnyEvent
2195
2196BOOT:
2197 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2198
2199SV *
2200_schedule (...)
2201 PROTOTYPE: @
2202 CODE:
2203{
2204 static int incede;
2205
2206 api_cede_notself ();
2207
2208 ++incede;
2209 while (coro_nready >= incede && api_cede ())
2210 ;
2211
2212 sv_setsv (sv_activity, &PL_sv_undef);
2213 if (coro_nready >= incede)
2214 {
2215 PUSHMARK (SP);
2216 PUTBACK;
2217 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2218 SPAGAIN;
2219 }
2220
2221 --incede;
2222}
2223

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines