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