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.406 by root, Sat Jun 11 13:49:00 2011 UTC vs.
Revision 1.438 by root, Mon Nov 18 10:27:53 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 #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
303 typedef void (*load_save_perl_slots_type)(perl_slots *);
307static load_save_perl_slots_type load_perl_slots, save_perl_slots; 304 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
308#endif 305#endif
309 306
310/** Coro::Select ************************************************************/ 307/** Coro::Select ************************************************************/
311 308
312static OP *(*coro_old_pp_sselect) (pTHX); 309static OP *(*coro_old_pp_sselect) (pTHX);
… …
329 326
330/** time stuff **************************************************************/ 327/** time stuff **************************************************************/
331 328
332#ifdef HAS_GETTIMEOFDAY 329#ifdef HAS_GETTIMEOFDAY
333 330
334ECB_INLINE void 331ecb_inline void
335coro_u2time (pTHX_ UV ret[2]) 332coro_u2time (pTHX_ UV ret[2])
336{ 333{
337 struct timeval tv; 334 struct timeval tv;
338 gettimeofday (&tv, 0); 335 gettimeofday (&tv, 0);
339 336
340 ret [0] = tv.tv_sec; 337 ret [0] = tv.tv_sec;
341 ret [1] = tv.tv_usec; 338 ret [1] = tv.tv_usec;
342} 339}
343 340
344ECB_INLINE double 341ecb_inline double
345coro_nvtime () 342coro_nvtime (void)
346{ 343{
347 struct timeval tv; 344 struct timeval tv;
348 gettimeofday (&tv, 0); 345 gettimeofday (&tv, 0);
349 346
350 return tv.tv_sec + tv.tv_usec * 1e-6; 347 return tv.tv_sec + tv.tv_usec * 1e-6;
351} 348}
352 349
353ECB_INLINE void 350ecb_inline void
354time_init (pTHX) 351time_init (pTHX)
355{ 352{
356 nvtime = coro_nvtime; 353 nvtime = coro_nvtime;
357 u2time = coro_u2time; 354 u2time = coro_u2time;
358} 355}
359 356
360#else 357#else
361 358
362ECB_INLINE void 359ecb_inline void
363time_init (pTHX) 360time_init (pTHX)
364{ 361{
365 SV **svp; 362 SV **svp;
366 363
367 require_pv ("Time/HiRes.pm"); 364 require_pv ("Time/HiRes.pm");
368 365
369 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 366 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
370 367
371 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 368 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
372 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");
373 370
… …
409 get_hv (name, create); 406 get_hv (name, create);
410#endif 407#endif
411 return get_hv (name, create); 408 return get_hv (name, create);
412} 409}
413 410
414ECB_INLINE void 411ecb_inline void
415coro_times_update () 412coro_times_update (void)
416{ 413{
417#ifdef coro_clock_gettime 414#ifdef coro_clock_gettime
418 struct timespec ts; 415 struct timespec ts;
419 416
420 ts.tv_sec = ts.tv_nsec = 0; 417 ts.tv_sec = ts.tv_nsec = 0;
… …
432 time_real [0] = tv [0]; 429 time_real [0] = tv [0];
433 time_real [1] = tv [1] * 1000; 430 time_real [1] = tv [1] * 1000;
434#endif 431#endif
435} 432}
436 433
437ECB_INLINE void 434ecb_inline void
438coro_times_add (struct coro *c) 435coro_times_add (struct coro *c)
439{ 436{
440 c->t_real [1] += time_real [1]; 437 c->t_real [1] += time_real [1];
441 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]; }
442 c->t_real [0] += time_real [0]; 439 c->t_real [0] += time_real [0];
… …
444 c->t_cpu [1] += time_cpu [1]; 441 c->t_cpu [1] += time_cpu [1];
445 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]; }
446 c->t_cpu [0] += time_cpu [0]; 443 c->t_cpu [0] += time_cpu [0];
447} 444}
448 445
449ECB_INLINE void 446ecb_inline void
450coro_times_sub (struct coro *c) 447coro_times_sub (struct coro *c)
451{ 448{
452 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]; }
453 c->t_real [1] -= time_real [1]; 450 c->t_real [1] -= time_real [1];
454 c->t_real [0] -= time_real [0]; 451 c->t_real [0] -= time_real [0];
… …
475 : 0) 472 : 0)
476 473
477#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)
478#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)
479 476
480ECB_INLINE MAGIC * 477ecb_inline MAGIC *
481SvSTATEhv_p (pTHX_ SV *coro) 478SvSTATEhv_p (pTHX_ SV *coro)
482{ 479{
483 MAGIC *mg; 480 MAGIC *mg;
484 481
485 if (ecb_expect_true ( 482 if (ecb_expect_true (
… …
490 return mg; 487 return mg;
491 488
492 return 0; 489 return 0;
493} 490}
494 491
495ECB_INLINE struct coro * 492ecb_inline struct coro *
496SvSTATE_ (pTHX_ SV *coro) 493SvSTATE_ (pTHX_ SV *coro)
497{ 494{
498 MAGIC *mg; 495 MAGIC *mg;
499 496
500 if (SvROK (coro)) 497 if (SvROK (coro))
… …
514#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 511#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
515 512
516/*****************************************************************************/ 513/*****************************************************************************/
517/* padlist management and caching */ 514/* padlist management and caching */
518 515
519ECB_INLINE AV * 516ecb_inline PADLIST *
520coro_derive_padlist (pTHX_ CV *cv) 517coro_derive_padlist (pTHX_ CV *cv)
521{ 518{
522 AV *padlist = CvPADLIST (cv); 519 PADLIST *padlist = CvPADLIST (cv);
523 AV *newpadlist, *newpad; 520 PADLIST *newpadlist;
521 PAD *newpad;
522 PADOFFSET off = PadlistMAX (padlist) + 1;
524 523
525 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. */
526 AvREAL_off (newpadlist); 552 AvREAL_off (newpadlist);
527#if PERL_VERSION_ATLEAST (5,10,0)
528 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
529#else
530 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
531#endif 553#endif
532 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
533 --AvFILLp (padlist);
534 554
535 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 555 /* Already extended to 2 elements by newPADLIST. */
536 av_store (newpadlist, 1, (SV *)newpad); 556 PadlistMAX (newpadlist) = 1;
557 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
558 PadlistARRAY (newpadlist)[1] = newpad;
537 559
538 return newpadlist; 560 return newpadlist;
539} 561}
540 562
541ECB_INLINE void 563ecb_inline void
542free_padlist (pTHX_ AV *padlist) 564free_padlist (pTHX_ PADLIST *padlist)
543{ 565{
544 /* may be during global destruction */ 566 /* may be during global destruction */
545 if (!IN_DESTRUCT) 567 if (!IN_DESTRUCT)
546 { 568 {
547 I32 i = AvFILLp (padlist); 569 I32 i = PadlistMAX (padlist);
548 570
549 while (i > 0) /* special-case index 0 */ 571 while (i > 0) /* special-case index 0 */
550 { 572 {
551 /* we try to be extra-careful here */ 573 /* we try to be extra-careful here */
552 AV *av = (AV *)AvARRAY (padlist)[i--]; 574 PAD *pad = PadlistARRAY (padlist)[i--];
553 I32 j = AvFILLp (av);
554 575
576 if (pad)
577 {
578 I32 j = PadMAX (pad);
579
555 while (j >= 0) 580 while (j >= 0)
556 SvREFCNT_dec (AvARRAY (av)[j--]); 581 SvREFCNT_dec (PadARRAY (pad)[j--]);
557 582
558 AvFILLp (av) = -1; 583 PadMAX (pad) = -1;
559 SvREFCNT_dec (av); 584 SvREFCNT_dec (pad);
585 }
560 } 586 }
561 587
562 SvREFCNT_dec (AvARRAY (padlist)[0]); 588 SvREFCNT_dec (PadlistNAMES (padlist));
563 589
590#if NEWPADAPI
591 Safefree (PadlistARRAY (padlist));
592 Safefree (padlist);
593#else
564 AvFILLp (padlist) = -1; 594 AvFILLp (padlist) = -1;
595 AvREAL_off (padlist);
565 SvREFCNT_dec ((SV*)padlist); 596 SvREFCNT_dec ((SV*)padlist);
597#endif
566 } 598 }
567} 599}
568 600
569static int 601static int
570coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 602coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
571{ 603{
572 AV *padlist; 604 PADLIST *padlist;
573 AV *av = (AV *)mg->mg_obj; 605 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
606 size_t len = *(size_t *)mg->mg_ptr;
574 607
575 /* perl manages to free our internal AV and _then_ call us */ 608 /* perl manages to free our internal AV and _then_ call us */
576 if (IN_DESTRUCT) 609 if (IN_DESTRUCT)
577 return 0; 610 return 0;
578 611
579 /* casting is fun. */ 612 while (len--)
580 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
581 free_padlist (aTHX_ padlist); 613 free_padlist (aTHX_ padlists[len]);
582
583 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
584 614
585 return 0; 615 return 0;
586} 616}
587 617
588static MGVTBL coro_cv_vtbl = { 618static MGVTBL coro_cv_vtbl = {
589 0, 0, 0, 0, 619 0, 0, 0, 0,
590 coro_cv_free 620 coro_cv_free
591}; 621};
592 622
593/* the next two functions merely cache the padlists */ 623/* the next two functions merely cache the padlists */
594ECB_INLINE void 624ecb_inline void
595get_padlist (pTHX_ CV *cv) 625get_padlist (pTHX_ CV *cv)
596{ 626{
597 MAGIC *mg = CORO_MAGIC_cv (cv); 627 MAGIC *mg = CORO_MAGIC_cv (cv);
598 AV *av; 628 size_t *lenp;
599 629
600 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 630 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
601 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 631 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
602 else 632 else
603 { 633 {
604#if CORO_PREFER_PERL_FUNCTIONS 634#if CORO_PREFER_PERL_FUNCTIONS
605 /* this is probably cleaner? but also slower! */ 635 /* this is probably cleaner? but also slower! */
606 /* in practise, it seems to be less stable */ 636 /* in practise, it seems to be less stable */
… …
612 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 642 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
613#endif 643#endif
614 } 644 }
615} 645}
616 646
617ECB_INLINE void 647ecb_inline void
618put_padlist (pTHX_ CV *cv) 648put_padlist (pTHX_ CV *cv)
619{ 649{
620 MAGIC *mg = CORO_MAGIC_cv (cv); 650 MAGIC *mg = CORO_MAGIC_cv (cv);
621 AV *av;
622 651
623 if (ecb_expect_false (!mg)) 652 if (ecb_expect_false (!mg))
653 {
624 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 654 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
655 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
656 mg->mg_len = 1; /* so mg_free frees mg_ptr */
657 }
658 else
659 Renew (mg->mg_ptr,
660 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
661 char);
625 662
626 av = (AV *)mg->mg_obj; 663 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
627
628 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
629 av_extend (av, AvFILLp (av) + 1);
630
631 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
632} 664}
633 665
634/** load & save, init *******************************************************/ 666/** load & save, init *******************************************************/
635 667
668ecb_inline void
669swap_sv (SV *a, SV *b)
670{
671 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
672 SV tmp;
673
674 /* swap sv_any */
675 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
676
677 /* swap sv_flags */
678 SvFLAGS (&tmp) = SvFLAGS (a);
679 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
680 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
681
682#if PERL_VERSION_ATLEAST (5,10,0)
683 /* perl 5.10 and later complicates this _quite_ a bit, but it also
684 * is much faster, so no quarrels here. alternatively, we could
685 * sv_upgrade to avoid this.
686 */
687 {
688 /* swap sv_u */
689 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
690
691 /* if SvANY points to the head, we need to adjust the pointers,
692 * as the pointer for a still points to b, and maybe vice versa.
693 */
694 #define svany_in_head(type) \
695 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
696
697 if (svany_in_head (SvTYPE (a)))
698 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
699
700 if (svany_in_head (SvTYPE (b)))
701 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
702 }
703#endif
704}
705
636/* swap sv heads, at least logically */ 706/* swap sv heads, at least logically */
637static void 707static void
638swap_svs (pTHX_ Coro__State c) 708swap_svs (pTHX_ Coro__State c)
639{ 709{
640 int i; 710 int i;
641 711
642 for (i = 0; i <= AvFILLp (c->swap_sv); ) 712 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
643 { 713 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
644 SV *a = AvARRAY (c->swap_sv)[i++];
645 SV *b = AvARRAY (c->swap_sv)[i++];
646
647 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
648 SV tmp;
649
650 /* swap sv_any */
651 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
652
653 /* swap sv_flags */
654 SvFLAGS (&tmp) = SvFLAGS (a);
655 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
656 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
657
658#if PERL_VERSION_ATLEAST (5,10,0)
659 /* perl 5.10 complicates this _quite_ a bit, but it also is
660 * much faster, so no quarrels here. alternatively, we could
661 * sv_upgrade to avoid this.
662 */
663 {
664 /* swap sv_u */
665 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
666
667 /* if SvANY points to the head, we need to adjust the pointers,
668 * as the pointer for a still points to b, and maybe vice versa.
669 */
670 #define svany_in_head(type) \
671 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
672
673 if (svany_in_head (SvTYPE (a)))
674 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
675
676 if (svany_in_head (SvTYPE (b)))
677 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
678 }
679#endif
680 }
681} 714}
682 715
683#define SWAP_SVS(coro) \ 716#define SWAP_SVS(coro) \
684 if (ecb_expect_false ((coro)->swap_sv)) \ 717 if (ecb_expect_false ((coro)->swap_sv)) \
685 swap_svs (aTHX_ (coro)) 718 swap_svs (aTHX_ (coro))
… …
697 730
698#if CORO_JIT 731#if CORO_JIT
699 load_perl_slots (slot); 732 load_perl_slots (slot);
700#else 733#else
701 #define VARx(name,expr,type) expr = slot->name; 734 #define VARx(name,expr,type) expr = slot->name;
702 # include "state.h" 735 #include "state.h"
703 #undef VARx
704#endif 736#endif
705 737
706 { 738 {
707 dSP; 739 dSP;
708 740
… …
711 /* now do the ugly restore mess */ 743 /* now do the ugly restore mess */
712 while (ecb_expect_true (cv = (CV *)POPs)) 744 while (ecb_expect_true (cv = (CV *)POPs))
713 { 745 {
714 put_padlist (aTHX_ cv); /* mark this padlist as available */ 746 put_padlist (aTHX_ cv); /* mark this padlist as available */
715 CvDEPTH (cv) = PTR2IV (POPs); 747 CvDEPTH (cv) = PTR2IV (POPs);
716 CvPADLIST (cv) = (AV *)POPs; 748 CvPADLIST (cv) = (PADLIST *)POPs;
717 } 749 }
718 750
719 PUTBACK; 751 PUTBACK;
720 } 752 }
721 753
… …
811 843
812 PUTBACK; 844 PUTBACK;
813 } 845 }
814 846
815 /* allocate some space on the context stack for our purposes */ 847 /* allocate some space on the context stack for our purposes */
816 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 848 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
817 { 849 {
818 unsigned int i; 850 unsigned int i;
819 851
820 for (i = 0; i < SLOT_COUNT; ++i) 852 for (i = 0; i < SLOT_COUNT; ++i)
821 CXINC; 853 CXINC;
… …
830 862
831#if CORO_JIT 863#if CORO_JIT
832 save_perl_slots (slot); 864 save_perl_slots (slot);
833#else 865#else
834 #define VARx(name,expr,type) slot->name = expr; 866 #define VARx(name,expr,type) slot->name = expr;
835 # include "state.h" 867 #include "state.h"
836 #undef VARx
837#endif 868#endif
838 } 869 }
839} 870}
840 871
841/* 872/*
… …
873#endif 904#endif
874 905
875 New(54,PL_scopestack,8,I32); 906 New(54,PL_scopestack,8,I32);
876 PL_scopestack_ix = 0; 907 PL_scopestack_ix = 0;
877 PL_scopestack_max = 8; 908 PL_scopestack_max = 8;
909#if HAS_SCOPESTACK_NAME
910 New(54,PL_scopestack_name,8,const char*);
911#endif
878 912
879 New(54,PL_savestack,24,ANY); 913 New(54,PL_savestack,24,ANY);
880 PL_savestack_ix = 0; 914 PL_savestack_ix = 0;
881 PL_savestack_max = 24; 915 PL_savestack_max = 24;
882 916
… …
910 } 944 }
911 945
912 Safefree (PL_tmps_stack); 946 Safefree (PL_tmps_stack);
913 Safefree (PL_markstack); 947 Safefree (PL_markstack);
914 Safefree (PL_scopestack); 948 Safefree (PL_scopestack);
949#if HAS_SCOPESTACK_NAME
950 Safefree (PL_scopestack_name);
951#endif
915 Safefree (PL_savestack); 952 Safefree (PL_savestack);
916#if !PERL_VERSION_ATLEAST (5,10,0) 953#if !PERL_VERSION_ATLEAST (5,10,0)
917 Safefree (PL_retstack); 954 Safefree (PL_retstack);
918#endif 955#endif
919} 956}
… …
979 { 1016 {
980 SV **svp = 0; 1017 SV **svp = 0;
981 1018
982 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1019 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
983 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1020 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
984 1021
985 if (svp) 1022 if (svp)
986 { 1023 {
987 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1024 SV *ssv;
1025
1026 if (!*svp)
1027 ssv = &PL_sv_undef;
1028 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1029 ssv = sv_2mortal (newRV_inc (*svp));
1030 else
1031 ssv = *svp;
1032
1033 sv_setsv (sv, ssv);
988 return 0; 1034 return 0;
989 } 1035 }
990 } 1036 }
991 1037
992 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1038 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
… …
1086 PL_hints = 0; 1132 PL_hints = 0;
1087 1133
1088 /* recreate the die/warn hooks */ 1134 /* recreate the die/warn hooks */
1089 PL_diehook = SvREFCNT_inc (rv_diehook); 1135 PL_diehook = SvREFCNT_inc (rv_diehook);
1090 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1136 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1091 1137
1092 GvSV (PL_defgv) = newSV (0); 1138 GvSV (PL_defgv) = newSV (0);
1093 GvAV (PL_defgv) = coro->args; coro->args = 0; 1139 GvAV (PL_defgv) = coro->args; coro->args = 0;
1094 GvSV (PL_errgv) = newSV (0); 1140 GvSV (PL_errgv) = newSV (0);
1095 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1141 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1096 GvHV (PL_hintgv) = 0; 1142 GvHV (PL_hintgv) = 0;
… …
1184 /* restore swapped sv's */ 1230 /* restore swapped sv's */
1185 SWAP_SVS (coro); 1231 SWAP_SVS (coro);
1186 1232
1187 coro_destruct_stacks (aTHX); 1233 coro_destruct_stacks (aTHX);
1188 1234
1189 // now save some sv's to be free'd later 1235 /* now save some sv's to be free'd later */
1190 svf [0] = GvSV (PL_defgv); 1236 svf [0] = GvSV (PL_defgv);
1191 svf [1] = (SV *)GvAV (PL_defgv); 1237 svf [1] = (SV *)GvAV (PL_defgv);
1192 svf [2] = GvSV (PL_errgv); 1238 svf [2] = GvSV (PL_errgv);
1193 svf [3] = (SV *)PL_defoutgv; 1239 svf [3] = (SV *)PL_defoutgv;
1194 svf [4] = PL_rs; 1240 svf [4] = PL_rs;
… …
1214 SvREFCNT_dec (coro->invoke_cb); 1260 SvREFCNT_dec (coro->invoke_cb);
1215 SvREFCNT_dec (coro->invoke_av); 1261 SvREFCNT_dec (coro->invoke_av);
1216 } 1262 }
1217} 1263}
1218 1264
1219ECB_INLINE void 1265ecb_inline void
1220free_coro_mortal (pTHX) 1266free_coro_mortal (pTHX)
1221{ 1267{
1222 if (ecb_expect_true (coro_mortal)) 1268 if (ecb_expect_true (coro_mortal))
1223 { 1269 {
1224 SvREFCNT_dec ((SV *)coro_mortal); 1270 SvREFCNT_dec ((SV *)coro_mortal);
… …
1383 slf_frame.prepare = slf_prepare_set_stacklevel; 1429 slf_frame.prepare = slf_prepare_set_stacklevel;
1384 slf_frame.check = slf_check_set_stacklevel; 1430 slf_frame.check = slf_check_set_stacklevel;
1385} 1431}
1386 1432
1387/* the tail of transfer: execute stuff we can only do after a transfer */ 1433/* the tail of transfer: execute stuff we can only do after a transfer */
1388ECB_INLINE void 1434ecb_inline void
1389transfer_tail (pTHX) 1435transfer_tail (pTHX)
1390{ 1436{
1391 free_coro_mortal (aTHX); 1437 free_coro_mortal (aTHX);
1438}
1439
1440/* try to exit the same way perl's main function would do */
1441/* we do not bother resetting the environment or other things *7
1442/* that are not, uhm, essential */
1443/* this obviously also doesn't work when perl is embedded */
1444static void ecb_noinline ecb_cold
1445perlish_exit (pTHX)
1446{
1447 int exitstatus = perl_destruct (PL_curinterp);
1448 perl_free (PL_curinterp);
1449 exit (exitstatus);
1392} 1450}
1393 1451
1394/* 1452/*
1395 * this is a _very_ stripped down perl interpreter ;) 1453 * this is a _very_ stripped down perl interpreter ;)
1396 */ 1454 */
… …
1425 */ 1483 */
1426 1484
1427 /* 1485 /*
1428 * If perl-run returns we assume exit() was being called or the coro 1486 * If perl-run returns we assume exit() was being called or the coro
1429 * fell off the end, which seems to be the only valid (non-bug) 1487 * fell off the end, which seems to be the only valid (non-bug)
1430 * reason for perl_run to return. We try to exit by jumping to the 1488 * reason for perl_run to return. We try to mimic whatever perl is normally
1431 * bootstrap-time "top" top_env, as we cannot restore the "main" 1489 * doing in that case. YMMV.
1432 * coroutine as Coro has no such concept.
1433 * This actually isn't valid with the pthread backend, but OSes requiring
1434 * that backend are too broken to do it in a standards-compliant way.
1435 */ 1490 */
1436 PL_top_env = main_top_env; 1491 perlish_exit (aTHX);
1437 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1438 } 1492 }
1439} 1493}
1440 1494
1441static coro_cctx * 1495static coro_cctx *
1442cctx_new () 1496cctx_new (void)
1443{ 1497{
1444 coro_cctx *cctx; 1498 coro_cctx *cctx;
1445 1499
1446 ++cctx_count; 1500 ++cctx_count;
1447 New (0, cctx, 1, coro_cctx); 1501 New (0, cctx, 1, coro_cctx);
… …
1453 return cctx; 1507 return cctx;
1454} 1508}
1455 1509
1456/* create a new cctx only suitable as source */ 1510/* create a new cctx only suitable as source */
1457static coro_cctx * 1511static coro_cctx *
1458cctx_new_empty () 1512cctx_new_empty (void)
1459{ 1513{
1460 coro_cctx *cctx = cctx_new (); 1514 coro_cctx *cctx = cctx_new ();
1461 1515
1462 cctx->sptr = 0; 1516 cctx->stack.sptr = 0;
1463 coro_create (&cctx->cctx, 0, 0, 0, 0); 1517 coro_create (&cctx->cctx, 0, 0, 0, 0);
1464 1518
1465 return cctx; 1519 return cctx;
1466} 1520}
1467 1521
1468/* create a new cctx suitable as destination/running a perl interpreter */ 1522/* create a new cctx suitable as destination/running a perl interpreter */
1469static coro_cctx * 1523static coro_cctx *
1470cctx_new_run () 1524cctx_new_run (void)
1471{ 1525{
1472 coro_cctx *cctx = cctx_new (); 1526 coro_cctx *cctx = cctx_new ();
1473 void *stack_start;
1474 size_t stack_size;
1475 1527
1476#if HAVE_MMAP 1528 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1477 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1478 /* mmap supposedly does allocate-on-write for us */
1479 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1480
1481 if (cctx->sptr != (void *)-1)
1482 {
1483 #if CORO_STACKGUARD
1484 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1485 #endif
1486 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1487 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1488 cctx->flags |= CC_MAPPED;
1489 } 1529 {
1490 else
1491#endif
1492 {
1493 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1494 New (0, cctx->sptr, cctx_stacksize, long);
1495
1496 if (!cctx->sptr)
1497 {
1498 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1530 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1499 _exit (EXIT_FAILURE); 1531 _exit (EXIT_FAILURE);
1500 }
1501
1502 stack_start = cctx->sptr;
1503 stack_size = cctx->ssize;
1504 } 1532 }
1505 1533
1506 #if CORO_USE_VALGRIND
1507 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1508 #endif
1509
1510 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1534 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1511 1535
1512 return cctx; 1536 return cctx;
1513} 1537}
1514 1538
1515static void 1539static void
… …
1521 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1545 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1522 1546
1523 --cctx_count; 1547 --cctx_count;
1524 coro_destroy (&cctx->cctx); 1548 coro_destroy (&cctx->cctx);
1525 1549
1526 /* coro_transfer creates new, empty cctx's */ 1550 coro_stack_free (&cctx->stack);
1527 if (cctx->sptr)
1528 {
1529 #if CORO_USE_VALGRIND
1530 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1531 #endif
1532
1533#if HAVE_MMAP
1534 if (cctx->flags & CC_MAPPED)
1535 munmap (cctx->sptr, cctx->ssize);
1536 else
1537#endif
1538 Safefree (cctx->sptr);
1539 }
1540 1551
1541 Safefree (cctx); 1552 Safefree (cctx);
1542} 1553}
1543 1554
1544/* wether this cctx should be destructed */ 1555/* wether this cctx should be destructed */
… …
1563} 1574}
1564 1575
1565static void 1576static void
1566cctx_put (coro_cctx *cctx) 1577cctx_put (coro_cctx *cctx)
1567{ 1578{
1568 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1579 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1569 1580
1570 /* free another cctx if overlimit */ 1581 /* free another cctx if overlimit */
1571 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1582 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1572 { 1583 {
1573 coro_cctx *first = cctx_first; 1584 coro_cctx *first = cctx_first;
… …
1699 return; 1710 return;
1700 1711
1701 slf_destroy (aTHX_ coro); 1712 slf_destroy (aTHX_ coro);
1702 1713
1703 coro->flags |= CF_ZOMBIE; 1714 coro->flags |= CF_ZOMBIE;
1704 1715
1705 if (coro->flags & CF_READY) 1716 if (coro->flags & CF_READY)
1706 { 1717 {
1707 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1718 /* reduce nready, as destroying a ready coro effectively unreadies it */
1708 /* alternative: look through all ready queues and remove the coro */ 1719 /* alternative: look through all ready queues and remove the coro */
1709 --coro_nready; 1720 --coro_nready;
… …
1786 TRANSFER (ta, 1); 1797 TRANSFER (ta, 1);
1787} 1798}
1788 1799
1789/** Coro ********************************************************************/ 1800/** Coro ********************************************************************/
1790 1801
1791ECB_INLINE void 1802ecb_inline void
1792coro_enq (pTHX_ struct coro *coro) 1803coro_enq (pTHX_ struct coro *coro)
1793{ 1804{
1794 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1805 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1795 1806
1796 SvREFCNT_inc_NN (coro->hv); 1807 SvREFCNT_inc_NN (coro->hv);
… …
1798 coro->next_ready = 0; 1809 coro->next_ready = 0;
1799 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1810 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1800 ready [1] = coro; 1811 ready [1] = coro;
1801} 1812}
1802 1813
1803ECB_INLINE struct coro * 1814ecb_inline struct coro *
1804coro_deq (pTHX) 1815coro_deq (pTHX)
1805{ 1816{
1806 int prio; 1817 int prio;
1807 1818
1808 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1819 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1861{ 1872{
1862 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1873 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1863} 1874}
1864 1875
1865/* expects to own a reference to next->hv */ 1876/* expects to own a reference to next->hv */
1866ECB_INLINE void 1877ecb_inline void
1867prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1878prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1868{ 1879{
1869 SV *prev_sv = SvRV (coro_current); 1880 SV *prev_sv = SvRV (coro_current);
1870 1881
1871 ta->prev = SvSTATE_hv (prev_sv); 1882 ta->prev = SvSTATE_hv (prev_sv);
… …
1930 } 1941 }
1931 } 1942 }
1932 } 1943 }
1933} 1944}
1934 1945
1935ECB_INLINE void 1946ecb_inline void
1936prepare_cede (pTHX_ struct coro_transfer_args *ta) 1947prepare_cede (pTHX_ struct coro_transfer_args *ta)
1937{ 1948{
1938 api_ready (aTHX_ coro_current); 1949 api_ready (aTHX_ coro_current);
1939 prepare_schedule (aTHX_ ta); 1950 prepare_schedule (aTHX_ ta);
1940} 1951}
1941 1952
1942ECB_INLINE void 1953ecb_inline void
1943prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1954prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1944{ 1955{
1945 SV *prev = SvRV (coro_current); 1956 SV *prev = SvRV (coro_current);
1946 1957
1947 if (coro_nready) 1958 if (coro_nready)
… …
2112{ 2123{
2113 AV *od = coro->on_destroy; 2124 AV *od = coro->on_destroy;
2114 2125
2115 if (!od) 2126 if (!od)
2116 return; 2127 return;
2128
2129 coro->on_destroy = 0;
2130 sv_2mortal ((SV *)od);
2117 2131
2118 while (AvFILLp (od) >= 0) 2132 while (AvFILLp (od) >= 0)
2119 { 2133 {
2120 SV *cb = sv_2mortal (av_pop (od)); 2134 SV *cb = sv_2mortal (av_pop (od));
2121 2135
… …
2142 2156
2143static void 2157static void
2144coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2158coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2145{ 2159{
2146 AV *av; 2160 AV *av;
2147 2161
2148 if (coro->status) 2162 if (coro->status)
2149 { 2163 {
2150 av = coro->status; 2164 av = coro->status;
2151 av_clear (av); 2165 av_clear (av);
2152 } 2166 }
… …
2199 2213
2200 coro = SvSTATE (arg [0]); 2214 coro = SvSTATE (arg [0]);
2201 coro_hv = coro->hv; 2215 coro_hv = coro->hv;
2202 2216
2203 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2217 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2204 2218
2205 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2219 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2206 { 2220 {
2207 /* coro currently busy cancelling something, so just notify it */ 2221 /* coro currently busy cancelling something, so just notify it */
2208 coro->slf_frame.data = (void *)coro; 2222 coro->slf_frame.data = (void *)coro;
2209 2223
… …
2388 2402
2389static int 2403static int
2390slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2404slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2391{ 2405{
2392 SV *data = (SV *)frame->data; 2406 SV *data = (SV *)frame->data;
2393 2407
2394 if (CORO_THROW) 2408 if (CORO_THROW)
2395 return 0; 2409 return 0;
2396 2410
2397 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2411 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2398 return 1; 2412 return 1;
… …
2434 cb = sv_2mortal (coro->rouse_cb); 2448 cb = sv_2mortal (coro->rouse_cb);
2435 coro->rouse_cb = 0; 2449 coro->rouse_cb = 0;
2436 } 2450 }
2437 2451
2438 if (!SvROK (cb) 2452 if (!SvROK (cb)
2439 || SvTYPE (SvRV (cb)) != SVt_PVCV 2453 || SvTYPE (SvRV (cb)) != SVt_PVCV
2440 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2454 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2441 croak ("Coro::rouse_wait called with illegal callback argument,"); 2455 croak ("Coro::rouse_wait called with illegal callback argument,");
2442 2456
2443 { 2457 {
2444 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2458 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2947 { 2961 {
2948 int i; 2962 int i;
2949 /* if we were woken up but can't down, we look through the whole */ 2963 /* if we were woken up but can't down, we look through the whole */
2950 /* waiters list and only add us if we aren't in there already */ 2964 /* waiters list and only add us if we aren't in there already */
2951 /* this avoids some degenerate memory usage cases */ 2965 /* this avoids some degenerate memory usage cases */
2952 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug 2966 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2953 if (AvARRAY (av)[i] == coro_hv) 2967 if (AvARRAY (av)[i] == coro_hv)
2954 return 1; 2968 return 1;
2955 2969
2956 av_push (av, SvREFCNT_inc (coro_hv)); 2970 av_push (av, SvREFCNT_inc (coro_hv));
2957 return 1; 2971 return 1;
… …
3165 /* it quickly returns */ 3179 /* it quickly returns */
3166 if (CORO_THROW) 3180 if (CORO_THROW)
3167 return 0; 3181 return 0;
3168 3182
3169 /* one element that is an RV? repeat! */ 3183 /* one element that is an RV? repeat! */
3170 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3184 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3171 return 1; 3185 return 1;
3172 3186
3173 /* restore status */ 3187 /* restore status */
3174 { 3188 {
3175 SV *data_sv = av_pop (state); 3189 SV *data_sv = av_pop (state);
… …
3337#endif 3351#endif
3338 3352
3339#if CORO_JIT 3353#if CORO_JIT
3340 3354
3341static void ecb_noinline ecb_cold 3355static void ecb_noinline ecb_cold
3342pushav_3uv (pTHX_ UV a, UV b, UV c) 3356pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3343{ 3357{
3344 dSP; 3358 dSP;
3345 AV *av = newAV (); 3359 AV *av = newAV ();
3346 3360
3361 av_store (av, 3, newSVuv (d));
3347 av_store (av, 2, newSVuv (c)); 3362 av_store (av, 2, newSVuv (c));
3348 av_store (av, 1, newSVuv (b)); 3363 av_store (av, 1, newSVuv (b));
3349 av_store (av, 0, newSVuv (a)); 3364 av_store (av, 0, newSVuv (a));
3350 3365
3351 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 3366 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
… …
3358{ 3373{
3359 dSP; 3374 dSP;
3360 SV *load, *save; 3375 SV *load, *save;
3361 char *map_base; 3376 char *map_base;
3362 char *load_ptr, *save_ptr; 3377 char *load_ptr, *save_ptr;
3363 STRLEN load_len, save_len; 3378 STRLEN load_len, save_len, map_len;
3364 int count; 3379 int count;
3365 3380
3381 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3382
3366 PUSHMARK (SP); 3383 PUSHMARK (SP);
3367 PUTBACK;
3368#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type)); 3384 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3369# include "state.h" 3385 #include "state.h"
3370#undef VARx
3371 count = call_pv ("Coro::State::_jit", G_ARRAY); 3386 count = call_pv ("Coro::State::_jit", G_ARRAY);
3372 SPAGAIN; 3387 SPAGAIN;
3373 3388
3374 save = POPs; save_ptr = SvPVbyte (save, save_len); 3389 save = POPs; save_ptr = SvPVbyte (save, save_len);
3375 load = POPs; load_ptr = SvPVbyte (load, load_len); 3390 load = POPs; load_ptr = SvPVbyte (load, load_len);
3376 3391
3392 map_len = load_len + save_len + 16;
3393
3377 map_base = mmap (0, load_len + save_len + 16, PROT_EXEC | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3394 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3378 3395
3379 assert (("Coro: unable mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3396 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3380 3397
3381 load_perl_slots = (load_save_perl_slots_type)map_base; 3398 load_perl_slots = (load_save_perl_slots_type)map_base;
3382 memcpy (map_base, load_ptr, load_len); 3399 memcpy (map_base, load_ptr, load_len);
3383 3400
3384 map_base += (load_len + 15) & ~15; 3401 map_base += (load_len + 15) & ~15;
3385 3402
3386 save_perl_slots = (load_save_perl_slots_type)map_base; 3403 save_perl_slots = (load_save_perl_slots_type)map_base;
3387 memcpy (map_base, save_ptr, save_len); 3404 memcpy (map_base, save_ptr, save_len);
3405
3406 /* we are good citizens and try to make the page read-only, so the evil evil */
3407 /* hackers might have it a bit more difficult */
3408 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3409
3410 PUTBACK;
3411 eval_pv ("undef &Coro::State::_jit", 1);
3388} 3412}
3389 3413
3390#endif 3414#endif
3391 3415
3392MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3416MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
… …
3398#ifdef USE_ITHREADS 3422#ifdef USE_ITHREADS
3399# if CORO_PTHREAD 3423# if CORO_PTHREAD
3400 coro_thx = PERL_GET_CONTEXT; 3424 coro_thx = PERL_GET_CONTEXT;
3401# endif 3425# endif
3402#endif 3426#endif
3403 BOOT_PAGESIZE;
3404
3405 /* perl defines these to check for existance first, but why it doesn't */ 3427 /* perl defines these to check for existance first, but why it doesn't */
3406 /* just create them one at init time is not clear to me, except for */ 3428 /* just create them one at init time is not clear to me, except for */
3407 /* programs trying to delete them, but... */ 3429 /* programs trying to delete them, but... */
3408 /* anyway, we declare this as invalid and make sure they are initialised here */ 3430 /* anyway, we declare this as invalid and make sure they are initialised here */
3409 DEFSV; 3431 DEFSV;
… …
3460 time_init (aTHX); 3482 time_init (aTHX);
3461 3483
3462 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3484 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3463#if CORO_JIT 3485#if CORO_JIT
3464 PUTBACK; 3486 PUTBACK;
3465 require_pv ("Coro/jit-" CORO_JIT_TYPE ".pl");
3466 jit_init (aTHX); 3487 jit_init (aTHX);
3467 perl_eval_pv ("undef &Coro::State::_jit", 1);
3468 SPAGAIN; 3488 SPAGAIN;
3469#endif 3489#endif
3470} 3490}
3471 3491
3472SV * 3492SV *
… …
3481void 3501void
3482transfer (...) 3502transfer (...)
3483 PROTOTYPE: $$ 3503 PROTOTYPE: $$
3484 CODE: 3504 CODE:
3485 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3505 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3486
3487void
3488_exit (int code)
3489 PROTOTYPE: $
3490 CODE:
3491 _exit (code);
3492 3506
3493SV * 3507SV *
3494clone (Coro::State coro) 3508clone (Coro::State coro)
3495 CODE: 3509 CODE:
3496{ 3510{
… …
3551void 3565void
3552list () 3566list ()
3553 PROTOTYPE: 3567 PROTOTYPE:
3554 PPCODE: 3568 PPCODE:
3555{ 3569{
3556 struct coro *coro; 3570 struct coro *coro;
3557 for (coro = coro_first; coro; coro = coro->next) 3571 for (coro = coro_first; coro; coro = coro->next)
3558 if (coro->hv) 3572 if (coro->hv)
3559 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3573 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3560} 3574}
3561 3575
… …
3625 RETVAL = boolSV (coro->flags & ix); 3639 RETVAL = boolSV (coro->flags & ix);
3626 OUTPUT: 3640 OUTPUT:
3627 RETVAL 3641 RETVAL
3628 3642
3629void 3643void
3630throw (Coro::State self, SV *exception = &PL_sv_undef) 3644throw (SV *self, SV *exception = &PL_sv_undef)
3631 PROTOTYPE: $;$ 3645 PROTOTYPE: $;$
3632 CODE: 3646 CODE:
3633{ 3647{
3648 struct coro *coro = SvSTATE (self);
3634 struct coro *current = SvSTATE_current; 3649 struct coro *current = SvSTATE_current;
3635 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3650 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3636 SvREFCNT_dec (*exceptionp); 3651 SvREFCNT_dec (*exceptionp);
3637 SvGETMAGIC (exception); 3652 SvGETMAGIC (exception);
3638 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3653 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3654
3655 api_ready (aTHX_ self);
3639} 3656}
3640 3657
3641void 3658void
3642api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3659api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3643 PROTOTYPE: $;$ 3660 PROTOTYPE: $;$
… …
3720 3737
3721void 3738void
3722times (Coro::State self) 3739times (Coro::State self)
3723 PPCODE: 3740 PPCODE:
3724{ 3741{
3725 struct coro *current = SvSTATE (coro_current); 3742 struct coro *current = SvSTATE (coro_current);
3726 3743
3727 if (ecb_expect_false (current == self)) 3744 if (ecb_expect_false (current == self))
3728 { 3745 {
3729 coro_times_update (); 3746 coro_times_update ();
3730 coro_times_add (SvSTATE (coro_current)); 3747 coro_times_add (SvSTATE (coro_current));
… …
3773 3790
3774 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3791 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3775 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3792 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3776 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3793 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3777 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3794 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3778 3795
3779 coro_stash = gv_stashpv ("Coro", TRUE); 3796 coro_stash = gv_stashpv ("Coro", TRUE);
3780 3797
3781 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3798 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3782 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3799 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3783 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3800 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
4005 on_leave = 1 4022 on_leave = 1
4006 PROTOTYPE: & 4023 PROTOTYPE: &
4007 CODE: 4024 CODE:
4008{ 4025{
4009 struct coro *coro = SvSTATE_current; 4026 struct coro *coro = SvSTATE_current;
4010 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4027 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4011 4028
4012 block = s_get_cv_croak (block); 4029 block = s_get_cv_croak (block);
4013 4030
4014 if (!*avp) 4031 if (!*avp)
4015 *avp = newAV (); 4032 *avp = newAV ();
… …
4035 4052
4036SV * 4053SV *
4037new (SV *klass, SV *count = 0) 4054new (SV *klass, SV *count = 0)
4038 CODE: 4055 CODE:
4039{ 4056{
4040 int semcnt = 1; 4057 int semcnt = 1;
4041 4058
4042 if (count) 4059 if (count)
4043 { 4060 {
4044 SvGETMAGIC (count); 4061 SvGETMAGIC (count);
4045 4062
… …
4105 XSRETURN_NO; 4122 XSRETURN_NO;
4106} 4123}
4107 4124
4108void 4125void
4109waiters (SV *self) 4126waiters (SV *self)
4110 PPCODE: 4127 PPCODE:
4111{ 4128{
4112 AV *av = (AV *)SvRV (self); 4129 AV *av = (AV *)SvRV (self);
4113 int wcount = AvFILLp (av) + 1 - 1; 4130 int wcount = AvFILLp (av) + 1 - 1;
4114 4131
4115 if (GIMME_V == G_SCALAR) 4132 if (GIMME_V == G_SCALAR)
… …
4124} 4141}
4125 4142
4126MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4143MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4127 4144
4128void 4145void
4129_may_delete (SV *sem, int count, int extra_refs) 4146_may_delete (SV *sem, int count, unsigned int extra_refs)
4130 PPCODE: 4147 PPCODE:
4131{ 4148{
4132 AV *av = (AV *)SvRV (sem); 4149 AV *av = (AV *)SvRV (sem);
4133 4150
4134 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4151 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4135 && AvFILLp (av) == 0 /* no waiters, just count */ 4152 && AvFILLp (av) == 0 /* no waiters, just count */
4136 && SvIV (AvARRAY (av)[0]) == count) 4153 && SvIV (AvARRAY (av)[0]) == count)
4137 XSRETURN_YES; 4154 XSRETURN_YES;
… …
4158 4175
4159void 4176void
4160broadcast (SV *self) 4177broadcast (SV *self)
4161 CODE: 4178 CODE:
4162{ 4179{
4163 AV *av = (AV *)SvRV (self); 4180 AV *av = (AV *)SvRV (self);
4164 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4181 coro_signal_wake (aTHX_ av, AvFILLp (av));
4165} 4182}
4166 4183
4167void 4184void
4168send (SV *self) 4185send (SV *self)
… …
4176 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4193 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4177} 4194}
4178 4195
4179IV 4196IV
4180awaited (SV *self) 4197awaited (SV *self)
4181 CODE: 4198 CODE:
4182 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4199 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4183 OUTPUT: 4200 OUTPUT:
4184 RETVAL 4201 RETVAL
4185 4202
4186 4203
… …
4191 4208
4192void 4209void
4193_schedule (...) 4210_schedule (...)
4194 CODE: 4211 CODE:
4195{ 4212{
4196 static int incede; 4213 static int incede;
4197 4214
4198 api_cede_notself (aTHX); 4215 api_cede_notself (aTHX);
4199 4216
4200 ++incede; 4217 ++incede;
4201 while (coro_nready >= incede && api_cede (aTHX)) 4218 while (coro_nready >= incede && api_cede (aTHX))
… …
4245 { 4262 {
4246 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4263 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4247 coro_old_pp_sselect = 0; 4264 coro_old_pp_sselect = 0;
4248 } 4265 }
4249 4266
4267MODULE = Coro::State PACKAGE = Coro::Util
4268
4269void
4270_exit (int code)
4271 CODE:
4272 _exit (code);
4273
4274NV
4275time ()
4276 CODE:
4277 RETVAL = nvtime (aTHX);
4278 OUTPUT:
4279 RETVAL
4280
4281NV
4282gettimeofday ()
4283 PPCODE:
4284{
4285 UV tv [2];
4286 u2time (aTHX_ tv);
4287 EXTEND (SP, 2);
4288 PUSHs (sv_2mortal (newSVuv (tv [0])));
4289 PUSHs (sv_2mortal (newSVuv (tv [1])));
4290}
4291

Diff Legend

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