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.407 by root, Sat Jun 11 15:30:21 2011 UTC vs.
Revision 1.452 by root, Tue Jun 30 12:42:45 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
27#ifndef SvREFCNT_dec_NN
28 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
29#endif
30
31#ifndef SvREFCNT_inc_NN
32 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
33#endif
34
24#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
25# define SVs_PADSTALE 0 36# define SVs_PADSTALE 0
37#endif
38
39#ifdef PadARRAY
40# define NEWPADAPI 1
41# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
42#else
43typedef AV PADNAMELIST;
44# if !PERL_VERSION_ATLEAST(5,8,0)
45typedef AV PADLIST;
46typedef AV PAD;
47# endif
48# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
49# define PadlistMAX(pl) AvFILLp (pl)
50# define PadlistNAMES(pl) (*PadlistARRAY (pl))
51# define PadARRAY AvARRAY
52# define PadMAX AvFILLp
53# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
54#endif
55#ifndef PadnamelistREFCNT
56# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
57#endif
58#ifndef PadnamelistREFCNT_dec
59# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
60#endif
61
62/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
63/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
64#if PERL_VERSION_ATLEAST(5,19,0)
65# define SVt_BIND SVt_IV
26#endif 66#endif
27 67
28#if defined(_WIN32) 68#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY 69# undef HAS_GETTIMEOFDAY
30# undef setjmp 70# undef setjmp
33# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
34#else 74#else
35# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
36#endif 76#endif
37 77
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 */ 78/* the maximum number of idle cctx that will be pooled */
66static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
67 80
68#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
69# undef CORO_STACKGUARD 82# define HAS_SCOPESTACK_NAME 1
70#endif
71
72#ifndef CORO_STACKGUARD
73# define CORO_STACKGUARD 0
74#endif 83#endif
75 84
76/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
77#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
78# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
97# if CORO_PTHREAD 106# if CORO_PTHREAD
98static void *coro_thx; 107static void *coro_thx;
99# endif 108# endif
100#endif 109#endif
101 110
102/* used in state.h */
103#define VAR(name,type) VARx(name, PL_ ## name, type)
104
105#ifdef __linux 111#ifdef __linux
106# include <time.h> /* for timespec */ 112# include <time.h> /* for timespec */
107# include <syscall.h> /* for SYS_* */ 113# include <syscall.h> /* for SYS_* */
108# ifdef SYS_clock_gettime 114# ifdef SYS_clock_gettime
109# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts)) 115# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
172typedef struct coro_cctx 178typedef struct coro_cctx
173{ 179{
174 struct coro_cctx *next; 180 struct coro_cctx *next;
175 181
176 /* the stack */ 182 /* the stack */
177 void *sptr; 183 struct coro_stack stack;
178 size_t ssize;
179 184
180 /* cpu state */ 185 /* cpu state */
181 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 186 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
187#ifndef NDEBUG
182 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 188 JMPENV *idle_te; /* same as idle_sp, but for top_env */
189#endif
183 JMPENV *top_env; 190 JMPENV *top_env;
184 coro_context cctx; 191 coro_context cctx;
185 192
186 U32 gen; 193 U32 gen;
187#if CORO_USE_VALGRIND 194#if CORO_USE_VALGRIND
207}; 214};
208 215
209/* the structure where most of the perl state is stored, overlaid on the cxstack */ 216/* the structure where most of the perl state is stored, overlaid on the cxstack */
210typedef struct 217typedef struct
211{ 218{
212#define VARx(name,expr,type) type name; 219 #define VARx(name,expr,type) type name;
213# include "state.h" 220 #include "state.h"
214#undef VARx
215} perl_slots; 221} perl_slots;
216 222
217// how many context stack entries do we need for perl_slots 223/* 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)) 224#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
219 225
220/* this is a structure representing a perl-level coroutine */ 226/* this is a structure representing a perl-level coroutine */
221struct coro 227struct coro
222{ 228{
250 SV *saved_deffh; 256 SV *saved_deffh;
251 SV *invoke_cb; 257 SV *invoke_cb;
252 AV *invoke_av; 258 AV *invoke_av;
253 259
254 /* on_enter/on_leave */ 260 /* on_enter/on_leave */
255 AV *on_enter; 261 AV *on_enter; AV *on_enter_xs;
256 AV *on_leave; 262 AV *on_leave; AV *on_leave_xs;
257 263
258 /* swap_sv */ 264 /* swap_sv */
259 AV *swap_sv; 265 AV *swap_sv;
260 266
261 /* times */ 267 /* times */
291#define coro_nready coroapi.nready 297#define coro_nready coroapi.nready
292 298
293/** JIT *********************************************************************/ 299/** JIT *********************************************************************/
294 300
295#if CORO_JIT 301#if CORO_JIT
302 /* APPLE doesn't have mmap though */
303 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
296 #ifndef CORO_JIT_TYPE 304 #ifndef CORO_JIT_TYPE
297 #if __x86_64 && (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris) 305 #if ECB_AMD64 && CORO_JIT_UNIXY
298 #define CORO_JIT_TYPE "amd64-unix" 306 #define CORO_JIT_TYPE "amd64-unix"
299 typedef void (*load_save_perl_slots_type)(perl_slots *); 307 #elif __i386 && CORO_JIT_UNIXY
300 #elif __i386 && (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris)
301 #define CORO_JIT_TYPE "x86-unix" 308 #define CORO_JIT_TYPE "x86-unix"
302 typedef void (*load_save_perl_slots_type)(perl_slots *);
303 #else
304 #undef CORO_JIT
305 #endif 309 #endif
306 #endif 310 #endif
307#endif 311#endif
308 312
313#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
314 #undef CORO_JIT
315#endif
316
309#if CORO_JIT 317#if CORO_JIT
318 typedef void (*load_save_perl_slots_type)(perl_slots *);
310static load_save_perl_slots_type load_perl_slots, save_perl_slots; 319 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
311#endif 320#endif
312 321
313/** Coro::Select ************************************************************/ 322/** Coro::Select ************************************************************/
314 323
315static OP *(*coro_old_pp_sselect) (pTHX); 324static OP *(*coro_old_pp_sselect) (pTHX);
332 341
333/** time stuff **************************************************************/ 342/** time stuff **************************************************************/
334 343
335#ifdef HAS_GETTIMEOFDAY 344#ifdef HAS_GETTIMEOFDAY
336 345
337ECB_INLINE void 346ecb_inline void
338coro_u2time (pTHX_ UV ret[2]) 347coro_u2time (pTHX_ UV ret[2])
339{ 348{
340 struct timeval tv; 349 struct timeval tv;
341 gettimeofday (&tv, 0); 350 gettimeofday (&tv, 0);
342 351
343 ret [0] = tv.tv_sec; 352 ret [0] = tv.tv_sec;
344 ret [1] = tv.tv_usec; 353 ret [1] = tv.tv_usec;
345} 354}
346 355
347ECB_INLINE double 356ecb_inline double
348coro_nvtime () 357coro_nvtime (void)
349{ 358{
350 struct timeval tv; 359 struct timeval tv;
351 gettimeofday (&tv, 0); 360 gettimeofday (&tv, 0);
352 361
353 return tv.tv_sec + tv.tv_usec * 1e-6; 362 return tv.tv_sec + tv.tv_usec * 1e-6;
354} 363}
355 364
356ECB_INLINE void 365ecb_inline void
357time_init (pTHX) 366time_init (pTHX)
358{ 367{
359 nvtime = coro_nvtime; 368 nvtime = coro_nvtime;
360 u2time = coro_u2time; 369 u2time = coro_u2time;
361} 370}
362 371
363#else 372#else
364 373
365ECB_INLINE void 374ecb_inline void
366time_init (pTHX) 375time_init (pTHX)
367{ 376{
368 SV **svp; 377 SV **svp;
369 378
370 require_pv ("Time/HiRes.pm"); 379 require_pv ("Time/HiRes.pm");
371 380
372 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 381 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
373 382
374 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 383 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
375 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 384 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
376 385
412 get_hv (name, create); 421 get_hv (name, create);
413#endif 422#endif
414 return get_hv (name, create); 423 return get_hv (name, create);
415} 424}
416 425
417ECB_INLINE void 426ecb_inline void
418coro_times_update () 427coro_times_update (void)
419{ 428{
420#ifdef coro_clock_gettime 429#ifdef coro_clock_gettime
421 struct timespec ts; 430 struct timespec ts;
422 431
423 ts.tv_sec = ts.tv_nsec = 0; 432 ts.tv_sec = ts.tv_nsec = 0;
435 time_real [0] = tv [0]; 444 time_real [0] = tv [0];
436 time_real [1] = tv [1] * 1000; 445 time_real [1] = tv [1] * 1000;
437#endif 446#endif
438} 447}
439 448
440ECB_INLINE void 449ecb_inline void
441coro_times_add (struct coro *c) 450coro_times_add (struct coro *c)
442{ 451{
443 c->t_real [1] += time_real [1]; 452 c->t_real [1] += time_real [1];
444 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 453 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
445 c->t_real [0] += time_real [0]; 454 c->t_real [0] += time_real [0];
447 c->t_cpu [1] += time_cpu [1]; 456 c->t_cpu [1] += time_cpu [1];
448 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 457 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
449 c->t_cpu [0] += time_cpu [0]; 458 c->t_cpu [0] += time_cpu [0];
450} 459}
451 460
452ECB_INLINE void 461ecb_inline void
453coro_times_sub (struct coro *c) 462coro_times_sub (struct coro *c)
454{ 463{
455 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 464 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
456 c->t_real [1] -= time_real [1]; 465 c->t_real [1] -= time_real [1];
457 c->t_real [0] -= time_real [0]; 466 c->t_real [0] -= time_real [0];
478 : 0) 487 : 0)
479 488
480#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 489#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
481#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 490#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
482 491
483ECB_INLINE MAGIC * 492ecb_inline MAGIC *
484SvSTATEhv_p (pTHX_ SV *coro) 493SvSTATEhv_p (pTHX_ SV *coro)
485{ 494{
486 MAGIC *mg; 495 MAGIC *mg;
487 496
488 if (ecb_expect_true ( 497 if (ecb_expect_true (
493 return mg; 502 return mg;
494 503
495 return 0; 504 return 0;
496} 505}
497 506
498ECB_INLINE struct coro * 507ecb_inline struct coro *
499SvSTATE_ (pTHX_ SV *coro) 508SvSTATE_ (pTHX_ SV *coro_sv)
500{ 509{
501 MAGIC *mg; 510 MAGIC *mg;
502 511
503 if (SvROK (coro)) 512 if (SvROK (coro_sv))
504 coro = SvRV (coro); 513 coro_sv = SvRV (coro_sv);
505 514
506 mg = SvSTATEhv_p (aTHX_ coro); 515 mg = SvSTATEhv_p (aTHX_ coro_sv);
507 if (!mg) 516 if (!mg)
508 croak ("Coro::State object required"); 517 croak ("Coro::State object required");
509 518
510 return (struct coro *)mg->mg_ptr; 519 return (struct coro *)mg->mg_ptr;
511} 520}
517#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 526#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
518 527
519/*****************************************************************************/ 528/*****************************************************************************/
520/* padlist management and caching */ 529/* padlist management and caching */
521 530
522ECB_INLINE AV * 531ecb_inline PADLIST *
523coro_derive_padlist (pTHX_ CV *cv) 532coro_derive_padlist (pTHX_ CV *cv)
524{ 533{
525 AV *padlist = CvPADLIST (cv); 534 PADLIST *padlist = CvPADLIST (cv);
526 AV *newpadlist, *newpad; 535 PADLIST *newpadlist;
536 PADNAMELIST *padnames;
537 PAD *newpad;
538 PADOFFSET off = PadlistMAX (padlist) + 1;
527 539
528 newpadlist = newAV (); 540#if NEWPADAPI
541
542 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
543 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
544 while (!PadlistARRAY (padlist)[off - 1])
545 --off;
546
547 Perl_pad_push (aTHX_ padlist, off);
548
549 newpad = PadlistARRAY (padlist)[off];
550 PadlistARRAY (padlist)[off] = 0;
551
552#else
553
554#if PERL_VERSION_ATLEAST (5,10,0)
555 Perl_pad_push (aTHX_ padlist, off);
556#else
557 Perl_pad_push (aTHX_ padlist, off, 1);
558#endif
559
560 newpad = PadlistARRAY (padlist)[off];
561 PadlistMAX (padlist) = off - 1;
562
563#endif
564
565 newPADLIST (newpadlist);
566#if !PERL_VERSION_ATLEAST(5,15,3)
567 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
529 AvREAL_off (newpadlist); 568 AvREAL_off (newpadlist);
530#if PERL_VERSION_ATLEAST (5,10,0)
531 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
532#else
533 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
534#endif 569#endif
535 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
536 --AvFILLp (padlist);
537 570
538 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 571 /* Already extended to 2 elements by newPADLIST. */
539 av_store (newpadlist, 1, (SV *)newpad); 572 PadlistMAX (newpadlist) = 1;
573
574 padnames = PadlistNAMES (padlist);
575 ++PadnamelistREFCNT (padnames);
576 PadlistNAMES (newpadlist) = padnames;
577
578 PadlistARRAY (newpadlist)[1] = newpad;
540 579
541 return newpadlist; 580 return newpadlist;
542} 581}
543 582
544ECB_INLINE void 583ecb_inline void
545free_padlist (pTHX_ AV *padlist) 584free_padlist (pTHX_ PADLIST *padlist)
546{ 585{
547 /* may be during global destruction */ 586 /* may be during global destruction */
548 if (!IN_DESTRUCT) 587 if (!IN_DESTRUCT)
549 { 588 {
550 I32 i = AvFILLp (padlist); 589 I32 i = PadlistMAX (padlist);
551 590
552 while (i > 0) /* special-case index 0 */ 591 while (i > 0) /* special-case index 0 */
553 { 592 {
554 /* we try to be extra-careful here */ 593 /* we try to be extra-careful here */
555 AV *av = (AV *)AvARRAY (padlist)[i--]; 594 PAD *pad = PadlistARRAY (padlist)[i--];
556 I32 j = AvFILLp (av);
557 595
596 if (pad)
597 {
598 I32 j = PadMAX (pad);
599
558 while (j >= 0) 600 while (j >= 0)
559 SvREFCNT_dec (AvARRAY (av)[j--]); 601 SvREFCNT_dec (PadARRAY (pad)[j--]);
560 602
561 AvFILLp (av) = -1; 603 PadMAX (pad) = -1;
562 SvREFCNT_dec (av); 604 SvREFCNT_dec (pad);
605 }
563 } 606 }
564 607
565 SvREFCNT_dec (AvARRAY (padlist)[0]); 608 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
566 609
610#if NEWPADAPI
611 Safefree (PadlistARRAY (padlist));
612 Safefree (padlist);
613#else
567 AvFILLp (padlist) = -1; 614 AvFILLp (padlist) = -1;
615 AvREAL_off (padlist);
568 SvREFCNT_dec ((SV*)padlist); 616 SvREFCNT_dec ((SV*)padlist);
617#endif
569 } 618 }
570} 619}
571 620
572static int 621static int
573coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 622coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
574{ 623{
575 AV *padlist; 624 PADLIST *padlist;
576 AV *av = (AV *)mg->mg_obj; 625 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
626 size_t len = *(size_t *)mg->mg_ptr;
577 627
578 /* perl manages to free our internal AV and _then_ call us */ 628 /* perl manages to free our internal AV and _then_ call us */
579 if (IN_DESTRUCT) 629 if (IN_DESTRUCT)
580 return 0; 630 return 0;
581 631
582 /* casting is fun. */ 632 while (len--)
583 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
584 free_padlist (aTHX_ padlist); 633 free_padlist (aTHX_ padlists[len]);
585
586 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
587 634
588 return 0; 635 return 0;
589} 636}
590 637
591static MGVTBL coro_cv_vtbl = { 638static MGVTBL coro_cv_vtbl = {
592 0, 0, 0, 0, 639 0, 0, 0, 0,
593 coro_cv_free 640 coro_cv_free
594}; 641};
595 642
596/* the next two functions merely cache the padlists */ 643/* the next two functions merely cache the padlists */
597ECB_INLINE void 644ecb_inline void
598get_padlist (pTHX_ CV *cv) 645get_padlist (pTHX_ CV *cv)
599{ 646{
600 MAGIC *mg = CORO_MAGIC_cv (cv); 647 MAGIC *mg = CORO_MAGIC_cv (cv);
601 AV *av; 648 size_t *lenp;
602 649
603 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 650 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
604 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 651 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
605 else 652 else
606 { 653 {
607#if CORO_PREFER_PERL_FUNCTIONS 654#if CORO_PREFER_PERL_FUNCTIONS
608 /* this is probably cleaner? but also slower! */ 655 /* this is probably cleaner? but also slower! */
609 /* in practise, it seems to be less stable */ 656 /* in practise, it seems to be less stable */
615 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 662 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
616#endif 663#endif
617 } 664 }
618} 665}
619 666
620ECB_INLINE void 667ecb_inline void
621put_padlist (pTHX_ CV *cv) 668put_padlist (pTHX_ CV *cv)
622{ 669{
623 MAGIC *mg = CORO_MAGIC_cv (cv); 670 MAGIC *mg = CORO_MAGIC_cv (cv);
624 AV *av;
625 671
626 if (ecb_expect_false (!mg)) 672 if (ecb_expect_false (!mg))
673 {
627 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 674 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
675 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
676 mg->mg_len = 1; /* so mg_free frees mg_ptr */
677 }
678 else
679 Renew (mg->mg_ptr,
680 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
681 char);
628 682
629 av = (AV *)mg->mg_obj; 683 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
630
631 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
632 av_extend (av, AvFILLp (av) + 1);
633
634 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
635} 684}
636 685
637/** load & save, init *******************************************************/ 686/** load & save, init *******************************************************/
638 687
688ecb_inline void
689swap_sv (SV *a, SV *b)
690{
691 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
692 SV tmp;
693
694 /* swap sv_any */
695 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
696
697 /* swap sv_flags */
698 SvFLAGS (&tmp) = SvFLAGS (a);
699 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
700 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
701
702#if PERL_VERSION_ATLEAST (5,10,0)
703 /* perl 5.10 and later complicates this _quite_ a bit, but it also
704 * is much faster, so no quarrels here. alternatively, we could
705 * sv_upgrade to avoid this.
706 */
707 {
708 /* swap sv_u */
709 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
710
711 /* if SvANY points to the head, we need to adjust the pointers,
712 * as the pointer for a still points to b, and maybe vice versa.
713 */
714 #define svany_in_head(type) \
715 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
716
717 if (svany_in_head (SvTYPE (a)))
718 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
719
720 if (svany_in_head (SvTYPE (b)))
721 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
722 }
723#endif
724}
725
639/* swap sv heads, at least logically */ 726/* swap sv heads, at least logically */
640static void 727static void
641swap_svs (pTHX_ Coro__State c) 728swap_svs (pTHX_ Coro__State c)
642{ 729{
643 int i; 730 int i;
644 731
645 for (i = 0; i <= AvFILLp (c->swap_sv); ) 732 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
646 { 733 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
647 SV *a = AvARRAY (c->swap_sv)[i++];
648 SV *b = AvARRAY (c->swap_sv)[i++];
649
650 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
651 SV tmp;
652
653 /* swap sv_any */
654 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
655
656 /* swap sv_flags */
657 SvFLAGS (&tmp) = SvFLAGS (a);
658 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
659 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
660
661#if PERL_VERSION_ATLEAST (5,10,0)
662 /* perl 5.10 complicates this _quite_ a bit, but it also is
663 * much faster, so no quarrels here. alternatively, we could
664 * sv_upgrade to avoid this.
665 */
666 {
667 /* swap sv_u */
668 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
669
670 /* if SvANY points to the head, we need to adjust the pointers,
671 * as the pointer for a still points to b, and maybe vice versa.
672 */
673 #define svany_in_head(type) \
674 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
675
676 if (svany_in_head (SvTYPE (a)))
677 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
678
679 if (svany_in_head (SvTYPE (b)))
680 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
681 }
682#endif
683 }
684} 734}
685 735
686#define SWAP_SVS(coro) \ 736#define SWAP_SVS(coro) \
687 if (ecb_expect_false ((coro)->swap_sv)) \ 737 if (ecb_expect_false ((coro)->swap_sv)) \
688 swap_svs (aTHX_ (coro)) 738 swap_svs (aTHX_ (coro))
700 750
701#if CORO_JIT 751#if CORO_JIT
702 load_perl_slots (slot); 752 load_perl_slots (slot);
703#else 753#else
704 #define VARx(name,expr,type) expr = slot->name; 754 #define VARx(name,expr,type) expr = slot->name;
705 # include "state.h" 755 #include "state.h"
706 #undef VARx
707#endif 756#endif
708 757
709 { 758 {
710 dSP; 759 dSP;
711 760
714 /* now do the ugly restore mess */ 763 /* now do the ugly restore mess */
715 while (ecb_expect_true (cv = (CV *)POPs)) 764 while (ecb_expect_true (cv = (CV *)POPs))
716 { 765 {
717 put_padlist (aTHX_ cv); /* mark this padlist as available */ 766 put_padlist (aTHX_ cv); /* mark this padlist as available */
718 CvDEPTH (cv) = PTR2IV (POPs); 767 CvDEPTH (cv) = PTR2IV (POPs);
719 CvPADLIST (cv) = (AV *)POPs; 768 CvPADLIST (cv) = (PADLIST *)POPs;
720 } 769 }
721 770
722 PUTBACK; 771 PUTBACK;
723 } 772 }
724 773
739 788
740 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 789 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
741 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 790 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
742 } 791 }
743 792
793 if (ecb_expect_false (c->on_enter_xs))
794 {
795 int i;
796
797 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
798 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
799 }
800
744 SWAP_SVS (c); 801 SWAP_SVS (c);
745} 802}
746 803
747static void 804static void
748save_perl (pTHX_ Coro__State c) 805save_perl (pTHX_ Coro__State c)
749{ 806{
750 SWAP_SVS (c); 807 SWAP_SVS (c);
808
809 if (ecb_expect_false (c->on_leave_xs))
810 {
811 int i;
812
813 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
814 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
815 }
751 816
752 if (ecb_expect_false (c->on_leave)) 817 if (ecb_expect_false (c->on_leave))
753 { 818 {
754 int i; 819 int i;
755 820
814 879
815 PUTBACK; 880 PUTBACK;
816 } 881 }
817 882
818 /* allocate some space on the context stack for our purposes */ 883 /* allocate some space on the context stack for our purposes */
819 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 884 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
820 { 885 {
821 unsigned int i; 886 unsigned int i;
822 887
823 for (i = 0; i < SLOT_COUNT; ++i) 888 for (i = 0; i < SLOT_COUNT; ++i)
824 CXINC; 889 CXINC;
833 898
834#if CORO_JIT 899#if CORO_JIT
835 save_perl_slots (slot); 900 save_perl_slots (slot);
836#else 901#else
837 #define VARx(name,expr,type) slot->name = expr; 902 #define VARx(name,expr,type) slot->name = expr;
838 # include "state.h" 903 #include "state.h"
839 #undef VARx
840#endif 904#endif
841 } 905 }
842} 906}
843 907
844/* 908/*
876#endif 940#endif
877 941
878 New(54,PL_scopestack,8,I32); 942 New(54,PL_scopestack,8,I32);
879 PL_scopestack_ix = 0; 943 PL_scopestack_ix = 0;
880 PL_scopestack_max = 8; 944 PL_scopestack_max = 8;
945#if HAS_SCOPESTACK_NAME
946 New(54,PL_scopestack_name,8,const char*);
947#endif
881 948
882 New(54,PL_savestack,24,ANY); 949 New(54,PL_savestack,24,ANY);
883 PL_savestack_ix = 0; 950 PL_savestack_ix = 0;
884 PL_savestack_max = 24; 951 PL_savestack_max = 24;
885 952
913 } 980 }
914 981
915 Safefree (PL_tmps_stack); 982 Safefree (PL_tmps_stack);
916 Safefree (PL_markstack); 983 Safefree (PL_markstack);
917 Safefree (PL_scopestack); 984 Safefree (PL_scopestack);
985#if HAS_SCOPESTACK_NAME
986 Safefree (PL_scopestack_name);
987#endif
918 Safefree (PL_savestack); 988 Safefree (PL_savestack);
919#if !PERL_VERSION_ATLEAST (5,10,0) 989#if !PERL_VERSION_ATLEAST (5,10,0)
920 Safefree (PL_retstack); 990 Safefree (PL_retstack);
921#endif 991#endif
922} 992}
982 { 1052 {
983 SV **svp = 0; 1053 SV **svp = 0;
984 1054
985 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1055 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
986 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1056 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
987 1057
988 if (svp) 1058 if (svp)
989 { 1059 {
990 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1060 SV *ssv;
1061
1062 if (!*svp)
1063 ssv = &PL_sv_undef;
1064 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1065 ssv = sv_2mortal (newRV_inc (*svp));
1066 else
1067 ssv = *svp;
1068
1069 sv_setsv (sv, ssv);
991 return 0; 1070 return 0;
992 } 1071 }
993 } 1072 }
994 1073
995 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1074 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1089 PL_hints = 0; 1168 PL_hints = 0;
1090 1169
1091 /* recreate the die/warn hooks */ 1170 /* recreate the die/warn hooks */
1092 PL_diehook = SvREFCNT_inc (rv_diehook); 1171 PL_diehook = SvREFCNT_inc (rv_diehook);
1093 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1172 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1094 1173
1095 GvSV (PL_defgv) = newSV (0); 1174 GvSV (PL_defgv) = newSV (0);
1096 GvAV (PL_defgv) = coro->args; coro->args = 0; 1175 GvAV (PL_defgv) = coro->args; coro->args = 0;
1097 GvSV (PL_errgv) = newSV (0); 1176 GvSV (PL_errgv) = newSV (0);
1098 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1177 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1099 GvHV (PL_hintgv) = 0; 1178 GvHV (PL_hintgv) = newHV ();
1179#if PERL_VERSION_ATLEAST (5,10,0)
1180 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1181#endif
1100 PL_rs = newSVsv (GvSV (irsgv)); 1182 PL_rs = newSVsv (GvSV (irsgv));
1101 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1183 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1102 1184
1103 { 1185 {
1104 dSP; 1186 dSP;
1187 /* restore swapped sv's */ 1269 /* restore swapped sv's */
1188 SWAP_SVS (coro); 1270 SWAP_SVS (coro);
1189 1271
1190 coro_destruct_stacks (aTHX); 1272 coro_destruct_stacks (aTHX);
1191 1273
1192 // now save some sv's to be free'd later 1274 /* now save some sv's to be free'd later */
1193 svf [0] = GvSV (PL_defgv); 1275 svf [0] = GvSV (PL_defgv);
1194 svf [1] = (SV *)GvAV (PL_defgv); 1276 svf [1] = (SV *)GvAV (PL_defgv);
1195 svf [2] = GvSV (PL_errgv); 1277 svf [2] = GvSV (PL_errgv);
1196 svf [3] = (SV *)PL_defoutgv; 1278 svf [3] = (SV *)PL_defoutgv;
1197 svf [4] = PL_rs; 1279 svf [4] = PL_rs;
1214 1296
1215 SvREFCNT_dec (coro->saved_deffh); 1297 SvREFCNT_dec (coro->saved_deffh);
1216 SvREFCNT_dec (coro->rouse_cb); 1298 SvREFCNT_dec (coro->rouse_cb);
1217 SvREFCNT_dec (coro->invoke_cb); 1299 SvREFCNT_dec (coro->invoke_cb);
1218 SvREFCNT_dec (coro->invoke_av); 1300 SvREFCNT_dec (coro->invoke_av);
1301 SvREFCNT_dec (coro->on_enter_xs);
1302 SvREFCNT_dec (coro->on_leave_xs);
1219 } 1303 }
1220} 1304}
1221 1305
1222ECB_INLINE void 1306ecb_inline void
1223free_coro_mortal (pTHX) 1307free_coro_mortal (pTHX)
1224{ 1308{
1225 if (ecb_expect_true (coro_mortal)) 1309 if (ecb_expect_true (coro_mortal))
1226 { 1310 {
1227 SvREFCNT_dec ((SV *)coro_mortal); 1311 SvREFCNT_dec ((SV *)coro_mortal);
1286 1370
1287 if (PL_curcop != &PL_compiling) 1371 if (PL_curcop != &PL_compiling)
1288 { 1372 {
1289 SV **cb; 1373 SV **cb;
1290 1374
1291 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1375 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1292 { 1376 {
1293 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1377 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1294 1378
1295 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1379 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1296 { 1380 {
1386 slf_frame.prepare = slf_prepare_set_stacklevel; 1470 slf_frame.prepare = slf_prepare_set_stacklevel;
1387 slf_frame.check = slf_check_set_stacklevel; 1471 slf_frame.check = slf_check_set_stacklevel;
1388} 1472}
1389 1473
1390/* the tail of transfer: execute stuff we can only do after a transfer */ 1474/* the tail of transfer: execute stuff we can only do after a transfer */
1391ECB_INLINE void 1475ecb_inline void
1392transfer_tail (pTHX) 1476transfer_tail (pTHX)
1393{ 1477{
1394 free_coro_mortal (aTHX); 1478 free_coro_mortal (aTHX);
1479}
1480
1481/* try to exit the same way perl's main function would do */
1482/* we do not bother resetting the environment or other things *7
1483/* that are not, uhm, essential */
1484/* this obviously also doesn't work when perl is embedded */
1485static void ecb_noinline ecb_cold
1486perlish_exit (pTHX)
1487{
1488 int exitstatus = perl_destruct (PL_curinterp);
1489 perl_free (PL_curinterp);
1490 exit (exitstatus);
1395} 1491}
1396 1492
1397/* 1493/*
1398 * this is a _very_ stripped down perl interpreter ;) 1494 * this is a _very_ stripped down perl interpreter ;)
1399 */ 1495 */
1428 */ 1524 */
1429 1525
1430 /* 1526 /*
1431 * If perl-run returns we assume exit() was being called or the coro 1527 * If perl-run returns we assume exit() was being called or the coro
1432 * fell off the end, which seems to be the only valid (non-bug) 1528 * fell off the end, which seems to be the only valid (non-bug)
1433 * reason for perl_run to return. We try to exit by jumping to the 1529 * reason for perl_run to return. We try to mimic whatever perl is normally
1434 * bootstrap-time "top" top_env, as we cannot restore the "main" 1530 * doing in that case. YMMV.
1435 * coroutine as Coro has no such concept.
1436 * This actually isn't valid with the pthread backend, but OSes requiring
1437 * that backend are too broken to do it in a standards-compliant way.
1438 */ 1531 */
1439 PL_top_env = main_top_env; 1532 perlish_exit (aTHX);
1440 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1441 } 1533 }
1442} 1534}
1443 1535
1444static coro_cctx * 1536static coro_cctx *
1445cctx_new () 1537cctx_new (void)
1446{ 1538{
1447 coro_cctx *cctx; 1539 coro_cctx *cctx;
1448 1540
1449 ++cctx_count; 1541 ++cctx_count;
1450 New (0, cctx, 1, coro_cctx); 1542 New (0, cctx, 1, coro_cctx);
1456 return cctx; 1548 return cctx;
1457} 1549}
1458 1550
1459/* create a new cctx only suitable as source */ 1551/* create a new cctx only suitable as source */
1460static coro_cctx * 1552static coro_cctx *
1461cctx_new_empty () 1553cctx_new_empty (void)
1462{ 1554{
1463 coro_cctx *cctx = cctx_new (); 1555 coro_cctx *cctx = cctx_new ();
1464 1556
1465 cctx->sptr = 0; 1557 cctx->stack.sptr = 0;
1466 coro_create (&cctx->cctx, 0, 0, 0, 0); 1558 coro_create (&cctx->cctx, 0, 0, 0, 0);
1467 1559
1468 return cctx; 1560 return cctx;
1469} 1561}
1470 1562
1471/* create a new cctx suitable as destination/running a perl interpreter */ 1563/* create a new cctx suitable as destination/running a perl interpreter */
1472static coro_cctx * 1564static coro_cctx *
1473cctx_new_run () 1565cctx_new_run (void)
1474{ 1566{
1475 coro_cctx *cctx = cctx_new (); 1567 coro_cctx *cctx = cctx_new ();
1476 void *stack_start;
1477 size_t stack_size;
1478 1568
1479#if HAVE_MMAP 1569 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1480 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1481 /* mmap supposedly does allocate-on-write for us */
1482 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1483
1484 if (cctx->sptr != (void *)-1)
1485 {
1486 #if CORO_STACKGUARD
1487 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1488 #endif
1489 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1490 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1491 cctx->flags |= CC_MAPPED;
1492 } 1570 {
1493 else
1494#endif
1495 {
1496 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1497 New (0, cctx->sptr, cctx_stacksize, long);
1498
1499 if (!cctx->sptr)
1500 {
1501 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1571 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1502 _exit (EXIT_FAILURE); 1572 _exit (EXIT_FAILURE);
1503 }
1504
1505 stack_start = cctx->sptr;
1506 stack_size = cctx->ssize;
1507 } 1573 }
1508 1574
1509 #if CORO_USE_VALGRIND
1510 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1511 #endif
1512
1513 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1575 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1514 1576
1515 return cctx; 1577 return cctx;
1516} 1578}
1517 1579
1518static void 1580static void
1524 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1586 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1525 1587
1526 --cctx_count; 1588 --cctx_count;
1527 coro_destroy (&cctx->cctx); 1589 coro_destroy (&cctx->cctx);
1528 1590
1529 /* coro_transfer creates new, empty cctx's */ 1591 coro_stack_free (&cctx->stack);
1530 if (cctx->sptr)
1531 {
1532 #if CORO_USE_VALGRIND
1533 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1534 #endif
1535
1536#if HAVE_MMAP
1537 if (cctx->flags & CC_MAPPED)
1538 munmap (cctx->sptr, cctx->ssize);
1539 else
1540#endif
1541 Safefree (cctx->sptr);
1542 }
1543 1592
1544 Safefree (cctx); 1593 Safefree (cctx);
1545} 1594}
1546 1595
1547/* wether this cctx should be destructed */ 1596/* wether this cctx should be destructed */
1566} 1615}
1567 1616
1568static void 1617static void
1569cctx_put (coro_cctx *cctx) 1618cctx_put (coro_cctx *cctx)
1570{ 1619{
1571 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1620 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1572 1621
1573 /* free another cctx if overlimit */ 1622 /* free another cctx if overlimit */
1574 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1623 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1575 { 1624 {
1576 coro_cctx *first = cctx_first; 1625 coro_cctx *first = cctx_first;
1702 return; 1751 return;
1703 1752
1704 slf_destroy (aTHX_ coro); 1753 slf_destroy (aTHX_ coro);
1705 1754
1706 coro->flags |= CF_ZOMBIE; 1755 coro->flags |= CF_ZOMBIE;
1707 1756
1708 if (coro->flags & CF_READY) 1757 if (coro->flags & CF_READY)
1709 { 1758 {
1710 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1759 /* reduce nready, as destroying a ready coro effectively unreadies it */
1711 /* alternative: look through all ready queues and remove the coro */ 1760 /* alternative: look through all ready queues and remove the coro */
1712 --coro_nready; 1761 --coro_nready;
1789 TRANSFER (ta, 1); 1838 TRANSFER (ta, 1);
1790} 1839}
1791 1840
1792/** Coro ********************************************************************/ 1841/** Coro ********************************************************************/
1793 1842
1794ECB_INLINE void 1843ecb_inline void
1795coro_enq (pTHX_ struct coro *coro) 1844coro_enq (pTHX_ struct coro *coro)
1796{ 1845{
1797 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1846 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1798 1847
1799 SvREFCNT_inc_NN (coro->hv); 1848 SvREFCNT_inc_NN (coro->hv);
1801 coro->next_ready = 0; 1850 coro->next_ready = 0;
1802 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1851 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1803 ready [1] = coro; 1852 ready [1] = coro;
1804} 1853}
1805 1854
1806ECB_INLINE struct coro * 1855ecb_inline struct coro *
1807coro_deq (pTHX) 1856coro_deq (pTHX)
1808{ 1857{
1809 int prio; 1858 int prio;
1810 1859
1811 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1860 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1864{ 1913{
1865 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1914 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1866} 1915}
1867 1916
1868/* expects to own a reference to next->hv */ 1917/* expects to own a reference to next->hv */
1869ECB_INLINE void 1918ecb_inline void
1870prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1919prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1871{ 1920{
1872 SV *prev_sv = SvRV (coro_current); 1921 SV *prev_sv = SvRV (coro_current);
1873 1922
1874 ta->prev = SvSTATE_hv (prev_sv); 1923 ta->prev = SvSTATE_hv (prev_sv);
1908 /* nothing to schedule: call the idle handler */ 1957 /* nothing to schedule: call the idle handler */
1909 if (SvROK (sv_idle) 1958 if (SvROK (sv_idle)
1910 && SvOBJECT (SvRV (sv_idle))) 1959 && SvOBJECT (SvRV (sv_idle)))
1911 { 1960 {
1912 if (SvRV (sv_idle) == SvRV (coro_current)) 1961 if (SvRV (sv_idle) == SvRV (coro_current))
1962 {
1963 require_pv ("Carp");
1964
1965 {
1966 dSP;
1967
1968 ENTER;
1969 SAVETMPS;
1970
1971 PUSHMARK (SP);
1913 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1972 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1973 PUTBACK;
1974 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1975
1976 FREETMPS;
1977 LEAVE;
1978 }
1979 }
1914 1980
1915 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1981 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1916 api_ready (aTHX_ SvRV (sv_idle)); 1982 api_ready (aTHX_ SvRV (sv_idle));
1917 --coro_nready; 1983 --coro_nready;
1918 } 1984 }
1933 } 1999 }
1934 } 2000 }
1935 } 2001 }
1936} 2002}
1937 2003
1938ECB_INLINE void 2004ecb_inline void
1939prepare_cede (pTHX_ struct coro_transfer_args *ta) 2005prepare_cede (pTHX_ struct coro_transfer_args *ta)
1940{ 2006{
1941 api_ready (aTHX_ coro_current); 2007 api_ready (aTHX_ coro_current);
1942 prepare_schedule (aTHX_ ta); 2008 prepare_schedule (aTHX_ ta);
1943} 2009}
1944 2010
1945ECB_INLINE void 2011ecb_inline void
1946prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2012prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1947{ 2013{
1948 SV *prev = SvRV (coro_current); 2014 SV *prev = SvRV (coro_current);
1949 2015
1950 if (coro_nready) 2016 if (coro_nready)
2115{ 2181{
2116 AV *od = coro->on_destroy; 2182 AV *od = coro->on_destroy;
2117 2183
2118 if (!od) 2184 if (!od)
2119 return; 2185 return;
2186
2187 coro->on_destroy = 0;
2188 sv_2mortal ((SV *)od);
2120 2189
2121 while (AvFILLp (od) >= 0) 2190 while (AvFILLp (od) >= 0)
2122 { 2191 {
2123 SV *cb = sv_2mortal (av_pop (od)); 2192 SV *cb = sv_2mortal (av_pop (od));
2124 2193
2145 2214
2146static void 2215static void
2147coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2216coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2148{ 2217{
2149 AV *av; 2218 AV *av;
2150 2219
2151 if (coro->status) 2220 if (coro->status)
2152 { 2221 {
2153 av = coro->status; 2222 av = coro->status;
2154 av_clear (av); 2223 av_clear (av);
2155 } 2224 }
2202 2271
2203 coro = SvSTATE (arg [0]); 2272 coro = SvSTATE (arg [0]);
2204 coro_hv = coro->hv; 2273 coro_hv = coro->hv;
2205 2274
2206 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2275 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2207 2276
2208 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2277 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2209 { 2278 {
2210 /* coro currently busy cancelling something, so just notify it */ 2279 /* coro currently busy cancelling something, so just notify it */
2211 coro->slf_frame.data = (void *)coro; 2280 coro->slf_frame.data = (void *)coro;
2212 2281
2219 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2288 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2220 } 2289 }
2221 else 2290 else
2222 { 2291 {
2223 struct coro *self = SvSTATE_current; 2292 struct coro *self = SvSTATE_current;
2293
2294 if (!self)
2295 croak ("Coro::cancel called outside of thread content,");
2224 2296
2225 /* otherwise we cancel directly, purely for speed reasons 2297 /* otherwise we cancel directly, purely for speed reasons
2226 * unfortunately, this requires some magic trickery, as 2298 * unfortunately, this requires some magic trickery, as
2227 * somebody else could cancel us, so we have to fight the cancellation. 2299 * somebody else could cancel us, so we have to fight the cancellation.
2228 * this is ugly, and hopefully fully worth the extra speed. 2300 * this is ugly, and hopefully fully worth the extra speed.
2391 2463
2392static int 2464static int
2393slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2465slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2394{ 2466{
2395 SV *data = (SV *)frame->data; 2467 SV *data = (SV *)frame->data;
2396 2468
2397 if (CORO_THROW) 2469 if (CORO_THROW)
2398 return 0; 2470 return 0;
2399 2471
2400 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2472 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2401 return 1; 2473 return 1;
2437 cb = sv_2mortal (coro->rouse_cb); 2509 cb = sv_2mortal (coro->rouse_cb);
2438 coro->rouse_cb = 0; 2510 coro->rouse_cb = 0;
2439 } 2511 }
2440 2512
2441 if (!SvROK (cb) 2513 if (!SvROK (cb)
2442 || SvTYPE (SvRV (cb)) != SVt_PVCV 2514 || SvTYPE (SvRV (cb)) != SVt_PVCV
2443 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2515 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2444 croak ("Coro::rouse_wait called with illegal callback argument,"); 2516 croak ("Coro::rouse_wait called with illegal callback argument,");
2445 2517
2446 { 2518 {
2447 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2519 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2570 2642
2571/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2643/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2572static void 2644static void
2573slf_destroy (pTHX_ struct coro *coro) 2645slf_destroy (pTHX_ struct coro *coro)
2574{ 2646{
2575 /* this callback is reserved for slf functions needing to do cleanup */ 2647 struct CoroSLF frame = coro->slf_frame;
2576 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2577 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2578 2648
2579 /* 2649 /*
2580 * The on_destroy above most likely is from an SLF call. 2650 * The on_destroy below most likely is from an SLF call.
2581 * Since by definition the SLF call will not finish when we destroy 2651 * Since by definition the SLF call will not finish when we destroy
2582 * the coro, we will have to force-finish it here, otherwise 2652 * the coro, we will have to force-finish it here, otherwise
2583 * cleanup functions cannot call SLF functions. 2653 * cleanup functions cannot call SLF functions.
2584 */ 2654 */
2585 coro->slf_frame.prepare = 0; 2655 coro->slf_frame.prepare = 0;
2656
2657 /* this callback is reserved for slf functions needing to do cleanup */
2658 if (frame.destroy && frame.prepare && !PL_dirty)
2659 frame.destroy (aTHX_ &frame);
2586} 2660}
2587 2661
2588/* 2662/*
2589 * these not obviously related functions are all rolled into one 2663 * these not obviously related functions are all rolled into one
2590 * function to increase chances that they all will call transfer with the same 2664 * function to increase chances that they all will call transfer with the same
2773static void 2847static void
2774coro_pop_on_leave (pTHX_ void *coro) 2848coro_pop_on_leave (pTHX_ void *coro)
2775{ 2849{
2776 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2850 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2777 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2851 on_enterleave_call (aTHX_ sv_2mortal (cb));
2852}
2853
2854static void
2855enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2856{
2857 if (!hook)
2858 return;
2859
2860 if (!*avp)
2861 {
2862 *avp = newAV ();
2863 AvREAL_off (*avp);
2864 }
2865
2866 av_push (*avp, (SV *)hook);
2867 av_push (*avp, (SV *)arg);
2868}
2869
2870static void
2871enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2872{
2873 AV *av = *avp;
2874 int i;
2875
2876 if (!av)
2877 return;
2878
2879 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2880 if (AvARRAY (av)[i] == (SV *)hook)
2881 {
2882 if (execute)
2883 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2884
2885 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2886 av_pop (av);
2887 av_pop (av);
2888 break;
2889 }
2890
2891 if (AvFILLp (av) >= 0)
2892 {
2893 *avp = 0;
2894 SvREFCNT_dec_NN (av);
2895 }
2896}
2897
2898static void
2899api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2900{
2901 struct coro *coro = SvSTATE (coro_sv);
2902
2903 if (SvSTATE_current == coro)
2904 if (enter)
2905 enter (aTHX_ enter_arg);
2906
2907 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2908 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2909}
2910
2911static void
2912api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2913{
2914 struct coro *coro = SvSTATE (coro_sv);
2915
2916 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2917 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2918}
2919
2920static void
2921savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2922{
2923 struct coro *coro = SvSTATE_current;
2924
2925 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2926}
2927
2928static void
2929savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2930{
2931 struct coro *coro = SvSTATE_current;
2932
2933 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2934}
2935
2936static void
2937api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2938{
2939 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2940
2941 /* this ought to be much cheaper than malloc + a single destructor call */
2942 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2943 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2778} 2944}
2779 2945
2780/*****************************************************************************/ 2946/*****************************************************************************/
2781/* PerlIO::cede */ 2947/* PerlIO::cede */
2782 2948
2912 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3078 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2913 PUTBACK; 3079 PUTBACK;
2914 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3080 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2915 } 3081 }
2916 3082
2917 SvREFCNT_dec (cb); 3083 SvREFCNT_dec_NN (cb);
2918 } 3084 }
2919} 3085}
2920 3086
2921static void 3087static void
2922coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3088coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2930{ 3096{
2931 AV *av = (AV *)frame->data; 3097 AV *av = (AV *)frame->data;
2932 SV *count_sv = AvARRAY (av)[0]; 3098 SV *count_sv = AvARRAY (av)[0];
2933 SV *coro_hv = SvRV (coro_current); 3099 SV *coro_hv = SvRV (coro_current);
2934 3100
3101 frame->destroy = 0;
3102
2935 /* if we are about to throw, don't actually acquire the lock, just throw */ 3103 /* if we are about to throw, don't actually acquire the lock, just throw */
2936 if (CORO_THROW) 3104 if (ecb_expect_false (CORO_THROW))
3105 {
3106 /* we still might be responsible for the semaphore, so wake up others */
3107 coro_semaphore_adjust (aTHX_ av, 0);
3108
2937 return 0; 3109 return 0;
3110 }
2938 else if (SvIVX (count_sv) > 0) 3111 else if (SvIVX (count_sv) > 0)
2939 { 3112 {
2940 frame->destroy = 0;
2941
2942 if (acquire) 3113 if (acquire)
2943 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3114 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2944 else 3115 else
2945 coro_semaphore_adjust (aTHX_ av, 0); 3116 coro_semaphore_adjust (aTHX_ av, 0);
2946 3117
2950 { 3121 {
2951 int i; 3122 int i;
2952 /* if we were woken up but can't down, we look through the whole */ 3123 /* if we were woken up but can't down, we look through the whole */
2953 /* waiters list and only add us if we aren't in there already */ 3124 /* waiters list and only add us if we aren't in there already */
2954 /* this avoids some degenerate memory usage cases */ 3125 /* this avoids some degenerate memory usage cases */
2955 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug 3126 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2956 if (AvARRAY (av)[i] == coro_hv) 3127 if (AvARRAY (av)[i] == coro_hv)
2957 return 1; 3128 return 1;
2958 3129
2959 av_push (av, SvREFCNT_inc (coro_hv)); 3130 av_push (av, SvREFCNT_inc (coro_hv));
2960 return 1; 3131 return 1;
3057 { 3228 {
3058 api_ready (aTHX_ cb); 3229 api_ready (aTHX_ cb);
3059 sv_setiv (cb, 0); /* signal waiter */ 3230 sv_setiv (cb, 0); /* signal waiter */
3060 } 3231 }
3061 3232
3062 SvREFCNT_dec (cb); 3233 SvREFCNT_dec_NN (cb);
3063 3234
3064 --count; 3235 --count;
3065 } 3236 }
3066} 3237}
3067 3238
3152 } 3323 }
3153 3324
3154 av_push (state, data_sv); 3325 av_push (state, data_sv);
3155 3326
3156 api_ready (aTHX_ coro); 3327 api_ready (aTHX_ coro);
3157 SvREFCNT_dec (coro); 3328 SvREFCNT_dec_NN (coro);
3158 SvREFCNT_dec ((AV *)state); 3329 SvREFCNT_dec_NN ((AV *)state);
3159} 3330}
3160 3331
3161static int 3332static int
3162slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3333slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3163{ 3334{
3168 /* it quickly returns */ 3339 /* it quickly returns */
3169 if (CORO_THROW) 3340 if (CORO_THROW)
3170 return 0; 3341 return 0;
3171 3342
3172 /* one element that is an RV? repeat! */ 3343 /* one element that is an RV? repeat! */
3173 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3344 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3174 return 1; 3345 return 1;
3175 3346
3176 /* restore status */ 3347 /* restore status */
3177 { 3348 {
3178 SV *data_sv = av_pop (state); 3349 SV *data_sv = av_pop (state);
3181 errno = data->errorno; 3352 errno = data->errorno;
3182 PL_laststype = data->laststype; 3353 PL_laststype = data->laststype;
3183 PL_laststatval = data->laststatval; 3354 PL_laststatval = data->laststatval;
3184 PL_statcache = data->statcache; 3355 PL_statcache = data->statcache;
3185 3356
3186 SvREFCNT_dec (data_sv); 3357 SvREFCNT_dec_NN (data_sv);
3187 } 3358 }
3188 3359
3189 /* push result values */ 3360 /* push result values */
3190 { 3361 {
3191 dSP; 3362 dSP;
3340#endif 3511#endif
3341 3512
3342#if CORO_JIT 3513#if CORO_JIT
3343 3514
3344static void ecb_noinline ecb_cold 3515static void ecb_noinline ecb_cold
3345pushav_3uv (pTHX_ UV a, UV b, UV c) 3516pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3346{ 3517{
3347 dSP; 3518 dSP;
3348 AV *av = newAV (); 3519 AV *av = newAV ();
3349 3520
3521 av_store (av, 3, newSVuv (d));
3350 av_store (av, 2, newSVuv (c)); 3522 av_store (av, 2, newSVuv (c));
3351 av_store (av, 1, newSVuv (b)); 3523 av_store (av, 1, newSVuv (b));
3352 av_store (av, 0, newSVuv (a)); 3524 av_store (av, 0, newSVuv (a));
3353 3525
3354 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 3526 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3361{ 3533{
3362 dSP; 3534 dSP;
3363 SV *load, *save; 3535 SV *load, *save;
3364 char *map_base; 3536 char *map_base;
3365 char *load_ptr, *save_ptr; 3537 char *load_ptr, *save_ptr;
3366 STRLEN load_len, save_len; 3538 STRLEN load_len, save_len, map_len;
3367 int count; 3539 int count;
3368 3540
3541 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3542
3369 PUSHMARK (SP); 3543 PUSHMARK (SP);
3370 PUTBACK;
3371#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type)); 3544 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3372# include "state.h" 3545 #include "state.h"
3373#undef VARx
3374 count = call_pv ("Coro::State::_jit", G_ARRAY); 3546 count = call_pv ("Coro::State::_jit", G_ARRAY);
3375 SPAGAIN; 3547 SPAGAIN;
3376 3548
3377 save = POPs; save_ptr = SvPVbyte (save, save_len); 3549 save = POPs; save_ptr = SvPVbyte (save, save_len);
3378 load = POPs; load_ptr = SvPVbyte (load, load_len); 3550 load = POPs; load_ptr = SvPVbyte (load, load_len);
3379 3551
3552 map_len = load_len + save_len + 16;
3553
3380 map_base = mmap (0, load_len + save_len + 16, PROT_EXEC | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3554 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3381 3555
3382 assert (("Coro: unable mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3556 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3383 3557
3384 load_perl_slots = (load_save_perl_slots_type)map_base; 3558 load_perl_slots = (load_save_perl_slots_type)map_base;
3385 memcpy (map_base, load_ptr, load_len); 3559 memcpy (map_base, load_ptr, load_len);
3386 3560
3387 map_base += (load_len + 15) & ~15; 3561 map_base += (load_len + 15) & ~15;
3388 3562
3389 save_perl_slots = (load_save_perl_slots_type)map_base; 3563 save_perl_slots = (load_save_perl_slots_type)map_base;
3390 memcpy (map_base, save_ptr, save_len); 3564 memcpy (map_base, save_ptr, save_len);
3565
3566 /* we are good citizens and try to make the page read-only, so the evil evil */
3567 /* hackers might have it a bit more difficult */
3568 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3569
3570 PUTBACK;
3571 eval_pv ("undef &Coro::State::_jit", 1);
3391} 3572}
3392 3573
3393#endif 3574#endif
3394 3575
3395MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3576MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3396 3577
3397PROTOTYPES: DISABLE 3578PROTOTYPES: DISABLE
3398 3579
3399BOOT: 3580BOOT:
3400{ 3581{
3582#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3583#include "state.h"
3401#ifdef USE_ITHREADS 3584#ifdef USE_ITHREADS
3402# if CORO_PTHREAD 3585# if CORO_PTHREAD
3403 coro_thx = PERL_GET_CONTEXT; 3586 coro_thx = PERL_GET_CONTEXT;
3404# endif 3587# endif
3405#endif 3588#endif
3406 BOOT_PAGESIZE;
3407
3408 /* perl defines these to check for existance first, but why it doesn't */ 3589 /* perl defines these to check for existance first, but why it doesn't */
3409 /* just create them one at init time is not clear to me, except for */ 3590 /* just create them one at init time is not clear to me, except for */
3410 /* programs trying to delete them, but... */ 3591 /* programs trying to delete them, but... */
3411 /* anyway, we declare this as invalid and make sure they are initialised here */ 3592 /* anyway, we declare this as invalid and make sure they are initialised here */
3412 DEFSV; 3593 DEFSV;
3463 time_init (aTHX); 3644 time_init (aTHX);
3464 3645
3465 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3646 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3466#if CORO_JIT 3647#if CORO_JIT
3467 PUTBACK; 3648 PUTBACK;
3468 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3469 jit_init (aTHX); 3649 jit_init (aTHX);
3470 perl_eval_pv ("undef &Coro::State::_jit", 1);
3471 SPAGAIN; 3650 SPAGAIN;
3472#endif 3651#endif
3473} 3652}
3474 3653
3475SV * 3654SV *
3484void 3663void
3485transfer (...) 3664transfer (...)
3486 PROTOTYPE: $$ 3665 PROTOTYPE: $$
3487 CODE: 3666 CODE:
3488 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3667 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3489
3490void
3491_exit (int code)
3492 PROTOTYPE: $
3493 CODE:
3494 _exit (code);
3495 3668
3496SV * 3669SV *
3497clone (Coro::State coro) 3670clone (Coro::State coro)
3498 CODE: 3671 CODE:
3499{ 3672{
3554void 3727void
3555list () 3728list ()
3556 PROTOTYPE: 3729 PROTOTYPE:
3557 PPCODE: 3730 PPCODE:
3558{ 3731{
3559 struct coro *coro; 3732 struct coro *coro;
3560 for (coro = coro_first; coro; coro = coro->next) 3733 for (coro = coro_first; coro; coro = coro->next)
3561 if (coro->hv) 3734 if (coro->hv)
3562 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3735 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3563} 3736}
3564 3737
3628 RETVAL = boolSV (coro->flags & ix); 3801 RETVAL = boolSV (coro->flags & ix);
3629 OUTPUT: 3802 OUTPUT:
3630 RETVAL 3803 RETVAL
3631 3804
3632void 3805void
3633throw (Coro::State self, SV *exception = &PL_sv_undef) 3806throw (SV *self, SV *exception = &PL_sv_undef)
3634 PROTOTYPE: $;$ 3807 PROTOTYPE: $;$
3635 CODE: 3808 CODE:
3636{ 3809{
3810 struct coro *coro = SvSTATE (self);
3637 struct coro *current = SvSTATE_current; 3811 struct coro *current = SvSTATE_current;
3638 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3812 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3639 SvREFCNT_dec (*exceptionp); 3813 SvREFCNT_dec (*exceptionp);
3640 SvGETMAGIC (exception); 3814 SvGETMAGIC (exception);
3641 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3815 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3816
3817 api_ready (aTHX_ self);
3642} 3818}
3643 3819
3644void 3820void
3645api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3821api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3646 PROTOTYPE: $;$ 3822 PROTOTYPE: $;$
3723 3899
3724void 3900void
3725times (Coro::State self) 3901times (Coro::State self)
3726 PPCODE: 3902 PPCODE:
3727{ 3903{
3728 struct coro *current = SvSTATE (coro_current); 3904 struct coro *current = SvSTATE (coro_current);
3729 3905
3730 if (ecb_expect_false (current == self)) 3906 if (ecb_expect_false (current == self))
3731 { 3907 {
3732 coro_times_update (); 3908 coro_times_update ();
3733 coro_times_add (SvSTATE (coro_current)); 3909 coro_times_add (SvSTATE (coro_current));
3776 3952
3777 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3953 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3778 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3954 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3779 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3955 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3780 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3956 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3781 3957
3782 coro_stash = gv_stashpv ("Coro", TRUE); 3958 coro_stash = gv_stashpv ("Coro", TRUE);
3783 3959
3784 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3960 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3785 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3961 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3786 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3962 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3798 coroapi.ready = api_ready; 3974 coroapi.ready = api_ready;
3799 coroapi.is_ready = api_is_ready; 3975 coroapi.is_ready = api_is_ready;
3800 coroapi.nready = coro_nready; 3976 coroapi.nready = coro_nready;
3801 coroapi.current = coro_current; 3977 coroapi.current = coro_current;
3802 3978
3979 coroapi.enterleave_hook = api_enterleave_hook;
3980 coroapi.enterleave_unhook = api_enterleave_unhook;
3981 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3982
3803 /*GCoroAPI = &coroapi;*/ 3983 /*GCoroAPI = &coroapi;*/
3804 sv_setiv (sv, (IV)&coroapi); 3984 sv_setiv (sv, (IV)&coroapi);
3805 SvREADONLY_on (sv); 3985 SvREADONLY_on (sv);
3806 } 3986 }
3807} 3987}
3872 4052
3873void 4053void
3874_set_current (SV *current) 4054_set_current (SV *current)
3875 PROTOTYPE: $ 4055 PROTOTYPE: $
3876 CODE: 4056 CODE:
3877 SvREFCNT_dec (SvRV (coro_current)); 4057 SvREFCNT_dec_NN (SvRV (coro_current));
3878 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4058 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3879 4059
3880void 4060void
3881_set_readyhook (SV *hook) 4061_set_readyhook (SV *hook)
3882 PROTOTYPE: $ 4062 PROTOTYPE: $
3966 4146
3967 if ((SV *)hv == &PL_sv_undef) 4147 if ((SV *)hv == &PL_sv_undef)
3968 { 4148 {
3969 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4149 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3970 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4150 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3971 SvREFCNT_dec (sv); 4151 SvREFCNT_dec_NN (sv);
3972 } 4152 }
3973 4153
3974 { 4154 {
3975 struct coro *coro = SvSTATE_hv (hv); 4155 struct coro *coro = SvSTATE_hv (hv);
3976 4156
3983 api_ready (aTHX_ (SV *)hv); 4163 api_ready (aTHX_ (SV *)hv);
3984 4164
3985 if (GIMME_V != G_VOID) 4165 if (GIMME_V != G_VOID)
3986 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4166 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3987 else 4167 else
3988 SvREFCNT_dec (hv); 4168 SvREFCNT_dec_NN (hv);
3989} 4169}
3990 4170
3991SV * 4171SV *
3992rouse_cb () 4172rouse_cb ()
3993 PROTOTYPE: 4173 PROTOTYPE:
4008 on_leave = 1 4188 on_leave = 1
4009 PROTOTYPE: & 4189 PROTOTYPE: &
4010 CODE: 4190 CODE:
4011{ 4191{
4012 struct coro *coro = SvSTATE_current; 4192 struct coro *coro = SvSTATE_current;
4013 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4193 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4014 4194
4015 block = s_get_cv_croak (block); 4195 block = s_get_cv_croak (block);
4016 4196
4017 if (!*avp) 4197 if (!*avp)
4018 *avp = newAV (); 4198 *avp = newAV ();
4038 4218
4039SV * 4219SV *
4040new (SV *klass, SV *count = 0) 4220new (SV *klass, SV *count = 0)
4041 CODE: 4221 CODE:
4042{ 4222{
4043 int semcnt = 1; 4223 int semcnt = 1;
4044 4224
4045 if (count) 4225 if (count)
4046 { 4226 {
4047 SvGETMAGIC (count); 4227 SvGETMAGIC (count);
4048 4228
4108 XSRETURN_NO; 4288 XSRETURN_NO;
4109} 4289}
4110 4290
4111void 4291void
4112waiters (SV *self) 4292waiters (SV *self)
4113 PPCODE: 4293 PPCODE:
4114{ 4294{
4115 AV *av = (AV *)SvRV (self); 4295 AV *av = (AV *)SvRV (self);
4116 int wcount = AvFILLp (av) + 1 - 1; 4296 int wcount = AvFILLp (av) + 1 - 1;
4117 4297
4118 if (GIMME_V == G_SCALAR) 4298 if (GIMME_V == G_SCALAR)
4127} 4307}
4128 4308
4129MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4309MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4130 4310
4131void 4311void
4132_may_delete (SV *sem, int count, int extra_refs) 4312_may_delete (SV *sem, int count, unsigned int extra_refs)
4133 PPCODE: 4313 PPCODE:
4134{ 4314{
4135 AV *av = (AV *)SvRV (sem); 4315 AV *av = (AV *)SvRV (sem);
4136 4316
4137 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4317 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4138 && AvFILLp (av) == 0 /* no waiters, just count */ 4318 && AvFILLp (av) == 0 /* no waiters, just count */
4139 && SvIV (AvARRAY (av)[0]) == count) 4319 && SvIV (AvARRAY (av)[0]) == count)
4140 XSRETURN_YES; 4320 XSRETURN_YES;
4161 4341
4162void 4342void
4163broadcast (SV *self) 4343broadcast (SV *self)
4164 CODE: 4344 CODE:
4165{ 4345{
4166 AV *av = (AV *)SvRV (self); 4346 AV *av = (AV *)SvRV (self);
4167 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4347 coro_signal_wake (aTHX_ av, AvFILLp (av));
4168} 4348}
4169 4349
4170void 4350void
4171send (SV *self) 4351send (SV *self)
4179 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4359 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4180} 4360}
4181 4361
4182IV 4362IV
4183awaited (SV *self) 4363awaited (SV *self)
4184 CODE: 4364 CODE:
4185 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4365 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4186 OUTPUT: 4366 OUTPUT:
4187 RETVAL 4367 RETVAL
4188 4368
4189 4369
4194 4374
4195void 4375void
4196_schedule (...) 4376_schedule (...)
4197 CODE: 4377 CODE:
4198{ 4378{
4199 static int incede; 4379 static int incede;
4200 4380
4201 api_cede_notself (aTHX); 4381 api_cede_notself (aTHX);
4202 4382
4203 ++incede; 4383 ++incede;
4204 while (coro_nready >= incede && api_cede (aTHX)) 4384 while (coro_nready >= incede && api_cede (aTHX))
4248 { 4428 {
4249 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4429 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4250 coro_old_pp_sselect = 0; 4430 coro_old_pp_sselect = 0;
4251 } 4431 }
4252 4432
4433MODULE = Coro::State PACKAGE = Coro::Util
4434
4435void
4436_exit (int code)
4437 CODE:
4438 _exit (code);
4439
4440NV
4441time ()
4442 CODE:
4443 RETVAL = nvtime (aTHX);
4444 OUTPUT:
4445 RETVAL
4446
4447NV
4448gettimeofday ()
4449 PPCODE:
4450{
4451 UV tv [2];
4452 u2time (aTHX_ tv);
4453 EXTEND (SP, 2);
4454 PUSHs (sv_2mortal (newSVuv (tv [0])));
4455 PUSHs (sv_2mortal (newSVuv (tv [1])));
4456}
4457

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines