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.450 by root, Sun Jun 28 22:31:03 2015 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
19#define ECB_NO_LIBM 1
17#include "ecb.h" 20#include "ecb.h"
18 21
19#include <stddef.h> 22#include <stddef.h>
20#include <stdio.h> 23#include <stdio.h>
21#include <errno.h> 24#include <errno.h>
22#include <assert.h> 25#include <assert.h>
23 26
24#ifndef SVs_PADSTALE 27#ifndef SVs_PADSTALE
25# define SVs_PADSTALE 0 28# define SVs_PADSTALE 0
29#endif
30
31#ifdef PadARRAY
32# define NEWPADAPI 1
33# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
34#else
35typedef AV PADNAMELIST;
36# if !PERL_VERSION_ATLEAST(5,8,0)
37typedef AV PADLIST;
38typedef AV PAD;
39# endif
40# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
41# define PadlistMAX(pl) AvFILLp (pl)
42# define PadlistNAMES(pl) (*PadlistARRAY (pl))
43# define PadARRAY AvARRAY
44# define PadMAX AvFILLp
45# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
46#endif
47#ifndef PadnamelistREFCNT
48# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
49#endif
50#ifndef PadnamelistREFCNT_dec
51# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
52#endif
53
54/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
55/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
56#if PERL_VERSION_ATLEAST(5,19,0)
57# define SVt_BIND SVt_IV
26#endif 58#endif
27 59
28#if defined(_WIN32) 60#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY 61# undef HAS_GETTIMEOFDAY
30# undef setjmp 62# undef setjmp
33# define setjmp _setjmp /* deep magic */ 65# define setjmp _setjmp /* deep magic */
34#else 66#else
35# include <inttypes.h> /* most portable stdint.h */ 67# include <inttypes.h> /* most portable stdint.h */
36#endif 68#endif
37 69
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 */ 70/* the maximum number of idle cctx that will be pooled */
66static int cctx_max_idle = 4; 71static int cctx_max_idle = 4;
67 72
68#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 73#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# undef CORO_STACKGUARD 74# define HAS_SCOPESTACK_NAME 1
70#endif
71
72#ifndef CORO_STACKGUARD
73# define CORO_STACKGUARD 0
74#endif 75#endif
75 76
76/* prefer perl internal functions over our own? */ 77/* prefer perl internal functions over our own? */
77#ifndef CORO_PREFER_PERL_FUNCTIONS 78#ifndef CORO_PREFER_PERL_FUNCTIONS
78# define CORO_PREFER_PERL_FUNCTIONS 0 79# define CORO_PREFER_PERL_FUNCTIONS 0
97# if CORO_PTHREAD 98# if CORO_PTHREAD
98static void *coro_thx; 99static void *coro_thx;
99# endif 100# endif
100#endif 101#endif
101 102
102/* used in state.h */
103#define VAR(name,type) VARx(name, PL_ ## name, type)
104
105#ifdef __linux 103#ifdef __linux
106# include <time.h> /* for timespec */ 104# include <time.h> /* for timespec */
107# include <syscall.h> /* for SYS_* */ 105# include <syscall.h> /* for SYS_* */
108# ifdef SYS_clock_gettime 106# ifdef SYS_clock_gettime
109# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts)) 107# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
172typedef struct coro_cctx 170typedef struct coro_cctx
173{ 171{
174 struct coro_cctx *next; 172 struct coro_cctx *next;
175 173
176 /* the stack */ 174 /* the stack */
177 void *sptr; 175 struct coro_stack stack;
178 size_t ssize;
179 176
180 /* cpu state */ 177 /* cpu state */
181 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 178 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
179#ifndef NDEBUG
182 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 180 JMPENV *idle_te; /* same as idle_sp, but for top_env */
181#endif
183 JMPENV *top_env; 182 JMPENV *top_env;
184 coro_context cctx; 183 coro_context cctx;
185 184
186 U32 gen; 185 U32 gen;
187#if CORO_USE_VALGRIND 186#if CORO_USE_VALGRIND
207}; 206};
208 207
209/* the structure where most of the perl state is stored, overlaid on the cxstack */ 208/* the structure where most of the perl state is stored, overlaid on the cxstack */
210typedef struct 209typedef struct
211{ 210{
212#define VARx(name,expr,type) type name; 211 #define VARx(name,expr,type) type name;
213# include "state.h" 212 #include "state.h"
214#undef VARx
215} perl_slots; 213} perl_slots;
216 214
217// how many context stack entries do we need for perl_slots 215/* 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)) 216#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
219 217
220/* this is a structure representing a perl-level coroutine */ 218/* this is a structure representing a perl-level coroutine */
221struct coro 219struct coro
222{ 220{
250 SV *saved_deffh; 248 SV *saved_deffh;
251 SV *invoke_cb; 249 SV *invoke_cb;
252 AV *invoke_av; 250 AV *invoke_av;
253 251
254 /* on_enter/on_leave */ 252 /* on_enter/on_leave */
255 AV *on_enter; 253 AV *on_enter; AV *on_enter_xs;
256 AV *on_leave; 254 AV *on_leave; AV *on_leave_xs;
257 255
258 /* swap_sv */ 256 /* swap_sv */
259 AV *swap_sv; 257 AV *swap_sv;
260 258
261 /* times */ 259 /* times */
291#define coro_nready coroapi.nready 289#define coro_nready coroapi.nready
292 290
293/** JIT *********************************************************************/ 291/** JIT *********************************************************************/
294 292
295#if CORO_JIT 293#if CORO_JIT
294 /* APPLE doesn't have mmap though */
295 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
296 #ifndef CORO_JIT_TYPE 296 #ifndef CORO_JIT_TYPE
297 #if __linux && __amd64 297 #if ECB_AMD64 && CORO_JIT_UNIXY
298 #define CORO_JIT_TYPE "amd64-unix" 298 #define CORO_JIT_TYPE "amd64-unix"
299 typedef void (*load_save_perl_slots_type)(perl_slots *); 299 #elif __i386 && CORO_JIT_UNIXY
300 #else 300 #define CORO_JIT_TYPE "x86-unix"
301 #undef CORO_JIT
302 #endif 301 #endif
303 #endif 302 #endif
304#endif 303#endif
305 304
305#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
306 #undef CORO_JIT
307#endif
308
306#if CORO_JIT 309#if CORO_JIT
307 310 typedef void (*load_save_perl_slots_type)(perl_slots *);
308static load_save_perl_slots_type load_perl_slots, save_perl_slots; 311 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
309
310#endif 312#endif
311 313
312/** Coro::Select ************************************************************/ 314/** Coro::Select ************************************************************/
313 315
314static OP *(*coro_old_pp_sselect) (pTHX); 316static OP *(*coro_old_pp_sselect) (pTHX);
331 333
332/** time stuff **************************************************************/ 334/** time stuff **************************************************************/
333 335
334#ifdef HAS_GETTIMEOFDAY 336#ifdef HAS_GETTIMEOFDAY
335 337
336ECB_INLINE void 338ecb_inline void
337coro_u2time (pTHX_ UV ret[2]) 339coro_u2time (pTHX_ UV ret[2])
338{ 340{
339 struct timeval tv; 341 struct timeval tv;
340 gettimeofday (&tv, 0); 342 gettimeofday (&tv, 0);
341 343
342 ret [0] = tv.tv_sec; 344 ret [0] = tv.tv_sec;
343 ret [1] = tv.tv_usec; 345 ret [1] = tv.tv_usec;
344} 346}
345 347
346ECB_INLINE double 348ecb_inline double
347coro_nvtime () 349coro_nvtime (void)
348{ 350{
349 struct timeval tv; 351 struct timeval tv;
350 gettimeofday (&tv, 0); 352 gettimeofday (&tv, 0);
351 353
352 return tv.tv_sec + tv.tv_usec * 1e-6; 354 return tv.tv_sec + tv.tv_usec * 1e-6;
353} 355}
354 356
355ECB_INLINE void 357ecb_inline void
356time_init (pTHX) 358time_init (pTHX)
357{ 359{
358 nvtime = coro_nvtime; 360 nvtime = coro_nvtime;
359 u2time = coro_u2time; 361 u2time = coro_u2time;
360} 362}
361 363
362#else 364#else
363 365
364ECB_INLINE void 366ecb_inline void
365time_init (pTHX) 367time_init (pTHX)
366{ 368{
367 SV **svp; 369 SV **svp;
368 370
369 require_pv ("Time/HiRes.pm"); 371 require_pv ("Time/HiRes.pm");
370 372
371 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 373 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
372 374
373 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 375 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
374 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 376 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
375 377
411 get_hv (name, create); 413 get_hv (name, create);
412#endif 414#endif
413 return get_hv (name, create); 415 return get_hv (name, create);
414} 416}
415 417
416ECB_INLINE void 418ecb_inline void
417coro_times_update () 419coro_times_update (void)
418{ 420{
419#ifdef coro_clock_gettime 421#ifdef coro_clock_gettime
420 struct timespec ts; 422 struct timespec ts;
421 423
422 ts.tv_sec = ts.tv_nsec = 0; 424 ts.tv_sec = ts.tv_nsec = 0;
434 time_real [0] = tv [0]; 436 time_real [0] = tv [0];
435 time_real [1] = tv [1] * 1000; 437 time_real [1] = tv [1] * 1000;
436#endif 438#endif
437} 439}
438 440
439ECB_INLINE void 441ecb_inline void
440coro_times_add (struct coro *c) 442coro_times_add (struct coro *c)
441{ 443{
442 c->t_real [1] += time_real [1]; 444 c->t_real [1] += time_real [1];
443 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 445 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
444 c->t_real [0] += time_real [0]; 446 c->t_real [0] += time_real [0];
446 c->t_cpu [1] += time_cpu [1]; 448 c->t_cpu [1] += time_cpu [1];
447 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 449 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
448 c->t_cpu [0] += time_cpu [0]; 450 c->t_cpu [0] += time_cpu [0];
449} 451}
450 452
451ECB_INLINE void 453ecb_inline void
452coro_times_sub (struct coro *c) 454coro_times_sub (struct coro *c)
453{ 455{
454 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 456 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]; 457 c->t_real [1] -= time_real [1];
456 c->t_real [0] -= time_real [0]; 458 c->t_real [0] -= time_real [0];
477 : 0) 479 : 0)
478 480
479#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 481#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) 482#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
481 483
482ECB_INLINE MAGIC * 484ecb_inline MAGIC *
483SvSTATEhv_p (pTHX_ SV *coro) 485SvSTATEhv_p (pTHX_ SV *coro)
484{ 486{
485 MAGIC *mg; 487 MAGIC *mg;
486 488
487 if (ecb_expect_true ( 489 if (ecb_expect_true (
492 return mg; 494 return mg;
493 495
494 return 0; 496 return 0;
495} 497}
496 498
497ECB_INLINE struct coro * 499ecb_inline struct coro *
498SvSTATE_ (pTHX_ SV *coro) 500SvSTATE_ (pTHX_ SV *coro_sv)
499{ 501{
500 MAGIC *mg; 502 MAGIC *mg;
501 503
502 if (SvROK (coro)) 504 if (SvROK (coro_sv))
503 coro = SvRV (coro); 505 coro_sv = SvRV (coro_sv);
504 506
505 mg = SvSTATEhv_p (aTHX_ coro); 507 mg = SvSTATEhv_p (aTHX_ coro_sv);
506 if (!mg) 508 if (!mg)
507 croak ("Coro::State object required"); 509 croak ("Coro::State object required");
508 510
509 return (struct coro *)mg->mg_ptr; 511 return (struct coro *)mg->mg_ptr;
510} 512}
516#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 518#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
517 519
518/*****************************************************************************/ 520/*****************************************************************************/
519/* padlist management and caching */ 521/* padlist management and caching */
520 522
521ECB_INLINE AV * 523ecb_inline PADLIST *
522coro_derive_padlist (pTHX_ CV *cv) 524coro_derive_padlist (pTHX_ CV *cv)
523{ 525{
524 AV *padlist = CvPADLIST (cv); 526 PADLIST *padlist = CvPADLIST (cv);
525 AV *newpadlist, *newpad; 527 PADLIST *newpadlist;
528 PADNAMELIST *padnames;
529 PAD *newpad;
530 PADOFFSET off = PadlistMAX (padlist) + 1;
526 531
527 newpadlist = newAV (); 532#if NEWPADAPI
533
534 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
535 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
536 while (!PadlistARRAY (padlist)[off - 1])
537 --off;
538
539 Perl_pad_push (aTHX_ padlist, off);
540
541 newpad = PadlistARRAY (padlist)[off];
542 PadlistARRAY (padlist)[off] = 0;
543
544#else
545
546#if PERL_VERSION_ATLEAST (5,10,0)
547 Perl_pad_push (aTHX_ padlist, off);
548#else
549 Perl_pad_push (aTHX_ padlist, off, 1);
550#endif
551
552 newpad = PadlistARRAY (padlist)[off];
553 PadlistMAX (padlist) = off - 1;
554
555#endif
556
557 newPADLIST (newpadlist);
558#if !PERL_VERSION_ATLEAST(5,15,3)
559 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
528 AvREAL_off (newpadlist); 560 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 561#endif
534 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
535 --AvFILLp (padlist);
536 562
537 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 563 /* Already extended to 2 elements by newPADLIST. */
538 av_store (newpadlist, 1, (SV *)newpad); 564 PadlistMAX (newpadlist) = 1;
565
566 padnames = PadlistNAMES (padlist);
567 ++PadnamelistREFCNT (padnames);
568 PadlistNAMES (newpadlist) = padnames;
569
570 PadlistARRAY (newpadlist)[1] = newpad;
539 571
540 return newpadlist; 572 return newpadlist;
541} 573}
542 574
543ECB_INLINE void 575ecb_inline void
544free_padlist (pTHX_ AV *padlist) 576free_padlist (pTHX_ PADLIST *padlist)
545{ 577{
546 /* may be during global destruction */ 578 /* may be during global destruction */
547 if (!IN_DESTRUCT) 579 if (!IN_DESTRUCT)
548 { 580 {
549 I32 i = AvFILLp (padlist); 581 I32 i = PadlistMAX (padlist);
550 582
551 while (i > 0) /* special-case index 0 */ 583 while (i > 0) /* special-case index 0 */
552 { 584 {
553 /* we try to be extra-careful here */ 585 /* we try to be extra-careful here */
554 AV *av = (AV *)AvARRAY (padlist)[i--]; 586 PAD *pad = PadlistARRAY (padlist)[i--];
555 I32 j = AvFILLp (av);
556 587
588 if (pad)
589 {
590 I32 j = PadMAX (pad);
591
557 while (j >= 0) 592 while (j >= 0)
558 SvREFCNT_dec (AvARRAY (av)[j--]); 593 SvREFCNT_dec (PadARRAY (pad)[j--]);
559 594
560 AvFILLp (av) = -1; 595 PadMAX (pad) = -1;
561 SvREFCNT_dec (av); 596 SvREFCNT_dec (pad);
597 }
562 } 598 }
563 599
564 SvREFCNT_dec (AvARRAY (padlist)[0]); 600 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
565 601
602#if NEWPADAPI
603 Safefree (PadlistARRAY (padlist));
604 Safefree (padlist);
605#else
566 AvFILLp (padlist) = -1; 606 AvFILLp (padlist) = -1;
607 AvREAL_off (padlist);
567 SvREFCNT_dec ((SV*)padlist); 608 SvREFCNT_dec ((SV*)padlist);
609#endif
568 } 610 }
569} 611}
570 612
571static int 613static int
572coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 614coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
573{ 615{
574 AV *padlist; 616 PADLIST *padlist;
575 AV *av = (AV *)mg->mg_obj; 617 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
618 size_t len = *(size_t *)mg->mg_ptr;
576 619
577 /* perl manages to free our internal AV and _then_ call us */ 620 /* perl manages to free our internal AV and _then_ call us */
578 if (IN_DESTRUCT) 621 if (IN_DESTRUCT)
579 return 0; 622 return 0;
580 623
581 /* casting is fun. */ 624 while (len--)
582 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
583 free_padlist (aTHX_ padlist); 625 free_padlist (aTHX_ padlists[len]);
584
585 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
586 626
587 return 0; 627 return 0;
588} 628}
589 629
590static MGVTBL coro_cv_vtbl = { 630static MGVTBL coro_cv_vtbl = {
591 0, 0, 0, 0, 631 0, 0, 0, 0,
592 coro_cv_free 632 coro_cv_free
593}; 633};
594 634
595/* the next two functions merely cache the padlists */ 635/* the next two functions merely cache the padlists */
596ECB_INLINE void 636ecb_inline void
597get_padlist (pTHX_ CV *cv) 637get_padlist (pTHX_ CV *cv)
598{ 638{
599 MAGIC *mg = CORO_MAGIC_cv (cv); 639 MAGIC *mg = CORO_MAGIC_cv (cv);
600 AV *av; 640 size_t *lenp;
601 641
602 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 642 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
603 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 643 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
604 else 644 else
605 { 645 {
606#if CORO_PREFER_PERL_FUNCTIONS 646#if CORO_PREFER_PERL_FUNCTIONS
607 /* this is probably cleaner? but also slower! */ 647 /* this is probably cleaner? but also slower! */
608 /* in practise, it seems to be less stable */ 648 /* in practise, it seems to be less stable */
614 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 654 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
615#endif 655#endif
616 } 656 }
617} 657}
618 658
619ECB_INLINE void 659ecb_inline void
620put_padlist (pTHX_ CV *cv) 660put_padlist (pTHX_ CV *cv)
621{ 661{
622 MAGIC *mg = CORO_MAGIC_cv (cv); 662 MAGIC *mg = CORO_MAGIC_cv (cv);
623 AV *av;
624 663
625 if (ecb_expect_false (!mg)) 664 if (ecb_expect_false (!mg))
665 {
626 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 666 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
667 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
668 mg->mg_len = 1; /* so mg_free frees mg_ptr */
669 }
670 else
671 Renew (mg->mg_ptr,
672 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
673 char);
627 674
628 av = (AV *)mg->mg_obj; 675 ((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} 676}
635 677
636/** load & save, init *******************************************************/ 678/** load & save, init *******************************************************/
637 679
680ecb_inline void
681swap_sv (SV *a, SV *b)
682{
683 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
684 SV tmp;
685
686 /* swap sv_any */
687 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
688
689 /* swap sv_flags */
690 SvFLAGS (&tmp) = SvFLAGS (a);
691 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
692 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
693
694#if PERL_VERSION_ATLEAST (5,10,0)
695 /* perl 5.10 and later complicates this _quite_ a bit, but it also
696 * is much faster, so no quarrels here. alternatively, we could
697 * sv_upgrade to avoid this.
698 */
699 {
700 /* swap sv_u */
701 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
702
703 /* if SvANY points to the head, we need to adjust the pointers,
704 * as the pointer for a still points to b, and maybe vice versa.
705 */
706 #define svany_in_head(type) \
707 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
708
709 if (svany_in_head (SvTYPE (a)))
710 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
711
712 if (svany_in_head (SvTYPE (b)))
713 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
714 }
715#endif
716}
717
638/* swap sv heads, at least logically */ 718/* swap sv heads, at least logically */
639static void 719static void
640swap_svs (pTHX_ Coro__State c) 720swap_svs (pTHX_ Coro__State c)
641{ 721{
642 int i; 722 int i;
643 723
644 for (i = 0; i <= AvFILLp (c->swap_sv); ) 724 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
645 { 725 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} 726}
684 727
685#define SWAP_SVS(coro) \ 728#define SWAP_SVS(coro) \
686 if (ecb_expect_false ((coro)->swap_sv)) \ 729 if (ecb_expect_false ((coro)->swap_sv)) \
687 swap_svs (aTHX_ (coro)) 730 swap_svs (aTHX_ (coro))
699 742
700#if CORO_JIT 743#if CORO_JIT
701 load_perl_slots (slot); 744 load_perl_slots (slot);
702#else 745#else
703 #define VARx(name,expr,type) expr = slot->name; 746 #define VARx(name,expr,type) expr = slot->name;
704 # include "state.h" 747 #include "state.h"
705 #undef VARx
706#endif 748#endif
707 749
708 { 750 {
709 dSP; 751 dSP;
710 752
713 /* now do the ugly restore mess */ 755 /* now do the ugly restore mess */
714 while (ecb_expect_true (cv = (CV *)POPs)) 756 while (ecb_expect_true (cv = (CV *)POPs))
715 { 757 {
716 put_padlist (aTHX_ cv); /* mark this padlist as available */ 758 put_padlist (aTHX_ cv); /* mark this padlist as available */
717 CvDEPTH (cv) = PTR2IV (POPs); 759 CvDEPTH (cv) = PTR2IV (POPs);
718 CvPADLIST (cv) = (AV *)POPs; 760 CvPADLIST (cv) = (PADLIST *)POPs;
719 } 761 }
720 762
721 PUTBACK; 763 PUTBACK;
722 } 764 }
723 765
738 780
739 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 781 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
740 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 782 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
741 } 783 }
742 784
785 if (ecb_expect_false (c->on_enter_xs))
786 {
787 int i;
788
789 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
790 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
791 }
792
743 SWAP_SVS (c); 793 SWAP_SVS (c);
744} 794}
745 795
746static void 796static void
747save_perl (pTHX_ Coro__State c) 797save_perl (pTHX_ Coro__State c)
748{ 798{
749 SWAP_SVS (c); 799 SWAP_SVS (c);
800
801 if (ecb_expect_false (c->on_leave_xs))
802 {
803 int i;
804
805 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
806 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
807 }
750 808
751 if (ecb_expect_false (c->on_leave)) 809 if (ecb_expect_false (c->on_leave))
752 { 810 {
753 int i; 811 int i;
754 812
813 871
814 PUTBACK; 872 PUTBACK;
815 } 873 }
816 874
817 /* allocate some space on the context stack for our purposes */ 875 /* allocate some space on the context stack for our purposes */
818 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 876 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
819 { 877 {
820 unsigned int i; 878 unsigned int i;
821 879
822 for (i = 0; i < SLOT_COUNT; ++i) 880 for (i = 0; i < SLOT_COUNT; ++i)
823 CXINC; 881 CXINC;
832 890
833#if CORO_JIT 891#if CORO_JIT
834 save_perl_slots (slot); 892 save_perl_slots (slot);
835#else 893#else
836 #define VARx(name,expr,type) slot->name = expr; 894 #define VARx(name,expr,type) slot->name = expr;
837 # include "state.h" 895 #include "state.h"
838 #undef VARx
839#endif 896#endif
840 } 897 }
841} 898}
842 899
843/* 900/*
875#endif 932#endif
876 933
877 New(54,PL_scopestack,8,I32); 934 New(54,PL_scopestack,8,I32);
878 PL_scopestack_ix = 0; 935 PL_scopestack_ix = 0;
879 PL_scopestack_max = 8; 936 PL_scopestack_max = 8;
937#if HAS_SCOPESTACK_NAME
938 New(54,PL_scopestack_name,8,const char*);
939#endif
880 940
881 New(54,PL_savestack,24,ANY); 941 New(54,PL_savestack,24,ANY);
882 PL_savestack_ix = 0; 942 PL_savestack_ix = 0;
883 PL_savestack_max = 24; 943 PL_savestack_max = 24;
884 944
912 } 972 }
913 973
914 Safefree (PL_tmps_stack); 974 Safefree (PL_tmps_stack);
915 Safefree (PL_markstack); 975 Safefree (PL_markstack);
916 Safefree (PL_scopestack); 976 Safefree (PL_scopestack);
977#if HAS_SCOPESTACK_NAME
978 Safefree (PL_scopestack_name);
979#endif
917 Safefree (PL_savestack); 980 Safefree (PL_savestack);
918#if !PERL_VERSION_ATLEAST (5,10,0) 981#if !PERL_VERSION_ATLEAST (5,10,0)
919 Safefree (PL_retstack); 982 Safefree (PL_retstack);
920#endif 983#endif
921} 984}
981 { 1044 {
982 SV **svp = 0; 1045 SV **svp = 0;
983 1046
984 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1047 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
985 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1048 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
986 1049
987 if (svp) 1050 if (svp)
988 { 1051 {
989 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1052 SV *ssv;
1053
1054 if (!*svp)
1055 ssv = &PL_sv_undef;
1056 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1057 ssv = sv_2mortal (newRV_inc (*svp));
1058 else
1059 ssv = *svp;
1060
1061 sv_setsv (sv, ssv);
990 return 0; 1062 return 0;
991 } 1063 }
992 } 1064 }
993 1065
994 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1066 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1088 PL_hints = 0; 1160 PL_hints = 0;
1089 1161
1090 /* recreate the die/warn hooks */ 1162 /* recreate the die/warn hooks */
1091 PL_diehook = SvREFCNT_inc (rv_diehook); 1163 PL_diehook = SvREFCNT_inc (rv_diehook);
1092 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1164 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1093 1165
1094 GvSV (PL_defgv) = newSV (0); 1166 GvSV (PL_defgv) = newSV (0);
1095 GvAV (PL_defgv) = coro->args; coro->args = 0; 1167 GvAV (PL_defgv) = coro->args; coro->args = 0;
1096 GvSV (PL_errgv) = newSV (0); 1168 GvSV (PL_errgv) = newSV (0);
1097 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1169 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1098 GvHV (PL_hintgv) = 0; 1170 GvHV (PL_hintgv) = newHV ();
1171#if PERL_VERSION_ATLEAST (5,10,0)
1172 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1173#endif
1099 PL_rs = newSVsv (GvSV (irsgv)); 1174 PL_rs = newSVsv (GvSV (irsgv));
1100 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1175 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1101 1176
1102 { 1177 {
1103 dSP; 1178 dSP;
1186 /* restore swapped sv's */ 1261 /* restore swapped sv's */
1187 SWAP_SVS (coro); 1262 SWAP_SVS (coro);
1188 1263
1189 coro_destruct_stacks (aTHX); 1264 coro_destruct_stacks (aTHX);
1190 1265
1191 // now save some sv's to be free'd later 1266 /* now save some sv's to be free'd later */
1192 svf [0] = GvSV (PL_defgv); 1267 svf [0] = GvSV (PL_defgv);
1193 svf [1] = (SV *)GvAV (PL_defgv); 1268 svf [1] = (SV *)GvAV (PL_defgv);
1194 svf [2] = GvSV (PL_errgv); 1269 svf [2] = GvSV (PL_errgv);
1195 svf [3] = (SV *)PL_defoutgv; 1270 svf [3] = (SV *)PL_defoutgv;
1196 svf [4] = PL_rs; 1271 svf [4] = PL_rs;
1213 1288
1214 SvREFCNT_dec (coro->saved_deffh); 1289 SvREFCNT_dec (coro->saved_deffh);
1215 SvREFCNT_dec (coro->rouse_cb); 1290 SvREFCNT_dec (coro->rouse_cb);
1216 SvREFCNT_dec (coro->invoke_cb); 1291 SvREFCNT_dec (coro->invoke_cb);
1217 SvREFCNT_dec (coro->invoke_av); 1292 SvREFCNT_dec (coro->invoke_av);
1293 SvREFCNT_dec (coro->on_enter_xs);
1294 SvREFCNT_dec (coro->on_leave_xs);
1218 } 1295 }
1219} 1296}
1220 1297
1221ECB_INLINE void 1298ecb_inline void
1222free_coro_mortal (pTHX) 1299free_coro_mortal (pTHX)
1223{ 1300{
1224 if (ecb_expect_true (coro_mortal)) 1301 if (ecb_expect_true (coro_mortal))
1225 { 1302 {
1226 SvREFCNT_dec ((SV *)coro_mortal); 1303 SvREFCNT_dec ((SV *)coro_mortal);
1285 1362
1286 if (PL_curcop != &PL_compiling) 1363 if (PL_curcop != &PL_compiling)
1287 { 1364 {
1288 SV **cb; 1365 SV **cb;
1289 1366
1290 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1367 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1291 { 1368 {
1292 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1369 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1293 1370
1294 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1371 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1295 { 1372 {
1385 slf_frame.prepare = slf_prepare_set_stacklevel; 1462 slf_frame.prepare = slf_prepare_set_stacklevel;
1386 slf_frame.check = slf_check_set_stacklevel; 1463 slf_frame.check = slf_check_set_stacklevel;
1387} 1464}
1388 1465
1389/* the tail of transfer: execute stuff we can only do after a transfer */ 1466/* the tail of transfer: execute stuff we can only do after a transfer */
1390ECB_INLINE void 1467ecb_inline void
1391transfer_tail (pTHX) 1468transfer_tail (pTHX)
1392{ 1469{
1393 free_coro_mortal (aTHX); 1470 free_coro_mortal (aTHX);
1471}
1472
1473/* try to exit the same way perl's main function would do */
1474/* we do not bother resetting the environment or other things *7
1475/* that are not, uhm, essential */
1476/* this obviously also doesn't work when perl is embedded */
1477static void ecb_noinline ecb_cold
1478perlish_exit (pTHX)
1479{
1480 int exitstatus = perl_destruct (PL_curinterp);
1481 perl_free (PL_curinterp);
1482 exit (exitstatus);
1394} 1483}
1395 1484
1396/* 1485/*
1397 * this is a _very_ stripped down perl interpreter ;) 1486 * this is a _very_ stripped down perl interpreter ;)
1398 */ 1487 */
1427 */ 1516 */
1428 1517
1429 /* 1518 /*
1430 * If perl-run returns we assume exit() was being called or the coro 1519 * 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) 1520 * 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 1521 * 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" 1522 * 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 */ 1523 */
1438 PL_top_env = main_top_env; 1524 perlish_exit (aTHX);
1439 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1440 } 1525 }
1441} 1526}
1442 1527
1443static coro_cctx * 1528static coro_cctx *
1444cctx_new () 1529cctx_new (void)
1445{ 1530{
1446 coro_cctx *cctx; 1531 coro_cctx *cctx;
1447 1532
1448 ++cctx_count; 1533 ++cctx_count;
1449 New (0, cctx, 1, coro_cctx); 1534 New (0, cctx, 1, coro_cctx);
1455 return cctx; 1540 return cctx;
1456} 1541}
1457 1542
1458/* create a new cctx only suitable as source */ 1543/* create a new cctx only suitable as source */
1459static coro_cctx * 1544static coro_cctx *
1460cctx_new_empty () 1545cctx_new_empty (void)
1461{ 1546{
1462 coro_cctx *cctx = cctx_new (); 1547 coro_cctx *cctx = cctx_new ();
1463 1548
1464 cctx->sptr = 0; 1549 cctx->stack.sptr = 0;
1465 coro_create (&cctx->cctx, 0, 0, 0, 0); 1550 coro_create (&cctx->cctx, 0, 0, 0, 0);
1466 1551
1467 return cctx; 1552 return cctx;
1468} 1553}
1469 1554
1470/* create a new cctx suitable as destination/running a perl interpreter */ 1555/* create a new cctx suitable as destination/running a perl interpreter */
1471static coro_cctx * 1556static coro_cctx *
1472cctx_new_run () 1557cctx_new_run (void)
1473{ 1558{
1474 coro_cctx *cctx = cctx_new (); 1559 coro_cctx *cctx = cctx_new ();
1475 void *stack_start;
1476 size_t stack_size;
1477 1560
1478#if HAVE_MMAP 1561 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 } 1562 {
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."); 1563 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1501 _exit (EXIT_FAILURE); 1564 _exit (EXIT_FAILURE);
1502 }
1503
1504 stack_start = cctx->sptr;
1505 stack_size = cctx->ssize;
1506 } 1565 }
1507 1566
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); 1567 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1513 1568
1514 return cctx; 1569 return cctx;
1515} 1570}
1516 1571
1517static void 1572static void
1523 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1578 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1524 1579
1525 --cctx_count; 1580 --cctx_count;
1526 coro_destroy (&cctx->cctx); 1581 coro_destroy (&cctx->cctx);
1527 1582
1528 /* coro_transfer creates new, empty cctx's */ 1583 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 1584
1543 Safefree (cctx); 1585 Safefree (cctx);
1544} 1586}
1545 1587
1546/* wether this cctx should be destructed */ 1588/* wether this cctx should be destructed */
1565} 1607}
1566 1608
1567static void 1609static void
1568cctx_put (coro_cctx *cctx) 1610cctx_put (coro_cctx *cctx)
1569{ 1611{
1570 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1612 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1571 1613
1572 /* free another cctx if overlimit */ 1614 /* free another cctx if overlimit */
1573 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1615 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1574 { 1616 {
1575 coro_cctx *first = cctx_first; 1617 coro_cctx *first = cctx_first;
1701 return; 1743 return;
1702 1744
1703 slf_destroy (aTHX_ coro); 1745 slf_destroy (aTHX_ coro);
1704 1746
1705 coro->flags |= CF_ZOMBIE; 1747 coro->flags |= CF_ZOMBIE;
1706 1748
1707 if (coro->flags & CF_READY) 1749 if (coro->flags & CF_READY)
1708 { 1750 {
1709 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1751 /* reduce nready, as destroying a ready coro effectively unreadies it */
1710 /* alternative: look through all ready queues and remove the coro */ 1752 /* alternative: look through all ready queues and remove the coro */
1711 --coro_nready; 1753 --coro_nready;
1788 TRANSFER (ta, 1); 1830 TRANSFER (ta, 1);
1789} 1831}
1790 1832
1791/** Coro ********************************************************************/ 1833/** Coro ********************************************************************/
1792 1834
1793ECB_INLINE void 1835ecb_inline void
1794coro_enq (pTHX_ struct coro *coro) 1836coro_enq (pTHX_ struct coro *coro)
1795{ 1837{
1796 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1838 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1797 1839
1798 SvREFCNT_inc_NN (coro->hv); 1840 SvREFCNT_inc_NN (coro->hv);
1800 coro->next_ready = 0; 1842 coro->next_ready = 0;
1801 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1843 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1802 ready [1] = coro; 1844 ready [1] = coro;
1803} 1845}
1804 1846
1805ECB_INLINE struct coro * 1847ecb_inline struct coro *
1806coro_deq (pTHX) 1848coro_deq (pTHX)
1807{ 1849{
1808 int prio; 1850 int prio;
1809 1851
1810 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1852 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1863{ 1905{
1864 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1906 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1865} 1907}
1866 1908
1867/* expects to own a reference to next->hv */ 1909/* expects to own a reference to next->hv */
1868ECB_INLINE void 1910ecb_inline void
1869prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1911prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1870{ 1912{
1871 SV *prev_sv = SvRV (coro_current); 1913 SV *prev_sv = SvRV (coro_current);
1872 1914
1873 ta->prev = SvSTATE_hv (prev_sv); 1915 ta->prev = SvSTATE_hv (prev_sv);
1907 /* nothing to schedule: call the idle handler */ 1949 /* nothing to schedule: call the idle handler */
1908 if (SvROK (sv_idle) 1950 if (SvROK (sv_idle)
1909 && SvOBJECT (SvRV (sv_idle))) 1951 && SvOBJECT (SvRV (sv_idle)))
1910 { 1952 {
1911 if (SvRV (sv_idle) == SvRV (coro_current)) 1953 if (SvRV (sv_idle) == SvRV (coro_current))
1954 {
1955 require_pv ("Carp");
1956
1957 {
1958 dSP;
1959
1960 ENTER;
1961 SAVETMPS;
1962
1963 PUSHMARK (SP);
1912 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1964 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1965 PUTBACK;
1966 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1967
1968 FREETMPS;
1969 LEAVE;
1970 }
1971 }
1913 1972
1914 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1973 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1915 api_ready (aTHX_ SvRV (sv_idle)); 1974 api_ready (aTHX_ SvRV (sv_idle));
1916 --coro_nready; 1975 --coro_nready;
1917 } 1976 }
1932 } 1991 }
1933 } 1992 }
1934 } 1993 }
1935} 1994}
1936 1995
1937ECB_INLINE void 1996ecb_inline void
1938prepare_cede (pTHX_ struct coro_transfer_args *ta) 1997prepare_cede (pTHX_ struct coro_transfer_args *ta)
1939{ 1998{
1940 api_ready (aTHX_ coro_current); 1999 api_ready (aTHX_ coro_current);
1941 prepare_schedule (aTHX_ ta); 2000 prepare_schedule (aTHX_ ta);
1942} 2001}
1943 2002
1944ECB_INLINE void 2003ecb_inline void
1945prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2004prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1946{ 2005{
1947 SV *prev = SvRV (coro_current); 2006 SV *prev = SvRV (coro_current);
1948 2007
1949 if (coro_nready) 2008 if (coro_nready)
2114{ 2173{
2115 AV *od = coro->on_destroy; 2174 AV *od = coro->on_destroy;
2116 2175
2117 if (!od) 2176 if (!od)
2118 return; 2177 return;
2178
2179 coro->on_destroy = 0;
2180 sv_2mortal ((SV *)od);
2119 2181
2120 while (AvFILLp (od) >= 0) 2182 while (AvFILLp (od) >= 0)
2121 { 2183 {
2122 SV *cb = sv_2mortal (av_pop (od)); 2184 SV *cb = sv_2mortal (av_pop (od));
2123 2185
2144 2206
2145static void 2207static void
2146coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2208coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2147{ 2209{
2148 AV *av; 2210 AV *av;
2149 2211
2150 if (coro->status) 2212 if (coro->status)
2151 { 2213 {
2152 av = coro->status; 2214 av = coro->status;
2153 av_clear (av); 2215 av_clear (av);
2154 } 2216 }
2201 2263
2202 coro = SvSTATE (arg [0]); 2264 coro = SvSTATE (arg [0]);
2203 coro_hv = coro->hv; 2265 coro_hv = coro->hv;
2204 2266
2205 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2267 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2206 2268
2207 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2269 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2208 { 2270 {
2209 /* coro currently busy cancelling something, so just notify it */ 2271 /* coro currently busy cancelling something, so just notify it */
2210 coro->slf_frame.data = (void *)coro; 2272 coro->slf_frame.data = (void *)coro;
2211 2273
2218 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2280 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2219 } 2281 }
2220 else 2282 else
2221 { 2283 {
2222 struct coro *self = SvSTATE_current; 2284 struct coro *self = SvSTATE_current;
2285
2286 if (!self)
2287 croak ("Coro::cancel called outside of thread content,");
2223 2288
2224 /* otherwise we cancel directly, purely for speed reasons 2289 /* otherwise we cancel directly, purely for speed reasons
2225 * unfortunately, this requires some magic trickery, as 2290 * unfortunately, this requires some magic trickery, as
2226 * somebody else could cancel us, so we have to fight the cancellation. 2291 * somebody else could cancel us, so we have to fight the cancellation.
2227 * this is ugly, and hopefully fully worth the extra speed. 2292 * this is ugly, and hopefully fully worth the extra speed.
2390 2455
2391static int 2456static int
2392slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2457slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2393{ 2458{
2394 SV *data = (SV *)frame->data; 2459 SV *data = (SV *)frame->data;
2395 2460
2396 if (CORO_THROW) 2461 if (CORO_THROW)
2397 return 0; 2462 return 0;
2398 2463
2399 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2464 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2400 return 1; 2465 return 1;
2436 cb = sv_2mortal (coro->rouse_cb); 2501 cb = sv_2mortal (coro->rouse_cb);
2437 coro->rouse_cb = 0; 2502 coro->rouse_cb = 0;
2438 } 2503 }
2439 2504
2440 if (!SvROK (cb) 2505 if (!SvROK (cb)
2441 || SvTYPE (SvRV (cb)) != SVt_PVCV 2506 || SvTYPE (SvRV (cb)) != SVt_PVCV
2442 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2507 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2443 croak ("Coro::rouse_wait called with illegal callback argument,"); 2508 croak ("Coro::rouse_wait called with illegal callback argument,");
2444 2509
2445 { 2510 {
2446 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2511 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2569 2634
2570/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2635/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2571static void 2636static void
2572slf_destroy (pTHX_ struct coro *coro) 2637slf_destroy (pTHX_ struct coro *coro)
2573{ 2638{
2574 /* this callback is reserved for slf functions needing to do cleanup */ 2639 struct CoroSLF frame = coro->slf_frame;
2575 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2576 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2577 2640
2578 /* 2641 /*
2579 * The on_destroy above most likely is from an SLF call. 2642 * The on_destroy below most likely is from an SLF call.
2580 * Since by definition the SLF call will not finish when we destroy 2643 * Since by definition the SLF call will not finish when we destroy
2581 * the coro, we will have to force-finish it here, otherwise 2644 * the coro, we will have to force-finish it here, otherwise
2582 * cleanup functions cannot call SLF functions. 2645 * cleanup functions cannot call SLF functions.
2583 */ 2646 */
2584 coro->slf_frame.prepare = 0; 2647 coro->slf_frame.prepare = 0;
2648
2649 /* this callback is reserved for slf functions needing to do cleanup */
2650 if (frame.destroy && frame.prepare && !PL_dirty)
2651 frame.destroy (aTHX_ &frame);
2585} 2652}
2586 2653
2587/* 2654/*
2588 * these not obviously related functions are all rolled into one 2655 * these not obviously related functions are all rolled into one
2589 * function to increase chances that they all will call transfer with the same 2656 * function to increase chances that they all will call transfer with the same
2772static void 2839static void
2773coro_pop_on_leave (pTHX_ void *coro) 2840coro_pop_on_leave (pTHX_ void *coro)
2774{ 2841{
2775 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2842 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2776 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2843 on_enterleave_call (aTHX_ sv_2mortal (cb));
2844}
2845
2846static void
2847enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2848{
2849 if (!hook)
2850 return;
2851
2852 if (!*avp)
2853 {
2854 *avp = newAV ();
2855 AvREAL_off (*avp);
2856 }
2857
2858 av_push (*avp, (SV *)hook);
2859 av_push (*avp, (SV *)arg);
2860}
2861
2862static void
2863enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2864{
2865 AV *av = *avp;
2866 int i;
2867
2868 if (!av)
2869 return;
2870
2871 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2872 if (AvARRAY (av)[i] == (SV *)hook)
2873 {
2874 if (execute)
2875 hook ((void *)AvARRAY (av)[i + 1]);
2876
2877 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2878 av_pop (av);
2879 av_pop (av);
2880 break;
2881 }
2882
2883 if (AvFILLp (av) >= 0)
2884 {
2885 *avp = 0;
2886 SvREFCNT_dec_NN (av);
2887 }
2888}
2889
2890static void
2891api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2892{
2893 struct coro *coro = SvSTATE (coro_sv);
2894
2895 if (SvSTATE_current == coro)
2896 if (enter)
2897 enter (aTHX enter_arg);
2898
2899 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2900 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2901}
2902
2903static void
2904api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2905{
2906 struct coro *coro = SvSTATE (coro_sv);
2907
2908 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2909 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2910}
2911
2912static void
2913savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2914{
2915 struct coro *coro = SvSTATE_current;
2916
2917 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2918}
2919
2920static void
2921savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2922{
2923 struct coro *coro = SvSTATE_current;
2924
2925 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2926}
2927
2928static void
2929api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2930{
2931 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2932
2933 /* this ought to be much cheaper than malloc + a single destructor call */
2934 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2935 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2777} 2936}
2778 2937
2779/*****************************************************************************/ 2938/*****************************************************************************/
2780/* PerlIO::cede */ 2939/* PerlIO::cede */
2781 2940
2911 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3070 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2912 PUTBACK; 3071 PUTBACK;
2913 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3072 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2914 } 3073 }
2915 3074
2916 SvREFCNT_dec (cb); 3075 SvREFCNT_dec_NN (cb);
2917 } 3076 }
2918} 3077}
2919 3078
2920static void 3079static void
2921coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3080coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2929{ 3088{
2930 AV *av = (AV *)frame->data; 3089 AV *av = (AV *)frame->data;
2931 SV *count_sv = AvARRAY (av)[0]; 3090 SV *count_sv = AvARRAY (av)[0];
2932 SV *coro_hv = SvRV (coro_current); 3091 SV *coro_hv = SvRV (coro_current);
2933 3092
3093 frame->destroy = 0;
3094
2934 /* if we are about to throw, don't actually acquire the lock, just throw */ 3095 /* if we are about to throw, don't actually acquire the lock, just throw */
2935 if (CORO_THROW) 3096 if (ecb_expect_false (CORO_THROW))
3097 {
3098 /* we still might be responsible for the semaphore, so wake up others */
3099 coro_semaphore_adjust (aTHX_ av, 0);
3100
2936 return 0; 3101 return 0;
3102 }
2937 else if (SvIVX (count_sv) > 0) 3103 else if (SvIVX (count_sv) > 0)
2938 { 3104 {
2939 frame->destroy = 0;
2940
2941 if (acquire) 3105 if (acquire)
2942 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3106 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2943 else 3107 else
2944 coro_semaphore_adjust (aTHX_ av, 0); 3108 coro_semaphore_adjust (aTHX_ av, 0);
2945 3109
2949 { 3113 {
2950 int i; 3114 int i;
2951 /* if we were woken up but can't down, we look through the whole */ 3115 /* 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 */ 3116 /* waiters list and only add us if we aren't in there already */
2953 /* this avoids some degenerate memory usage cases */ 3117 /* this avoids some degenerate memory usage cases */
2954 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug 3118 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2955 if (AvARRAY (av)[i] == coro_hv) 3119 if (AvARRAY (av)[i] == coro_hv)
2956 return 1; 3120 return 1;
2957 3121
2958 av_push (av, SvREFCNT_inc (coro_hv)); 3122 av_push (av, SvREFCNT_inc (coro_hv));
2959 return 1; 3123 return 1;
3056 { 3220 {
3057 api_ready (aTHX_ cb); 3221 api_ready (aTHX_ cb);
3058 sv_setiv (cb, 0); /* signal waiter */ 3222 sv_setiv (cb, 0); /* signal waiter */
3059 } 3223 }
3060 3224
3061 SvREFCNT_dec (cb); 3225 SvREFCNT_dec_NN (cb);
3062 3226
3063 --count; 3227 --count;
3064 } 3228 }
3065} 3229}
3066 3230
3151 } 3315 }
3152 3316
3153 av_push (state, data_sv); 3317 av_push (state, data_sv);
3154 3318
3155 api_ready (aTHX_ coro); 3319 api_ready (aTHX_ coro);
3156 SvREFCNT_dec (coro); 3320 SvREFCNT_dec_NN (coro);
3157 SvREFCNT_dec ((AV *)state); 3321 SvREFCNT_dec_NN ((AV *)state);
3158} 3322}
3159 3323
3160static int 3324static int
3161slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3325slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3162{ 3326{
3167 /* it quickly returns */ 3331 /* it quickly returns */
3168 if (CORO_THROW) 3332 if (CORO_THROW)
3169 return 0; 3333 return 0;
3170 3334
3171 /* one element that is an RV? repeat! */ 3335 /* one element that is an RV? repeat! */
3172 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3336 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3173 return 1; 3337 return 1;
3174 3338
3175 /* restore status */ 3339 /* restore status */
3176 { 3340 {
3177 SV *data_sv = av_pop (state); 3341 SV *data_sv = av_pop (state);
3180 errno = data->errorno; 3344 errno = data->errorno;
3181 PL_laststype = data->laststype; 3345 PL_laststype = data->laststype;
3182 PL_laststatval = data->laststatval; 3346 PL_laststatval = data->laststatval;
3183 PL_statcache = data->statcache; 3347 PL_statcache = data->statcache;
3184 3348
3185 SvREFCNT_dec (data_sv); 3349 SvREFCNT_dec_NN (data_sv);
3186 } 3350 }
3187 3351
3188 /* push result values */ 3352 /* push result values */
3189 { 3353 {
3190 dSP; 3354 dSP;
3339#endif 3503#endif
3340 3504
3341#if CORO_JIT 3505#if CORO_JIT
3342 3506
3343static void ecb_noinline ecb_cold 3507static void ecb_noinline ecb_cold
3344pushav_3uv (pTHX_ UV a, UV b, UV c) 3508pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3345{ 3509{
3346 dSP; 3510 dSP;
3347 AV *av = newAV (); 3511 AV *av = newAV ();
3348 3512
3513 av_store (av, 3, newSVuv (d));
3349 av_store (av, 2, newSVuv (c)); 3514 av_store (av, 2, newSVuv (c));
3350 av_store (av, 1, newSVuv (b)); 3515 av_store (av, 1, newSVuv (b));
3351 av_store (av, 0, newSVuv (a)); 3516 av_store (av, 0, newSVuv (a));
3352 3517
3353 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 3518 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3360{ 3525{
3361 dSP; 3526 dSP;
3362 SV *load, *save; 3527 SV *load, *save;
3363 char *map_base; 3528 char *map_base;
3364 char *load_ptr, *save_ptr; 3529 char *load_ptr, *save_ptr;
3365 STRLEN load_len, save_len; 3530 STRLEN load_len, save_len, map_len;
3366 int count; 3531 int count;
3367 3532
3533 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3534
3368 PUSHMARK (SP); 3535 PUSHMARK (SP);
3369 PUTBACK;
3370#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type)); 3536 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3371# include "state.h" 3537 #include "state.h"
3372#undef VARx
3373 count = call_pv ("Coro::State::_jit", G_ARRAY); 3538 count = call_pv ("Coro::State::_jit", G_ARRAY);
3374 SPAGAIN; 3539 SPAGAIN;
3375 3540
3376 save = POPs; save_ptr = SvPVbyte (save, save_len); 3541 save = POPs; save_ptr = SvPVbyte (save, save_len);
3377 load = POPs; load_ptr = SvPVbyte (load, load_len); 3542 load = POPs; load_ptr = SvPVbyte (load, load_len);
3378 3543
3544 map_len = load_len + save_len + 16;
3545
3379 map_base = mmap (0, load_len + save_len + 16, PROT_EXEC | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3546 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3380 3547
3381 assert (("Coro: unable mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3548 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3382 3549
3383 load_perl_slots = (load_save_perl_slots_type)map_base; 3550 load_perl_slots = (load_save_perl_slots_type)map_base;
3384 memcpy (map_base, load_ptr, load_len); 3551 memcpy (map_base, load_ptr, load_len);
3385 3552
3386 map_base += (load_len + 15) & ~15; 3553 map_base += (load_len + 15) & ~15;
3387 3554
3388 save_perl_slots = (load_save_perl_slots_type)map_base; 3555 save_perl_slots = (load_save_perl_slots_type)map_base;
3389 memcpy (map_base, save_ptr, save_len); 3556 memcpy (map_base, save_ptr, save_len);
3557
3558 /* we are good citizens and try to make the page read-only, so the evil evil */
3559 /* hackers might have it a bit more difficult */
3560 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3561
3562 PUTBACK;
3563 eval_pv ("undef &Coro::State::_jit", 1);
3390} 3564}
3391 3565
3392#endif 3566#endif
3393 3567
3394MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3568MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3395 3569
3396PROTOTYPES: DISABLE 3570PROTOTYPES: DISABLE
3397 3571
3398BOOT: 3572BOOT:
3399{ 3573{
3574#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3575#include "state.h"
3400#ifdef USE_ITHREADS 3576#ifdef USE_ITHREADS
3401# if CORO_PTHREAD 3577# if CORO_PTHREAD
3402 coro_thx = PERL_GET_CONTEXT; 3578 coro_thx = PERL_GET_CONTEXT;
3403# endif 3579# endif
3404#endif 3580#endif
3405 BOOT_PAGESIZE;
3406
3407 /* perl defines these to check for existance first, but why it doesn't */ 3581 /* 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 */ 3582 /* just create them one at init time is not clear to me, except for */
3409 /* programs trying to delete them, but... */ 3583 /* programs trying to delete them, but... */
3410 /* anyway, we declare this as invalid and make sure they are initialised here */ 3584 /* anyway, we declare this as invalid and make sure they are initialised here */
3411 DEFSV; 3585 DEFSV;
3462 time_init (aTHX); 3636 time_init (aTHX);
3463 3637
3464 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3638 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3465#if CORO_JIT 3639#if CORO_JIT
3466 PUTBACK; 3640 PUTBACK;
3467 require_pv ("Coro/jit-" CORO_JIT_TYPE ".pl");
3468 jit_init (aTHX); 3641 jit_init (aTHX);
3469 perl_eval_pv ("undef &Coro::State::_jit", 1);
3470 SPAGAIN; 3642 SPAGAIN;
3471#endif 3643#endif
3472} 3644}
3473 3645
3474SV * 3646SV *
3483void 3655void
3484transfer (...) 3656transfer (...)
3485 PROTOTYPE: $$ 3657 PROTOTYPE: $$
3486 CODE: 3658 CODE:
3487 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3659 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3488
3489void
3490_exit (int code)
3491 PROTOTYPE: $
3492 CODE:
3493 _exit (code);
3494 3660
3495SV * 3661SV *
3496clone (Coro::State coro) 3662clone (Coro::State coro)
3497 CODE: 3663 CODE:
3498{ 3664{
3553void 3719void
3554list () 3720list ()
3555 PROTOTYPE: 3721 PROTOTYPE:
3556 PPCODE: 3722 PPCODE:
3557{ 3723{
3558 struct coro *coro; 3724 struct coro *coro;
3559 for (coro = coro_first; coro; coro = coro->next) 3725 for (coro = coro_first; coro; coro = coro->next)
3560 if (coro->hv) 3726 if (coro->hv)
3561 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3727 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3562} 3728}
3563 3729
3627 RETVAL = boolSV (coro->flags & ix); 3793 RETVAL = boolSV (coro->flags & ix);
3628 OUTPUT: 3794 OUTPUT:
3629 RETVAL 3795 RETVAL
3630 3796
3631void 3797void
3632throw (Coro::State self, SV *exception = &PL_sv_undef) 3798throw (SV *self, SV *exception = &PL_sv_undef)
3633 PROTOTYPE: $;$ 3799 PROTOTYPE: $;$
3634 CODE: 3800 CODE:
3635{ 3801{
3802 struct coro *coro = SvSTATE (self);
3636 struct coro *current = SvSTATE_current; 3803 struct coro *current = SvSTATE_current;
3637 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3804 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3638 SvREFCNT_dec (*exceptionp); 3805 SvREFCNT_dec (*exceptionp);
3639 SvGETMAGIC (exception); 3806 SvGETMAGIC (exception);
3640 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3807 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3808
3809 api_ready (aTHX_ self);
3641} 3810}
3642 3811
3643void 3812void
3644api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3813api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3645 PROTOTYPE: $;$ 3814 PROTOTYPE: $;$
3722 3891
3723void 3892void
3724times (Coro::State self) 3893times (Coro::State self)
3725 PPCODE: 3894 PPCODE:
3726{ 3895{
3727 struct coro *current = SvSTATE (coro_current); 3896 struct coro *current = SvSTATE (coro_current);
3728 3897
3729 if (ecb_expect_false (current == self)) 3898 if (ecb_expect_false (current == self))
3730 { 3899 {
3731 coro_times_update (); 3900 coro_times_update ();
3732 coro_times_add (SvSTATE (coro_current)); 3901 coro_times_add (SvSTATE (coro_current));
3775 3944
3776 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3945 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); 3946 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); 3947 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 */ 3948 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3780 3949
3781 coro_stash = gv_stashpv ("Coro", TRUE); 3950 coro_stash = gv_stashpv ("Coro", TRUE);
3782 3951
3783 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3952 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3784 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3953 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3785 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3954 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3797 coroapi.ready = api_ready; 3966 coroapi.ready = api_ready;
3798 coroapi.is_ready = api_is_ready; 3967 coroapi.is_ready = api_is_ready;
3799 coroapi.nready = coro_nready; 3968 coroapi.nready = coro_nready;
3800 coroapi.current = coro_current; 3969 coroapi.current = coro_current;
3801 3970
3971 coroapi.enterleave_hook = api_enterleave_hook;
3972 coroapi.enterleave_unhook = api_enterleave_unhook;
3973 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3974
3802 /*GCoroAPI = &coroapi;*/ 3975 /*GCoroAPI = &coroapi;*/
3803 sv_setiv (sv, (IV)&coroapi); 3976 sv_setiv (sv, (IV)&coroapi);
3804 SvREADONLY_on (sv); 3977 SvREADONLY_on (sv);
3805 } 3978 }
3806} 3979}
3871 4044
3872void 4045void
3873_set_current (SV *current) 4046_set_current (SV *current)
3874 PROTOTYPE: $ 4047 PROTOTYPE: $
3875 CODE: 4048 CODE:
3876 SvREFCNT_dec (SvRV (coro_current)); 4049 SvREFCNT_dec_NN (SvRV (coro_current));
3877 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4050 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3878 4051
3879void 4052void
3880_set_readyhook (SV *hook) 4053_set_readyhook (SV *hook)
3881 PROTOTYPE: $ 4054 PROTOTYPE: $
3965 4138
3966 if ((SV *)hv == &PL_sv_undef) 4139 if ((SV *)hv == &PL_sv_undef)
3967 { 4140 {
3968 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4141 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3969 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4142 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3970 SvREFCNT_dec (sv); 4143 SvREFCNT_dec_NN (sv);
3971 } 4144 }
3972 4145
3973 { 4146 {
3974 struct coro *coro = SvSTATE_hv (hv); 4147 struct coro *coro = SvSTATE_hv (hv);
3975 4148
3982 api_ready (aTHX_ (SV *)hv); 4155 api_ready (aTHX_ (SV *)hv);
3983 4156
3984 if (GIMME_V != G_VOID) 4157 if (GIMME_V != G_VOID)
3985 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4158 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3986 else 4159 else
3987 SvREFCNT_dec (hv); 4160 SvREFCNT_dec_NN (hv);
3988} 4161}
3989 4162
3990SV * 4163SV *
3991rouse_cb () 4164rouse_cb ()
3992 PROTOTYPE: 4165 PROTOTYPE:
4007 on_leave = 1 4180 on_leave = 1
4008 PROTOTYPE: & 4181 PROTOTYPE: &
4009 CODE: 4182 CODE:
4010{ 4183{
4011 struct coro *coro = SvSTATE_current; 4184 struct coro *coro = SvSTATE_current;
4012 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4185 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4013 4186
4014 block = s_get_cv_croak (block); 4187 block = s_get_cv_croak (block);
4015 4188
4016 if (!*avp) 4189 if (!*avp)
4017 *avp = newAV (); 4190 *avp = newAV ();
4037 4210
4038SV * 4211SV *
4039new (SV *klass, SV *count = 0) 4212new (SV *klass, SV *count = 0)
4040 CODE: 4213 CODE:
4041{ 4214{
4042 int semcnt = 1; 4215 int semcnt = 1;
4043 4216
4044 if (count) 4217 if (count)
4045 { 4218 {
4046 SvGETMAGIC (count); 4219 SvGETMAGIC (count);
4047 4220
4107 XSRETURN_NO; 4280 XSRETURN_NO;
4108} 4281}
4109 4282
4110void 4283void
4111waiters (SV *self) 4284waiters (SV *self)
4112 PPCODE: 4285 PPCODE:
4113{ 4286{
4114 AV *av = (AV *)SvRV (self); 4287 AV *av = (AV *)SvRV (self);
4115 int wcount = AvFILLp (av) + 1 - 1; 4288 int wcount = AvFILLp (av) + 1 - 1;
4116 4289
4117 if (GIMME_V == G_SCALAR) 4290 if (GIMME_V == G_SCALAR)
4126} 4299}
4127 4300
4128MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4301MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4129 4302
4130void 4303void
4131_may_delete (SV *sem, int count, int extra_refs) 4304_may_delete (SV *sem, int count, unsigned int extra_refs)
4132 PPCODE: 4305 PPCODE:
4133{ 4306{
4134 AV *av = (AV *)SvRV (sem); 4307 AV *av = (AV *)SvRV (sem);
4135 4308
4136 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4309 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4137 && AvFILLp (av) == 0 /* no waiters, just count */ 4310 && AvFILLp (av) == 0 /* no waiters, just count */
4138 && SvIV (AvARRAY (av)[0]) == count) 4311 && SvIV (AvARRAY (av)[0]) == count)
4139 XSRETURN_YES; 4312 XSRETURN_YES;
4160 4333
4161void 4334void
4162broadcast (SV *self) 4335broadcast (SV *self)
4163 CODE: 4336 CODE:
4164{ 4337{
4165 AV *av = (AV *)SvRV (self); 4338 AV *av = (AV *)SvRV (self);
4166 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4339 coro_signal_wake (aTHX_ av, AvFILLp (av));
4167} 4340}
4168 4341
4169void 4342void
4170send (SV *self) 4343send (SV *self)
4178 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4351 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4179} 4352}
4180 4353
4181IV 4354IV
4182awaited (SV *self) 4355awaited (SV *self)
4183 CODE: 4356 CODE:
4184 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4357 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4185 OUTPUT: 4358 OUTPUT:
4186 RETVAL 4359 RETVAL
4187 4360
4188 4361
4193 4366
4194void 4367void
4195_schedule (...) 4368_schedule (...)
4196 CODE: 4369 CODE:
4197{ 4370{
4198 static int incede; 4371 static int incede;
4199 4372
4200 api_cede_notself (aTHX); 4373 api_cede_notself (aTHX);
4201 4374
4202 ++incede; 4375 ++incede;
4203 while (coro_nready >= incede && api_cede (aTHX)) 4376 while (coro_nready >= incede && api_cede (aTHX))
4247 { 4420 {
4248 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4421 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4249 coro_old_pp_sselect = 0; 4422 coro_old_pp_sselect = 0;
4250 } 4423 }
4251 4424
4425MODULE = Coro::State PACKAGE = Coro::Util
4426
4427void
4428_exit (int code)
4429 CODE:
4430 _exit (code);
4431
4432NV
4433time ()
4434 CODE:
4435 RETVAL = nvtime (aTHX);
4436 OUTPUT:
4437 RETVAL
4438
4439NV
4440gettimeofday ()
4441 PPCODE:
4442{
4443 UV tv [2];
4444 u2time (aTHX_ tv);
4445 EXTEND (SP, 2);
4446 PUSHs (sv_2mortal (newSVuv (tv [0])));
4447 PUSHs (sv_2mortal (newSVuv (tv [1])));
4448}
4449

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines