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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines