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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines