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.408 by root, Sat Jun 11 16:58:40 2011 UTC vs.
Revision 1.437 by root, Tue Nov 5 15:13:42 2013 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */ 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7 7
8#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 9#define PERL_EXT
… …
12#include "perl.h" 12#include "perl.h"
13#include "XSUB.h" 13#include "XSUB.h"
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17
18#define ECB_NO_THREADS 1
17#include "ecb.h" 19#include "ecb.h"
18 20
19#include <stddef.h> 21#include <stddef.h>
20#include <stdio.h> 22#include <stdio.h>
21#include <errno.h> 23#include <errno.h>
22#include <assert.h> 24#include <assert.h>
23 25
24#ifndef SVs_PADSTALE 26#ifndef SVs_PADSTALE
25# define SVs_PADSTALE 0 27# define SVs_PADSTALE 0
28#endif
29
30#ifdef PadARRAY
31# define NEWPADAPI 1
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else
34typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST;
37typedef AV PAD;
38# endif
39# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
40# define PadlistMAX(pl) AvFILLp (pl)
41# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY
43# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45#endif
46
47/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
48/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
49#if PERL_VERSION_ATLEAST(5,19,0)
50# define SVt_BIND SVt_IV
26#endif 51#endif
27 52
28#if defined(_WIN32) 53#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY 54# undef HAS_GETTIMEOFDAY
30# undef setjmp 55# undef setjmp
… …
33# define setjmp _setjmp /* deep magic */ 58# define setjmp _setjmp /* deep magic */
34#else 59#else
35# include <inttypes.h> /* most portable stdint.h */ 60# include <inttypes.h> /* most portable stdint.h */
36#endif 61#endif
37 62
38#ifdef HAVE_MMAP
39# include <unistd.h>
40# include <sys/mman.h>
41# ifndef MAP_ANONYMOUS
42# ifdef MAP_ANON
43# define MAP_ANONYMOUS MAP_ANON
44# else
45# undef HAVE_MMAP
46# endif
47# endif
48# include <limits.h>
49# ifndef PAGESIZE
50# define PAGESIZE pagesize
51# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
52static long pagesize;
53# else
54# define BOOT_PAGESIZE (void)0
55# endif
56#else
57# define PAGESIZE 0
58# define BOOT_PAGESIZE (void)0
59#endif
60
61#if CORO_USE_VALGRIND
62# include <valgrind/valgrind.h>
63#endif
64
65/* the maximum number of idle cctx that will be pooled */ 63/* the maximum number of idle cctx that will be pooled */
66static int cctx_max_idle = 4; 64static int cctx_max_idle = 4;
67 65
68#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 66#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# undef CORO_STACKGUARD 67# define HAS_SCOPESTACK_NAME 1
70#endif
71
72#ifndef CORO_STACKGUARD
73# define CORO_STACKGUARD 0
74#endif 68#endif
75 69
76/* prefer perl internal functions over our own? */ 70/* prefer perl internal functions over our own? */
77#ifndef CORO_PREFER_PERL_FUNCTIONS 71#ifndef CORO_PREFER_PERL_FUNCTIONS
78# define CORO_PREFER_PERL_FUNCTIONS 0 72# define CORO_PREFER_PERL_FUNCTIONS 0
… …
97# if CORO_PTHREAD 91# if CORO_PTHREAD
98static void *coro_thx; 92static void *coro_thx;
99# endif 93# endif
100#endif 94#endif
101 95
102/* used in state.h */
103#define VAR(name,type) VARx(name, PL_ ## name, type)
104
105#ifdef __linux 96#ifdef __linux
106# include <time.h> /* for timespec */ 97# include <time.h> /* for timespec */
107# include <syscall.h> /* for SYS_* */ 98# include <syscall.h> /* for SYS_* */
108# ifdef SYS_clock_gettime 99# ifdef SYS_clock_gettime
109# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts)) 100# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
… …
172typedef struct coro_cctx 163typedef struct coro_cctx
173{ 164{
174 struct coro_cctx *next; 165 struct coro_cctx *next;
175 166
176 /* the stack */ 167 /* the stack */
177 void *sptr; 168 struct coro_stack stack;
178 size_t ssize;
179 169
180 /* cpu state */ 170 /* cpu state */
181 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 171 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
172#ifndef NDEBUG
182 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 173 JMPENV *idle_te; /* same as idle_sp, but for top_env */
174#endif
183 JMPENV *top_env; 175 JMPENV *top_env;
184 coro_context cctx; 176 coro_context cctx;
185 177
186 U32 gen; 178 U32 gen;
187#if CORO_USE_VALGRIND 179#if CORO_USE_VALGRIND
… …
207}; 199};
208 200
209/* the structure where most of the perl state is stored, overlaid on the cxstack */ 201/* the structure where most of the perl state is stored, overlaid on the cxstack */
210typedef struct 202typedef struct
211{ 203{
212#define VARx(name,expr,type) type name; 204 #define VARx(name,expr,type) type name;
213# include "state.h" 205 #include "state.h"
214#undef VARx
215} perl_slots; 206} perl_slots;
216 207
217// how many context stack entries do we need for perl_slots 208/* how many context stack entries do we need for perl_slots */
218#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 209#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
219 210
220/* this is a structure representing a perl-level coroutine */ 211/* this is a structure representing a perl-level coroutine */
221struct coro 212struct coro
222{ 213{
… …
291#define coro_nready coroapi.nready 282#define coro_nready coroapi.nready
292 283
293/** JIT *********************************************************************/ 284/** JIT *********************************************************************/
294 285
295#if CORO_JIT 286#if CORO_JIT
287 /* APPLE doesn't have mmap though */
288 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
296 #ifndef CORO_JIT_TYPE 289 #ifndef CORO_JIT_TYPE
297 #if __x86_64 && (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris) 290 #if ECB_AMD64 && CORO_JIT_UNIXY
298 #define CORO_JIT_TYPE "amd64-unix" 291 #define CORO_JIT_TYPE "amd64-unix"
299 typedef void (*load_save_perl_slots_type)(perl_slots *); 292 #elif __i386 && CORO_JIT_UNIXY
300 #elif __i386 && (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris)
301 #define CORO_JIT_TYPE "x86-unix" 293 #define CORO_JIT_TYPE "x86-unix"
302 typedef void (*load_save_perl_slots_type)(perl_slots *);
303 #else
304 #undef CORO_JIT
305 #endif 294 #endif
306 #endif 295 #endif
307#endif 296#endif
308 297
298#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
299 #undef CORO_JIT
300#endif
301
309#if CORO_JIT 302#if CORO_JIT
303 typedef void (*load_save_perl_slots_type)(perl_slots *);
310static load_save_perl_slots_type load_perl_slots, save_perl_slots; 304 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
311#endif 305#endif
312 306
313/** Coro::Select ************************************************************/ 307/** Coro::Select ************************************************************/
314 308
315static OP *(*coro_old_pp_sselect) (pTHX); 309static OP *(*coro_old_pp_sselect) (pTHX);
… …
332 326
333/** time stuff **************************************************************/ 327/** time stuff **************************************************************/
334 328
335#ifdef HAS_GETTIMEOFDAY 329#ifdef HAS_GETTIMEOFDAY
336 330
337ECB_INLINE void 331ecb_inline void
338coro_u2time (pTHX_ UV ret[2]) 332coro_u2time (pTHX_ UV ret[2])
339{ 333{
340 struct timeval tv; 334 struct timeval tv;
341 gettimeofday (&tv, 0); 335 gettimeofday (&tv, 0);
342 336
343 ret [0] = tv.tv_sec; 337 ret [0] = tv.tv_sec;
344 ret [1] = tv.tv_usec; 338 ret [1] = tv.tv_usec;
345} 339}
346 340
347ECB_INLINE double 341ecb_inline double
348coro_nvtime () 342coro_nvtime (void)
349{ 343{
350 struct timeval tv; 344 struct timeval tv;
351 gettimeofday (&tv, 0); 345 gettimeofday (&tv, 0);
352 346
353 return tv.tv_sec + tv.tv_usec * 1e-6; 347 return tv.tv_sec + tv.tv_usec * 1e-6;
354} 348}
355 349
356ECB_INLINE void 350ecb_inline void
357time_init (pTHX) 351time_init (pTHX)
358{ 352{
359 nvtime = coro_nvtime; 353 nvtime = coro_nvtime;
360 u2time = coro_u2time; 354 u2time = coro_u2time;
361} 355}
362 356
363#else 357#else
364 358
365ECB_INLINE void 359ecb_inline void
366time_init (pTHX) 360time_init (pTHX)
367{ 361{
368 SV **svp; 362 SV **svp;
369 363
370 require_pv ("Time/HiRes.pm"); 364 require_pv ("Time/HiRes.pm");
371 365
372 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 366 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
373 367
374 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 368 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
375 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 369 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
376 370
… …
412 get_hv (name, create); 406 get_hv (name, create);
413#endif 407#endif
414 return get_hv (name, create); 408 return get_hv (name, create);
415} 409}
416 410
417ECB_INLINE void 411ecb_inline void
418coro_times_update () 412coro_times_update (void)
419{ 413{
420#ifdef coro_clock_gettime 414#ifdef coro_clock_gettime
421 struct timespec ts; 415 struct timespec ts;
422 416
423 ts.tv_sec = ts.tv_nsec = 0; 417 ts.tv_sec = ts.tv_nsec = 0;
… …
435 time_real [0] = tv [0]; 429 time_real [0] = tv [0];
436 time_real [1] = tv [1] * 1000; 430 time_real [1] = tv [1] * 1000;
437#endif 431#endif
438} 432}
439 433
440ECB_INLINE void 434ecb_inline void
441coro_times_add (struct coro *c) 435coro_times_add (struct coro *c)
442{ 436{
443 c->t_real [1] += time_real [1]; 437 c->t_real [1] += time_real [1];
444 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 438 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
445 c->t_real [0] += time_real [0]; 439 c->t_real [0] += time_real [0];
… …
447 c->t_cpu [1] += time_cpu [1]; 441 c->t_cpu [1] += time_cpu [1];
448 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 442 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
449 c->t_cpu [0] += time_cpu [0]; 443 c->t_cpu [0] += time_cpu [0];
450} 444}
451 445
452ECB_INLINE void 446ecb_inline void
453coro_times_sub (struct coro *c) 447coro_times_sub (struct coro *c)
454{ 448{
455 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 449 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
456 c->t_real [1] -= time_real [1]; 450 c->t_real [1] -= time_real [1];
457 c->t_real [0] -= time_real [0]; 451 c->t_real [0] -= time_real [0];
… …
478 : 0) 472 : 0)
479 473
480#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 474#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
481#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 475#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
482 476
483ECB_INLINE MAGIC * 477ecb_inline MAGIC *
484SvSTATEhv_p (pTHX_ SV *coro) 478SvSTATEhv_p (pTHX_ SV *coro)
485{ 479{
486 MAGIC *mg; 480 MAGIC *mg;
487 481
488 if (ecb_expect_true ( 482 if (ecb_expect_true (
… …
493 return mg; 487 return mg;
494 488
495 return 0; 489 return 0;
496} 490}
497 491
498ECB_INLINE struct coro * 492ecb_inline struct coro *
499SvSTATE_ (pTHX_ SV *coro) 493SvSTATE_ (pTHX_ SV *coro)
500{ 494{
501 MAGIC *mg; 495 MAGIC *mg;
502 496
503 if (SvROK (coro)) 497 if (SvROK (coro))
… …
517#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 511#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
518 512
519/*****************************************************************************/ 513/*****************************************************************************/
520/* padlist management and caching */ 514/* padlist management and caching */
521 515
522ECB_INLINE AV * 516ecb_inline PADLIST *
523coro_derive_padlist (pTHX_ CV *cv) 517coro_derive_padlist (pTHX_ CV *cv)
524{ 518{
525 AV *padlist = CvPADLIST (cv); 519 PADLIST *padlist = CvPADLIST (cv);
526 AV *newpadlist, *newpad; 520 PADLIST *newpadlist;
521 PAD *newpad;
522 PADOFFSET off = PadlistMAX (padlist) + 1;
527 523
528 newpadlist = newAV (); 524#if NEWPADAPI
525
526 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
527 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
528 while (!PadlistARRAY (padlist)[off - 1])
529 --off;
530
531 Perl_pad_push (aTHX_ padlist, off);
532
533 newpad = PadlistARRAY (padlist)[off];
534 PadlistARRAY (padlist)[off] = 0;
535
536#else
537
538#if PERL_VERSION_ATLEAST (5,10,0)
539 Perl_pad_push (aTHX_ padlist, off);
540#else
541 Perl_pad_push (aTHX_ padlist, off, 1);
542#endif
543
544 newpad = PadlistARRAY (padlist)[off];
545 PadlistMAX (padlist) = off - 1;
546
547#endif
548
549 newPADLIST (newpadlist);
550#if !PERL_VERSION_ATLEAST(5,15,3)
551 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
529 AvREAL_off (newpadlist); 552 AvREAL_off (newpadlist);
530#if PERL_VERSION_ATLEAST (5,10,0)
531 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
532#else
533 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
534#endif 553#endif
535 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
536 --AvFILLp (padlist);
537 554
538 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 555 /* Already extended to 2 elements by newPADLIST. */
539 av_store (newpadlist, 1, (SV *)newpad); 556 PadlistMAX (newpadlist) = 1;
557 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
558 PadlistARRAY (newpadlist)[1] = newpad;
540 559
541 return newpadlist; 560 return newpadlist;
542} 561}
543 562
544ECB_INLINE void 563ecb_inline void
545free_padlist (pTHX_ AV *padlist) 564free_padlist (pTHX_ PADLIST *padlist)
546{ 565{
547 /* may be during global destruction */ 566 /* may be during global destruction */
548 if (!IN_DESTRUCT) 567 if (!IN_DESTRUCT)
549 { 568 {
550 I32 i = AvFILLp (padlist); 569 I32 i = PadlistMAX (padlist);
551 570
552 while (i > 0) /* special-case index 0 */ 571 while (i > 0) /* special-case index 0 */
553 { 572 {
554 /* we try to be extra-careful here */ 573 /* we try to be extra-careful here */
555 AV *av = (AV *)AvARRAY (padlist)[i--]; 574 PAD *pad = PadlistARRAY (padlist)[i--];
556 I32 j = AvFILLp (av); 575 I32 j = PadMAX (pad);
557 576
558 while (j >= 0) 577 while (j >= 0)
559 SvREFCNT_dec (AvARRAY (av)[j--]); 578 SvREFCNT_dec (PadARRAY (pad)[j--]);
560 579
561 AvFILLp (av) = -1; 580 PadMAX (pad) = -1;
562 SvREFCNT_dec (av); 581 SvREFCNT_dec (pad);
563 } 582 }
564 583
565 SvREFCNT_dec (AvARRAY (padlist)[0]); 584 SvREFCNT_dec (PadlistNAMES (padlist));
566 585
586#if NEWPADAPI
587 Safefree (PadlistARRAY (padlist));
588 Safefree (padlist);
589#else
567 AvFILLp (padlist) = -1; 590 AvFILLp (padlist) = -1;
591 AvREAL_off (padlist);
568 SvREFCNT_dec ((SV*)padlist); 592 SvREFCNT_dec ((SV*)padlist);
593#endif
569 } 594 }
570} 595}
571 596
572static int 597static int
573coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 598coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
574{ 599{
575 AV *padlist; 600 PADLIST *padlist;
576 AV *av = (AV *)mg->mg_obj; 601 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
602 size_t len = *(size_t *)mg->mg_ptr;
577 603
578 /* perl manages to free our internal AV and _then_ call us */ 604 /* perl manages to free our internal AV and _then_ call us */
579 if (IN_DESTRUCT) 605 if (IN_DESTRUCT)
580 return 0; 606 return 0;
581 607
582 /* casting is fun. */ 608 while (len--)
583 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
584 free_padlist (aTHX_ padlist); 609 free_padlist (aTHX_ padlists[len]);
585
586 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
587 610
588 return 0; 611 return 0;
589} 612}
590 613
591static MGVTBL coro_cv_vtbl = { 614static MGVTBL coro_cv_vtbl = {
592 0, 0, 0, 0, 615 0, 0, 0, 0,
593 coro_cv_free 616 coro_cv_free
594}; 617};
595 618
596/* the next two functions merely cache the padlists */ 619/* the next two functions merely cache the padlists */
597ECB_INLINE void 620ecb_inline void
598get_padlist (pTHX_ CV *cv) 621get_padlist (pTHX_ CV *cv)
599{ 622{
600 MAGIC *mg = CORO_MAGIC_cv (cv); 623 MAGIC *mg = CORO_MAGIC_cv (cv);
601 AV *av; 624 size_t *lenp;
602 625
603 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 626 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
604 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 627 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
605 else 628 else
606 { 629 {
607#if CORO_PREFER_PERL_FUNCTIONS 630#if CORO_PREFER_PERL_FUNCTIONS
608 /* this is probably cleaner? but also slower! */ 631 /* this is probably cleaner? but also slower! */
609 /* in practise, it seems to be less stable */ 632 /* in practise, it seems to be less stable */
… …
615 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 638 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
616#endif 639#endif
617 } 640 }
618} 641}
619 642
620ECB_INLINE void 643ecb_inline void
621put_padlist (pTHX_ CV *cv) 644put_padlist (pTHX_ CV *cv)
622{ 645{
623 MAGIC *mg = CORO_MAGIC_cv (cv); 646 MAGIC *mg = CORO_MAGIC_cv (cv);
624 AV *av;
625 647
626 if (ecb_expect_false (!mg)) 648 if (ecb_expect_false (!mg))
649 {
627 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 650 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
651 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
652 mg->mg_len = 1; /* so mg_free frees mg_ptr */
653 }
654 else
655 Renew (mg->mg_ptr,
656 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
657 char);
628 658
629 av = (AV *)mg->mg_obj; 659 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
630
631 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
632 av_extend (av, AvFILLp (av) + 1);
633
634 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
635} 660}
636 661
637/** load & save, init *******************************************************/ 662/** load & save, init *******************************************************/
638 663
664ecb_inline void
665swap_sv (SV *a, SV *b)
666{
667 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
668 SV tmp;
669
670 /* swap sv_any */
671 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
672
673 /* swap sv_flags */
674 SvFLAGS (&tmp) = SvFLAGS (a);
675 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
676 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
677
678#if PERL_VERSION_ATLEAST (5,10,0)
679 /* perl 5.10 and later complicates this _quite_ a bit, but it also
680 * is much faster, so no quarrels here. alternatively, we could
681 * sv_upgrade to avoid this.
682 */
683 {
684 /* swap sv_u */
685 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
686
687 /* if SvANY points to the head, we need to adjust the pointers,
688 * as the pointer for a still points to b, and maybe vice versa.
689 */
690 #define svany_in_head(type) \
691 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
692
693 if (svany_in_head (SvTYPE (a)))
694 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
695
696 if (svany_in_head (SvTYPE (b)))
697 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
698 }
699#endif
700}
701
639/* swap sv heads, at least logically */ 702/* swap sv heads, at least logically */
640static void 703static void
641swap_svs (pTHX_ Coro__State c) 704swap_svs (pTHX_ Coro__State c)
642{ 705{
643 int i; 706 int i;
644 707
645 for (i = 0; i <= AvFILLp (c->swap_sv); ) 708 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
646 { 709 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
647 SV *a = AvARRAY (c->swap_sv)[i++];
648 SV *b = AvARRAY (c->swap_sv)[i++];
649
650 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
651 SV tmp;
652
653 /* swap sv_any */
654 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
655
656 /* swap sv_flags */
657 SvFLAGS (&tmp) = SvFLAGS (a);
658 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
659 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
660
661#if PERL_VERSION_ATLEAST (5,10,0)
662 /* perl 5.10 complicates this _quite_ a bit, but it also is
663 * much faster, so no quarrels here. alternatively, we could
664 * sv_upgrade to avoid this.
665 */
666 {
667 /* swap sv_u */
668 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
669
670 /* if SvANY points to the head, we need to adjust the pointers,
671 * as the pointer for a still points to b, and maybe vice versa.
672 */
673 #define svany_in_head(type) \
674 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
675
676 if (svany_in_head (SvTYPE (a)))
677 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
678
679 if (svany_in_head (SvTYPE (b)))
680 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
681 }
682#endif
683 }
684} 710}
685 711
686#define SWAP_SVS(coro) \ 712#define SWAP_SVS(coro) \
687 if (ecb_expect_false ((coro)->swap_sv)) \ 713 if (ecb_expect_false ((coro)->swap_sv)) \
688 swap_svs (aTHX_ (coro)) 714 swap_svs (aTHX_ (coro))
… …
700 726
701#if CORO_JIT 727#if CORO_JIT
702 load_perl_slots (slot); 728 load_perl_slots (slot);
703#else 729#else
704 #define VARx(name,expr,type) expr = slot->name; 730 #define VARx(name,expr,type) expr = slot->name;
705 # include "state.h" 731 #include "state.h"
706 #undef VARx
707#endif 732#endif
708 733
709 { 734 {
710 dSP; 735 dSP;
711 736
… …
714 /* now do the ugly restore mess */ 739 /* now do the ugly restore mess */
715 while (ecb_expect_true (cv = (CV *)POPs)) 740 while (ecb_expect_true (cv = (CV *)POPs))
716 { 741 {
717 put_padlist (aTHX_ cv); /* mark this padlist as available */ 742 put_padlist (aTHX_ cv); /* mark this padlist as available */
718 CvDEPTH (cv) = PTR2IV (POPs); 743 CvDEPTH (cv) = PTR2IV (POPs);
719 CvPADLIST (cv) = (AV *)POPs; 744 CvPADLIST (cv) = (PADLIST *)POPs;
720 } 745 }
721 746
722 PUTBACK; 747 PUTBACK;
723 } 748 }
724 749
… …
814 839
815 PUTBACK; 840 PUTBACK;
816 } 841 }
817 842
818 /* allocate some space on the context stack for our purposes */ 843 /* allocate some space on the context stack for our purposes */
819 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 844 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
820 { 845 {
821 unsigned int i; 846 unsigned int i;
822 847
823 for (i = 0; i < SLOT_COUNT; ++i) 848 for (i = 0; i < SLOT_COUNT; ++i)
824 CXINC; 849 CXINC;
… …
833 858
834#if CORO_JIT 859#if CORO_JIT
835 save_perl_slots (slot); 860 save_perl_slots (slot);
836#else 861#else
837 #define VARx(name,expr,type) slot->name = expr; 862 #define VARx(name,expr,type) slot->name = expr;
838 # include "state.h" 863 #include "state.h"
839 #undef VARx
840#endif 864#endif
841 } 865 }
842} 866}
843 867
844/* 868/*
… …
876#endif 900#endif
877 901
878 New(54,PL_scopestack,8,I32); 902 New(54,PL_scopestack,8,I32);
879 PL_scopestack_ix = 0; 903 PL_scopestack_ix = 0;
880 PL_scopestack_max = 8; 904 PL_scopestack_max = 8;
905#if HAS_SCOPESTACK_NAME
906 New(54,PL_scopestack_name,8,const char*);
907#endif
881 908
882 New(54,PL_savestack,24,ANY); 909 New(54,PL_savestack,24,ANY);
883 PL_savestack_ix = 0; 910 PL_savestack_ix = 0;
884 PL_savestack_max = 24; 911 PL_savestack_max = 24;
885 912
… …
913 } 940 }
914 941
915 Safefree (PL_tmps_stack); 942 Safefree (PL_tmps_stack);
916 Safefree (PL_markstack); 943 Safefree (PL_markstack);
917 Safefree (PL_scopestack); 944 Safefree (PL_scopestack);
945#if HAS_SCOPESTACK_NAME
946 Safefree (PL_scopestack_name);
947#endif
918 Safefree (PL_savestack); 948 Safefree (PL_savestack);
919#if !PERL_VERSION_ATLEAST (5,10,0) 949#if !PERL_VERSION_ATLEAST (5,10,0)
920 Safefree (PL_retstack); 950 Safefree (PL_retstack);
921#endif 951#endif
922} 952}
… …
982 { 1012 {
983 SV **svp = 0; 1013 SV **svp = 0;
984 1014
985 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1015 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
986 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1016 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
987 1017
988 if (svp) 1018 if (svp)
989 { 1019 {
990 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1020 SV *ssv;
1021
1022 if (!*svp)
1023 ssv = &PL_sv_undef;
1024 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1025 ssv = sv_2mortal (newRV_inc (*svp));
1026 else
1027 ssv = *svp;
1028
1029 sv_setsv (sv, ssv);
991 return 0; 1030 return 0;
992 } 1031 }
993 } 1032 }
994 1033
995 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1034 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
… …
1089 PL_hints = 0; 1128 PL_hints = 0;
1090 1129
1091 /* recreate the die/warn hooks */ 1130 /* recreate the die/warn hooks */
1092 PL_diehook = SvREFCNT_inc (rv_diehook); 1131 PL_diehook = SvREFCNT_inc (rv_diehook);
1093 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1132 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1094 1133
1095 GvSV (PL_defgv) = newSV (0); 1134 GvSV (PL_defgv) = newSV (0);
1096 GvAV (PL_defgv) = coro->args; coro->args = 0; 1135 GvAV (PL_defgv) = coro->args; coro->args = 0;
1097 GvSV (PL_errgv) = newSV (0); 1136 GvSV (PL_errgv) = newSV (0);
1098 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1137 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1099 GvHV (PL_hintgv) = 0; 1138 GvHV (PL_hintgv) = 0;
… …
1187 /* restore swapped sv's */ 1226 /* restore swapped sv's */
1188 SWAP_SVS (coro); 1227 SWAP_SVS (coro);
1189 1228
1190 coro_destruct_stacks (aTHX); 1229 coro_destruct_stacks (aTHX);
1191 1230
1192 // now save some sv's to be free'd later 1231 /* now save some sv's to be free'd later */
1193 svf [0] = GvSV (PL_defgv); 1232 svf [0] = GvSV (PL_defgv);
1194 svf [1] = (SV *)GvAV (PL_defgv); 1233 svf [1] = (SV *)GvAV (PL_defgv);
1195 svf [2] = GvSV (PL_errgv); 1234 svf [2] = GvSV (PL_errgv);
1196 svf [3] = (SV *)PL_defoutgv; 1235 svf [3] = (SV *)PL_defoutgv;
1197 svf [4] = PL_rs; 1236 svf [4] = PL_rs;
… …
1217 SvREFCNT_dec (coro->invoke_cb); 1256 SvREFCNT_dec (coro->invoke_cb);
1218 SvREFCNT_dec (coro->invoke_av); 1257 SvREFCNT_dec (coro->invoke_av);
1219 } 1258 }
1220} 1259}
1221 1260
1222ECB_INLINE void 1261ecb_inline void
1223free_coro_mortal (pTHX) 1262free_coro_mortal (pTHX)
1224{ 1263{
1225 if (ecb_expect_true (coro_mortal)) 1264 if (ecb_expect_true (coro_mortal))
1226 { 1265 {
1227 SvREFCNT_dec ((SV *)coro_mortal); 1266 SvREFCNT_dec ((SV *)coro_mortal);
… …
1386 slf_frame.prepare = slf_prepare_set_stacklevel; 1425 slf_frame.prepare = slf_prepare_set_stacklevel;
1387 slf_frame.check = slf_check_set_stacklevel; 1426 slf_frame.check = slf_check_set_stacklevel;
1388} 1427}
1389 1428
1390/* the tail of transfer: execute stuff we can only do after a transfer */ 1429/* the tail of transfer: execute stuff we can only do after a transfer */
1391ECB_INLINE void 1430ecb_inline void
1392transfer_tail (pTHX) 1431transfer_tail (pTHX)
1393{ 1432{
1394 free_coro_mortal (aTHX); 1433 free_coro_mortal (aTHX);
1434}
1435
1436/* try to exit the same way perl's main function would do */
1437/* we do not bother resetting the environment or other things *7
1438/* that are not, uhm, essential */
1439/* this obviously also doesn't work when perl is embedded */
1440static void ecb_noinline ecb_cold
1441perlish_exit (pTHX)
1442{
1443 int exitstatus = perl_destruct (PL_curinterp);
1444 perl_free (PL_curinterp);
1445 exit (exitstatus);
1395} 1446}
1396 1447
1397/* 1448/*
1398 * this is a _very_ stripped down perl interpreter ;) 1449 * this is a _very_ stripped down perl interpreter ;)
1399 */ 1450 */
… …
1428 */ 1479 */
1429 1480
1430 /* 1481 /*
1431 * If perl-run returns we assume exit() was being called or the coro 1482 * If perl-run returns we assume exit() was being called or the coro
1432 * fell off the end, which seems to be the only valid (non-bug) 1483 * fell off the end, which seems to be the only valid (non-bug)
1433 * reason for perl_run to return. We try to exit by jumping to the 1484 * reason for perl_run to return. We try to mimic whatever perl is normally
1434 * bootstrap-time "top" top_env, as we cannot restore the "main" 1485 * doing in that case. YMMV.
1435 * coroutine as Coro has no such concept.
1436 * This actually isn't valid with the pthread backend, but OSes requiring
1437 * that backend are too broken to do it in a standards-compliant way.
1438 */ 1486 */
1439 PL_top_env = main_top_env; 1487 perlish_exit (aTHX);
1440 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1441 } 1488 }
1442} 1489}
1443 1490
1444static coro_cctx * 1491static coro_cctx *
1445cctx_new () 1492cctx_new (void)
1446{ 1493{
1447 coro_cctx *cctx; 1494 coro_cctx *cctx;
1448 1495
1449 ++cctx_count; 1496 ++cctx_count;
1450 New (0, cctx, 1, coro_cctx); 1497 New (0, cctx, 1, coro_cctx);
… …
1456 return cctx; 1503 return cctx;
1457} 1504}
1458 1505
1459/* create a new cctx only suitable as source */ 1506/* create a new cctx only suitable as source */
1460static coro_cctx * 1507static coro_cctx *
1461cctx_new_empty () 1508cctx_new_empty (void)
1462{ 1509{
1463 coro_cctx *cctx = cctx_new (); 1510 coro_cctx *cctx = cctx_new ();
1464 1511
1465 cctx->sptr = 0; 1512 cctx->stack.sptr = 0;
1466 coro_create (&cctx->cctx, 0, 0, 0, 0); 1513 coro_create (&cctx->cctx, 0, 0, 0, 0);
1467 1514
1468 return cctx; 1515 return cctx;
1469} 1516}
1470 1517
1471/* create a new cctx suitable as destination/running a perl interpreter */ 1518/* create a new cctx suitable as destination/running a perl interpreter */
1472static coro_cctx * 1519static coro_cctx *
1473cctx_new_run () 1520cctx_new_run (void)
1474{ 1521{
1475 coro_cctx *cctx = cctx_new (); 1522 coro_cctx *cctx = cctx_new ();
1476 void *stack_start;
1477 size_t stack_size;
1478 1523
1479#if HAVE_MMAP 1524 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1480 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1481 /* mmap supposedly does allocate-on-write for us */
1482 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1483
1484 if (cctx->sptr != (void *)-1)
1485 {
1486 #if CORO_STACKGUARD
1487 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1488 #endif
1489 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1490 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1491 cctx->flags |= CC_MAPPED;
1492 } 1525 {
1493 else
1494#endif
1495 {
1496 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1497 New (0, cctx->sptr, cctx_stacksize, long);
1498
1499 if (!cctx->sptr)
1500 {
1501 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1526 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1502 _exit (EXIT_FAILURE); 1527 _exit (EXIT_FAILURE);
1503 }
1504
1505 stack_start = cctx->sptr;
1506 stack_size = cctx->ssize;
1507 } 1528 }
1508 1529
1509 #if CORO_USE_VALGRIND
1510 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1511 #endif
1512
1513 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1530 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1514 1531
1515 return cctx; 1532 return cctx;
1516} 1533}
1517 1534
1518static void 1535static void
… …
1524 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1541 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1525 1542
1526 --cctx_count; 1543 --cctx_count;
1527 coro_destroy (&cctx->cctx); 1544 coro_destroy (&cctx->cctx);
1528 1545
1529 /* coro_transfer creates new, empty cctx's */ 1546 coro_stack_free (&cctx->stack);
1530 if (cctx->sptr)
1531 {
1532 #if CORO_USE_VALGRIND
1533 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1534 #endif
1535
1536#if HAVE_MMAP
1537 if (cctx->flags & CC_MAPPED)
1538 munmap (cctx->sptr, cctx->ssize);
1539 else
1540#endif
1541 Safefree (cctx->sptr);
1542 }
1543 1547
1544 Safefree (cctx); 1548 Safefree (cctx);
1545} 1549}
1546 1550
1547/* wether this cctx should be destructed */ 1551/* wether this cctx should be destructed */
… …
1566} 1570}
1567 1571
1568static void 1572static void
1569cctx_put (coro_cctx *cctx) 1573cctx_put (coro_cctx *cctx)
1570{ 1574{
1571 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1575 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1572 1576
1573 /* free another cctx if overlimit */ 1577 /* free another cctx if overlimit */
1574 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1578 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1575 { 1579 {
1576 coro_cctx *first = cctx_first; 1580 coro_cctx *first = cctx_first;
… …
1702 return; 1706 return;
1703 1707
1704 slf_destroy (aTHX_ coro); 1708 slf_destroy (aTHX_ coro);
1705 1709
1706 coro->flags |= CF_ZOMBIE; 1710 coro->flags |= CF_ZOMBIE;
1707 1711
1708 if (coro->flags & CF_READY) 1712 if (coro->flags & CF_READY)
1709 { 1713 {
1710 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1714 /* reduce nready, as destroying a ready coro effectively unreadies it */
1711 /* alternative: look through all ready queues and remove the coro */ 1715 /* alternative: look through all ready queues and remove the coro */
1712 --coro_nready; 1716 --coro_nready;
… …
1789 TRANSFER (ta, 1); 1793 TRANSFER (ta, 1);
1790} 1794}
1791 1795
1792/** Coro ********************************************************************/ 1796/** Coro ********************************************************************/
1793 1797
1794ECB_INLINE void 1798ecb_inline void
1795coro_enq (pTHX_ struct coro *coro) 1799coro_enq (pTHX_ struct coro *coro)
1796{ 1800{
1797 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1801 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1798 1802
1799 SvREFCNT_inc_NN (coro->hv); 1803 SvREFCNT_inc_NN (coro->hv);
… …
1801 coro->next_ready = 0; 1805 coro->next_ready = 0;
1802 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1806 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1803 ready [1] = coro; 1807 ready [1] = coro;
1804} 1808}
1805 1809
1806ECB_INLINE struct coro * 1810ecb_inline struct coro *
1807coro_deq (pTHX) 1811coro_deq (pTHX)
1808{ 1812{
1809 int prio; 1813 int prio;
1810 1814
1811 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1815 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1864{ 1868{
1865 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1869 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1866} 1870}
1867 1871
1868/* expects to own a reference to next->hv */ 1872/* expects to own a reference to next->hv */
1869ECB_INLINE void 1873ecb_inline void
1870prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1874prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1871{ 1875{
1872 SV *prev_sv = SvRV (coro_current); 1876 SV *prev_sv = SvRV (coro_current);
1873 1877
1874 ta->prev = SvSTATE_hv (prev_sv); 1878 ta->prev = SvSTATE_hv (prev_sv);
… …
1933 } 1937 }
1934 } 1938 }
1935 } 1939 }
1936} 1940}
1937 1941
1938ECB_INLINE void 1942ecb_inline void
1939prepare_cede (pTHX_ struct coro_transfer_args *ta) 1943prepare_cede (pTHX_ struct coro_transfer_args *ta)
1940{ 1944{
1941 api_ready (aTHX_ coro_current); 1945 api_ready (aTHX_ coro_current);
1942 prepare_schedule (aTHX_ ta); 1946 prepare_schedule (aTHX_ ta);
1943} 1947}
1944 1948
1945ECB_INLINE void 1949ecb_inline void
1946prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1950prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1947{ 1951{
1948 SV *prev = SvRV (coro_current); 1952 SV *prev = SvRV (coro_current);
1949 1953
1950 if (coro_nready) 1954 if (coro_nready)
… …
2115{ 2119{
2116 AV *od = coro->on_destroy; 2120 AV *od = coro->on_destroy;
2117 2121
2118 if (!od) 2122 if (!od)
2119 return; 2123 return;
2124
2125 coro->on_destroy = 0;
2126 sv_2mortal ((SV *)od);
2120 2127
2121 while (AvFILLp (od) >= 0) 2128 while (AvFILLp (od) >= 0)
2122 { 2129 {
2123 SV *cb = sv_2mortal (av_pop (od)); 2130 SV *cb = sv_2mortal (av_pop (od));
2124 2131
… …
2145 2152
2146static void 2153static void
2147coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2154coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2148{ 2155{
2149 AV *av; 2156 AV *av;
2150 2157
2151 if (coro->status) 2158 if (coro->status)
2152 { 2159 {
2153 av = coro->status; 2160 av = coro->status;
2154 av_clear (av); 2161 av_clear (av);
2155 } 2162 }
… …
2202 2209
2203 coro = SvSTATE (arg [0]); 2210 coro = SvSTATE (arg [0]);
2204 coro_hv = coro->hv; 2211 coro_hv = coro->hv;
2205 2212
2206 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2213 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2207 2214
2208 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2215 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2209 { 2216 {
2210 /* coro currently busy cancelling something, so just notify it */ 2217 /* coro currently busy cancelling something, so just notify it */
2211 coro->slf_frame.data = (void *)coro; 2218 coro->slf_frame.data = (void *)coro;
2212 2219
… …
2391 2398
2392static int 2399static int
2393slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2400slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2394{ 2401{
2395 SV *data = (SV *)frame->data; 2402 SV *data = (SV *)frame->data;
2396 2403
2397 if (CORO_THROW) 2404 if (CORO_THROW)
2398 return 0; 2405 return 0;
2399 2406
2400 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2407 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2401 return 1; 2408 return 1;
… …
2437 cb = sv_2mortal (coro->rouse_cb); 2444 cb = sv_2mortal (coro->rouse_cb);
2438 coro->rouse_cb = 0; 2445 coro->rouse_cb = 0;
2439 } 2446 }
2440 2447
2441 if (!SvROK (cb) 2448 if (!SvROK (cb)
2442 || SvTYPE (SvRV (cb)) != SVt_PVCV 2449 || SvTYPE (SvRV (cb)) != SVt_PVCV
2443 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2450 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2444 croak ("Coro::rouse_wait called with illegal callback argument,"); 2451 croak ("Coro::rouse_wait called with illegal callback argument,");
2445 2452
2446 { 2453 {
2447 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2454 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2950 { 2957 {
2951 int i; 2958 int i;
2952 /* if we were woken up but can't down, we look through the whole */ 2959 /* if we were woken up but can't down, we look through the whole */
2953 /* waiters list and only add us if we aren't in there already */ 2960 /* waiters list and only add us if we aren't in there already */
2954 /* this avoids some degenerate memory usage cases */ 2961 /* this avoids some degenerate memory usage cases */
2955 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug 2962 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2956 if (AvARRAY (av)[i] == coro_hv) 2963 if (AvARRAY (av)[i] == coro_hv)
2957 return 1; 2964 return 1;
2958 2965
2959 av_push (av, SvREFCNT_inc (coro_hv)); 2966 av_push (av, SvREFCNT_inc (coro_hv));
2960 return 1; 2967 return 1;
… …
3168 /* it quickly returns */ 3175 /* it quickly returns */
3169 if (CORO_THROW) 3176 if (CORO_THROW)
3170 return 0; 3177 return 0;
3171 3178
3172 /* one element that is an RV? repeat! */ 3179 /* one element that is an RV? repeat! */
3173 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3180 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3174 return 1; 3181 return 1;
3175 3182
3176 /* restore status */ 3183 /* restore status */
3177 { 3184 {
3178 SV *data_sv = av_pop (state); 3185 SV *data_sv = av_pop (state);
… …
3340#endif 3347#endif
3341 3348
3342#if CORO_JIT 3349#if CORO_JIT
3343 3350
3344static void ecb_noinline ecb_cold 3351static void ecb_noinline ecb_cold
3345pushav_3uv (pTHX_ UV a, UV b, UV c) 3352pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3346{ 3353{
3347 dSP; 3354 dSP;
3348 AV *av = newAV (); 3355 AV *av = newAV ();
3349 3356
3357 av_store (av, 3, newSVuv (d));
3350 av_store (av, 2, newSVuv (c)); 3358 av_store (av, 2, newSVuv (c));
3351 av_store (av, 1, newSVuv (b)); 3359 av_store (av, 1, newSVuv (b));
3352 av_store (av, 0, newSVuv (a)); 3360 av_store (av, 0, newSVuv (a));
3353 3361
3354 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 3362 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
… …
3361{ 3369{
3362 dSP; 3370 dSP;
3363 SV *load, *save; 3371 SV *load, *save;
3364 char *map_base; 3372 char *map_base;
3365 char *load_ptr, *save_ptr; 3373 char *load_ptr, *save_ptr;
3366 STRLEN load_len, save_len; 3374 STRLEN load_len, save_len, map_len;
3367 int count; 3375 int count;
3368 3376
3377 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3378
3369 PUSHMARK (SP); 3379 PUSHMARK (SP);
3370 PUTBACK;
3371#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type)); 3380 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3372# include "state.h" 3381 #include "state.h"
3373#undef VARx
3374 count = call_pv ("Coro::State::_jit", G_ARRAY); 3382 count = call_pv ("Coro::State::_jit", G_ARRAY);
3375 SPAGAIN; 3383 SPAGAIN;
3376 3384
3377 save = POPs; save_ptr = SvPVbyte (save, save_len); 3385 save = POPs; save_ptr = SvPVbyte (save, save_len);
3378 load = POPs; load_ptr = SvPVbyte (load, load_len); 3386 load = POPs; load_ptr = SvPVbyte (load, load_len);
3379 3387
3388 map_len = load_len + save_len + 16;
3389
3380 map_base = mmap (0, load_len + save_len + 16, PROT_EXEC | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3390 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3381 3391
3382 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3392 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3383 3393
3384 load_perl_slots = (load_save_perl_slots_type)map_base; 3394 load_perl_slots = (load_save_perl_slots_type)map_base;
3385 memcpy (map_base, load_ptr, load_len); 3395 memcpy (map_base, load_ptr, load_len);
3386 3396
3387 map_base += (load_len + 15) & ~15; 3397 map_base += (load_len + 15) & ~15;
3388 3398
3389 save_perl_slots = (load_save_perl_slots_type)map_base; 3399 save_perl_slots = (load_save_perl_slots_type)map_base;
3390 memcpy (map_base, save_ptr, save_len); 3400 memcpy (map_base, save_ptr, save_len);
3401
3402 /* we are good citizens and try to make the page read-only, so the evil evil */
3403 /* hackers might have it a bit more difficult */
3404 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3405
3406 PUTBACK;
3407 eval_pv ("undef &Coro::State::_jit", 1);
3391} 3408}
3392 3409
3393#endif 3410#endif
3394 3411
3395MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3412MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
… …
3401#ifdef USE_ITHREADS 3418#ifdef USE_ITHREADS
3402# if CORO_PTHREAD 3419# if CORO_PTHREAD
3403 coro_thx = PERL_GET_CONTEXT; 3420 coro_thx = PERL_GET_CONTEXT;
3404# endif 3421# endif
3405#endif 3422#endif
3406 BOOT_PAGESIZE;
3407
3408 /* perl defines these to check for existance first, but why it doesn't */ 3423 /* perl defines these to check for existance first, but why it doesn't */
3409 /* just create them one at init time is not clear to me, except for */ 3424 /* just create them one at init time is not clear to me, except for */
3410 /* programs trying to delete them, but... */ 3425 /* programs trying to delete them, but... */
3411 /* anyway, we declare this as invalid and make sure they are initialised here */ 3426 /* anyway, we declare this as invalid and make sure they are initialised here */
3412 DEFSV; 3427 DEFSV;
… …
3463 time_init (aTHX); 3478 time_init (aTHX);
3464 3479
3465 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3480 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3466#if CORO_JIT 3481#if CORO_JIT
3467 PUTBACK; 3482 PUTBACK;
3468 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3469 jit_init (aTHX); 3483 jit_init (aTHX);
3470 perl_eval_pv ("undef &Coro::State::_jit", 1);
3471 SPAGAIN; 3484 SPAGAIN;
3472#endif 3485#endif
3473} 3486}
3474 3487
3475SV * 3488SV *
… …
3484void 3497void
3485transfer (...) 3498transfer (...)
3486 PROTOTYPE: $$ 3499 PROTOTYPE: $$
3487 CODE: 3500 CODE:
3488 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3501 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3489
3490void
3491_exit (int code)
3492 PROTOTYPE: $
3493 CODE:
3494 _exit (code);
3495 3502
3496SV * 3503SV *
3497clone (Coro::State coro) 3504clone (Coro::State coro)
3498 CODE: 3505 CODE:
3499{ 3506{
… …
3554void 3561void
3555list () 3562list ()
3556 PROTOTYPE: 3563 PROTOTYPE:
3557 PPCODE: 3564 PPCODE:
3558{ 3565{
3559 struct coro *coro; 3566 struct coro *coro;
3560 for (coro = coro_first; coro; coro = coro->next) 3567 for (coro = coro_first; coro; coro = coro->next)
3561 if (coro->hv) 3568 if (coro->hv)
3562 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3569 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3563} 3570}
3564 3571
… …
3628 RETVAL = boolSV (coro->flags & ix); 3635 RETVAL = boolSV (coro->flags & ix);
3629 OUTPUT: 3636 OUTPUT:
3630 RETVAL 3637 RETVAL
3631 3638
3632void 3639void
3633throw (Coro::State self, SV *exception = &PL_sv_undef) 3640throw (SV *self, SV *exception = &PL_sv_undef)
3634 PROTOTYPE: $;$ 3641 PROTOTYPE: $;$
3635 CODE: 3642 CODE:
3636{ 3643{
3644 struct coro *coro = SvSTATE (self);
3637 struct coro *current = SvSTATE_current; 3645 struct coro *current = SvSTATE_current;
3638 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3646 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3639 SvREFCNT_dec (*exceptionp); 3647 SvREFCNT_dec (*exceptionp);
3640 SvGETMAGIC (exception); 3648 SvGETMAGIC (exception);
3641 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3649 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3650
3651 api_ready (aTHX_ self);
3642} 3652}
3643 3653
3644void 3654void
3645api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3655api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3646 PROTOTYPE: $;$ 3656 PROTOTYPE: $;$
… …
3723 3733
3724void 3734void
3725times (Coro::State self) 3735times (Coro::State self)
3726 PPCODE: 3736 PPCODE:
3727{ 3737{
3728 struct coro *current = SvSTATE (coro_current); 3738 struct coro *current = SvSTATE (coro_current);
3729 3739
3730 if (ecb_expect_false (current == self)) 3740 if (ecb_expect_false (current == self))
3731 { 3741 {
3732 coro_times_update (); 3742 coro_times_update ();
3733 coro_times_add (SvSTATE (coro_current)); 3743 coro_times_add (SvSTATE (coro_current));
… …
3776 3786
3777 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3787 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3778 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3788 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3779 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3789 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3780 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3790 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3781 3791
3782 coro_stash = gv_stashpv ("Coro", TRUE); 3792 coro_stash = gv_stashpv ("Coro", TRUE);
3783 3793
3784 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3794 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3785 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3795 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3786 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3796 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4008 on_leave = 1 4018 on_leave = 1
4009 PROTOTYPE: & 4019 PROTOTYPE: &
4010 CODE: 4020 CODE:
4011{ 4021{
4012 struct coro *coro = SvSTATE_current; 4022 struct coro *coro = SvSTATE_current;
4013 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4023 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4014 4024
4015 block = s_get_cv_croak (block); 4025 block = s_get_cv_croak (block);
4016 4026
4017 if (!*avp) 4027 if (!*avp)
4018 *avp = newAV (); 4028 *avp = newAV ();
… …
4038 4048
4039SV * 4049SV *
4040new (SV *klass, SV *count = 0) 4050new (SV *klass, SV *count = 0)
4041 CODE: 4051 CODE:
4042{ 4052{
4043 int semcnt = 1; 4053 int semcnt = 1;
4044 4054
4045 if (count) 4055 if (count)
4046 { 4056 {
4047 SvGETMAGIC (count); 4057 SvGETMAGIC (count);
4048 4058
… …
4108 XSRETURN_NO; 4118 XSRETURN_NO;
4109} 4119}
4110 4120
4111void 4121void
4112waiters (SV *self) 4122waiters (SV *self)
4113 PPCODE: 4123 PPCODE:
4114{ 4124{
4115 AV *av = (AV *)SvRV (self); 4125 AV *av = (AV *)SvRV (self);
4116 int wcount = AvFILLp (av) + 1 - 1; 4126 int wcount = AvFILLp (av) + 1 - 1;
4117 4127
4118 if (GIMME_V == G_SCALAR) 4128 if (GIMME_V == G_SCALAR)
… …
4127} 4137}
4128 4138
4129MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4139MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4130 4140
4131void 4141void
4132_may_delete (SV *sem, int count, int extra_refs) 4142_may_delete (SV *sem, int count, unsigned int extra_refs)
4133 PPCODE: 4143 PPCODE:
4134{ 4144{
4135 AV *av = (AV *)SvRV (sem); 4145 AV *av = (AV *)SvRV (sem);
4136 4146
4137 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4147 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4138 && AvFILLp (av) == 0 /* no waiters, just count */ 4148 && AvFILLp (av) == 0 /* no waiters, just count */
4139 && SvIV (AvARRAY (av)[0]) == count) 4149 && SvIV (AvARRAY (av)[0]) == count)
4140 XSRETURN_YES; 4150 XSRETURN_YES;
… …
4161 4171
4162void 4172void
4163broadcast (SV *self) 4173broadcast (SV *self)
4164 CODE: 4174 CODE:
4165{ 4175{
4166 AV *av = (AV *)SvRV (self); 4176 AV *av = (AV *)SvRV (self);
4167 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4177 coro_signal_wake (aTHX_ av, AvFILLp (av));
4168} 4178}
4169 4179
4170void 4180void
4171send (SV *self) 4181send (SV *self)
… …
4179 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4189 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4180} 4190}
4181 4191
4182IV 4192IV
4183awaited (SV *self) 4193awaited (SV *self)
4184 CODE: 4194 CODE:
4185 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4195 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4186 OUTPUT: 4196 OUTPUT:
4187 RETVAL 4197 RETVAL
4188 4198
4189 4199
… …
4194 4204
4195void 4205void
4196_schedule (...) 4206_schedule (...)
4197 CODE: 4207 CODE:
4198{ 4208{
4199 static int incede; 4209 static int incede;
4200 4210
4201 api_cede_notself (aTHX); 4211 api_cede_notself (aTHX);
4202 4212
4203 ++incede; 4213 ++incede;
4204 while (coro_nready >= incede && api_cede (aTHX)) 4214 while (coro_nready >= incede && api_cede (aTHX))
… …
4248 { 4258 {
4249 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4259 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4250 coro_old_pp_sselect = 0; 4260 coro_old_pp_sselect = 0;
4251 } 4261 }
4252 4262
4263MODULE = Coro::State PACKAGE = Coro::Util
4264
4265void
4266_exit (int code)
4267 CODE:
4268 _exit (code);
4269
4270NV
4271time ()
4272 CODE:
4273 RETVAL = nvtime (aTHX);
4274 OUTPUT:
4275 RETVAL
4276
4277NV
4278gettimeofday ()
4279 PPCODE:
4280{
4281 UV tv [2];
4282 u2time (aTHX_ tv);
4283 EXTEND (SP, 2);
4284 PUSHs (sv_2mortal (newSVuv (tv [0])));
4285 PUSHs (sv_2mortal (newSVuv (tv [1])));
4286}
4287

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines