ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

Comparing Coro/Coro/State.xs (file contents):
Revision 1.406 by root, Sat Jun 11 13:49:00 2011 UTC vs.
Revision 1.456 by root, Sun Mar 6 06:26:21 2016 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))
134 140
135static GV *irsgv; /* $/ */ 141static GV *irsgv; /* $/ */
136static GV *stdoutgv; /* *STDOUT */ 142static GV *stdoutgv; /* *STDOUT */
137static SV *rv_diehook; 143static SV *rv_diehook;
138static SV *rv_warnhook; 144static SV *rv_warnhook;
139static HV *hv_sig; /* %SIG */
140 145
141/* async_pool helper stuff */ 146/* async_pool helper stuff */
142static SV *sv_pool_rss; 147static SV *sv_pool_rss;
143static SV *sv_pool_size; 148static SV *sv_pool_size;
144static SV *sv_async_pool_idle; /* description string */ 149static SV *sv_async_pool_idle; /* description string */
172typedef struct coro_cctx 177typedef struct coro_cctx
173{ 178{
174 struct coro_cctx *next; 179 struct coro_cctx *next;
175 180
176 /* the stack */ 181 /* the stack */
177 void *sptr; 182 struct coro_stack stack;
178 size_t ssize;
179 183
180 /* cpu state */ 184 /* cpu state */
181 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
186#ifndef NDEBUG
182 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 187 JMPENV *idle_te; /* same as idle_sp, but for top_env */
188#endif
183 JMPENV *top_env; 189 JMPENV *top_env;
184 coro_context cctx; 190 coro_context cctx;
185 191
186 U32 gen; 192 U32 gen;
187#if CORO_USE_VALGRIND 193#if CORO_USE_VALGRIND
207}; 213};
208 214
209/* the structure where most of the perl state is stored, overlaid on the cxstack */ 215/* the structure where most of the perl state is stored, overlaid on the cxstack */
210typedef struct 216typedef struct
211{ 217{
212#define VARx(name,expr,type) type name; 218 #define VARx(name,expr,type) type name;
213# include "state.h" 219 #include "state.h"
214#undef VARx
215} perl_slots; 220} perl_slots;
216 221
217// how many context stack entries do we need for perl_slots 222/* 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)) 223#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
219 224
220/* this is a structure representing a perl-level coroutine */ 225/* this is a structure representing a perl-level coroutine */
221struct coro 226struct coro
222{ 227{
250 SV *saved_deffh; 255 SV *saved_deffh;
251 SV *invoke_cb; 256 SV *invoke_cb;
252 AV *invoke_av; 257 AV *invoke_av;
253 258
254 /* on_enter/on_leave */ 259 /* on_enter/on_leave */
255 AV *on_enter; 260 AV *on_enter; AV *on_enter_xs;
256 AV *on_leave; 261 AV *on_leave; AV *on_leave_xs;
257 262
258 /* swap_sv */ 263 /* swap_sv */
259 AV *swap_sv; 264 AV *swap_sv;
260 265
261 /* times */ 266 /* times */
291#define coro_nready coroapi.nready 296#define coro_nready coroapi.nready
292 297
293/** JIT *********************************************************************/ 298/** JIT *********************************************************************/
294 299
295#if CORO_JIT 300#if CORO_JIT
301 /* APPLE doesn't have mmap though */
302 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
296 #ifndef CORO_JIT_TYPE 303 #ifndef CORO_JIT_TYPE
297 #if __x86_64 && (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris) 304 #if ECB_AMD64 && CORO_JIT_UNIXY
298 #define CORO_JIT_TYPE "amd64-unix" 305 #define CORO_JIT_TYPE "amd64-unix"
299 typedef void (*load_save_perl_slots_type)(perl_slots *); 306 #elif __i386 && CORO_JIT_UNIXY
300 #else 307 #define CORO_JIT_TYPE "x86-unix"
301 #undef CORO_JIT
302 #endif 308 #endif
303 #endif 309 #endif
304#endif 310#endif
305 311
312#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
313 #undef CORO_JIT
314#endif
315
306#if CORO_JIT 316#if CORO_JIT
317 typedef void (*load_save_perl_slots_type)(perl_slots *);
307static load_save_perl_slots_type load_perl_slots, save_perl_slots; 318 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
308#endif 319#endif
309 320
310/** Coro::Select ************************************************************/ 321/** Coro::Select ************************************************************/
311 322
312static OP *(*coro_old_pp_sselect) (pTHX); 323static OP *(*coro_old_pp_sselect) (pTHX);
329 340
330/** time stuff **************************************************************/ 341/** time stuff **************************************************************/
331 342
332#ifdef HAS_GETTIMEOFDAY 343#ifdef HAS_GETTIMEOFDAY
333 344
334ECB_INLINE void 345ecb_inline void
335coro_u2time (pTHX_ UV ret[2]) 346coro_u2time (pTHX_ UV ret[2])
336{ 347{
337 struct timeval tv; 348 struct timeval tv;
338 gettimeofday (&tv, 0); 349 gettimeofday (&tv, 0);
339 350
340 ret [0] = tv.tv_sec; 351 ret [0] = tv.tv_sec;
341 ret [1] = tv.tv_usec; 352 ret [1] = tv.tv_usec;
342} 353}
343 354
344ECB_INLINE double 355ecb_inline double
345coro_nvtime () 356coro_nvtime (void)
346{ 357{
347 struct timeval tv; 358 struct timeval tv;
348 gettimeofday (&tv, 0); 359 gettimeofday (&tv, 0);
349 360
350 return tv.tv_sec + tv.tv_usec * 1e-6; 361 return tv.tv_sec + tv.tv_usec * 1e-6;
351} 362}
352 363
353ECB_INLINE void 364ecb_inline void
354time_init (pTHX) 365time_init (pTHX)
355{ 366{
356 nvtime = coro_nvtime; 367 nvtime = coro_nvtime;
357 u2time = coro_u2time; 368 u2time = coro_u2time;
358} 369}
359 370
360#else 371#else
361 372
362ECB_INLINE void 373ecb_inline void
363time_init (pTHX) 374time_init (pTHX)
364{ 375{
365 SV **svp; 376 SV **svp;
366 377
367 require_pv ("Time/HiRes.pm"); 378 require_pv ("Time/HiRes.pm");
368 379
369 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 380 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
370 381
371 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 382 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
372 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 383 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
373 384
409 get_hv (name, create); 420 get_hv (name, create);
410#endif 421#endif
411 return get_hv (name, create); 422 return get_hv (name, create);
412} 423}
413 424
414ECB_INLINE void 425ecb_inline void
415coro_times_update () 426coro_times_update (void)
416{ 427{
417#ifdef coro_clock_gettime 428#ifdef coro_clock_gettime
418 struct timespec ts; 429 struct timespec ts;
419 430
420 ts.tv_sec = ts.tv_nsec = 0; 431 ts.tv_sec = ts.tv_nsec = 0;
432 time_real [0] = tv [0]; 443 time_real [0] = tv [0];
433 time_real [1] = tv [1] * 1000; 444 time_real [1] = tv [1] * 1000;
434#endif 445#endif
435} 446}
436 447
437ECB_INLINE void 448ecb_inline void
438coro_times_add (struct coro *c) 449coro_times_add (struct coro *c)
439{ 450{
440 c->t_real [1] += time_real [1]; 451 c->t_real [1] += time_real [1];
441 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 452 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
442 c->t_real [0] += time_real [0]; 453 c->t_real [0] += time_real [0];
444 c->t_cpu [1] += time_cpu [1]; 455 c->t_cpu [1] += time_cpu [1];
445 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 456 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
446 c->t_cpu [0] += time_cpu [0]; 457 c->t_cpu [0] += time_cpu [0];
447} 458}
448 459
449ECB_INLINE void 460ecb_inline void
450coro_times_sub (struct coro *c) 461coro_times_sub (struct coro *c)
451{ 462{
452 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 463 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
453 c->t_real [1] -= time_real [1]; 464 c->t_real [1] -= time_real [1];
454 c->t_real [0] -= time_real [0]; 465 c->t_real [0] -= time_real [0];
475 : 0) 486 : 0)
476 487
477#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 488#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
478#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 489#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
479 490
480ECB_INLINE MAGIC * 491ecb_inline MAGIC *
481SvSTATEhv_p (pTHX_ SV *coro) 492SvSTATEhv_p (pTHX_ SV *coro)
482{ 493{
483 MAGIC *mg; 494 MAGIC *mg;
484 495
485 if (ecb_expect_true ( 496 if (ecb_expect_true (
490 return mg; 501 return mg;
491 502
492 return 0; 503 return 0;
493} 504}
494 505
495ECB_INLINE struct coro * 506ecb_inline struct coro *
496SvSTATE_ (pTHX_ SV *coro) 507SvSTATE_ (pTHX_ SV *coro_sv)
497{ 508{
498 MAGIC *mg; 509 MAGIC *mg;
499 510
500 if (SvROK (coro)) 511 if (SvROK (coro_sv))
501 coro = SvRV (coro); 512 coro_sv = SvRV (coro_sv);
502 513
503 mg = SvSTATEhv_p (aTHX_ coro); 514 mg = SvSTATEhv_p (aTHX_ coro_sv);
504 if (!mg) 515 if (!mg)
505 croak ("Coro::State object required"); 516 croak ("Coro::State object required");
506 517
507 return (struct coro *)mg->mg_ptr; 518 return (struct coro *)mg->mg_ptr;
508} 519}
514#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 525#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
515 526
516/*****************************************************************************/ 527/*****************************************************************************/
517/* padlist management and caching */ 528/* padlist management and caching */
518 529
519ECB_INLINE AV * 530ecb_inline PADLIST *
520coro_derive_padlist (pTHX_ CV *cv) 531coro_derive_padlist (pTHX_ CV *cv)
521{ 532{
522 AV *padlist = CvPADLIST (cv); 533 PADLIST *padlist = CvPADLIST (cv);
523 AV *newpadlist, *newpad; 534 PADLIST *newpadlist;
535 PADNAMELIST *padnames;
536 PAD *newpad;
537 PADOFFSET off = PadlistMAX (padlist) + 1;
524 538
525 newpadlist = newAV (); 539#if NEWPADAPI
540
541 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
542 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
543 while (!PadlistARRAY (padlist)[off - 1])
544 --off;
545
546 Perl_pad_push (aTHX_ padlist, off);
547
548 newpad = PadlistARRAY (padlist)[off];
549 PadlistARRAY (padlist)[off] = 0;
550
551#else
552
553#if PERL_VERSION_ATLEAST (5,10,0)
554 Perl_pad_push (aTHX_ padlist, off);
555#else
556 Perl_pad_push (aTHX_ padlist, off, 1);
557#endif
558
559 newpad = PadlistARRAY (padlist)[off];
560 PadlistMAX (padlist) = off - 1;
561
562#endif
563
564 newPADLIST (newpadlist);
565#if !PERL_VERSION_ATLEAST(5,15,3)
566 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
526 AvREAL_off (newpadlist); 567 AvREAL_off (newpadlist);
527#if PERL_VERSION_ATLEAST (5,10,0)
528 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
529#else
530 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
531#endif 568#endif
532 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
533 --AvFILLp (padlist);
534 569
535 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 570 /* Already extended to 2 elements by newPADLIST. */
536 av_store (newpadlist, 1, (SV *)newpad); 571 PadlistMAX (newpadlist) = 1;
572
573 padnames = PadlistNAMES (padlist);
574 ++PadnamelistREFCNT (padnames);
575 PadlistNAMES (newpadlist) = padnames;
576
577 PadlistARRAY (newpadlist)[1] = newpad;
537 578
538 return newpadlist; 579 return newpadlist;
539} 580}
540 581
541ECB_INLINE void 582ecb_inline void
542free_padlist (pTHX_ AV *padlist) 583free_padlist (pTHX_ PADLIST *padlist)
543{ 584{
544 /* may be during global destruction */ 585 /* may be during global destruction */
545 if (!IN_DESTRUCT) 586 if (!IN_DESTRUCT)
546 { 587 {
547 I32 i = AvFILLp (padlist); 588 I32 i = PadlistMAX (padlist);
548 589
549 while (i > 0) /* special-case index 0 */ 590 while (i > 0) /* special-case index 0 */
550 { 591 {
551 /* we try to be extra-careful here */ 592 /* we try to be extra-careful here */
552 AV *av = (AV *)AvARRAY (padlist)[i--]; 593 PAD *pad = PadlistARRAY (padlist)[i--];
553 I32 j = AvFILLp (av);
554 594
595 if (pad)
596 {
597 I32 j = PadMAX (pad);
598
555 while (j >= 0) 599 while (j >= 0)
556 SvREFCNT_dec (AvARRAY (av)[j--]); 600 SvREFCNT_dec (PadARRAY (pad)[j--]);
557 601
558 AvFILLp (av) = -1; 602 PadMAX (pad) = -1;
559 SvREFCNT_dec (av); 603 SvREFCNT_dec (pad);
604 }
560 } 605 }
561 606
562 SvREFCNT_dec (AvARRAY (padlist)[0]); 607 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
563 608
609#if NEWPADAPI
610 Safefree (PadlistARRAY (padlist));
611 Safefree (padlist);
612#else
564 AvFILLp (padlist) = -1; 613 AvFILLp (padlist) = -1;
614 AvREAL_off (padlist);
565 SvREFCNT_dec ((SV*)padlist); 615 SvREFCNT_dec ((SV*)padlist);
616#endif
566 } 617 }
567} 618}
568 619
569static int 620static int
570coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 621coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
571{ 622{
572 AV *padlist; 623 PADLIST *padlist;
573 AV *av = (AV *)mg->mg_obj; 624 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
625 size_t len = *(size_t *)mg->mg_ptr;
574 626
575 /* perl manages to free our internal AV and _then_ call us */ 627 /* perl manages to free our internal AV and _then_ call us */
576 if (IN_DESTRUCT) 628 if (IN_DESTRUCT)
577 return 0; 629 return 0;
578 630
579 /* casting is fun. */ 631 while (len--)
580 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
581 free_padlist (aTHX_ padlist); 632 free_padlist (aTHX_ padlists[len]);
582
583 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
584 633
585 return 0; 634 return 0;
586} 635}
587 636
588static MGVTBL coro_cv_vtbl = { 637static MGVTBL coro_cv_vtbl = {
589 0, 0, 0, 0, 638 0, 0, 0, 0,
590 coro_cv_free 639 coro_cv_free
591}; 640};
592 641
593/* the next two functions merely cache the padlists */ 642/* the next two functions merely cache the padlists */
594ECB_INLINE void 643ecb_inline void
595get_padlist (pTHX_ CV *cv) 644get_padlist (pTHX_ CV *cv)
596{ 645{
597 MAGIC *mg = CORO_MAGIC_cv (cv); 646 MAGIC *mg = CORO_MAGIC_cv (cv);
598 AV *av; 647 size_t *lenp;
599 648
600 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 649 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
601 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 650 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
602 else 651 else
603 { 652 {
604#if CORO_PREFER_PERL_FUNCTIONS 653#if CORO_PREFER_PERL_FUNCTIONS
605 /* this is probably cleaner? but also slower! */ 654 /* this is probably cleaner? but also slower! */
606 /* in practise, it seems to be less stable */ 655 /* in practise, it seems to be less stable */
612 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 661 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
613#endif 662#endif
614 } 663 }
615} 664}
616 665
617ECB_INLINE void 666ecb_inline void
618put_padlist (pTHX_ CV *cv) 667put_padlist (pTHX_ CV *cv)
619{ 668{
620 MAGIC *mg = CORO_MAGIC_cv (cv); 669 MAGIC *mg = CORO_MAGIC_cv (cv);
621 AV *av;
622 670
623 if (ecb_expect_false (!mg)) 671 if (ecb_expect_false (!mg))
672 {
624 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 673 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
674 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
675 mg->mg_len = 1; /* so mg_free frees mg_ptr */
676 }
677 else
678 Renew (mg->mg_ptr,
679 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
680 char);
625 681
626 av = (AV *)mg->mg_obj; 682 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
627
628 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
629 av_extend (av, AvFILLp (av) + 1);
630
631 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
632} 683}
633 684
634/** load & save, init *******************************************************/ 685/** load & save, init *******************************************************/
635 686
687ecb_inline void
688swap_sv (SV *a, SV *b)
689{
690 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
691 SV tmp;
692
693 /* swap sv_any */
694 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
695
696 /* swap sv_flags */
697 SvFLAGS (&tmp) = SvFLAGS (a);
698 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
699 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
700
701#if PERL_VERSION_ATLEAST (5,10,0)
702 /* perl 5.10 and later complicates this _quite_ a bit, but it also
703 * is much faster, so no quarrels here. alternatively, we could
704 * sv_upgrade to avoid this.
705 */
706 {
707 /* swap sv_u */
708 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
709
710 /* if SvANY points to the head, we need to adjust the pointers,
711 * as the pointer for a still points to b, and maybe vice versa.
712 */
713 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
714 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
715 svany_in_head_set |= 1 << SVt_NV;
716 #endif
717
718 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
719
720 if (svany_in_head (SvTYPE (a)))
721 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
722
723 if (svany_in_head (SvTYPE (b)))
724 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
725 }
726#endif
727}
728
636/* swap sv heads, at least logically */ 729/* swap sv heads, at least logically */
637static void 730static void
638swap_svs (pTHX_ Coro__State c) 731swap_svs (pTHX_ Coro__State c)
639{ 732{
640 int i; 733 int i;
641 734
642 for (i = 0; i <= AvFILLp (c->swap_sv); ) 735 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
643 { 736 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
644 SV *a = AvARRAY (c->swap_sv)[i++];
645 SV *b = AvARRAY (c->swap_sv)[i++];
646
647 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
648 SV tmp;
649
650 /* swap sv_any */
651 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
652
653 /* swap sv_flags */
654 SvFLAGS (&tmp) = SvFLAGS (a);
655 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
656 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
657
658#if PERL_VERSION_ATLEAST (5,10,0)
659 /* perl 5.10 complicates this _quite_ a bit, but it also is
660 * much faster, so no quarrels here. alternatively, we could
661 * sv_upgrade to avoid this.
662 */
663 {
664 /* swap sv_u */
665 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
666
667 /* if SvANY points to the head, we need to adjust the pointers,
668 * as the pointer for a still points to b, and maybe vice versa.
669 */
670 #define svany_in_head(type) \
671 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
672
673 if (svany_in_head (SvTYPE (a)))
674 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
675
676 if (svany_in_head (SvTYPE (b)))
677 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
678 }
679#endif
680 }
681} 737}
682 738
683#define SWAP_SVS(coro) \ 739#define SWAP_SVS(coro) \
684 if (ecb_expect_false ((coro)->swap_sv)) \ 740 if (ecb_expect_false ((coro)->swap_sv)) \
685 swap_svs (aTHX_ (coro)) 741 swap_svs (aTHX_ (coro))
697 753
698#if CORO_JIT 754#if CORO_JIT
699 load_perl_slots (slot); 755 load_perl_slots (slot);
700#else 756#else
701 #define VARx(name,expr,type) expr = slot->name; 757 #define VARx(name,expr,type) expr = slot->name;
702 # include "state.h" 758 #include "state.h"
703 #undef VARx
704#endif 759#endif
705 760
706 { 761 {
707 dSP; 762 dSP;
708 763
711 /* now do the ugly restore mess */ 766 /* now do the ugly restore mess */
712 while (ecb_expect_true (cv = (CV *)POPs)) 767 while (ecb_expect_true (cv = (CV *)POPs))
713 { 768 {
714 put_padlist (aTHX_ cv); /* mark this padlist as available */ 769 put_padlist (aTHX_ cv); /* mark this padlist as available */
715 CvDEPTH (cv) = PTR2IV (POPs); 770 CvDEPTH (cv) = PTR2IV (POPs);
716 CvPADLIST (cv) = (AV *)POPs; 771 CvPADLIST (cv) = (PADLIST *)POPs;
717 } 772 }
718 773
719 PUTBACK; 774 PUTBACK;
720 } 775 }
721 776
736 791
737 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 792 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
738 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 793 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
739 } 794 }
740 795
796 if (ecb_expect_false (c->on_enter_xs))
797 {
798 int i;
799
800 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
801 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
802 }
803
741 SWAP_SVS (c); 804 SWAP_SVS (c);
742} 805}
743 806
744static void 807static void
745save_perl (pTHX_ Coro__State c) 808save_perl (pTHX_ Coro__State c)
746{ 809{
747 SWAP_SVS (c); 810 SWAP_SVS (c);
811
812 if (ecb_expect_false (c->on_leave_xs))
813 {
814 int i;
815
816 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
817 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
818 }
748 819
749 if (ecb_expect_false (c->on_leave)) 820 if (ecb_expect_false (c->on_leave))
750 { 821 {
751 int i; 822 int i;
752 823
811 882
812 PUTBACK; 883 PUTBACK;
813 } 884 }
814 885
815 /* allocate some space on the context stack for our purposes */ 886 /* allocate some space on the context stack for our purposes */
816 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 887 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
817 { 888 {
818 unsigned int i; 889 unsigned int i;
819 890
820 for (i = 0; i < SLOT_COUNT; ++i) 891 for (i = 0; i < SLOT_COUNT; ++i)
821 CXINC; 892 CXINC;
830 901
831#if CORO_JIT 902#if CORO_JIT
832 save_perl_slots (slot); 903 save_perl_slots (slot);
833#else 904#else
834 #define VARx(name,expr,type) slot->name = expr; 905 #define VARx(name,expr,type) slot->name = expr;
835 # include "state.h" 906 #include "state.h"
836 #undef VARx
837#endif 907#endif
838 } 908 }
839} 909}
840 910
841/* 911/*
873#endif 943#endif
874 944
875 New(54,PL_scopestack,8,I32); 945 New(54,PL_scopestack,8,I32);
876 PL_scopestack_ix = 0; 946 PL_scopestack_ix = 0;
877 PL_scopestack_max = 8; 947 PL_scopestack_max = 8;
948#if HAS_SCOPESTACK_NAME
949 New(54,PL_scopestack_name,8,const char*);
950#endif
878 951
879 New(54,PL_savestack,24,ANY); 952 New(54,PL_savestack,24,ANY);
880 PL_savestack_ix = 0; 953 PL_savestack_ix = 0;
881 PL_savestack_max = 24; 954 PL_savestack_max = 24;
882 955
910 } 983 }
911 984
912 Safefree (PL_tmps_stack); 985 Safefree (PL_tmps_stack);
913 Safefree (PL_markstack); 986 Safefree (PL_markstack);
914 Safefree (PL_scopestack); 987 Safefree (PL_scopestack);
988#if HAS_SCOPESTACK_NAME
989 Safefree (PL_scopestack_name);
990#endif
915 Safefree (PL_savestack); 991 Safefree (PL_savestack);
916#if !PERL_VERSION_ATLEAST (5,10,0) 992#if !PERL_VERSION_ATLEAST (5,10,0)
917 Safefree (PL_retstack); 993 Safefree (PL_retstack);
918#endif 994#endif
919} 995}
979 { 1055 {
980 SV **svp = 0; 1056 SV **svp = 0;
981 1057
982 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1058 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
983 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1059 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
984 1060
985 if (svp) 1061 if (svp)
986 { 1062 {
987 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1063 SV *ssv;
1064
1065 if (!*svp)
1066 ssv = &PL_sv_undef;
1067 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1068 ssv = sv_2mortal (newRV_inc (*svp));
1069 else
1070 ssv = *svp;
1071
1072 sv_setsv (sv, ssv);
988 return 0; 1073 return 0;
989 } 1074 }
990 } 1075 }
991 1076
992 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1077 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
1086 PL_hints = 0; 1171 PL_hints = 0;
1087 1172
1088 /* recreate the die/warn hooks */ 1173 /* recreate the die/warn hooks */
1089 PL_diehook = SvREFCNT_inc (rv_diehook); 1174 PL_diehook = SvREFCNT_inc (rv_diehook);
1090 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1175 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1091 1176
1092 GvSV (PL_defgv) = newSV (0); 1177 GvSV (PL_defgv) = newSV (0);
1093 GvAV (PL_defgv) = coro->args; coro->args = 0; 1178 GvAV (PL_defgv) = coro->args; coro->args = 0;
1094 GvSV (PL_errgv) = newSV (0); 1179 GvSV (PL_errgv) = newSV (0);
1095 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1180 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1096 GvHV (PL_hintgv) = 0; 1181 GvHV (PL_hintgv) = newHV ();
1182#if PERL_VERSION_ATLEAST (5,10,0)
1183 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1184#endif
1097 PL_rs = newSVsv (GvSV (irsgv)); 1185 PL_rs = newSVsv (GvSV (irsgv));
1098 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1186 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1099 1187
1100 { 1188 {
1101 dSP; 1189 dSP;
1184 /* restore swapped sv's */ 1272 /* restore swapped sv's */
1185 SWAP_SVS (coro); 1273 SWAP_SVS (coro);
1186 1274
1187 coro_destruct_stacks (aTHX); 1275 coro_destruct_stacks (aTHX);
1188 1276
1189 // now save some sv's to be free'd later 1277 /* now save some sv's to be free'd later */
1190 svf [0] = GvSV (PL_defgv); 1278 svf [0] = GvSV (PL_defgv);
1191 svf [1] = (SV *)GvAV (PL_defgv); 1279 svf [1] = (SV *)GvAV (PL_defgv);
1192 svf [2] = GvSV (PL_errgv); 1280 svf [2] = GvSV (PL_errgv);
1193 svf [3] = (SV *)PL_defoutgv; 1281 svf [3] = (SV *)PL_defoutgv;
1194 svf [4] = PL_rs; 1282 svf [4] = PL_rs;
1211 1299
1212 SvREFCNT_dec (coro->saved_deffh); 1300 SvREFCNT_dec (coro->saved_deffh);
1213 SvREFCNT_dec (coro->rouse_cb); 1301 SvREFCNT_dec (coro->rouse_cb);
1214 SvREFCNT_dec (coro->invoke_cb); 1302 SvREFCNT_dec (coro->invoke_cb);
1215 SvREFCNT_dec (coro->invoke_av); 1303 SvREFCNT_dec (coro->invoke_av);
1304 SvREFCNT_dec (coro->on_enter_xs);
1305 SvREFCNT_dec (coro->on_leave_xs);
1216 } 1306 }
1217} 1307}
1218 1308
1219ECB_INLINE void 1309ecb_inline void
1220free_coro_mortal (pTHX) 1310free_coro_mortal (pTHX)
1221{ 1311{
1222 if (ecb_expect_true (coro_mortal)) 1312 if (ecb_expect_true (coro_mortal))
1223 { 1313 {
1224 SvREFCNT_dec ((SV *)coro_mortal); 1314 SvREFCNT_dec ((SV *)coro_mortal);
1283 1373
1284 if (PL_curcop != &PL_compiling) 1374 if (PL_curcop != &PL_compiling)
1285 { 1375 {
1286 SV **cb; 1376 SV **cb;
1287 1377
1288 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1378 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1289 { 1379 {
1290 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1380 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1291 1381
1292 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1382 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1293 { 1383 {
1383 slf_frame.prepare = slf_prepare_set_stacklevel; 1473 slf_frame.prepare = slf_prepare_set_stacklevel;
1384 slf_frame.check = slf_check_set_stacklevel; 1474 slf_frame.check = slf_check_set_stacklevel;
1385} 1475}
1386 1476
1387/* the tail of transfer: execute stuff we can only do after a transfer */ 1477/* the tail of transfer: execute stuff we can only do after a transfer */
1388ECB_INLINE void 1478ecb_inline void
1389transfer_tail (pTHX) 1479transfer_tail (pTHX)
1390{ 1480{
1391 free_coro_mortal (aTHX); 1481 free_coro_mortal (aTHX);
1482}
1483
1484/* try to exit the same way perl's main function would do */
1485/* we do not bother resetting the environment or other things *7
1486/* that are not, uhm, essential */
1487/* this obviously also doesn't work when perl is embedded */
1488static void ecb_noinline ecb_cold
1489perlish_exit (pTHX)
1490{
1491 int exitstatus = perl_destruct (PL_curinterp);
1492 perl_free (PL_curinterp);
1493 exit (exitstatus);
1392} 1494}
1393 1495
1394/* 1496/*
1395 * this is a _very_ stripped down perl interpreter ;) 1497 * this is a _very_ stripped down perl interpreter ;)
1396 */ 1498 */
1425 */ 1527 */
1426 1528
1427 /* 1529 /*
1428 * If perl-run returns we assume exit() was being called or the coro 1530 * If perl-run returns we assume exit() was being called or the coro
1429 * fell off the end, which seems to be the only valid (non-bug) 1531 * fell off the end, which seems to be the only valid (non-bug)
1430 * reason for perl_run to return. We try to exit by jumping to the 1532 * reason for perl_run to return. We try to mimic whatever perl is normally
1431 * bootstrap-time "top" top_env, as we cannot restore the "main" 1533 * doing in that case. YMMV.
1432 * coroutine as Coro has no such concept.
1433 * This actually isn't valid with the pthread backend, but OSes requiring
1434 * that backend are too broken to do it in a standards-compliant way.
1435 */ 1534 */
1436 PL_top_env = main_top_env; 1535 perlish_exit (aTHX);
1437 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1438 } 1536 }
1439} 1537}
1440 1538
1441static coro_cctx * 1539static coro_cctx *
1442cctx_new () 1540cctx_new (void)
1443{ 1541{
1444 coro_cctx *cctx; 1542 coro_cctx *cctx;
1445 1543
1446 ++cctx_count; 1544 ++cctx_count;
1447 New (0, cctx, 1, coro_cctx); 1545 New (0, cctx, 1, coro_cctx);
1453 return cctx; 1551 return cctx;
1454} 1552}
1455 1553
1456/* create a new cctx only suitable as source */ 1554/* create a new cctx only suitable as source */
1457static coro_cctx * 1555static coro_cctx *
1458cctx_new_empty () 1556cctx_new_empty (void)
1459{ 1557{
1460 coro_cctx *cctx = cctx_new (); 1558 coro_cctx *cctx = cctx_new ();
1461 1559
1462 cctx->sptr = 0; 1560 cctx->stack.sptr = 0;
1463 coro_create (&cctx->cctx, 0, 0, 0, 0); 1561 coro_create (&cctx->cctx, 0, 0, 0, 0);
1464 1562
1465 return cctx; 1563 return cctx;
1466} 1564}
1467 1565
1468/* create a new cctx suitable as destination/running a perl interpreter */ 1566/* create a new cctx suitable as destination/running a perl interpreter */
1469static coro_cctx * 1567static coro_cctx *
1470cctx_new_run () 1568cctx_new_run (void)
1471{ 1569{
1472 coro_cctx *cctx = cctx_new (); 1570 coro_cctx *cctx = cctx_new ();
1473 void *stack_start;
1474 size_t stack_size;
1475 1571
1476#if HAVE_MMAP 1572 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1477 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1478 /* mmap supposedly does allocate-on-write for us */
1479 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1480
1481 if (cctx->sptr != (void *)-1)
1482 {
1483 #if CORO_STACKGUARD
1484 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1485 #endif
1486 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1487 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1488 cctx->flags |= CC_MAPPED;
1489 } 1573 {
1490 else
1491#endif
1492 {
1493 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1494 New (0, cctx->sptr, cctx_stacksize, long);
1495
1496 if (!cctx->sptr)
1497 {
1498 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1574 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1499 _exit (EXIT_FAILURE); 1575 _exit (EXIT_FAILURE);
1500 }
1501
1502 stack_start = cctx->sptr;
1503 stack_size = cctx->ssize;
1504 } 1576 }
1505 1577
1506 #if CORO_USE_VALGRIND
1507 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1508 #endif
1509
1510 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1578 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1511 1579
1512 return cctx; 1580 return cctx;
1513} 1581}
1514 1582
1515static void 1583static void
1521 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1589 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1522 1590
1523 --cctx_count; 1591 --cctx_count;
1524 coro_destroy (&cctx->cctx); 1592 coro_destroy (&cctx->cctx);
1525 1593
1526 /* coro_transfer creates new, empty cctx's */ 1594 coro_stack_free (&cctx->stack);
1527 if (cctx->sptr)
1528 {
1529 #if CORO_USE_VALGRIND
1530 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1531 #endif
1532
1533#if HAVE_MMAP
1534 if (cctx->flags & CC_MAPPED)
1535 munmap (cctx->sptr, cctx->ssize);
1536 else
1537#endif
1538 Safefree (cctx->sptr);
1539 }
1540 1595
1541 Safefree (cctx); 1596 Safefree (cctx);
1542} 1597}
1543 1598
1544/* wether this cctx should be destructed */ 1599/* wether this cctx should be destructed */
1563} 1618}
1564 1619
1565static void 1620static void
1566cctx_put (coro_cctx *cctx) 1621cctx_put (coro_cctx *cctx)
1567{ 1622{
1568 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1623 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1569 1624
1570 /* free another cctx if overlimit */ 1625 /* free another cctx if overlimit */
1571 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1626 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1572 { 1627 {
1573 coro_cctx *first = cctx_first; 1628 coro_cctx *first = cctx_first;
1699 return; 1754 return;
1700 1755
1701 slf_destroy (aTHX_ coro); 1756 slf_destroy (aTHX_ coro);
1702 1757
1703 coro->flags |= CF_ZOMBIE; 1758 coro->flags |= CF_ZOMBIE;
1704 1759
1705 if (coro->flags & CF_READY) 1760 if (coro->flags & CF_READY)
1706 { 1761 {
1707 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1762 /* reduce nready, as destroying a ready coro effectively unreadies it */
1708 /* alternative: look through all ready queues and remove the coro */ 1763 /* alternative: look through all ready queues and remove the coro */
1709 --coro_nready; 1764 --coro_nready;
1786 TRANSFER (ta, 1); 1841 TRANSFER (ta, 1);
1787} 1842}
1788 1843
1789/** Coro ********************************************************************/ 1844/** Coro ********************************************************************/
1790 1845
1791ECB_INLINE void 1846ecb_inline void
1792coro_enq (pTHX_ struct coro *coro) 1847coro_enq (pTHX_ struct coro *coro)
1793{ 1848{
1794 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1849 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1795 1850
1796 SvREFCNT_inc_NN (coro->hv); 1851 SvREFCNT_inc_NN (coro->hv);
1798 coro->next_ready = 0; 1853 coro->next_ready = 0;
1799 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1854 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1800 ready [1] = coro; 1855 ready [1] = coro;
1801} 1856}
1802 1857
1803ECB_INLINE struct coro * 1858ecb_inline struct coro *
1804coro_deq (pTHX) 1859coro_deq (pTHX)
1805{ 1860{
1806 int prio; 1861 int prio;
1807 1862
1808 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1863 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1861{ 1916{
1862 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1917 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1863} 1918}
1864 1919
1865/* expects to own a reference to next->hv */ 1920/* expects to own a reference to next->hv */
1866ECB_INLINE void 1921ecb_inline void
1867prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1922prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1868{ 1923{
1869 SV *prev_sv = SvRV (coro_current); 1924 SV *prev_sv = SvRV (coro_current);
1870 1925
1871 ta->prev = SvSTATE_hv (prev_sv); 1926 ta->prev = SvSTATE_hv (prev_sv);
1905 /* nothing to schedule: call the idle handler */ 1960 /* nothing to schedule: call the idle handler */
1906 if (SvROK (sv_idle) 1961 if (SvROK (sv_idle)
1907 && SvOBJECT (SvRV (sv_idle))) 1962 && SvOBJECT (SvRV (sv_idle)))
1908 { 1963 {
1909 if (SvRV (sv_idle) == SvRV (coro_current)) 1964 if (SvRV (sv_idle) == SvRV (coro_current))
1965 {
1966 require_pv ("Carp");
1967
1968 {
1969 dSP;
1970
1971 ENTER;
1972 SAVETMPS;
1973
1974 PUSHMARK (SP);
1910 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1975 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1976 PUTBACK;
1977 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1978
1979 FREETMPS;
1980 LEAVE;
1981 }
1982 }
1911 1983
1912 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1984 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1913 api_ready (aTHX_ SvRV (sv_idle)); 1985 api_ready (aTHX_ SvRV (sv_idle));
1914 --coro_nready; 1986 --coro_nready;
1915 } 1987 }
1930 } 2002 }
1931 } 2003 }
1932 } 2004 }
1933} 2005}
1934 2006
1935ECB_INLINE void 2007ecb_inline void
1936prepare_cede (pTHX_ struct coro_transfer_args *ta) 2008prepare_cede (pTHX_ struct coro_transfer_args *ta)
1937{ 2009{
1938 api_ready (aTHX_ coro_current); 2010 api_ready (aTHX_ coro_current);
1939 prepare_schedule (aTHX_ ta); 2011 prepare_schedule (aTHX_ ta);
1940} 2012}
1941 2013
1942ECB_INLINE void 2014ecb_inline void
1943prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2015prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1944{ 2016{
1945 SV *prev = SvRV (coro_current); 2017 SV *prev = SvRV (coro_current);
1946 2018
1947 if (coro_nready) 2019 if (coro_nready)
2112{ 2184{
2113 AV *od = coro->on_destroy; 2185 AV *od = coro->on_destroy;
2114 2186
2115 if (!od) 2187 if (!od)
2116 return; 2188 return;
2189
2190 coro->on_destroy = 0;
2191 sv_2mortal ((SV *)od);
2117 2192
2118 while (AvFILLp (od) >= 0) 2193 while (AvFILLp (od) >= 0)
2119 { 2194 {
2120 SV *cb = sv_2mortal (av_pop (od)); 2195 SV *cb = sv_2mortal (av_pop (od));
2121 2196
2142 2217
2143static void 2218static void
2144coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2219coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2145{ 2220{
2146 AV *av; 2221 AV *av;
2147 2222
2148 if (coro->status) 2223 if (coro->status)
2149 { 2224 {
2150 av = coro->status; 2225 av = coro->status;
2151 av_clear (av); 2226 av_clear (av);
2152 } 2227 }
2199 2274
2200 coro = SvSTATE (arg [0]); 2275 coro = SvSTATE (arg [0]);
2201 coro_hv = coro->hv; 2276 coro_hv = coro->hv;
2202 2277
2203 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2278 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2204 2279
2205 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2280 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2206 { 2281 {
2207 /* coro currently busy cancelling something, so just notify it */ 2282 /* coro currently busy cancelling something, so just notify it */
2208 coro->slf_frame.data = (void *)coro; 2283 coro->slf_frame.data = (void *)coro;
2209 2284
2216 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2291 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2217 } 2292 }
2218 else 2293 else
2219 { 2294 {
2220 struct coro *self = SvSTATE_current; 2295 struct coro *self = SvSTATE_current;
2296
2297 if (!self)
2298 croak ("Coro::cancel called outside of thread content,");
2221 2299
2222 /* otherwise we cancel directly, purely for speed reasons 2300 /* otherwise we cancel directly, purely for speed reasons
2223 * unfortunately, this requires some magic trickery, as 2301 * unfortunately, this requires some magic trickery, as
2224 * somebody else could cancel us, so we have to fight the cancellation. 2302 * somebody else could cancel us, so we have to fight the cancellation.
2225 * this is ugly, and hopefully fully worth the extra speed. 2303 * this is ugly, and hopefully fully worth the extra speed.
2388 2466
2389static int 2467static int
2390slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2468slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2391{ 2469{
2392 SV *data = (SV *)frame->data; 2470 SV *data = (SV *)frame->data;
2393 2471
2394 if (CORO_THROW) 2472 if (CORO_THROW)
2395 return 0; 2473 return 0;
2396 2474
2397 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2475 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2398 return 1; 2476 return 1;
2434 cb = sv_2mortal (coro->rouse_cb); 2512 cb = sv_2mortal (coro->rouse_cb);
2435 coro->rouse_cb = 0; 2513 coro->rouse_cb = 0;
2436 } 2514 }
2437 2515
2438 if (!SvROK (cb) 2516 if (!SvROK (cb)
2439 || SvTYPE (SvRV (cb)) != SVt_PVCV 2517 || SvTYPE (SvRV (cb)) != SVt_PVCV
2440 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2518 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2441 croak ("Coro::rouse_wait called with illegal callback argument,"); 2519 croak ("Coro::rouse_wait called with illegal callback argument,");
2442 2520
2443 { 2521 {
2444 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2522 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2567 2645
2568/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2646/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2569static void 2647static void
2570slf_destroy (pTHX_ struct coro *coro) 2648slf_destroy (pTHX_ struct coro *coro)
2571{ 2649{
2572 /* this callback is reserved for slf functions needing to do cleanup */ 2650 struct CoroSLF frame = coro->slf_frame;
2573 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2574 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2575 2651
2576 /* 2652 /*
2577 * The on_destroy above most likely is from an SLF call. 2653 * The on_destroy below most likely is from an SLF call.
2578 * Since by definition the SLF call will not finish when we destroy 2654 * Since by definition the SLF call will not finish when we destroy
2579 * the coro, we will have to force-finish it here, otherwise 2655 * the coro, we will have to force-finish it here, otherwise
2580 * cleanup functions cannot call SLF functions. 2656 * cleanup functions cannot call SLF functions.
2581 */ 2657 */
2582 coro->slf_frame.prepare = 0; 2658 coro->slf_frame.prepare = 0;
2659
2660 /* this callback is reserved for slf functions needing to do cleanup */
2661 if (frame.destroy && frame.prepare && !PL_dirty)
2662 frame.destroy (aTHX_ &frame);
2583} 2663}
2584 2664
2585/* 2665/*
2586 * these not obviously related functions are all rolled into one 2666 * these not obviously related functions are all rolled into one
2587 * function to increase chances that they all will call transfer with the same 2667 * function to increase chances that they all will call transfer with the same
2770static void 2850static void
2771coro_pop_on_leave (pTHX_ void *coro) 2851coro_pop_on_leave (pTHX_ void *coro)
2772{ 2852{
2773 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2853 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2774 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2854 on_enterleave_call (aTHX_ sv_2mortal (cb));
2855}
2856
2857static void
2858enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2859{
2860 if (!hook)
2861 return;
2862
2863 if (!*avp)
2864 {
2865 *avp = newAV ();
2866 AvREAL_off (*avp);
2867 }
2868
2869 av_push (*avp, (SV *)hook);
2870 av_push (*avp, (SV *)arg);
2871}
2872
2873static void
2874enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2875{
2876 AV *av = *avp;
2877 int i;
2878
2879 if (!av)
2880 return;
2881
2882 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2883 if (AvARRAY (av)[i] == (SV *)hook)
2884 {
2885 if (execute)
2886 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2887
2888 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2889 av_pop (av);
2890 av_pop (av);
2891 break;
2892 }
2893
2894 if (AvFILLp (av) >= 0)
2895 {
2896 *avp = 0;
2897 SvREFCNT_dec_NN (av);
2898 }
2899}
2900
2901static void
2902api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2903{
2904 struct coro *coro = SvSTATE (coro_sv);
2905
2906 if (SvSTATE_current == coro)
2907 if (enter)
2908 enter (aTHX_ enter_arg);
2909
2910 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2911 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2912}
2913
2914static void
2915api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2916{
2917 struct coro *coro = SvSTATE (coro_sv);
2918
2919 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2920 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2921}
2922
2923static void
2924savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2925{
2926 struct coro *coro = SvSTATE_current;
2927
2928 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2929}
2930
2931static void
2932savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2933{
2934 struct coro *coro = SvSTATE_current;
2935
2936 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2937}
2938
2939static void
2940api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2941{
2942 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2943
2944 /* this ought to be much cheaper than malloc + a single destructor call */
2945 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2946 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2775} 2947}
2776 2948
2777/*****************************************************************************/ 2949/*****************************************************************************/
2778/* PerlIO::cede */ 2950/* PerlIO::cede */
2779 2951
2909 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3081 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2910 PUTBACK; 3082 PUTBACK;
2911 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3083 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2912 } 3084 }
2913 3085
2914 SvREFCNT_dec (cb); 3086 SvREFCNT_dec_NN (cb);
2915 } 3087 }
2916} 3088}
2917 3089
2918static void 3090static void
2919coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3091coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2927{ 3099{
2928 AV *av = (AV *)frame->data; 3100 AV *av = (AV *)frame->data;
2929 SV *count_sv = AvARRAY (av)[0]; 3101 SV *count_sv = AvARRAY (av)[0];
2930 SV *coro_hv = SvRV (coro_current); 3102 SV *coro_hv = SvRV (coro_current);
2931 3103
3104 frame->destroy = 0;
3105
2932 /* if we are about to throw, don't actually acquire the lock, just throw */ 3106 /* if we are about to throw, don't actually acquire the lock, just throw */
2933 if (CORO_THROW) 3107 if (ecb_expect_false (CORO_THROW))
3108 {
3109 /* we still might be responsible for the semaphore, so wake up others */
3110 coro_semaphore_adjust (aTHX_ av, 0);
3111
2934 return 0; 3112 return 0;
3113 }
2935 else if (SvIVX (count_sv) > 0) 3114 else if (SvIVX (count_sv) > 0)
2936 { 3115 {
2937 frame->destroy = 0;
2938
2939 if (acquire) 3116 if (acquire)
2940 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3117 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2941 else 3118 else
2942 coro_semaphore_adjust (aTHX_ av, 0); 3119 coro_semaphore_adjust (aTHX_ av, 0);
2943 3120
2947 { 3124 {
2948 int i; 3125 int i;
2949 /* if we were woken up but can't down, we look through the whole */ 3126 /* if we were woken up but can't down, we look through the whole */
2950 /* waiters list and only add us if we aren't in there already */ 3127 /* waiters list and only add us if we aren't in there already */
2951 /* this avoids some degenerate memory usage cases */ 3128 /* this avoids some degenerate memory usage cases */
2952 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug 3129 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2953 if (AvARRAY (av)[i] == coro_hv) 3130 if (AvARRAY (av)[i] == coro_hv)
2954 return 1; 3131 return 1;
2955 3132
2956 av_push (av, SvREFCNT_inc (coro_hv)); 3133 av_push (av, SvREFCNT_inc (coro_hv));
2957 return 1; 3134 return 1;
3054 { 3231 {
3055 api_ready (aTHX_ cb); 3232 api_ready (aTHX_ cb);
3056 sv_setiv (cb, 0); /* signal waiter */ 3233 sv_setiv (cb, 0); /* signal waiter */
3057 } 3234 }
3058 3235
3059 SvREFCNT_dec (cb); 3236 SvREFCNT_dec_NN (cb);
3060 3237
3061 --count; 3238 --count;
3062 } 3239 }
3063} 3240}
3064 3241
3149 } 3326 }
3150 3327
3151 av_push (state, data_sv); 3328 av_push (state, data_sv);
3152 3329
3153 api_ready (aTHX_ coro); 3330 api_ready (aTHX_ coro);
3154 SvREFCNT_dec (coro); 3331 SvREFCNT_dec_NN (coro);
3155 SvREFCNT_dec ((AV *)state); 3332 SvREFCNT_dec_NN ((AV *)state);
3156} 3333}
3157 3334
3158static int 3335static int
3159slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3336slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3160{ 3337{
3165 /* it quickly returns */ 3342 /* it quickly returns */
3166 if (CORO_THROW) 3343 if (CORO_THROW)
3167 return 0; 3344 return 0;
3168 3345
3169 /* one element that is an RV? repeat! */ 3346 /* one element that is an RV? repeat! */
3170 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3347 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3171 return 1; 3348 return 1;
3172 3349
3173 /* restore status */ 3350 /* restore status */
3174 { 3351 {
3175 SV *data_sv = av_pop (state); 3352 SV *data_sv = av_pop (state);
3178 errno = data->errorno; 3355 errno = data->errorno;
3179 PL_laststype = data->laststype; 3356 PL_laststype = data->laststype;
3180 PL_laststatval = data->laststatval; 3357 PL_laststatval = data->laststatval;
3181 PL_statcache = data->statcache; 3358 PL_statcache = data->statcache;
3182 3359
3183 SvREFCNT_dec (data_sv); 3360 SvREFCNT_dec_NN (data_sv);
3184 } 3361 }
3185 3362
3186 /* push result values */ 3363 /* push result values */
3187 { 3364 {
3188 dSP; 3365 dSP;
3337#endif 3514#endif
3338 3515
3339#if CORO_JIT 3516#if CORO_JIT
3340 3517
3341static void ecb_noinline ecb_cold 3518static void ecb_noinline ecb_cold
3342pushav_3uv (pTHX_ UV a, UV b, UV c) 3519pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3343{ 3520{
3344 dSP; 3521 dSP;
3345 AV *av = newAV (); 3522 AV *av = newAV ();
3346 3523
3524 av_store (av, 3, newSVuv (d));
3347 av_store (av, 2, newSVuv (c)); 3525 av_store (av, 2, newSVuv (c));
3348 av_store (av, 1, newSVuv (b)); 3526 av_store (av, 1, newSVuv (b));
3349 av_store (av, 0, newSVuv (a)); 3527 av_store (av, 0, newSVuv (a));
3350 3528
3351 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 3529 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3358{ 3536{
3359 dSP; 3537 dSP;
3360 SV *load, *save; 3538 SV *load, *save;
3361 char *map_base; 3539 char *map_base;
3362 char *load_ptr, *save_ptr; 3540 char *load_ptr, *save_ptr;
3363 STRLEN load_len, save_len; 3541 STRLEN load_len, save_len, map_len;
3364 int count; 3542 int count;
3365 3543
3544 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3545
3366 PUSHMARK (SP); 3546 PUSHMARK (SP);
3367 PUTBACK;
3368#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type)); 3547 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3369# include "state.h" 3548 #include "state.h"
3370#undef VARx
3371 count = call_pv ("Coro::State::_jit", G_ARRAY); 3549 count = call_pv ("Coro::State::_jit", G_ARRAY);
3372 SPAGAIN; 3550 SPAGAIN;
3373 3551
3374 save = POPs; save_ptr = SvPVbyte (save, save_len); 3552 save = POPs; save_ptr = SvPVbyte (save, save_len);
3375 load = POPs; load_ptr = SvPVbyte (load, load_len); 3553 load = POPs; load_ptr = SvPVbyte (load, load_len);
3376 3554
3555 map_len = load_len + save_len + 16;
3556
3377 map_base = mmap (0, load_len + save_len + 16, PROT_EXEC | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3557 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3378 3558
3379 assert (("Coro: unable mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3559 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3380 3560
3381 load_perl_slots = (load_save_perl_slots_type)map_base; 3561 load_perl_slots = (load_save_perl_slots_type)map_base;
3382 memcpy (map_base, load_ptr, load_len); 3562 memcpy (map_base, load_ptr, load_len);
3383 3563
3384 map_base += (load_len + 15) & ~15; 3564 map_base += (load_len + 15) & ~15;
3385 3565
3386 save_perl_slots = (load_save_perl_slots_type)map_base; 3566 save_perl_slots = (load_save_perl_slots_type)map_base;
3387 memcpy (map_base, save_ptr, save_len); 3567 memcpy (map_base, save_ptr, save_len);
3568
3569 /* we are good citizens and try to make the page read-only, so the evil evil */
3570 /* hackers might have it a bit more difficult */
3571 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3572
3573 PUTBACK;
3574 eval_pv ("undef &Coro::State::_jit", 1);
3388} 3575}
3389 3576
3390#endif 3577#endif
3391 3578
3392MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3579MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3393 3580
3394PROTOTYPES: DISABLE 3581PROTOTYPES: DISABLE
3395 3582
3396BOOT: 3583BOOT:
3397{ 3584{
3585#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3586#include "state.h"
3398#ifdef USE_ITHREADS 3587#ifdef USE_ITHREADS
3399# if CORO_PTHREAD 3588# if CORO_PTHREAD
3400 coro_thx = PERL_GET_CONTEXT; 3589 coro_thx = PERL_GET_CONTEXT;
3401# endif 3590# endif
3402#endif 3591#endif
3403 BOOT_PAGESIZE;
3404
3405 /* perl defines these to check for existance first, but why it doesn't */ 3592 /* perl defines these to check for existance first, but why it doesn't */
3406 /* just create them one at init time is not clear to me, except for */ 3593 /* just create them one at init time is not clear to me, except for */
3407 /* programs trying to delete them, but... */ 3594 /* programs trying to delete them, but... */
3408 /* anyway, we declare this as invalid and make sure they are initialised here */ 3595 /* anyway, we declare this as invalid and make sure they are initialised here */
3409 DEFSV; 3596 DEFSV;
3416 3603
3417 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3604 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
3418 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3605 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
3419 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3606 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
3420 3607
3421 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3422 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3608 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3423 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3609 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3424 3610
3425 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3611 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3426 3612
3460 time_init (aTHX); 3646 time_init (aTHX);
3461 3647
3462 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3648 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3463#if CORO_JIT 3649#if CORO_JIT
3464 PUTBACK; 3650 PUTBACK;
3465 require_pv ("Coro/jit-" CORO_JIT_TYPE ".pl");
3466 jit_init (aTHX); 3651 jit_init (aTHX);
3467 perl_eval_pv ("undef &Coro::State::_jit", 1);
3468 SPAGAIN; 3652 SPAGAIN;
3469#endif 3653#endif
3470} 3654}
3471 3655
3472SV * 3656SV *
3481void 3665void
3482transfer (...) 3666transfer (...)
3483 PROTOTYPE: $$ 3667 PROTOTYPE: $$
3484 CODE: 3668 CODE:
3485 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3669 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3486
3487void
3488_exit (int code)
3489 PROTOTYPE: $
3490 CODE:
3491 _exit (code);
3492 3670
3493SV * 3671SV *
3494clone (Coro::State coro) 3672clone (Coro::State coro)
3495 CODE: 3673 CODE:
3496{ 3674{
3551void 3729void
3552list () 3730list ()
3553 PROTOTYPE: 3731 PROTOTYPE:
3554 PPCODE: 3732 PPCODE:
3555{ 3733{
3556 struct coro *coro; 3734 struct coro *coro;
3557 for (coro = coro_first; coro; coro = coro->next) 3735 for (coro = coro_first; coro; coro = coro->next)
3558 if (coro->hv) 3736 if (coro->hv)
3559 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3737 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3560} 3738}
3561 3739
3625 RETVAL = boolSV (coro->flags & ix); 3803 RETVAL = boolSV (coro->flags & ix);
3626 OUTPUT: 3804 OUTPUT:
3627 RETVAL 3805 RETVAL
3628 3806
3629void 3807void
3630throw (Coro::State self, SV *exception = &PL_sv_undef) 3808throw (SV *self, SV *exception = &PL_sv_undef)
3631 PROTOTYPE: $;$ 3809 PROTOTYPE: $;$
3632 CODE: 3810 CODE:
3633{ 3811{
3812 struct coro *coro = SvSTATE (self);
3634 struct coro *current = SvSTATE_current; 3813 struct coro *current = SvSTATE_current;
3635 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3814 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3636 SvREFCNT_dec (*exceptionp); 3815 SvREFCNT_dec (*exceptionp);
3637 SvGETMAGIC (exception); 3816 SvGETMAGIC (exception);
3638 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3817 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3818
3819 api_ready (aTHX_ self);
3639} 3820}
3640 3821
3641void 3822void
3642api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3823api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3643 PROTOTYPE: $;$ 3824 PROTOTYPE: $;$
3720 3901
3721void 3902void
3722times (Coro::State self) 3903times (Coro::State self)
3723 PPCODE: 3904 PPCODE:
3724{ 3905{
3725 struct coro *current = SvSTATE (coro_current); 3906 struct coro *current = SvSTATE (coro_current);
3726 3907
3727 if (ecb_expect_false (current == self)) 3908 if (ecb_expect_false (current == self))
3728 { 3909 {
3729 coro_times_update (); 3910 coro_times_update ();
3730 coro_times_add (SvSTATE (coro_current)); 3911 coro_times_add (SvSTATE (coro_current));
3760 3941
3761MODULE = Coro::State PACKAGE = Coro 3942MODULE = Coro::State PACKAGE = Coro
3762 3943
3763BOOT: 3944BOOT:
3764{ 3945{
3946 if (SVt_LAST > 32)
3947 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3948
3765 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3949 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3766 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3950 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3767 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3951 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3768 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3952 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3769 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3953 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3773 3957
3774 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3958 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3775 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3959 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3776 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3960 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3777 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3961 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3778 3962
3779 coro_stash = gv_stashpv ("Coro", TRUE); 3963 coro_stash = gv_stashpv ("Coro", TRUE);
3780 3964
3781 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3965 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3782 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3966 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3783 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3967 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3795 coroapi.ready = api_ready; 3979 coroapi.ready = api_ready;
3796 coroapi.is_ready = api_is_ready; 3980 coroapi.is_ready = api_is_ready;
3797 coroapi.nready = coro_nready; 3981 coroapi.nready = coro_nready;
3798 coroapi.current = coro_current; 3982 coroapi.current = coro_current;
3799 3983
3984 coroapi.enterleave_hook = api_enterleave_hook;
3985 coroapi.enterleave_unhook = api_enterleave_unhook;
3986 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
3987
3800 /*GCoroAPI = &coroapi;*/ 3988 /*GCoroAPI = &coroapi;*/
3801 sv_setiv (sv, (IV)&coroapi); 3989 sv_setiv (sv, (IV)&coroapi);
3802 SvREADONLY_on (sv); 3990 SvREADONLY_on (sv);
3803 } 3991 }
3804} 3992}
3869 4057
3870void 4058void
3871_set_current (SV *current) 4059_set_current (SV *current)
3872 PROTOTYPE: $ 4060 PROTOTYPE: $
3873 CODE: 4061 CODE:
3874 SvREFCNT_dec (SvRV (coro_current)); 4062 SvREFCNT_dec_NN (SvRV (coro_current));
3875 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4063 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3876 4064
3877void 4065void
3878_set_readyhook (SV *hook) 4066_set_readyhook (SV *hook)
3879 PROTOTYPE: $ 4067 PROTOTYPE: $
3963 4151
3964 if ((SV *)hv == &PL_sv_undef) 4152 if ((SV *)hv == &PL_sv_undef)
3965 { 4153 {
3966 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4154 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3967 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4155 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3968 SvREFCNT_dec (sv); 4156 SvREFCNT_dec_NN (sv);
3969 } 4157 }
3970 4158
3971 { 4159 {
3972 struct coro *coro = SvSTATE_hv (hv); 4160 struct coro *coro = SvSTATE_hv (hv);
3973 4161
3980 api_ready (aTHX_ (SV *)hv); 4168 api_ready (aTHX_ (SV *)hv);
3981 4169
3982 if (GIMME_V != G_VOID) 4170 if (GIMME_V != G_VOID)
3983 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4171 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3984 else 4172 else
3985 SvREFCNT_dec (hv); 4173 SvREFCNT_dec_NN (hv);
3986} 4174}
3987 4175
3988SV * 4176SV *
3989rouse_cb () 4177rouse_cb ()
3990 PROTOTYPE: 4178 PROTOTYPE:
4005 on_leave = 1 4193 on_leave = 1
4006 PROTOTYPE: & 4194 PROTOTYPE: &
4007 CODE: 4195 CODE:
4008{ 4196{
4009 struct coro *coro = SvSTATE_current; 4197 struct coro *coro = SvSTATE_current;
4010 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4198 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4011 4199
4012 block = s_get_cv_croak (block); 4200 block = s_get_cv_croak (block);
4013 4201
4014 if (!*avp) 4202 if (!*avp)
4015 *avp = newAV (); 4203 *avp = newAV ();
4035 4223
4036SV * 4224SV *
4037new (SV *klass, SV *count = 0) 4225new (SV *klass, SV *count = 0)
4038 CODE: 4226 CODE:
4039{ 4227{
4040 int semcnt = 1; 4228 int semcnt = 1;
4041 4229
4042 if (count) 4230 if (count)
4043 { 4231 {
4044 SvGETMAGIC (count); 4232 SvGETMAGIC (count);
4045 4233
4069 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4257 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4070 OUTPUT: 4258 OUTPUT:
4071 RETVAL 4259 RETVAL
4072 4260
4073void 4261void
4074up (SV *self, int adjust = 1) 4262up (SV *self)
4075 ALIAS:
4076 adjust = 1
4077 CODE: 4263 CODE:
4264 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4265
4266void
4267adjust (SV *self, int adjust)
4268 CODE:
4078 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4269 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4079 4270
4080void 4271void
4081down (...) 4272down (...)
4082 CODE: 4273 CODE:
4083 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4274 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
4105 XSRETURN_NO; 4296 XSRETURN_NO;
4106} 4297}
4107 4298
4108void 4299void
4109waiters (SV *self) 4300waiters (SV *self)
4110 PPCODE: 4301 PPCODE:
4111{ 4302{
4112 AV *av = (AV *)SvRV (self); 4303 AV *av = (AV *)SvRV (self);
4113 int wcount = AvFILLp (av) + 1 - 1; 4304 int wcount = AvFILLp (av) + 1 - 1;
4114 4305
4115 if (GIMME_V == G_SCALAR) 4306 if (GIMME_V == G_SCALAR)
4124} 4315}
4125 4316
4126MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4317MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4127 4318
4128void 4319void
4129_may_delete (SV *sem, int count, int extra_refs) 4320_may_delete (SV *sem, int count, unsigned int extra_refs)
4130 PPCODE: 4321 PPCODE:
4131{ 4322{
4132 AV *av = (AV *)SvRV (sem); 4323 AV *av = (AV *)SvRV (sem);
4133 4324
4134 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4325 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4135 && AvFILLp (av) == 0 /* no waiters, just count */ 4326 && AvFILLp (av) == 0 /* no waiters, just count */
4136 && SvIV (AvARRAY (av)[0]) == count) 4327 && SvIV (AvARRAY (av)[0]) == count)
4137 XSRETURN_YES; 4328 XSRETURN_YES;
4158 4349
4159void 4350void
4160broadcast (SV *self) 4351broadcast (SV *self)
4161 CODE: 4352 CODE:
4162{ 4353{
4163 AV *av = (AV *)SvRV (self); 4354 AV *av = (AV *)SvRV (self);
4164 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4355 coro_signal_wake (aTHX_ av, AvFILLp (av));
4165} 4356}
4166 4357
4167void 4358void
4168send (SV *self) 4359send (SV *self)
4176 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4367 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4177} 4368}
4178 4369
4179IV 4370IV
4180awaited (SV *self) 4371awaited (SV *self)
4181 CODE: 4372 CODE:
4182 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4373 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4183 OUTPUT: 4374 OUTPUT:
4184 RETVAL 4375 RETVAL
4185 4376
4186 4377
4191 4382
4192void 4383void
4193_schedule (...) 4384_schedule (...)
4194 CODE: 4385 CODE:
4195{ 4386{
4196 static int incede; 4387 static int incede;
4197 4388
4198 api_cede_notself (aTHX); 4389 api_cede_notself (aTHX);
4199 4390
4200 ++incede; 4391 ++incede;
4201 while (coro_nready >= incede && api_cede (aTHX)) 4392 while (coro_nready >= incede && api_cede (aTHX))
4245 { 4436 {
4246 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4437 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4247 coro_old_pp_sselect = 0; 4438 coro_old_pp_sselect = 0;
4248 } 4439 }
4249 4440
4441MODULE = Coro::State PACKAGE = Coro::Util
4442
4443void
4444_exit (int code)
4445 CODE:
4446 _exit (code);
4447
4448NV
4449time ()
4450 CODE:
4451 RETVAL = nvtime (aTHX);
4452 OUTPUT:
4453 RETVAL
4454
4455NV
4456gettimeofday ()
4457 PPCODE:
4458{
4459 UV tv [2];
4460 u2time (aTHX_ tv);
4461 EXTEND (SP, 2);
4462 PUSHs (sv_2mortal (newSVuv (tv [0])));
4463 PUSHs (sv_2mortal (newSVuv (tv [1])));
4464}
4465

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines