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.192 by root, Fri Oct 5 21:51:40 2007 UTC vs.
Revision 1.232 by root, Thu Apr 24 12:40:38 2008 UTC

1#include "libcoro/coro.c" 1#include "libcoro/coro.c"
2 2
3#define PERL_NO_GET_CONTEXT 3#define PERL_NO_GET_CONTEXT
4#define PERL_EXT
4 5
5#include "EXTERN.h" 6#include "EXTERN.h"
6#include "perl.h" 7#include "perl.h"
7#include "XSUB.h" 8#include "XSUB.h"
8 9
9#include "patchlevel.h" 10#include "patchlevel.h"
10 11
11#include <stdio.h> 12#include <stdio.h>
12#include <errno.h> 13#include <errno.h>
13#include <assert.h> 14#include <assert.h>
15
16#ifdef WIN32
17# undef setjmp
18# undef longjmp
19# undef _exit
20# define setjmp _setjmp // deep magic, don't ask
21#else
22# include <inttypes.h> /* most portable stdint.h */
23#endif
14 24
15#ifdef HAVE_MMAP 25#ifdef HAVE_MMAP
16# include <unistd.h> 26# include <unistd.h>
17# include <sys/mman.h> 27# include <sys/mman.h>
18# ifndef MAP_ANONYMOUS 28# ifndef MAP_ANONYMOUS
70# ifndef IS_PADCONST 80# ifndef IS_PADCONST
71# define IS_PADCONST(v) 0 81# define IS_PADCONST(v) 0
72# endif 82# endif
73#endif 83#endif
74 84
85/* 5.8.8 */
86#ifndef GV_NOTQUAL
87# define GV_NOTQUAL 0
88#endif
89#ifndef newSV
90# define newSV(l) NEWSV(0,l)
91#endif
92
93/* 5.11 */
94#ifndef CxHASARGS
95# define CxHASARGS(cx) (cx)->blk_sub.hasargs
96#endif
97
75/* 5.8.7 */ 98/* 5.8.7 */
76#ifndef SvRV_set 99#ifndef SvRV_set
77# define SvRV_set(s,v) SvRV(s) = (v) 100# define SvRV_set(s,v) SvRV(s) = (v)
78#endif
79
80/* 5.8.8 */
81#ifndef GV_NOTQUAL
82# define GV_NOTQUAL 0
83#endif
84#ifndef newSV
85# define newSV(l) NEWSV(0,l)
86#endif 101#endif
87 102
88#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 103#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
89# undef CORO_STACKGUARD 104# undef CORO_STACKGUARD
90#endif 105#endif
106#define IN_DESTRUCT (PL_main_cv == Nullcv) 121#define IN_DESTRUCT (PL_main_cv == Nullcv)
107 122
108#if __GNUC__ >= 3 123#if __GNUC__ >= 3
109# define attribute(x) __attribute__(x) 124# define attribute(x) __attribute__(x)
110# define BARRIER __asm__ __volatile__ ("" : : : "memory") 125# define BARRIER __asm__ __volatile__ ("" : : : "memory")
126# define expect(expr,value) __builtin_expect ((expr),(value))
111#else 127#else
112# define attribute(x) 128# define attribute(x)
113# define BARRIER 129# define BARRIER
130# define expect(expr,value) (expr)
114#endif 131#endif
132
133#define expect_false(expr) expect ((expr) != 0, 0)
134#define expect_true(expr) expect ((expr) != 0, 1)
115 135
116#define NOINLINE attribute ((noinline)) 136#define NOINLINE attribute ((noinline))
117 137
118#include "CoroAPI.h" 138#include "CoroAPI.h"
119 139
138static size_t coro_stacksize = CORO_STACKSIZE; 158static size_t coro_stacksize = CORO_STACKSIZE;
139static struct CoroAPI coroapi; 159static struct CoroAPI coroapi;
140static AV *main_mainstack; /* used to differentiate between $main and others */ 160static AV *main_mainstack; /* used to differentiate between $main and others */
141static JMPENV *main_top_env; 161static JMPENV *main_top_env;
142static HV *coro_state_stash, *coro_stash; 162static HV *coro_state_stash, *coro_stash;
143static SV *coro_mortal; /* will be freed after next transfer */ 163static volatile SV *coro_mortal; /* will be freed after next transfer */
144 164
145static GV *irsgv; /* $/ */ 165static GV *irsgv; /* $/ */
146static GV *stdoutgv; /* *STDOUT */ 166static GV *stdoutgv; /* *STDOUT */
167static SV *rv_diehook;
168static SV *rv_warnhook;
169static HV *hv_sig; /* %SIG */
147 170
148/* async_pool helper stuff */ 171/* async_pool helper stuff */
149static SV *sv_pool_rss; 172static SV *sv_pool_rss;
150static SV *sv_pool_size; 173static SV *sv_pool_size;
151static AV *av_async_pool; 174static AV *av_async_pool;
187 CF_READY = 0x0002, /* coroutine is ready */ 210 CF_READY = 0x0002, /* coroutine is ready */
188 CF_NEW = 0x0004, /* has never been switched to */ 211 CF_NEW = 0x0004, /* has never been switched to */
189 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 212 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
190}; 213};
191 214
215/* the structure where most of the perl state is stored, overlaid on the cxstack */
216typedef struct {
217 SV *defsv;
218 AV *defav;
219 SV *errsv;
220 SV *irsgv;
221#define VAR(name,type) type name;
222# include "state.h"
223#undef VAR
224} perl_slots;
225
226#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
227
192/* this is a structure representing a perl-level coroutine */ 228/* this is a structure representing a perl-level coroutine */
193struct coro { 229struct coro {
194 /* the c coroutine allocated to this perl coroutine, if any */ 230 /* the c coroutine allocated to this perl coroutine, if any */
195 coro_cctx *cctx; 231 coro_cctx *cctx;
196 232
233 /* process data */
234 AV *mainstack;
235 perl_slots *slot; /* basically the saved sp */
236
197 /* data associated with this coroutine (initial args) */ 237 AV *args; /* data associated with this coroutine (initial args) */
198 AV *args; 238 int refcnt; /* coroutines are refcounted, yes */
199 int refcnt;
200 int flags; /* CF_ flags */ 239 int flags; /* CF_ flags */
201 240 HV *hv; /* the perl hash associated with this coro, if any */
202 /* optionally saved, might be zero */
203 AV *defav; /* @_ */
204 SV *defsv; /* $_ */
205 SV *errsv; /* $@ */
206 SV *deffh; /* default filehandle */
207 SV *irssv; /* $/ */
208 SV *irssv_sv; /* real $/ cache */
209
210#define VAR(name,type) type name;
211# include "state.h"
212#undef VAR
213 241
214 /* statistics */ 242 /* statistics */
215 int usecount; /* number of transfers to this coro */ 243 int usecount; /* number of transfers to this coro */
216 244
217 /* coro process data */ 245 /* coro process data */
218 int prio; 246 int prio;
219 //SV *throw; 247 SV *throw; /* exception to be thrown */
220 248
221 /* async_pool */ 249 /* async_pool */
222 SV *saved_deffh; 250 SV *saved_deffh;
223 251
224 /* linked list */ 252 /* linked list */
225 struct coro *next, *prev; 253 struct coro *next, *prev;
226 HV *hv; /* the perl hash associated with this coro, if any */
227}; 254};
228 255
229typedef struct coro *Coro__State; 256typedef struct coro *Coro__State;
230typedef struct coro *Coro__State_or_hashref; 257typedef struct coro *Coro__State_or_hashref;
231 258
244static int coro_nready; 271static int coro_nready;
245static struct coro *coro_first; 272static struct coro *coro_first;
246 273
247/** lowlevel stuff **********************************************************/ 274/** lowlevel stuff **********************************************************/
248 275
276static SV *
277coro_get_sv (pTHX_ const char *name, int create)
278{
279#if PERL_VERSION_ATLEAST (5,10,0)
280 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
281 get_sv (name, create);
282#endif
283 return get_sv (name, create);
284}
285
286static AV *
287coro_get_av (pTHX_ const char *name, int create)
288{
289#if PERL_VERSION_ATLEAST (5,10,0)
290 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
291 get_av (name, create);
292#endif
293 return get_av (name, create);
294}
295
296static HV *
297coro_get_hv (pTHX_ const char *name, int create)
298{
299#if PERL_VERSION_ATLEAST (5,10,0)
300 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
301 get_hv (name, create);
302#endif
303 return get_hv (name, create);
304}
305
249static AV * 306static AV *
250coro_clone_padlist (pTHX_ CV *cv) 307coro_clone_padlist (pTHX_ CV *cv)
251{ 308{
252 AV *padlist = CvPADLIST (cv); 309 AV *padlist = CvPADLIST (cv);
253 AV *newpadlist, *newpad; 310 AV *newpadlist, *newpad;
254 311
255 newpadlist = newAV (); 312 newpadlist = newAV ();
256 AvREAL_off (newpadlist); 313 AvREAL_off (newpadlist);
257#if PERL_VERSION_ATLEAST (5,9,0) 314#if PERL_VERSION_ATLEAST (5,10,0)
258 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 315 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
259#else 316#else
260 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 317 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
261#endif 318#endif
262 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 319 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
300 357
301 /* casting is fun. */ 358 /* casting is fun. */
302 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 359 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
303 free_padlist (aTHX_ padlist); 360 free_padlist (aTHX_ padlist);
304 361
305 SvREFCNT_dec (av);
306
307 return 0; 362 return 0;
308} 363}
309 364
310#define PERL_MAGIC_coro PERL_MAGIC_ext 365#define CORO_MAGIC_type_cv PERL_MAGIC_ext
366#define CORO_MAGIC_type_state PERL_MAGIC_ext
311 367
312static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 368static MGVTBL coro_cv_vtbl = {
369 0, 0, 0, 0,
370 coro_cv_free
371};
313 372
314#define CORO_MAGIC(cv) \ 373#define CORO_MAGIC(sv,type) \
315 SvMAGIC (cv) \ 374 SvMAGIC (sv) \
316 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 375 ? SvMAGIC (sv)->mg_type == type \
317 ? SvMAGIC (cv) \ 376 ? SvMAGIC (sv) \
318 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 377 : mg_find (sv, type) \
319 : 0 378 : 0
379
380#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
381#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
320 382
321static struct coro * 383static struct coro *
322SvSTATE_ (pTHX_ SV *coro) 384SvSTATE_ (pTHX_ SV *coro)
323{ 385{
324 HV *stash; 386 HV *stash;
325 MAGIC *mg; 387 MAGIC *mg;
326 388
327 if (SvROK (coro)) 389 if (SvROK (coro))
328 coro = SvRV (coro); 390 coro = SvRV (coro);
329 391
330 if (SvTYPE (coro) != SVt_PVHV) 392 if (expect_false (SvTYPE (coro) != SVt_PVHV))
331 croak ("Coro::State object required"); 393 croak ("Coro::State object required");
332 394
333 stash = SvSTASH (coro); 395 stash = SvSTASH (coro);
334 if (stash != coro_stash && stash != coro_state_stash) 396 if (expect_false (stash != coro_stash && stash != coro_state_stash))
335 { 397 {
336 /* very slow, but rare, check */ 398 /* very slow, but rare, check */
337 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 399 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
338 croak ("Coro::State object required"); 400 croak ("Coro::State object required");
339 } 401 }
340 402
341 mg = CORO_MAGIC (coro); 403 mg = CORO_MAGIC_state (coro);
342 return (struct coro *)mg->mg_ptr; 404 return (struct coro *)mg->mg_ptr;
343} 405}
344 406
345#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 407#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
346 408
347/* the next two functions merely cache the padlists */ 409/* the next two functions merely cache the padlists */
348static void 410static void
349get_padlist (pTHX_ CV *cv) 411get_padlist (pTHX_ CV *cv)
350{ 412{
351 MAGIC *mg = CORO_MAGIC (cv); 413 MAGIC *mg = CORO_MAGIC_cv (cv);
352 AV *av; 414 AV *av;
353 415
354 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 416 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
355 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 417 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
356 else 418 else
357 { 419 {
358#if CORO_PREFER_PERL_FUNCTIONS 420#if CORO_PREFER_PERL_FUNCTIONS
359 /* this is probably cleaner, but also slower? */ 421 /* this is probably cleaner, but also slower? */
368} 430}
369 431
370static void 432static void
371put_padlist (pTHX_ CV *cv) 433put_padlist (pTHX_ CV *cv)
372{ 434{
373 MAGIC *mg = CORO_MAGIC (cv); 435 MAGIC *mg = CORO_MAGIC_cv (cv);
374 AV *av; 436 AV *av;
375 437
376 if (!mg) 438 if (expect_false (!mg))
377 { 439 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
378 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
379 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
380 mg->mg_virtual = &vtbl_coro;
381 mg->mg_obj = (SV *)newAV ();
382 }
383 440
384 av = (AV *)mg->mg_obj; 441 av = (AV *)mg->mg_obj;
385 442
386 if (AvFILLp (av) >= AvMAX (av)) 443 if (expect_false (AvFILLp (av) >= AvMAX (av)))
387 av_extend (av, AvMAX (av) + 1); 444 av_extend (av, AvMAX (av) + 1);
388 445
389 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 446 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
390} 447}
391 448
392/** load & save, init *******************************************************/ 449/** load & save, init *******************************************************/
393 450
394static void 451static void
395load_perl (pTHX_ Coro__State c) 452load_perl (pTHX_ Coro__State c)
396{ 453{
454 perl_slots *slot = c->slot;
455 c->slot = 0;
456
457 PL_mainstack = c->mainstack;
458
459 GvSV (PL_defgv) = slot->defsv;
460 GvAV (PL_defgv) = slot->defav;
461 GvSV (PL_errgv) = slot->errsv;
462 GvSV (irsgv) = slot->irsgv;
463
397#define VAR(name,type) PL_ ## name = c->name; 464 #define VAR(name,type) PL_ ## name = slot->name;
398# include "state.h" 465 # include "state.h"
399#undef VAR 466 #undef VAR
400
401 GvSV (PL_defgv) = c->defsv;
402 GvAV (PL_defgv) = c->defav;
403 GvSV (PL_errgv) = c->errsv;
404 GvSV (irsgv) = c->irssv_sv;
405 467
406 { 468 {
407 dSP; 469 dSP;
470
408 CV *cv; 471 CV *cv;
409 472
410 /* now do the ugly restore mess */ 473 /* now do the ugly restore mess */
411 while ((cv = (CV *)POPs)) 474 while (expect_true (cv = (CV *)POPs))
412 { 475 {
413 put_padlist (aTHX_ cv); /* mark this padlist as available */ 476 put_padlist (aTHX_ cv); /* mark this padlist as available */
414 CvDEPTH (cv) = PTR2IV (POPs); 477 CvDEPTH (cv) = PTR2IV (POPs);
415 CvPADLIST (cv) = (AV *)POPs; 478 CvPADLIST (cv) = (AV *)POPs;
416 } 479 }
435 498
436 XPUSHs (Nullsv); 499 XPUSHs (Nullsv);
437 /* this loop was inspired by pp_caller */ 500 /* this loop was inspired by pp_caller */
438 for (;;) 501 for (;;)
439 { 502 {
440 while (cxix >= 0) 503 while (expect_true (cxix >= 0))
441 { 504 {
442 PERL_CONTEXT *cx = &ccstk[cxix--]; 505 PERL_CONTEXT *cx = &ccstk[cxix--];
443 506
444 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 507 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
445 { 508 {
446 CV *cv = cx->blk_sub.cv; 509 CV *cv = cx->blk_sub.cv;
447 510
448 if (CvDEPTH (cv)) 511 if (expect_true (CvDEPTH (cv)))
449 { 512 {
450 EXTEND (SP, 3); 513 EXTEND (SP, 3);
451 PUSHs ((SV *)CvPADLIST (cv)); 514 PUSHs ((SV *)CvPADLIST (cv));
452 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 515 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
453 PUSHs ((SV *)cv); 516 PUSHs ((SV *)cv);
456 get_padlist (aTHX_ cv); 519 get_padlist (aTHX_ cv);
457 } 520 }
458 } 521 }
459 } 522 }
460 523
461 if (top_si->si_type == PERLSI_MAIN) 524 if (expect_true (top_si->si_type == PERLSI_MAIN))
462 break; 525 break;
463 526
464 top_si = top_si->si_prev; 527 top_si = top_si->si_prev;
465 ccstk = top_si->si_cxstack; 528 ccstk = top_si->si_cxstack;
466 cxix = top_si->si_cxix; 529 cxix = top_si->si_cxix;
467 } 530 }
468 531
469 PUTBACK; 532 PUTBACK;
470 } 533 }
471 534
535 /* allocate some space on the context stack for our purposes */
536 /* we manually unroll here, as usually 2 slots is enough */
537 if (SLOT_COUNT >= 1) CXINC;
538 if (SLOT_COUNT >= 2) CXINC;
539 if (SLOT_COUNT >= 3) CXINC;
540 {
541 int i;
542 for (i = 3; i < SLOT_COUNT; ++i)
543 CXINC;
544 }
545 cxstack_ix -= SLOT_COUNT; /* undo allocation */
546
547 c->mainstack = PL_mainstack;
548
549 {
550 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
551
472 c->defav = GvAV (PL_defgv); 552 slot->defav = GvAV (PL_defgv);
473 c->defsv = DEFSV; 553 slot->defsv = DEFSV;
474 c->errsv = ERRSV; 554 slot->errsv = ERRSV;
475 c->irssv_sv = GvSV (irsgv); 555 slot->irsgv = GvSV (irsgv);
476 556
477#define VAR(name,type)c->name = PL_ ## name; 557 #define VAR(name,type) slot->name = PL_ ## name;
478# include "state.h" 558 # include "state.h"
479#undef VAR 559 #undef VAR
560 }
480} 561}
481 562
482/* 563/*
483 * allocate various perl stacks. This is an exact copy 564 * allocate various perl stacks. This is an exact copy
484 * of perl.c:init_stacks, except that it uses less memory 565 * of perl.c:init_stacks, except that it uses less memory
489# define coro_init_stacks init_stacks 570# define coro_init_stacks init_stacks
490#else 571#else
491static void 572static void
492coro_init_stacks (pTHX) 573coro_init_stacks (pTHX)
493{ 574{
494 PL_curstackinfo = new_stackinfo(64, 6); 575 PL_curstackinfo = new_stackinfo(32, 8);
495 PL_curstackinfo->si_type = PERLSI_MAIN; 576 PL_curstackinfo->si_type = PERLSI_MAIN;
496 PL_curstack = PL_curstackinfo->si_stack; 577 PL_curstack = PL_curstackinfo->si_stack;
497 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 578 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
498 579
499 PL_stack_base = AvARRAY(PL_curstack); 580 PL_stack_base = AvARRAY(PL_curstack);
500 PL_stack_sp = PL_stack_base; 581 PL_stack_sp = PL_stack_base;
501 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 582 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
502 583
503 New(50,PL_tmps_stack,64,SV*); 584 New(50,PL_tmps_stack,32,SV*);
504 PL_tmps_floor = -1; 585 PL_tmps_floor = -1;
505 PL_tmps_ix = -1; 586 PL_tmps_ix = -1;
506 PL_tmps_max = 64; 587 PL_tmps_max = 32;
507 588
508 New(54,PL_markstack,16,I32); 589 New(54,PL_markstack,16,I32);
509 PL_markstack_ptr = PL_markstack; 590 PL_markstack_ptr = PL_markstack;
510 PL_markstack_max = PL_markstack + 16; 591 PL_markstack_max = PL_markstack + 16;
511 592
512#ifdef SET_MARK_OFFSET 593#ifdef SET_MARK_OFFSET
513 SET_MARK_OFFSET; 594 SET_MARK_OFFSET;
514#endif 595#endif
515 596
516 New(54,PL_scopestack,16,I32); 597 New(54,PL_scopestack,8,I32);
517 PL_scopestack_ix = 0; 598 PL_scopestack_ix = 0;
518 PL_scopestack_max = 16; 599 PL_scopestack_max = 8;
519 600
520 New(54,PL_savestack,64,ANY); 601 New(54,PL_savestack,24,ANY);
521 PL_savestack_ix = 0; 602 PL_savestack_ix = 0;
522 PL_savestack_max = 64; 603 PL_savestack_max = 24;
523 604
524#if !PERL_VERSION_ATLEAST (5,9,0) 605#if !PERL_VERSION_ATLEAST (5,10,0)
525 New(54,PL_retstack,4,OP*); 606 New(54,PL_retstack,4,OP*);
526 PL_retstack_ix = 0; 607 PL_retstack_ix = 0;
527 PL_retstack_max = 4; 608 PL_retstack_max = 4;
528#endif 609#endif
529} 610}
552 633
553 Safefree (PL_tmps_stack); 634 Safefree (PL_tmps_stack);
554 Safefree (PL_markstack); 635 Safefree (PL_markstack);
555 Safefree (PL_scopestack); 636 Safefree (PL_scopestack);
556 Safefree (PL_savestack); 637 Safefree (PL_savestack);
557#if !PERL_VERSION_ATLEAST (5,9,0) 638#if !PERL_VERSION_ATLEAST (5,10,0)
558 Safefree (PL_retstack); 639 Safefree (PL_retstack);
559#endif 640#endif
560} 641}
561 642
562static size_t 643static size_t
564{ 645{
565 size_t rss = sizeof (*coro); 646 size_t rss = sizeof (*coro);
566 647
567 if (coro->mainstack) 648 if (coro->mainstack)
568 { 649 {
650 perl_slots tmp_slot;
651 perl_slots *slot;
652
569 if (coro->flags & CF_RUNNING) 653 if (coro->flags & CF_RUNNING)
570 { 654 {
655 slot = &tmp_slot;
656
571 #define VAR(name,type)coro->name = PL_ ## name; 657 #define VAR(name,type) slot->name = PL_ ## name;
572 # include "state.h" 658 # include "state.h"
573 #undef VAR 659 #undef VAR
574 } 660 }
661 else
662 slot = coro->slot;
575 663
576 rss += sizeof (coro->curstackinfo); 664 rss += sizeof (slot->curstackinfo);
577 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
578 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 665 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
579 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 666 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
580 rss += coro->tmps_max * sizeof (SV *); 667 rss += slot->tmps_max * sizeof (SV *);
581 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 668 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
582 rss += coro->scopestack_max * sizeof (I32); 669 rss += slot->scopestack_max * sizeof (I32);
583 rss += coro->savestack_max * sizeof (ANY); 670 rss += slot->savestack_max * sizeof (ANY);
584 671
585#if !PERL_VERSION_ATLEAST (5,9,0) 672#if !PERL_VERSION_ATLEAST (5,10,0)
586 rss += coro->retstack_max * sizeof (OP *); 673 rss += slot->retstack_max * sizeof (OP *);
587#endif 674#endif
588 } 675 }
589 676
590 return rss; 677 return rss;
591} 678}
592 679
593/** coroutine stack handling ************************************************/ 680/** coroutine stack handling ************************************************/
681
682static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
683static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
684
685/*
686 * This overrides the default magic get method of %SIG elements.
687 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
688 * and instead of tryign to save and restore the hash elements, we just provide
689 * readback here.
690 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
691 * not expecting this to actually change the hook. This is a potential problem
692 * when a schedule happens then, but we ignore this.
693 */
694static int
695coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
696{
697 const char *s = MgPV_nolen_const (mg);
698
699 if (*s == '_')
700 {
701 if (strEQ (s, "__DIE__" ) && PL_diehook ) return sv_setsv (sv, PL_diehook ), 0;
702 if (strEQ (s, "__WARN__") && PL_warnhook) return sv_setsv (sv, PL_warnhook), 0;
703 }
704
705 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
706}
707
708static int
709coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
710{
711 const char *s = MgPV_nolen_const (mg);
712
713 if (*s == '_')
714 {
715 SV **svp = 0;
716
717 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
718 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
719
720 if (svp)
721 {
722 SV *old = *svp;
723 *svp = newSVsv (sv);
724 SvREFCNT_dec (old);
725 return 0;
726 }
727 }
728
729 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
730}
594 731
595static void 732static void
596coro_setup (pTHX_ struct coro *coro) 733coro_setup (pTHX_ struct coro *coro)
597{ 734{
598 /* 735 /*
603 PL_runops = RUNOPS_DEFAULT; 740 PL_runops = RUNOPS_DEFAULT;
604 PL_curcop = &PL_compiling; 741 PL_curcop = &PL_compiling;
605 PL_in_eval = EVAL_NULL; 742 PL_in_eval = EVAL_NULL;
606 PL_comppad = 0; 743 PL_comppad = 0;
607 PL_curpm = 0; 744 PL_curpm = 0;
745 PL_curpad = 0;
608 PL_localizing = 0; 746 PL_localizing = 0;
609 PL_dirty = 0; 747 PL_dirty = 0;
610 PL_restartop = 0; 748 PL_restartop = 0;
749#if PERL_VERSION_ATLEAST (5,10,0)
750 PL_parser = 0;
751#endif
752
753 /* recreate the die/warn hooks */
754 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
755 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
611 756
612 GvSV (PL_defgv) = newSV (0); 757 GvSV (PL_defgv) = newSV (0);
613 GvAV (PL_defgv) = coro->args; coro->args = 0; 758 GvAV (PL_defgv) = coro->args; coro->args = 0;
614 GvSV (PL_errgv) = newSV (0); 759 GvSV (PL_errgv) = newSV (0);
615 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 760 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
616 PL_rs = newSVsv (GvSV (irsgv)); 761 PL_rs = newSVsv (GvSV (irsgv));
617 PL_defoutgv = SvREFCNT_inc (stdoutgv); 762 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
618
619 ENTER; /* necessary e.g. for dounwind */
620 763
621 { 764 {
622 dSP; 765 dSP;
623 LOGOP myop; 766 LOGOP myop;
624 767
631 PUTBACK; 774 PUTBACK;
632 PL_op = (OP *)&myop; 775 PL_op = (OP *)&myop;
633 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 776 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
634 SPAGAIN; 777 SPAGAIN;
635 } 778 }
779
780 /* this newly created coroutine might be run on an existing cctx which most
781 * likely was suspended in set_stacklevel, called from entersub.
782 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
783 * so we ENTER here for symmetry
784 */
785 ENTER;
636} 786}
637 787
638static void 788static void
639coro_destroy (pTHX_ struct coro *coro) 789coro_destroy (pTHX_ struct coro *coro)
640{ 790{
660 SvREFCNT_dec (GvSV (PL_errgv)); 810 SvREFCNT_dec (GvSV (PL_errgv));
661 SvREFCNT_dec (PL_defoutgv); 811 SvREFCNT_dec (PL_defoutgv);
662 SvREFCNT_dec (PL_rs); 812 SvREFCNT_dec (PL_rs);
663 SvREFCNT_dec (GvSV (irsgv)); 813 SvREFCNT_dec (GvSV (irsgv));
664 814
815 SvREFCNT_dec (PL_diehook);
816 SvREFCNT_dec (PL_warnhook);
817
665 SvREFCNT_dec (coro->saved_deffh); 818 SvREFCNT_dec (coro->saved_deffh);
666 //SvREFCNT_dec (coro->throw); 819 SvREFCNT_dec (coro->throw);
667 820
668 coro_destroy_stacks (aTHX); 821 coro_destroy_stacks (aTHX);
669} 822}
670 823
671static void 824static void
672free_coro_mortal (pTHX) 825free_coro_mortal (pTHX)
673{ 826{
674 if (coro_mortal) 827 if (expect_true (coro_mortal))
675 { 828 {
676 SvREFCNT_dec (coro_mortal); 829 SvREFCNT_dec (coro_mortal);
677 coro_mortal = 0; 830 coro_mortal = 0;
678 } 831 }
679} 832}
708 bot = PL_stack_base + cx->blk_oldsp + 1; 861 bot = PL_stack_base + cx->blk_oldsp + 1;
709 top = cx->blk_gimme == G_ARRAY ? SP + 1 862 top = cx->blk_gimme == G_ARRAY ? SP + 1
710 : cx->blk_gimme == G_SCALAR ? bot + 1 863 : cx->blk_gimme == G_SCALAR ? bot + 1
711 : bot; 864 : bot;
712 865
866 av_extend (av, top - bot);
713 while (bot < top) 867 while (bot < top)
714 av_push (av, SvREFCNT_inc (*bot++)); 868 av_push (av, SvREFCNT_inc (*bot++));
715 869
716 PL_runops = RUNOPS_DEFAULT; 870 PL_runops = RUNOPS_DEFAULT;
717 ENTER; 871 ENTER;
757 SAVETMPS; 911 SAVETMPS;
758 EXTEND (SP, 3); 912 EXTEND (SP, 3);
759 PUSHMARK (SP); 913 PUSHMARK (SP);
760 PUSHs (&PL_sv_yes); 914 PUSHs (&PL_sv_yes);
761 PUSHs (fullname); 915 PUSHs (fullname);
762 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 916 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
763 PUTBACK; 917 PUTBACK;
764 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 918 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
765 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 919 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
766 SPAGAIN; 920 SPAGAIN;
767 FREETMPS; 921 FREETMPS;
803 957
804/* inject a fake call to Coro::State::_cctx_init into the execution */ 958/* inject a fake call to Coro::State::_cctx_init into the execution */
805/* _cctx_init should be careful, as it could be called at almost any time */ 959/* _cctx_init should be careful, as it could be called at almost any time */
806/* during execution of a perl program */ 960/* during execution of a perl program */
807static void NOINLINE 961static void NOINLINE
808prepare_cctx (pTHX_ coro_cctx *cctx) 962cctx_prepare (pTHX_ coro_cctx *cctx)
809{ 963{
810 dSP; 964 dSP;
811 LOGOP myop; 965 LOGOP myop;
812 966
813 PL_top_env = &PL_start_env; 967 PL_top_env = &PL_start_env;
831 985
832/* 986/*
833 * this is a _very_ stripped down perl interpreter ;) 987 * this is a _very_ stripped down perl interpreter ;)
834 */ 988 */
835static void 989static void
836coro_run (void *arg) 990cctx_run (void *arg)
837{ 991{
838 dTHX; 992 dTHX;
839 993
840 /* coro_run is the alternative tail of transfer(), so unlock here. */ 994 /* cctx_run is the alternative tail of transfer(), so unlock here. */
841 UNLOCK; 995 UNLOCK;
842 996
843 /* we now skip the entersub that lead to transfer() */ 997 /* we now skip the entersub that lead to transfer() */
844 PL_op = PL_op->op_next; 998 PL_op = PL_op->op_next;
845 999
846 /* inject a fake subroutine call to cctx_init */ 1000 /* inject a fake subroutine call to cctx_init */
847 prepare_cctx (aTHX_ (coro_cctx *)arg); 1001 cctx_prepare (aTHX_ (coro_cctx *)arg);
848 1002
849 /* somebody or something will hit me for both perl_run and PL_restartop */ 1003 /* somebody or something will hit me for both perl_run and PL_restartop */
850 PL_restartop = PL_op; 1004 PL_restartop = PL_op;
851 perl_run (PL_curinterp); 1005 perl_run (PL_curinterp);
852 1006
871 ++cctx_count; 1025 ++cctx_count;
872 1026
873 Newz (0, cctx, 1, coro_cctx); 1027 Newz (0, cctx, 1, coro_cctx);
874 1028
875#if HAVE_MMAP 1029#if HAVE_MMAP
876
877 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1030 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
878 /* mmap supposedly does allocate-on-write for us */ 1031 /* mmap supposedly does allocate-on-write for us */
879 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1032 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
880 1033
881 if (cctx->sptr != (void *)-1) 1034 if (cctx->sptr != (void *)-1)
902 stack_start = cctx->sptr; 1055 stack_start = cctx->sptr;
903 stack_size = cctx->ssize; 1056 stack_size = cctx->ssize;
904 } 1057 }
905 1058
906 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1059 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
907 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1060 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
908 1061
909 return cctx; 1062 return cctx;
910} 1063}
911 1064
912static void 1065static void
929 Safefree (cctx->sptr); 1082 Safefree (cctx->sptr);
930 1083
931 Safefree (cctx); 1084 Safefree (cctx);
932} 1085}
933 1086
1087/* wether this cctx should be destructed */
1088#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1089
934static coro_cctx * 1090static coro_cctx *
935cctx_get (pTHX) 1091cctx_get (pTHX)
936{ 1092{
937 while (cctx_first) 1093 while (expect_true (cctx_first))
938 { 1094 {
939 coro_cctx *cctx = cctx_first; 1095 coro_cctx *cctx = cctx_first;
940 cctx_first = cctx->next; 1096 cctx_first = cctx->next;
941 --cctx_idle; 1097 --cctx_idle;
942 1098
943 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1099 if (expect_true (!CCTX_EXPIRED (cctx)))
944 return cctx; 1100 return cctx;
945 1101
946 cctx_destroy (cctx); 1102 cctx_destroy (cctx);
947 } 1103 }
948 1104
951 1107
952static void 1108static void
953cctx_put (coro_cctx *cctx) 1109cctx_put (coro_cctx *cctx)
954{ 1110{
955 /* free another cctx if overlimit */ 1111 /* free another cctx if overlimit */
956 if (cctx_idle >= MAX_IDLE_CCTX) 1112 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
957 { 1113 {
958 coro_cctx *first = cctx_first; 1114 coro_cctx *first = cctx_first;
959 cctx_first = first->next; 1115 cctx_first = first->next;
960 --cctx_idle; 1116 --cctx_idle;
961 1117
967 cctx_first = cctx; 1123 cctx_first = cctx;
968} 1124}
969 1125
970/** coroutine switching *****************************************************/ 1126/** coroutine switching *****************************************************/
971 1127
972static void NOINLINE 1128static void
973transfer_check (pTHX_ struct coro *prev, struct coro *next) 1129transfer_check (pTHX_ struct coro *prev, struct coro *next)
974{ 1130{
975 if (prev != next) 1131 if (expect_true (prev != next))
976 { 1132 {
977 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1133 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
978 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1134 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
979 1135
980 if (next->flags & CF_RUNNING) 1136 if (expect_false (next->flags & CF_RUNNING))
981 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1137 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
982 1138
983 if (next->flags & CF_DESTROYED) 1139 if (expect_false (next->flags & CF_DESTROYED))
984 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1140 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
985 1141
1142#if !PERL_VERSION_ATLEAST (5,10,0)
986 if (PL_lex_state != LEX_NOTPARSING) 1143 if (expect_false (PL_lex_state != LEX_NOTPARSING))
987 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1144 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1145#endif
988 } 1146 }
989} 1147}
990 1148
991/* always use the TRANSFER macro */ 1149/* always use the TRANSFER macro */
992static void NOINLINE 1150static void NOINLINE
993transfer (pTHX_ struct coro *prev, struct coro *next) 1151transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
994{ 1152{
995 dSTACKLEVEL; 1153 dSTACKLEVEL;
1154 static volatile int has_throw;
996 1155
997 /* sometimes transfer is only called to set idle_sp */ 1156 /* sometimes transfer is only called to set idle_sp */
998 if (!next) 1157 if (expect_false (!next))
999 { 1158 {
1000 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1159 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1001 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1160 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1002 } 1161 }
1003 else if (prev != next) 1162 else if (expect_true (prev != next))
1004 { 1163 {
1005 coro_cctx *prev__cctx; 1164 coro_cctx *prev__cctx;
1006 1165
1007 if (prev->flags & CF_NEW) 1166 if (expect_false (prev->flags & CF_NEW))
1008 { 1167 {
1009 /* create a new empty context */ 1168 /* create a new empty context */
1010 Newz (0, prev->cctx, 1, coro_cctx); 1169 Newz (0, prev->cctx, 1, coro_cctx);
1011 prev->flags &= ~CF_NEW; 1170 prev->flags &= ~CF_NEW;
1012 prev->flags |= CF_RUNNING; 1171 prev->flags |= CF_RUNNING;
1015 prev->flags &= ~CF_RUNNING; 1174 prev->flags &= ~CF_RUNNING;
1016 next->flags |= CF_RUNNING; 1175 next->flags |= CF_RUNNING;
1017 1176
1018 LOCK; 1177 LOCK;
1019 1178
1179 /* first get rid of the old state */
1180 save_perl (aTHX_ prev);
1181
1020 if (next->flags & CF_NEW) 1182 if (expect_false (next->flags & CF_NEW))
1021 { 1183 {
1022 /* need to start coroutine */ 1184 /* need to start coroutine */
1023 next->flags &= ~CF_NEW; 1185 next->flags &= ~CF_NEW;
1024 /* first get rid of the old state */
1025 save_perl (aTHX_ prev);
1026 /* setup coroutine call */ 1186 /* setup coroutine call */
1027 coro_setup (aTHX_ next); 1187 coro_setup (aTHX_ next);
1028 } 1188 }
1029 else 1189 else
1030 {
1031 /* coroutine already started */
1032 save_perl (aTHX_ prev);
1033 load_perl (aTHX_ next); 1190 load_perl (aTHX_ next);
1034 }
1035 1191
1036 prev__cctx = prev->cctx; 1192 prev__cctx = prev->cctx;
1037 1193
1038 /* possibly "free" the cctx */ 1194 /* possibly "free" the cctx */
1039 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1195 if (expect_true (
1196 prev__cctx->idle_sp == STACKLEVEL
1197 && !(prev__cctx->flags & CC_TRACE)
1198 && !force_cctx
1199 ))
1040 { 1200 {
1041 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1201 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1042 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1202 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1043 1203
1044 prev->cctx = 0; 1204 prev->cctx = 0;
1045 1205
1206 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1207 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1208 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1209 if (!next->cctx)
1210 next->cctx = cctx_get (aTHX);
1211
1046 cctx_put (prev__cctx); 1212 cctx_put (prev__cctx);
1047 } 1213 }
1048 1214
1049 ++next->usecount; 1215 ++next->usecount;
1050 1216
1051 if (!next->cctx) 1217 if (expect_true (!next->cctx))
1052 next->cctx = cctx_get (aTHX); 1218 next->cctx = cctx_get (aTHX);
1053 1219
1220 has_throw = !!next->throw;
1221
1054 if (prev__cctx != next->cctx) 1222 if (expect_false (prev__cctx != next->cctx))
1055 { 1223 {
1056 prev__cctx->top_env = PL_top_env; 1224 prev__cctx->top_env = PL_top_env;
1057 PL_top_env = next->cctx->top_env; 1225 PL_top_env = next->cctx->top_env;
1058 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1226 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1059 } 1227 }
1060 1228
1061 free_coro_mortal (aTHX); 1229 free_coro_mortal (aTHX);
1062 UNLOCK; 1230 UNLOCK;
1231
1232 if (expect_false (has_throw))
1233 {
1234 struct coro *coro = SvSTATE (coro_current);
1235
1236 if (coro->throw)
1237 {
1238 SV *exception = coro->throw;
1239 coro->throw = 0;
1240 sv_setsv (ERRSV, exception);
1241 croak (0);
1242 }
1243 }
1063 } 1244 }
1064} 1245}
1065 1246
1066struct transfer_args 1247struct transfer_args
1067{ 1248{
1068 struct coro *prev, *next; 1249 struct coro *prev, *next;
1069}; 1250};
1070 1251
1071#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1252#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1072#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1253#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1073 1254
1074/** high level stuff ********************************************************/ 1255/** high level stuff ********************************************************/
1075 1256
1076static int 1257static int
1102 save_perl (aTHX_ &temp); 1283 save_perl (aTHX_ &temp);
1103 load_perl (aTHX_ coro); 1284 load_perl (aTHX_ coro);
1104 1285
1105 coro_destroy (aTHX_ coro); 1286 coro_destroy (aTHX_ coro);
1106 1287
1107 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1288 load_perl (aTHX_ &temp);
1108 1289
1109 coro->mainstack = 0; 1290 coro->slot = 0;
1110 } 1291 }
1111 1292
1112 cctx_destroy (coro->cctx); 1293 cctx_destroy (coro->cctx);
1113 SvREFCNT_dec (coro->args); 1294 SvREFCNT_dec (coro->args);
1114 1295
1170{ 1351{
1171 dTHX; 1352 dTHX;
1172 struct transfer_args ta; 1353 struct transfer_args ta;
1173 1354
1174 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1355 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1175 TRANSFER (ta); 1356 TRANSFER (ta, 1);
1176} 1357}
1177 1358
1178/** Coro ********************************************************************/ 1359/** Coro ********************************************************************/
1179 1360
1180static void 1361static void
1182{ 1363{
1183 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1364 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1184} 1365}
1185 1366
1186static SV * 1367static SV *
1187coro_deq (pTHX_ int min_prio) 1368coro_deq (pTHX)
1188{ 1369{
1189 int prio = PRIO_MAX - PRIO_MIN; 1370 int prio;
1190 1371
1191 min_prio -= PRIO_MIN;
1192 if (min_prio < 0)
1193 min_prio = 0;
1194
1195 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1372 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1196 if (AvFILLp (coro_ready [prio]) >= 0) 1373 if (AvFILLp (coro_ready [prio]) >= 0)
1197 return av_shift (coro_ready [prio]); 1374 return av_shift (coro_ready [prio]);
1198 1375
1199 return 0; 1376 return 0;
1200} 1377}
1236 SV *prev_sv, *next_sv; 1413 SV *prev_sv, *next_sv;
1237 1414
1238 for (;;) 1415 for (;;)
1239 { 1416 {
1240 LOCK; 1417 LOCK;
1241 next_sv = coro_deq (aTHX_ PRIO_MIN); 1418 next_sv = coro_deq (aTHX);
1242 1419
1243 /* nothing to schedule: call the idle handler */ 1420 /* nothing to schedule: call the idle handler */
1244 if (!next_sv) 1421 if (expect_false (!next_sv))
1245 { 1422 {
1246 dSP; 1423 dSP;
1247 UNLOCK; 1424 UNLOCK;
1248 1425
1249 ENTER; 1426 ENTER;
1250 SAVETMPS; 1427 SAVETMPS;
1251 1428
1252 PUSHMARK (SP); 1429 PUSHMARK (SP);
1253 PUTBACK; 1430 PUTBACK;
1254 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1431 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1432 SPAGAIN;
1255 1433
1256 FREETMPS; 1434 FREETMPS;
1257 LEAVE; 1435 LEAVE;
1258 continue; 1436 continue;
1259 } 1437 }
1260 1438
1261 ta->next = SvSTATE (next_sv); 1439 ta->next = SvSTATE (next_sv);
1262 1440
1263 /* cannot transfer to destroyed coros, skip and look for next */ 1441 /* cannot transfer to destroyed coros, skip and look for next */
1264 if (ta->next->flags & CF_DESTROYED) 1442 if (expect_false (ta->next->flags & CF_DESTROYED))
1265 { 1443 {
1266 UNLOCK; 1444 UNLOCK;
1267 SvREFCNT_dec (next_sv); 1445 SvREFCNT_dec (next_sv);
1268 /* coro_nready is already taken care of by destroy */ 1446 /* coro_nready is already taken care of by destroy */
1269 continue; 1447 continue;
1314{ 1492{
1315 dTHX; 1493 dTHX;
1316 struct transfer_args ta; 1494 struct transfer_args ta;
1317 1495
1318 prepare_schedule (aTHX_ &ta); 1496 prepare_schedule (aTHX_ &ta);
1319 TRANSFER (ta); 1497 TRANSFER (ta, 1);
1320} 1498}
1321 1499
1322static int 1500static int
1323api_cede (void) 1501api_cede (void)
1324{ 1502{
1325 dTHX; 1503 dTHX;
1326 struct transfer_args ta; 1504 struct transfer_args ta;
1327 1505
1328 prepare_cede (aTHX_ &ta); 1506 prepare_cede (aTHX_ &ta);
1329 1507
1330 if (ta.prev != ta.next) 1508 if (expect_true (ta.prev != ta.next))
1331 { 1509 {
1332 TRANSFER (ta); 1510 TRANSFER (ta, 1);
1333 return 1; 1511 return 1;
1334 } 1512 }
1335 else 1513 else
1336 return 0; 1514 return 0;
1337} 1515}
1342 dTHX; 1520 dTHX;
1343 struct transfer_args ta; 1521 struct transfer_args ta;
1344 1522
1345 if (prepare_cede_notself (aTHX_ &ta)) 1523 if (prepare_cede_notself (aTHX_ &ta))
1346 { 1524 {
1347 TRANSFER (ta); 1525 TRANSFER (ta, 1);
1348 return 1; 1526 return 1;
1349 } 1527 }
1350 else 1528 else
1351 return 0; 1529 return 0;
1352} 1530}
1371 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1549 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1372 1550
1373 if (coro->flags & CF_RUNNING) 1551 if (coro->flags & CF_RUNNING)
1374 PL_runops = RUNOPS_DEFAULT; 1552 PL_runops = RUNOPS_DEFAULT;
1375 else 1553 else
1376 coro->runops = RUNOPS_DEFAULT; 1554 coro->slot->runops = RUNOPS_DEFAULT;
1377 } 1555 }
1378} 1556}
1379 1557
1380MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1558MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1381 1559
1388#endif 1566#endif
1389 BOOT_PAGESIZE; 1567 BOOT_PAGESIZE;
1390 1568
1391 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1569 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1392 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1570 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1571
1572 orig_sigelem_get = PL_vtbl_sigelem.svt_get;
1573 PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1574 orig_sigelem_set = PL_vtbl_sigelem.svt_set;
1575 PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1576
1577 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1578 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1579 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1393 1580
1394 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1581 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1395 1582
1396 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1583 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1397 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1584 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1403 1590
1404 while (main_top_env->je_prev) 1591 while (main_top_env->je_prev)
1405 main_top_env = main_top_env->je_prev; 1592 main_top_env = main_top_env->je_prev;
1406 1593
1407 coroapi.ver = CORO_API_VERSION; 1594 coroapi.ver = CORO_API_VERSION;
1595 coroapi.rev = CORO_API_REVISION;
1408 coroapi.transfer = api_transfer; 1596 coroapi.transfer = api_transfer;
1409 1597
1410 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1598 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1411} 1599}
1412 1600
1413SV * 1601SV *
1414new (char *klass, ...) 1602new (char *klass, ...)
1415 CODE: 1603 CODE:
1416{ 1604{
1417 struct coro *coro; 1605 struct coro *coro;
1606 MAGIC *mg;
1418 HV *hv; 1607 HV *hv;
1419 int i; 1608 int i;
1420 1609
1421 Newz (0, coro, 1, struct coro); 1610 Newz (0, coro, 1, struct coro);
1422 coro->args = newAV (); 1611 coro->args = newAV ();
1425 if (coro_first) coro_first->prev = coro; 1614 if (coro_first) coro_first->prev = coro;
1426 coro->next = coro_first; 1615 coro->next = coro_first;
1427 coro_first = coro; 1616 coro_first = coro;
1428 1617
1429 coro->hv = hv = newHV (); 1618 coro->hv = hv = newHV ();
1430 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1619 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1620 mg->mg_flags |= MGf_DUP;
1431 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1621 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1432 1622
1433 av_extend (coro->args, items - 1); 1623 av_extend (coro->args, items - 1);
1434
1435 for (i = 1; i < items; i++) 1624 for (i = 1; i < items; i++)
1436 av_push (coro->args, newSVsv (ST (i))); 1625 av_push (coro->args, newSVsv (ST (i)));
1437} 1626}
1438 OUTPUT: 1627 OUTPUT:
1439 RETVAL 1628 RETVAL
1450 Coro::cede_notself = 4 1639 Coro::cede_notself = 4
1451 CODE: 1640 CODE:
1452{ 1641{
1453 struct transfer_args ta; 1642 struct transfer_args ta;
1454 1643
1644 PUTBACK;
1455 switch (ix) 1645 switch (ix)
1456 { 1646 {
1457 case 0: 1647 case 0:
1458 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1648 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1459 ta.next = 0; 1649 ta.next = 0;
1478 if (!prepare_cede_notself (aTHX_ &ta)) 1668 if (!prepare_cede_notself (aTHX_ &ta))
1479 XSRETURN_EMPTY; 1669 XSRETURN_EMPTY;
1480 1670
1481 break; 1671 break;
1482 } 1672 }
1673 SPAGAIN;
1483 1674
1484 BARRIER; 1675 BARRIER;
1676 PUTBACK;
1485 TRANSFER (ta); 1677 TRANSFER (ta, 0);
1486 1678 SPAGAIN; /* might be the sp of a different coroutine now */
1487 if (GIMME_V != G_VOID && ta.next != ta.prev) 1679 /* be extra careful not to ever do anything after TRANSFER */
1488 XSRETURN_YES;
1489} 1680}
1490 1681
1491bool 1682bool
1492_destroy (SV *coro_sv) 1683_destroy (SV *coro_sv)
1493 CODE: 1684 CODE:
1542 CODE: 1733 CODE:
1543{ 1734{
1544 if (coro->mainstack) 1735 if (coro->mainstack)
1545 { 1736 {
1546 struct coro temp; 1737 struct coro temp;
1547 Zero (&temp, 1, struct coro);
1548 1738
1549 if (!(coro->flags & CF_RUNNING)) 1739 if (!(coro->flags & CF_RUNNING))
1550 { 1740 {
1741 PUTBACK;
1551 save_perl (aTHX_ &temp); 1742 save_perl (aTHX_ &temp);
1552 load_perl (aTHX_ coro); 1743 load_perl (aTHX_ coro);
1553 } 1744 }
1554 1745
1555 { 1746 {
1556 dSP; 1747 dSP;
1557 ENTER; 1748 ENTER;
1558 SAVETMPS; 1749 SAVETMPS;
1750 PUTBACK;
1751 PUSHSTACK;
1559 PUSHMARK (SP); 1752 PUSHMARK (SP);
1560 PUTBACK; 1753
1561 if (ix) 1754 if (ix)
1562 eval_sv (coderef, 0); 1755 eval_sv (coderef, 0);
1563 else 1756 else
1564 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1757 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1758
1759 POPSTACK;
1565 SPAGAIN; 1760 SPAGAIN;
1566 FREETMPS; 1761 FREETMPS;
1567 LEAVE; 1762 LEAVE;
1568 PUTBACK; 1763 PUTBACK;
1569 } 1764 }
1570 1765
1571 if (!(coro->flags & CF_RUNNING)) 1766 if (!(coro->flags & CF_RUNNING))
1572 { 1767 {
1573 save_perl (aTHX_ coro); 1768 save_perl (aTHX_ coro);
1574 load_perl (aTHX_ &temp); 1769 load_perl (aTHX_ &temp);
1770 SPAGAIN;
1575 } 1771 }
1576 } 1772 }
1577} 1773}
1578 1774
1579SV * 1775SV *
1620 case 1: RETVAL = coro->usecount; break; 1816 case 1: RETVAL = coro->usecount; break;
1621 } 1817 }
1622 OUTPUT: 1818 OUTPUT:
1623 RETVAL 1819 RETVAL
1624 1820
1821void
1822force_cctx ()
1823 CODE:
1824 struct coro *coro = SvSTATE (coro_current);
1825 coro->cctx->idle_sp = 0;
1625 1826
1626MODULE = Coro::State PACKAGE = Coro 1827MODULE = Coro::State PACKAGE = Coro
1627 1828
1628BOOT: 1829BOOT:
1629{ 1830{
1630 int i; 1831 int i;
1631 1832
1632 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE); 1833 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
1633 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE); 1834 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1634 av_async_pool = get_av ("Coro::async_pool", TRUE); 1835 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
1635 1836
1636 coro_current = get_sv ("Coro::current", FALSE); 1837 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1637 SvREADONLY_on (coro_current); 1838 SvREADONLY_on (coro_current);
1638 1839
1639 coro_stash = gv_stashpv ("Coro", TRUE); 1840 coro_stash = gv_stashpv ("Coro", TRUE);
1640 1841
1641 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1842 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1642 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1843 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1643 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1844 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1644 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1845 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1647 1848
1648 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1849 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1649 coro_ready[i] = newAV (); 1850 coro_ready[i] = newAV ();
1650 1851
1651 { 1852 {
1652 SV *sv = perl_get_sv("Coro::API", 1); 1853 SV *sv = perl_get_sv ("Coro::API", TRUE);
1854 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1653 1855
1654 coroapi.schedule = api_schedule; 1856 coroapi.schedule = api_schedule;
1655 coroapi.cede = api_cede; 1857 coroapi.cede = api_cede;
1656 coroapi.cede_notself = api_cede_notself; 1858 coroapi.cede_notself = api_cede_notself;
1657 coroapi.ready = api_ready; 1859 coroapi.ready = api_ready;
1708 CODE: 1910 CODE:
1709 RETVAL = coro_nready; 1911 RETVAL = coro_nready;
1710 OUTPUT: 1912 OUTPUT:
1711 RETVAL 1913 RETVAL
1712 1914
1915void
1916throw (Coro::State self, SV *throw = &PL_sv_undef)
1917 PROTOTYPE: $;$
1918 CODE:
1919 SvREFCNT_dec (self->throw);
1920 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1921
1922void
1923swap_defsv (Coro::State self)
1924 PROTOTYPE: $
1925 ALIAS:
1926 swap_defav = 1
1927 CODE:
1928 if (!self->slot)
1929 croak ("cannot swap state with coroutine that has no saved state");
1930 else
1931 {
1932 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
1933 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
1934
1935 SV *tmp = *src; *src = *dst; *dst = tmp;
1936 }
1937
1713# for async_pool speedup 1938# for async_pool speedup
1714void 1939void
1715_pool_1 (SV *cb) 1940_pool_1 (SV *cb)
1716 CODE: 1941 CODE:
1717{ 1942{
1721 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 1946 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1722 AV *invoke_av; 1947 AV *invoke_av;
1723 int i, len; 1948 int i, len;
1724 1949
1725 if (!invoke) 1950 if (!invoke)
1951 {
1952 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1726 croak ("\3terminate\2\n"); 1953 croak ("\3async_pool terminate\2\n");
1954 }
1727 1955
1728 SvREFCNT_dec (coro->saved_deffh); 1956 SvREFCNT_dec (coro->saved_deffh);
1729 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 1957 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1730 1958
1731 hv_store (hv, "desc", sizeof ("desc") - 1, 1959 hv_store (hv, "desc", sizeof ("desc") - 1,
1757 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 1985 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1758 coro->saved_deffh = 0; 1986 coro->saved_deffh = 0;
1759 1987
1760 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 1988 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1761 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 1989 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1990 {
1991 SvREFCNT_dec (PL_diehook); PL_diehook = 0;
1762 croak ("\3terminate\2\n"); 1992 croak ("\3async_pool terminate\2\n");
1993 }
1763 1994
1764 av_clear (GvAV (PL_defgv)); 1995 av_clear (GvAV (PL_defgv));
1765 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 1996 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1766 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 1997 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1767 1998

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines