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.409 by root, Sun Jun 12 04:29:15 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 x x x x
305 #undef CORO_JIT
306 #endif 294 #endif
307 #endif 295 #endif
308#endif 296#endif
309 297
298#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
299 #undef CORO_JIT
300#endif
301
310#if CORO_JIT 302#if CORO_JIT
303 typedef void (*load_save_perl_slots_type)(perl_slots *);
311static load_save_perl_slots_type load_perl_slots, save_perl_slots; 304 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
312#endif 305#endif
313 306
314/** Coro::Select ************************************************************/ 307/** Coro::Select ************************************************************/
315 308
316static OP *(*coro_old_pp_sselect) (pTHX); 309static OP *(*coro_old_pp_sselect) (pTHX);
… …
333 326
334/** time stuff **************************************************************/ 327/** time stuff **************************************************************/
335 328
336#ifdef HAS_GETTIMEOFDAY 329#ifdef HAS_GETTIMEOFDAY
337 330
338ECB_INLINE void 331ecb_inline void
339coro_u2time (pTHX_ UV ret[2]) 332coro_u2time (pTHX_ UV ret[2])
340{ 333{
341 struct timeval tv; 334 struct timeval tv;
342 gettimeofday (&tv, 0); 335 gettimeofday (&tv, 0);
343 336
344 ret [0] = tv.tv_sec; 337 ret [0] = tv.tv_sec;
345 ret [1] = tv.tv_usec; 338 ret [1] = tv.tv_usec;
346} 339}
347 340
348ECB_INLINE double 341ecb_inline double
349coro_nvtime () 342coro_nvtime (void)
350{ 343{
351 struct timeval tv; 344 struct timeval tv;
352 gettimeofday (&tv, 0); 345 gettimeofday (&tv, 0);
353 346
354 return tv.tv_sec + tv.tv_usec * 1e-6; 347 return tv.tv_sec + tv.tv_usec * 1e-6;
355} 348}
356 349
357ECB_INLINE void 350ecb_inline void
358time_init (pTHX) 351time_init (pTHX)
359{ 352{
360 nvtime = coro_nvtime; 353 nvtime = coro_nvtime;
361 u2time = coro_u2time; 354 u2time = coro_u2time;
362} 355}
363 356
364#else 357#else
365 358
366ECB_INLINE void 359ecb_inline void
367time_init (pTHX) 360time_init (pTHX)
368{ 361{
369 SV **svp; 362 SV **svp;
370 363
371 require_pv ("Time/HiRes.pm"); 364 require_pv ("Time/HiRes.pm");
372 365
373 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 366 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
374 367
375 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 368 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
376 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");
377 370
… …
413 get_hv (name, create); 406 get_hv (name, create);
414#endif 407#endif
415 return get_hv (name, create); 408 return get_hv (name, create);
416} 409}
417 410
418ECB_INLINE void 411ecb_inline void
419coro_times_update () 412coro_times_update (void)
420{ 413{
421#ifdef coro_clock_gettime 414#ifdef coro_clock_gettime
422 struct timespec ts; 415 struct timespec ts;
423 416
424 ts.tv_sec = ts.tv_nsec = 0; 417 ts.tv_sec = ts.tv_nsec = 0;
… …
436 time_real [0] = tv [0]; 429 time_real [0] = tv [0];
437 time_real [1] = tv [1] * 1000; 430 time_real [1] = tv [1] * 1000;
438#endif 431#endif
439} 432}
440 433
441ECB_INLINE void 434ecb_inline void
442coro_times_add (struct coro *c) 435coro_times_add (struct coro *c)
443{ 436{
444 c->t_real [1] += time_real [1]; 437 c->t_real [1] += time_real [1];
445 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]; }
446 c->t_real [0] += time_real [0]; 439 c->t_real [0] += time_real [0];
… …
448 c->t_cpu [1] += time_cpu [1]; 441 c->t_cpu [1] += time_cpu [1];
449 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]; }
450 c->t_cpu [0] += time_cpu [0]; 443 c->t_cpu [0] += time_cpu [0];
451} 444}
452 445
453ECB_INLINE void 446ecb_inline void
454coro_times_sub (struct coro *c) 447coro_times_sub (struct coro *c)
455{ 448{
456 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]; }
457 c->t_real [1] -= time_real [1]; 450 c->t_real [1] -= time_real [1];
458 c->t_real [0] -= time_real [0]; 451 c->t_real [0] -= time_real [0];
… …
479 : 0) 472 : 0)
480 473
481#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)
482#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)
483 476
484ECB_INLINE MAGIC * 477ecb_inline MAGIC *
485SvSTATEhv_p (pTHX_ SV *coro) 478SvSTATEhv_p (pTHX_ SV *coro)
486{ 479{
487 MAGIC *mg; 480 MAGIC *mg;
488 481
489 if (ecb_expect_true ( 482 if (ecb_expect_true (
… …
494 return mg; 487 return mg;
495 488
496 return 0; 489 return 0;
497} 490}
498 491
499ECB_INLINE struct coro * 492ecb_inline struct coro *
500SvSTATE_ (pTHX_ SV *coro) 493SvSTATE_ (pTHX_ SV *coro)
501{ 494{
502 MAGIC *mg; 495 MAGIC *mg;
503 496
504 if (SvROK (coro)) 497 if (SvROK (coro))
… …
518#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 511#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
519 512
520/*****************************************************************************/ 513/*****************************************************************************/
521/* padlist management and caching */ 514/* padlist management and caching */
522 515
523ECB_INLINE AV * 516ecb_inline PADLIST *
524coro_derive_padlist (pTHX_ CV *cv) 517coro_derive_padlist (pTHX_ CV *cv)
525{ 518{
526 AV *padlist = CvPADLIST (cv); 519 PADLIST *padlist = CvPADLIST (cv);
527 AV *newpadlist, *newpad; 520 PADLIST *newpadlist;
521 PAD *newpad;
522 PADOFFSET off = PadlistMAX (padlist) + 1;
528 523
529 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. */
530 AvREAL_off (newpadlist); 552 AvREAL_off (newpadlist);
531#if PERL_VERSION_ATLEAST (5,10,0)
532 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
533#else
534 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
535#endif 553#endif
536 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
537 --AvFILLp (padlist);
538 554
539 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 555 /* Already extended to 2 elements by newPADLIST. */
540 av_store (newpadlist, 1, (SV *)newpad); 556 PadlistMAX (newpadlist) = 1;
557 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
558 PadlistARRAY (newpadlist)[1] = newpad;
541 559
542 return newpadlist; 560 return newpadlist;
543} 561}
544 562
545ECB_INLINE void 563ecb_inline void
546free_padlist (pTHX_ AV *padlist) 564free_padlist (pTHX_ PADLIST *padlist)
547{ 565{
548 /* may be during global destruction */ 566 /* may be during global destruction */
549 if (!IN_DESTRUCT) 567 if (!IN_DESTRUCT)
550 { 568 {
551 I32 i = AvFILLp (padlist); 569 I32 i = PadlistMAX (padlist);
552 570
553 while (i > 0) /* special-case index 0 */ 571 while (i > 0) /* special-case index 0 */
554 { 572 {
555 /* we try to be extra-careful here */ 573 /* we try to be extra-careful here */
556 AV *av = (AV *)AvARRAY (padlist)[i--]; 574 PAD *pad = PadlistARRAY (padlist)[i--];
557 I32 j = AvFILLp (av); 575 I32 j = PadMAX (pad);
558 576
559 while (j >= 0) 577 while (j >= 0)
560 SvREFCNT_dec (AvARRAY (av)[j--]); 578 SvREFCNT_dec (PadARRAY (pad)[j--]);
561 579
562 AvFILLp (av) = -1; 580 PadMAX (pad) = -1;
563 SvREFCNT_dec (av); 581 SvREFCNT_dec (pad);
564 } 582 }
565 583
566 SvREFCNT_dec (AvARRAY (padlist)[0]); 584 SvREFCNT_dec (PadlistNAMES (padlist));
567 585
586#if NEWPADAPI
587 Safefree (PadlistARRAY (padlist));
588 Safefree (padlist);
589#else
568 AvFILLp (padlist) = -1; 590 AvFILLp (padlist) = -1;
591 AvREAL_off (padlist);
569 SvREFCNT_dec ((SV*)padlist); 592 SvREFCNT_dec ((SV*)padlist);
593#endif
570 } 594 }
571} 595}
572 596
573static int 597static int
574coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 598coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
575{ 599{
576 AV *padlist; 600 PADLIST *padlist;
577 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;
578 603
579 /* perl manages to free our internal AV and _then_ call us */ 604 /* perl manages to free our internal AV and _then_ call us */
580 if (IN_DESTRUCT) 605 if (IN_DESTRUCT)
581 return 0; 606 return 0;
582 607
583 /* casting is fun. */ 608 while (len--)
584 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
585 free_padlist (aTHX_ padlist); 609 free_padlist (aTHX_ padlists[len]);
586
587 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
588 610
589 return 0; 611 return 0;
590} 612}
591 613
592static MGVTBL coro_cv_vtbl = { 614static MGVTBL coro_cv_vtbl = {
593 0, 0, 0, 0, 615 0, 0, 0, 0,
594 coro_cv_free 616 coro_cv_free
595}; 617};
596 618
597/* the next two functions merely cache the padlists */ 619/* the next two functions merely cache the padlists */
598ECB_INLINE void 620ecb_inline void
599get_padlist (pTHX_ CV *cv) 621get_padlist (pTHX_ CV *cv)
600{ 622{
601 MAGIC *mg = CORO_MAGIC_cv (cv); 623 MAGIC *mg = CORO_MAGIC_cv (cv);
602 AV *av; 624 size_t *lenp;
603 625
604 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 626 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
605 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 627 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
606 else 628 else
607 { 629 {
608#if CORO_PREFER_PERL_FUNCTIONS 630#if CORO_PREFER_PERL_FUNCTIONS
609 /* this is probably cleaner? but also slower! */ 631 /* this is probably cleaner? but also slower! */
610 /* in practise, it seems to be less stable */ 632 /* in practise, it seems to be less stable */
… …
616 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 638 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
617#endif 639#endif
618 } 640 }
619} 641}
620 642
621ECB_INLINE void 643ecb_inline void
622put_padlist (pTHX_ CV *cv) 644put_padlist (pTHX_ CV *cv)
623{ 645{
624 MAGIC *mg = CORO_MAGIC_cv (cv); 646 MAGIC *mg = CORO_MAGIC_cv (cv);
625 AV *av;
626 647
627 if (ecb_expect_false (!mg)) 648 if (ecb_expect_false (!mg))
649 {
628 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);
629 658
630 av = (AV *)mg->mg_obj; 659 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
631
632 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
633 av_extend (av, AvFILLp (av) + 1);
634
635 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
636} 660}
637 661
638/** load & save, init *******************************************************/ 662/** load & save, init *******************************************************/
639 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
640/* swap sv heads, at least logically */ 702/* swap sv heads, at least logically */
641static void 703static void
642swap_svs (pTHX_ Coro__State c) 704swap_svs (pTHX_ Coro__State c)
643{ 705{
644 int i; 706 int i;
645 707
646 for (i = 0; i <= AvFILLp (c->swap_sv); ) 708 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
647 { 709 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
648 SV *a = AvARRAY (c->swap_sv)[i++];
649 SV *b = AvARRAY (c->swap_sv)[i++];
650
651 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
652 SV tmp;
653
654 /* swap sv_any */
655 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
656
657 /* swap sv_flags */
658 SvFLAGS (&tmp) = SvFLAGS (a);
659 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
660 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
661
662#if PERL_VERSION_ATLEAST (5,10,0)
663 /* perl 5.10 complicates this _quite_ a bit, but it also is
664 * much faster, so no quarrels here. alternatively, we could
665 * sv_upgrade to avoid this.
666 */
667 {
668 /* swap sv_u */
669 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
670
671 /* if SvANY points to the head, we need to adjust the pointers,
672 * as the pointer for a still points to b, and maybe vice versa.
673 */
674 #define svany_in_head(type) \
675 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
676
677 if (svany_in_head (SvTYPE (a)))
678 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
679
680 if (svany_in_head (SvTYPE (b)))
681 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
682 }
683#endif
684 }
685} 710}
686 711
687#define SWAP_SVS(coro) \ 712#define SWAP_SVS(coro) \
688 if (ecb_expect_false ((coro)->swap_sv)) \ 713 if (ecb_expect_false ((coro)->swap_sv)) \
689 swap_svs (aTHX_ (coro)) 714 swap_svs (aTHX_ (coro))
… …
701 726
702#if CORO_JIT 727#if CORO_JIT
703 load_perl_slots (slot); 728 load_perl_slots (slot);
704#else 729#else
705 #define VARx(name,expr,type) expr = slot->name; 730 #define VARx(name,expr,type) expr = slot->name;
706 # include "state.h" 731 #include "state.h"
707 #undef VARx
708#endif 732#endif
709 733
710 { 734 {
711 dSP; 735 dSP;
712 736
… …
715 /* now do the ugly restore mess */ 739 /* now do the ugly restore mess */
716 while (ecb_expect_true (cv = (CV *)POPs)) 740 while (ecb_expect_true (cv = (CV *)POPs))
717 { 741 {
718 put_padlist (aTHX_ cv); /* mark this padlist as available */ 742 put_padlist (aTHX_ cv); /* mark this padlist as available */
719 CvDEPTH (cv) = PTR2IV (POPs); 743 CvDEPTH (cv) = PTR2IV (POPs);
720 CvPADLIST (cv) = (AV *)POPs; 744 CvPADLIST (cv) = (PADLIST *)POPs;
721 } 745 }
722 746
723 PUTBACK; 747 PUTBACK;
724 } 748 }
725 749
… …
815 839
816 PUTBACK; 840 PUTBACK;
817 } 841 }
818 842
819 /* allocate some space on the context stack for our purposes */ 843 /* allocate some space on the context stack for our purposes */
820 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 844 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
821 { 845 {
822 unsigned int i; 846 unsigned int i;
823 847
824 for (i = 0; i < SLOT_COUNT; ++i) 848 for (i = 0; i < SLOT_COUNT; ++i)
825 CXINC; 849 CXINC;
… …
834 858
835#if CORO_JIT 859#if CORO_JIT
836 save_perl_slots (slot); 860 save_perl_slots (slot);
837#else 861#else
838 #define VARx(name,expr,type) slot->name = expr; 862 #define VARx(name,expr,type) slot->name = expr;
839 # include "state.h" 863 #include "state.h"
840 #undef VARx
841#endif 864#endif
842 } 865 }
843} 866}
844 867
845/* 868/*
… …
877#endif 900#endif
878 901
879 New(54,PL_scopestack,8,I32); 902 New(54,PL_scopestack,8,I32);
880 PL_scopestack_ix = 0; 903 PL_scopestack_ix = 0;
881 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
882 908
883 New(54,PL_savestack,24,ANY); 909 New(54,PL_savestack,24,ANY);
884 PL_savestack_ix = 0; 910 PL_savestack_ix = 0;
885 PL_savestack_max = 24; 911 PL_savestack_max = 24;
886 912
… …
914 } 940 }
915 941
916 Safefree (PL_tmps_stack); 942 Safefree (PL_tmps_stack);
917 Safefree (PL_markstack); 943 Safefree (PL_markstack);
918 Safefree (PL_scopestack); 944 Safefree (PL_scopestack);
945#if HAS_SCOPESTACK_NAME
946 Safefree (PL_scopestack_name);
947#endif
919 Safefree (PL_savestack); 948 Safefree (PL_savestack);
920#if !PERL_VERSION_ATLEAST (5,10,0) 949#if !PERL_VERSION_ATLEAST (5,10,0)
921 Safefree (PL_retstack); 950 Safefree (PL_retstack);
922#endif 951#endif
923} 952}
… …
983 { 1012 {
984 SV **svp = 0; 1013 SV **svp = 0;
985 1014
986 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1015 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
987 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1016 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
988 1017
989 if (svp) 1018 if (svp)
990 { 1019 {
991 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);
992 return 0; 1030 return 0;
993 } 1031 }
994 } 1032 }
995 1033
996 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1034 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
… …
1090 PL_hints = 0; 1128 PL_hints = 0;
1091 1129
1092 /* recreate the die/warn hooks */ 1130 /* recreate the die/warn hooks */
1093 PL_diehook = SvREFCNT_inc (rv_diehook); 1131 PL_diehook = SvREFCNT_inc (rv_diehook);
1094 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1132 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1095 1133
1096 GvSV (PL_defgv) = newSV (0); 1134 GvSV (PL_defgv) = newSV (0);
1097 GvAV (PL_defgv) = coro->args; coro->args = 0; 1135 GvAV (PL_defgv) = coro->args; coro->args = 0;
1098 GvSV (PL_errgv) = newSV (0); 1136 GvSV (PL_errgv) = newSV (0);
1099 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);
1100 GvHV (PL_hintgv) = 0; 1138 GvHV (PL_hintgv) = 0;
… …
1188 /* restore swapped sv's */ 1226 /* restore swapped sv's */
1189 SWAP_SVS (coro); 1227 SWAP_SVS (coro);
1190 1228
1191 coro_destruct_stacks (aTHX); 1229 coro_destruct_stacks (aTHX);
1192 1230
1193 // now save some sv's to be free'd later 1231 /* now save some sv's to be free'd later */
1194 svf [0] = GvSV (PL_defgv); 1232 svf [0] = GvSV (PL_defgv);
1195 svf [1] = (SV *)GvAV (PL_defgv); 1233 svf [1] = (SV *)GvAV (PL_defgv);
1196 svf [2] = GvSV (PL_errgv); 1234 svf [2] = GvSV (PL_errgv);
1197 svf [3] = (SV *)PL_defoutgv; 1235 svf [3] = (SV *)PL_defoutgv;
1198 svf [4] = PL_rs; 1236 svf [4] = PL_rs;
… …
1218 SvREFCNT_dec (coro->invoke_cb); 1256 SvREFCNT_dec (coro->invoke_cb);
1219 SvREFCNT_dec (coro->invoke_av); 1257 SvREFCNT_dec (coro->invoke_av);
1220 } 1258 }
1221} 1259}
1222 1260
1223ECB_INLINE void 1261ecb_inline void
1224free_coro_mortal (pTHX) 1262free_coro_mortal (pTHX)
1225{ 1263{
1226 if (ecb_expect_true (coro_mortal)) 1264 if (ecb_expect_true (coro_mortal))
1227 { 1265 {
1228 SvREFCNT_dec ((SV *)coro_mortal); 1266 SvREFCNT_dec ((SV *)coro_mortal);
… …
1387 slf_frame.prepare = slf_prepare_set_stacklevel; 1425 slf_frame.prepare = slf_prepare_set_stacklevel;
1388 slf_frame.check = slf_check_set_stacklevel; 1426 slf_frame.check = slf_check_set_stacklevel;
1389} 1427}
1390 1428
1391/* 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 */
1392ECB_INLINE void 1430ecb_inline void
1393transfer_tail (pTHX) 1431transfer_tail (pTHX)
1394{ 1432{
1395 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);
1396} 1446}
1397 1447
1398/* 1448/*
1399 * this is a _very_ stripped down perl interpreter ;) 1449 * this is a _very_ stripped down perl interpreter ;)
1400 */ 1450 */
… …
1429 */ 1479 */
1430 1480
1431 /* 1481 /*
1432 * 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
1433 * 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)
1434 * 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
1435 * bootstrap-time "top" top_env, as we cannot restore the "main" 1485 * doing in that case. YMMV.
1436 * coroutine as Coro has no such concept.
1437 * This actually isn't valid with the pthread backend, but OSes requiring
1438 * that backend are too broken to do it in a standards-compliant way.
1439 */ 1486 */
1440 PL_top_env = main_top_env; 1487 perlish_exit (aTHX);
1441 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1442 } 1488 }
1443} 1489}
1444 1490
1445static coro_cctx * 1491static coro_cctx *
1446cctx_new () 1492cctx_new (void)
1447{ 1493{
1448 coro_cctx *cctx; 1494 coro_cctx *cctx;
1449 1495
1450 ++cctx_count; 1496 ++cctx_count;
1451 New (0, cctx, 1, coro_cctx); 1497 New (0, cctx, 1, coro_cctx);
… …
1457 return cctx; 1503 return cctx;
1458} 1504}
1459 1505
1460/* create a new cctx only suitable as source */ 1506/* create a new cctx only suitable as source */
1461static coro_cctx * 1507static coro_cctx *
1462cctx_new_empty () 1508cctx_new_empty (void)
1463{ 1509{
1464 coro_cctx *cctx = cctx_new (); 1510 coro_cctx *cctx = cctx_new ();
1465 1511
1466 cctx->sptr = 0; 1512 cctx->stack.sptr = 0;
1467 coro_create (&cctx->cctx, 0, 0, 0, 0); 1513 coro_create (&cctx->cctx, 0, 0, 0, 0);
1468 1514
1469 return cctx; 1515 return cctx;
1470} 1516}
1471 1517
1472/* create a new cctx suitable as destination/running a perl interpreter */ 1518/* create a new cctx suitable as destination/running a perl interpreter */
1473static coro_cctx * 1519static coro_cctx *
1474cctx_new_run () 1520cctx_new_run (void)
1475{ 1521{
1476 coro_cctx *cctx = cctx_new (); 1522 coro_cctx *cctx = cctx_new ();
1477 void *stack_start;
1478 size_t stack_size;
1479 1523
1480#if HAVE_MMAP 1524 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1481 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1482 /* mmap supposedly does allocate-on-write for us */
1483 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1484
1485 if (cctx->sptr != (void *)-1)
1486 {
1487 #if CORO_STACKGUARD
1488 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1489 #endif
1490 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1491 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1492 cctx->flags |= CC_MAPPED;
1493 } 1525 {
1494 else
1495#endif
1496 {
1497 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1498 New (0, cctx->sptr, cctx_stacksize, long);
1499
1500 if (!cctx->sptr)
1501 {
1502 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1526 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1503 _exit (EXIT_FAILURE); 1527 _exit (EXIT_FAILURE);
1504 }
1505
1506 stack_start = cctx->sptr;
1507 stack_size = cctx->ssize;
1508 } 1528 }
1509 1529
1510 #if CORO_USE_VALGRIND
1511 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1512 #endif
1513
1514 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);
1515 1531
1516 return cctx; 1532 return cctx;
1517} 1533}
1518 1534
1519static void 1535static void
… …
1525 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1541 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1526 1542
1527 --cctx_count; 1543 --cctx_count;
1528 coro_destroy (&cctx->cctx); 1544 coro_destroy (&cctx->cctx);
1529 1545
1530 /* coro_transfer creates new, empty cctx's */ 1546 coro_stack_free (&cctx->stack);
1531 if (cctx->sptr)
1532 {
1533 #if CORO_USE_VALGRIND
1534 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1535 #endif
1536
1537#if HAVE_MMAP
1538 if (cctx->flags & CC_MAPPED)
1539 munmap (cctx->sptr, cctx->ssize);
1540 else
1541#endif
1542 Safefree (cctx->sptr);
1543 }
1544 1547
1545 Safefree (cctx); 1548 Safefree (cctx);
1546} 1549}
1547 1550
1548/* wether this cctx should be destructed */ 1551/* wether this cctx should be destructed */
… …
1567} 1570}
1568 1571
1569static void 1572static void
1570cctx_put (coro_cctx *cctx) 1573cctx_put (coro_cctx *cctx)
1571{ 1574{
1572 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));
1573 1576
1574 /* free another cctx if overlimit */ 1577 /* free another cctx if overlimit */
1575 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1578 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1576 { 1579 {
1577 coro_cctx *first = cctx_first; 1580 coro_cctx *first = cctx_first;
… …
1703 return; 1706 return;
1704 1707
1705 slf_destroy (aTHX_ coro); 1708 slf_destroy (aTHX_ coro);
1706 1709
1707 coro->flags |= CF_ZOMBIE; 1710 coro->flags |= CF_ZOMBIE;
1708 1711
1709 if (coro->flags & CF_READY) 1712 if (coro->flags & CF_READY)
1710 { 1713 {
1711 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1714 /* reduce nready, as destroying a ready coro effectively unreadies it */
1712 /* alternative: look through all ready queues and remove the coro */ 1715 /* alternative: look through all ready queues and remove the coro */
1713 --coro_nready; 1716 --coro_nready;
… …
1790 TRANSFER (ta, 1); 1793 TRANSFER (ta, 1);
1791} 1794}
1792 1795
1793/** Coro ********************************************************************/ 1796/** Coro ********************************************************************/
1794 1797
1795ECB_INLINE void 1798ecb_inline void
1796coro_enq (pTHX_ struct coro *coro) 1799coro_enq (pTHX_ struct coro *coro)
1797{ 1800{
1798 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1801 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1799 1802
1800 SvREFCNT_inc_NN (coro->hv); 1803 SvREFCNT_inc_NN (coro->hv);
… …
1802 coro->next_ready = 0; 1805 coro->next_ready = 0;
1803 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1806 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1804 ready [1] = coro; 1807 ready [1] = coro;
1805} 1808}
1806 1809
1807ECB_INLINE struct coro * 1810ecb_inline struct coro *
1808coro_deq (pTHX) 1811coro_deq (pTHX)
1809{ 1812{
1810 int prio; 1813 int prio;
1811 1814
1812 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1815 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1865{ 1868{
1866 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1869 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1867} 1870}
1868 1871
1869/* expects to own a reference to next->hv */ 1872/* expects to own a reference to next->hv */
1870ECB_INLINE void 1873ecb_inline void
1871prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1874prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1872{ 1875{
1873 SV *prev_sv = SvRV (coro_current); 1876 SV *prev_sv = SvRV (coro_current);
1874 1877
1875 ta->prev = SvSTATE_hv (prev_sv); 1878 ta->prev = SvSTATE_hv (prev_sv);
… …
1934 } 1937 }
1935 } 1938 }
1936 } 1939 }
1937} 1940}
1938 1941
1939ECB_INLINE void 1942ecb_inline void
1940prepare_cede (pTHX_ struct coro_transfer_args *ta) 1943prepare_cede (pTHX_ struct coro_transfer_args *ta)
1941{ 1944{
1942 api_ready (aTHX_ coro_current); 1945 api_ready (aTHX_ coro_current);
1943 prepare_schedule (aTHX_ ta); 1946 prepare_schedule (aTHX_ ta);
1944} 1947}
1945 1948
1946ECB_INLINE void 1949ecb_inline void
1947prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1950prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1948{ 1951{
1949 SV *prev = SvRV (coro_current); 1952 SV *prev = SvRV (coro_current);
1950 1953
1951 if (coro_nready) 1954 if (coro_nready)
… …
2116{ 2119{
2117 AV *od = coro->on_destroy; 2120 AV *od = coro->on_destroy;
2118 2121
2119 if (!od) 2122 if (!od)
2120 return; 2123 return;
2124
2125 coro->on_destroy = 0;
2126 sv_2mortal ((SV *)od);
2121 2127
2122 while (AvFILLp (od) >= 0) 2128 while (AvFILLp (od) >= 0)
2123 { 2129 {
2124 SV *cb = sv_2mortal (av_pop (od)); 2130 SV *cb = sv_2mortal (av_pop (od));
2125 2131
… …
2146 2152
2147static void 2153static void
2148coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2154coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2149{ 2155{
2150 AV *av; 2156 AV *av;
2151 2157
2152 if (coro->status) 2158 if (coro->status)
2153 { 2159 {
2154 av = coro->status; 2160 av = coro->status;
2155 av_clear (av); 2161 av_clear (av);
2156 } 2162 }
… …
2203 2209
2204 coro = SvSTATE (arg [0]); 2210 coro = SvSTATE (arg [0]);
2205 coro_hv = coro->hv; 2211 coro_hv = coro->hv;
2206 2212
2207 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2213 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2208 2214
2209 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2215 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2210 { 2216 {
2211 /* coro currently busy cancelling something, so just notify it */ 2217 /* coro currently busy cancelling something, so just notify it */
2212 coro->slf_frame.data = (void *)coro; 2218 coro->slf_frame.data = (void *)coro;
2213 2219
… …
2392 2398
2393static int 2399static int
2394slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2400slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2395{ 2401{
2396 SV *data = (SV *)frame->data; 2402 SV *data = (SV *)frame->data;
2397 2403
2398 if (CORO_THROW) 2404 if (CORO_THROW)
2399 return 0; 2405 return 0;
2400 2406
2401 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2407 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2402 return 1; 2408 return 1;
… …
2438 cb = sv_2mortal (coro->rouse_cb); 2444 cb = sv_2mortal (coro->rouse_cb);
2439 coro->rouse_cb = 0; 2445 coro->rouse_cb = 0;
2440 } 2446 }
2441 2447
2442 if (!SvROK (cb) 2448 if (!SvROK (cb)
2443 || SvTYPE (SvRV (cb)) != SVt_PVCV 2449 || SvTYPE (SvRV (cb)) != SVt_PVCV
2444 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2450 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2445 croak ("Coro::rouse_wait called with illegal callback argument,"); 2451 croak ("Coro::rouse_wait called with illegal callback argument,");
2446 2452
2447 { 2453 {
2448 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2454 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2951 { 2957 {
2952 int i; 2958 int i;
2953 /* 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 */
2954 /* 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 */
2955 /* this avoids some degenerate memory usage cases */ 2961 /* this avoids some degenerate memory usage cases */
2956 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 */
2957 if (AvARRAY (av)[i] == coro_hv) 2963 if (AvARRAY (av)[i] == coro_hv)
2958 return 1; 2964 return 1;
2959 2965
2960 av_push (av, SvREFCNT_inc (coro_hv)); 2966 av_push (av, SvREFCNT_inc (coro_hv));
2961 return 1; 2967 return 1;
… …
3169 /* it quickly returns */ 3175 /* it quickly returns */
3170 if (CORO_THROW) 3176 if (CORO_THROW)
3171 return 0; 3177 return 0;
3172 3178
3173 /* one element that is an RV? repeat! */ 3179 /* one element that is an RV? repeat! */
3174 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3180 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3175 return 1; 3181 return 1;
3176 3182
3177 /* restore status */ 3183 /* restore status */
3178 { 3184 {
3179 SV *data_sv = av_pop (state); 3185 SV *data_sv = av_pop (state);
… …
3341#endif 3347#endif
3342 3348
3343#if CORO_JIT 3349#if CORO_JIT
3344 3350
3345static void ecb_noinline ecb_cold 3351static void ecb_noinline ecb_cold
3346pushav_3uv (pTHX_ UV a, UV b, UV c) 3352pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3347{ 3353{
3348 dSP; 3354 dSP;
3349 AV *av = newAV (); 3355 AV *av = newAV ();
3350 3356
3357 av_store (av, 3, newSVuv (d));
3351 av_store (av, 2, newSVuv (c)); 3358 av_store (av, 2, newSVuv (c));
3352 av_store (av, 1, newSVuv (b)); 3359 av_store (av, 1, newSVuv (b));
3353 av_store (av, 0, newSVuv (a)); 3360 av_store (av, 0, newSVuv (a));
3354 3361
3355 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 3362 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
… …
3362{ 3369{
3363 dSP; 3370 dSP;
3364 SV *load, *save; 3371 SV *load, *save;
3365 char *map_base; 3372 char *map_base;
3366 char *load_ptr, *save_ptr; 3373 char *load_ptr, *save_ptr;
3367 STRLEN load_len, save_len; 3374 STRLEN load_len, save_len, map_len;
3368 int count; 3375 int count;
3369 3376
3370 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1); 3377 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3371 3378
3372 PUSHMARK (SP); 3379 PUSHMARK (SP);
3373#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));
3374# include "state.h" 3381 #include "state.h"
3375#undef VARx
3376 count = call_pv ("Coro::State::_jit", G_ARRAY); 3382 count = call_pv ("Coro::State::_jit", G_ARRAY);
3377 SPAGAIN; 3383 SPAGAIN;
3378 3384
3379 save = POPs; save_ptr = SvPVbyte (save, save_len); 3385 save = POPs; save_ptr = SvPVbyte (save, save_len);
3380 load = POPs; load_ptr = SvPVbyte (load, load_len); 3386 load = POPs; load_ptr = SvPVbyte (load, load_len);
3381 3387
3388 map_len = load_len + save_len + 16;
3389
3382 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);
3383 3391
3384 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));
3385 3393
3386 load_perl_slots = (load_save_perl_slots_type)map_base; 3394 load_perl_slots = (load_save_perl_slots_type)map_base;
3387 memcpy (map_base, load_ptr, load_len); 3395 memcpy (map_base, load_ptr, load_len);
3388 3396
3389 map_base += (load_len + 15) & ~15; 3397 map_base += (load_len + 15) & ~15;
3390 3398
3391 save_perl_slots = (load_save_perl_slots_type)map_base; 3399 save_perl_slots = (load_save_perl_slots_type)map_base;
3392 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);
3393 3405
3394 PUTBACK; 3406 PUTBACK;
3395 eval_pv ("undef &Coro::State::_jit", 1); 3407 eval_pv ("undef &Coro::State::_jit", 1);
3396} 3408}
3397 3409
… …
3406#ifdef USE_ITHREADS 3418#ifdef USE_ITHREADS
3407# if CORO_PTHREAD 3419# if CORO_PTHREAD
3408 coro_thx = PERL_GET_CONTEXT; 3420 coro_thx = PERL_GET_CONTEXT;
3409# endif 3421# endif
3410#endif 3422#endif
3411 BOOT_PAGESIZE;
3412
3413 /* 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 */
3414 /* 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 */
3415 /* programs trying to delete them, but... */ 3425 /* programs trying to delete them, but... */
3416 /* 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 */
3417 DEFSV; 3427 DEFSV;
… …
3487void 3497void
3488transfer (...) 3498transfer (...)
3489 PROTOTYPE: $$ 3499 PROTOTYPE: $$
3490 CODE: 3500 CODE:
3491 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3501 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3492
3493void
3494_exit (int code)
3495 PROTOTYPE: $
3496 CODE:
3497 _exit (code);
3498 3502
3499SV * 3503SV *
3500clone (Coro::State coro) 3504clone (Coro::State coro)
3501 CODE: 3505 CODE:
3502{ 3506{
… …
3557void 3561void
3558list () 3562list ()
3559 PROTOTYPE: 3563 PROTOTYPE:
3560 PPCODE: 3564 PPCODE:
3561{ 3565{
3562 struct coro *coro; 3566 struct coro *coro;
3563 for (coro = coro_first; coro; coro = coro->next) 3567 for (coro = coro_first; coro; coro = coro->next)
3564 if (coro->hv) 3568 if (coro->hv)
3565 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3569 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3566} 3570}
3567 3571
… …
3631 RETVAL = boolSV (coro->flags & ix); 3635 RETVAL = boolSV (coro->flags & ix);
3632 OUTPUT: 3636 OUTPUT:
3633 RETVAL 3637 RETVAL
3634 3638
3635void 3639void
3636throw (Coro::State self, SV *exception = &PL_sv_undef) 3640throw (SV *self, SV *exception = &PL_sv_undef)
3637 PROTOTYPE: $;$ 3641 PROTOTYPE: $;$
3638 CODE: 3642 CODE:
3639{ 3643{
3644 struct coro *coro = SvSTATE (self);
3640 struct coro *current = SvSTATE_current; 3645 struct coro *current = SvSTATE_current;
3641 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3646 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3642 SvREFCNT_dec (*exceptionp); 3647 SvREFCNT_dec (*exceptionp);
3643 SvGETMAGIC (exception); 3648 SvGETMAGIC (exception);
3644 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3649 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3650
3651 api_ready (aTHX_ self);
3645} 3652}
3646 3653
3647void 3654void
3648api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3655api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3649 PROTOTYPE: $;$ 3656 PROTOTYPE: $;$
… …
3726 3733
3727void 3734void
3728times (Coro::State self) 3735times (Coro::State self)
3729 PPCODE: 3736 PPCODE:
3730{ 3737{
3731 struct coro *current = SvSTATE (coro_current); 3738 struct coro *current = SvSTATE (coro_current);
3732 3739
3733 if (ecb_expect_false (current == self)) 3740 if (ecb_expect_false (current == self))
3734 { 3741 {
3735 coro_times_update (); 3742 coro_times_update ();
3736 coro_times_add (SvSTATE (coro_current)); 3743 coro_times_add (SvSTATE (coro_current));
… …
3779 3786
3780 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);
3781 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3788 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3782 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);
3783 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 */
3784 3791
3785 coro_stash = gv_stashpv ("Coro", TRUE); 3792 coro_stash = gv_stashpv ("Coro", TRUE);
3786 3793
3787 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3794 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3788 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3795 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3789 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3796 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4011 on_leave = 1 4018 on_leave = 1
4012 PROTOTYPE: & 4019 PROTOTYPE: &
4013 CODE: 4020 CODE:
4014{ 4021{
4015 struct coro *coro = SvSTATE_current; 4022 struct coro *coro = SvSTATE_current;
4016 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4023 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4017 4024
4018 block = s_get_cv_croak (block); 4025 block = s_get_cv_croak (block);
4019 4026
4020 if (!*avp) 4027 if (!*avp)
4021 *avp = newAV (); 4028 *avp = newAV ();
… …
4041 4048
4042SV * 4049SV *
4043new (SV *klass, SV *count = 0) 4050new (SV *klass, SV *count = 0)
4044 CODE: 4051 CODE:
4045{ 4052{
4046 int semcnt = 1; 4053 int semcnt = 1;
4047 4054
4048 if (count) 4055 if (count)
4049 { 4056 {
4050 SvGETMAGIC (count); 4057 SvGETMAGIC (count);
4051 4058
… …
4111 XSRETURN_NO; 4118 XSRETURN_NO;
4112} 4119}
4113 4120
4114void 4121void
4115waiters (SV *self) 4122waiters (SV *self)
4116 PPCODE: 4123 PPCODE:
4117{ 4124{
4118 AV *av = (AV *)SvRV (self); 4125 AV *av = (AV *)SvRV (self);
4119 int wcount = AvFILLp (av) + 1 - 1; 4126 int wcount = AvFILLp (av) + 1 - 1;
4120 4127
4121 if (GIMME_V == G_SCALAR) 4128 if (GIMME_V == G_SCALAR)
… …
4130} 4137}
4131 4138
4132MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4139MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4133 4140
4134void 4141void
4135_may_delete (SV *sem, int count, int extra_refs) 4142_may_delete (SV *sem, int count, unsigned int extra_refs)
4136 PPCODE: 4143 PPCODE:
4137{ 4144{
4138 AV *av = (AV *)SvRV (sem); 4145 AV *av = (AV *)SvRV (sem);
4139 4146
4140 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4147 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4141 && AvFILLp (av) == 0 /* no waiters, just count */ 4148 && AvFILLp (av) == 0 /* no waiters, just count */
4142 && SvIV (AvARRAY (av)[0]) == count) 4149 && SvIV (AvARRAY (av)[0]) == count)
4143 XSRETURN_YES; 4150 XSRETURN_YES;
… …
4164 4171
4165void 4172void
4166broadcast (SV *self) 4173broadcast (SV *self)
4167 CODE: 4174 CODE:
4168{ 4175{
4169 AV *av = (AV *)SvRV (self); 4176 AV *av = (AV *)SvRV (self);
4170 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4177 coro_signal_wake (aTHX_ av, AvFILLp (av));
4171} 4178}
4172 4179
4173void 4180void
4174send (SV *self) 4181send (SV *self)
… …
4182 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4189 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4183} 4190}
4184 4191
4185IV 4192IV
4186awaited (SV *self) 4193awaited (SV *self)
4187 CODE: 4194 CODE:
4188 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4195 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4189 OUTPUT: 4196 OUTPUT:
4190 RETVAL 4197 RETVAL
4191 4198
4192 4199
… …
4197 4204
4198void 4205void
4199_schedule (...) 4206_schedule (...)
4200 CODE: 4207 CODE:
4201{ 4208{
4202 static int incede; 4209 static int incede;
4203 4210
4204 api_cede_notself (aTHX); 4211 api_cede_notself (aTHX);
4205 4212
4206 ++incede; 4213 ++incede;
4207 while (coro_nready >= incede && api_cede (aTHX)) 4214 while (coro_nready >= incede && api_cede (aTHX))
… …
4251 { 4258 {
4252 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4259 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4253 coro_old_pp_sselect = 0; 4260 coro_old_pp_sselect = 0;
4254 } 4261 }
4255 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