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

Comparing Coro/Coro/State.xs (file contents):
Revision 1.405 by root, Sat Jun 11 13:01:26 2011 UTC vs.
Revision 1.465 by root, Sat Jun 25 19:04:04 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))
110# define CORO_CLOCK_MONOTONIC 1 116# define CORO_CLOCK_MONOTONIC 1
111# define CORO_CLOCK_THREAD_CPUTIME_ID 3 117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
112# endif 118# endif
113#endif 119#endif
114 120
121/* perl usually suppressed asserts. for debugging, we sometimes force it to be on */
122#if 0
123# undef NDEBUG
124# include <assert.h>
125#endif
126
115static double (*nvtime)(); /* so why doesn't it take void? */ 127static double (*nvtime)(); /* so why doesn't it take void? */
116static void (*u2time)(pTHX_ UV ret[2]); 128static void (*u2time)(pTHX_ UV ret[2]);
117 129
118/* we hijack an hopefully unused CV flag for our purposes */ 130/* we hijack an hopefully unused CV flag for our purposes */
119#define CVf_SLF 0x4000 131#define CVf_SLF 0x4000
… …
134 146
135static GV *irsgv; /* $/ */ 147static GV *irsgv; /* $/ */
136static GV *stdoutgv; /* *STDOUT */ 148static GV *stdoutgv; /* *STDOUT */
137static SV *rv_diehook; 149static SV *rv_diehook;
138static SV *rv_warnhook; 150static SV *rv_warnhook;
139static HV *hv_sig; /* %SIG */
140 151
141/* async_pool helper stuff */ 152/* async_pool helper stuff */
142static SV *sv_pool_rss; 153static SV *sv_pool_rss;
143static SV *sv_pool_size; 154static SV *sv_pool_size;
144static SV *sv_async_pool_idle; /* description string */ 155static SV *sv_async_pool_idle; /* description string */
… …
172typedef struct coro_cctx 183typedef struct coro_cctx
173{ 184{
174 struct coro_cctx *next; 185 struct coro_cctx *next;
175 186
176 /* the stack */ 187 /* the stack */
177 void *sptr; 188 struct coro_stack stack;
178 size_t ssize;
179 189
180 /* cpu state */ 190 /* cpu state */
181 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 191 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
192#ifndef NDEBUG
182 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 193 JMPENV *idle_te; /* same as idle_sp, but for top_env */
194#endif
183 JMPENV *top_env; 195 JMPENV *top_env;
184 coro_context cctx; 196 coro_context cctx;
185 197
186 U32 gen; 198 U32 gen;
187#if CORO_USE_VALGRIND 199#if CORO_USE_VALGRIND
… …
207}; 219};
208 220
209/* the structure where most of the perl state is stored, overlaid on the cxstack */ 221/* the structure where most of the perl state is stored, overlaid on the cxstack */
210typedef struct 222typedef struct
211{ 223{
212#define VARx(name,expr,type) type name; 224 #define VARx(name,expr,type) type name;
213# include "state.h" 225 #include "state.h"
214#undef VARx
215} perl_slots; 226} perl_slots;
216 227
217// how many context stack entries do we need for perl_slots 228/* 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)) 229#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
219 230
220/* this is a structure representing a perl-level coroutine */ 231/* this is a structure representing a perl-level coroutine */
221struct coro 232struct coro
222{ 233{
… …
250 SV *saved_deffh; 261 SV *saved_deffh;
251 SV *invoke_cb; 262 SV *invoke_cb;
252 AV *invoke_av; 263 AV *invoke_av;
253 264
254 /* on_enter/on_leave */ 265 /* on_enter/on_leave */
255 AV *on_enter; 266 AV *on_enter; AV *on_enter_xs;
256 AV *on_leave; 267 AV *on_leave; AV *on_leave_xs;
257 268
258 /* swap_sv */ 269 /* swap_sv */
259 AV *swap_sv; 270 AV *swap_sv;
260 271
261 /* times */ 272 /* times */
… …
291#define coro_nready coroapi.nready 302#define coro_nready coroapi.nready
292 303
293/** JIT *********************************************************************/ 304/** JIT *********************************************************************/
294 305
295#if CORO_JIT 306#if CORO_JIT
307 /* APPLE doesn't have mmap though */
308 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
296 #ifndef CORO_JIT_TYPE 309 #ifndef CORO_JIT_TYPE
297 #if __linux && __amd64 310 #if ECB_AMD64 && CORO_JIT_UNIXY
298 #define CORO_JIT_TYPE "amd64-unix" 311 #define CORO_JIT_TYPE "amd64-unix"
299 typedef void (*load_save_perl_slots_type)(perl_slots *); 312 #elif __i386 && CORO_JIT_UNIXY
300 #else 313 #define CORO_JIT_TYPE "x86-unix"
301 #undef CORO_JIT
302 #endif 314 #endif
303 #endif 315 #endif
304#endif 316#endif
305 317
318#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
319 #undef CORO_JIT
320#endif
321
306#if CORO_JIT 322#if CORO_JIT
307 323 typedef void (*load_save_perl_slots_type)(perl_slots *);
308static load_save_perl_slots_type load_perl_slots, save_perl_slots; 324 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
309
310#endif 325#endif
311 326
312/** Coro::Select ************************************************************/ 327/** Coro::Select ************************************************************/
313 328
314static OP *(*coro_old_pp_sselect) (pTHX); 329static OP *(*coro_old_pp_sselect) (pTHX);
… …
331 346
332/** time stuff **************************************************************/ 347/** time stuff **************************************************************/
333 348
334#ifdef HAS_GETTIMEOFDAY 349#ifdef HAS_GETTIMEOFDAY
335 350
336ECB_INLINE void 351ecb_inline void
337coro_u2time (pTHX_ UV ret[2]) 352coro_u2time (pTHX_ UV ret[2])
338{ 353{
339 struct timeval tv; 354 struct timeval tv;
340 gettimeofday (&tv, 0); 355 gettimeofday (&tv, 0);
341 356
342 ret [0] = tv.tv_sec; 357 ret [0] = tv.tv_sec;
343 ret [1] = tv.tv_usec; 358 ret [1] = tv.tv_usec;
344} 359}
345 360
346ECB_INLINE double 361ecb_inline double
347coro_nvtime () 362coro_nvtime (void)
348{ 363{
349 struct timeval tv; 364 struct timeval tv;
350 gettimeofday (&tv, 0); 365 gettimeofday (&tv, 0);
351 366
352 return tv.tv_sec + tv.tv_usec * 1e-6; 367 return tv.tv_sec + tv.tv_usec * 1e-6;
353} 368}
354 369
355ECB_INLINE void 370ecb_inline void
356time_init (pTHX) 371time_init (pTHX)
357{ 372{
358 nvtime = coro_nvtime; 373 nvtime = coro_nvtime;
359 u2time = coro_u2time; 374 u2time = coro_u2time;
360} 375}
361 376
362#else 377#else
363 378
364ECB_INLINE void 379ecb_inline void
365time_init (pTHX) 380time_init (pTHX)
366{ 381{
367 SV **svp; 382 SV **svp;
368 383
369 require_pv ("Time/HiRes.pm"); 384 require_pv ("Time/HiRes.pm");
370 385
371 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 386 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
372 387
373 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 388 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
374 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 389 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
375 390
… …
411 get_hv (name, create); 426 get_hv (name, create);
412#endif 427#endif
413 return get_hv (name, create); 428 return get_hv (name, create);
414} 429}
415 430
416ECB_INLINE void 431ecb_inline void
417coro_times_update () 432coro_times_update (void)
418{ 433{
419#ifdef coro_clock_gettime 434#ifdef coro_clock_gettime
420 struct timespec ts; 435 struct timespec ts;
421 436
422 ts.tv_sec = ts.tv_nsec = 0; 437 ts.tv_sec = ts.tv_nsec = 0;
… …
434 time_real [0] = tv [0]; 449 time_real [0] = tv [0];
435 time_real [1] = tv [1] * 1000; 450 time_real [1] = tv [1] * 1000;
436#endif 451#endif
437} 452}
438 453
439ECB_INLINE void 454ecb_inline void
440coro_times_add (struct coro *c) 455coro_times_add (struct coro *c)
441{ 456{
442 c->t_real [1] += time_real [1]; 457 c->t_real [1] += time_real [1];
443 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 458 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
444 c->t_real [0] += time_real [0]; 459 c->t_real [0] += time_real [0];
… …
446 c->t_cpu [1] += time_cpu [1]; 461 c->t_cpu [1] += time_cpu [1];
447 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 462 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
448 c->t_cpu [0] += time_cpu [0]; 463 c->t_cpu [0] += time_cpu [0];
449} 464}
450 465
451ECB_INLINE void 466ecb_inline void
452coro_times_sub (struct coro *c) 467coro_times_sub (struct coro *c)
453{ 468{
454 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 469 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
455 c->t_real [1] -= time_real [1]; 470 c->t_real [1] -= time_real [1];
456 c->t_real [0] -= time_real [0]; 471 c->t_real [0] -= time_real [0];
… …
477 : 0) 492 : 0)
478 493
479#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 494#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
480#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 495#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
481 496
482ECB_INLINE MAGIC * 497ecb_inline MAGIC *
483SvSTATEhv_p (pTHX_ SV *coro) 498SvSTATEhv_p (pTHX_ SV *coro)
484{ 499{
485 MAGIC *mg; 500 MAGIC *mg;
486 501
487 if (ecb_expect_true ( 502 if (ecb_expect_true (
… …
492 return mg; 507 return mg;
493 508
494 return 0; 509 return 0;
495} 510}
496 511
497ECB_INLINE struct coro * 512ecb_inline struct coro *
498SvSTATE_ (pTHX_ SV *coro) 513SvSTATE_ (pTHX_ SV *coro_sv)
499{ 514{
500 MAGIC *mg; 515 MAGIC *mg;
501 516
502 if (SvROK (coro)) 517 if (SvROK (coro_sv))
503 coro = SvRV (coro); 518 coro_sv = SvRV (coro_sv);
504 519
505 mg = SvSTATEhv_p (aTHX_ coro); 520 mg = SvSTATEhv_p (aTHX_ coro_sv);
506 if (!mg) 521 if (!mg)
507 croak ("Coro::State object required"); 522 croak ("Coro::State object required");
508 523
509 return (struct coro *)mg->mg_ptr; 524 return (struct coro *)mg->mg_ptr;
510} 525}
… …
516#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 531#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
517 532
518/*****************************************************************************/ 533/*****************************************************************************/
519/* padlist management and caching */ 534/* padlist management and caching */
520 535
521ECB_INLINE AV * 536ecb_inline PADLIST *
522coro_derive_padlist (pTHX_ CV *cv) 537coro_derive_padlist (pTHX_ CV *cv)
523{ 538{
524 AV *padlist = CvPADLIST (cv); 539 PADLIST *padlist = CvPADLIST (cv);
525 AV *newpadlist, *newpad; 540 PADLIST *newpadlist;
541 PADNAMELIST *padnames;
542 PAD *newpad;
543 PADOFFSET off = PadlistMAX (padlist) + 1;
526 544
527 newpadlist = newAV (); 545#if NEWPADAPI
546
547 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
548 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
549 while (!PadlistARRAY (padlist)[off - 1])
550 --off;
551
552 Perl_pad_push (aTHX_ padlist, off);
553
554 newpad = PadlistARRAY (padlist)[off];
555 PadlistARRAY (padlist)[off] = 0;
556
557#else
558
559#if PERL_VERSION_ATLEAST (5,10,0)
560 Perl_pad_push (aTHX_ padlist, off);
561#else
562 Perl_pad_push (aTHX_ padlist, off, 1);
563#endif
564
565 newpad = PadlistARRAY (padlist)[off];
566 PadlistMAX (padlist) = off - 1;
567
568#endif
569
570 newPADLIST (newpadlist);
571#if !PERL_VERSION_ATLEAST(5,15,3)
572 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
528 AvREAL_off (newpadlist); 573 AvREAL_off (newpadlist);
529#if PERL_VERSION_ATLEAST (5,10,0)
530 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
531#else
532 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
533#endif 574#endif
534 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
535 --AvFILLp (padlist);
536 575
537 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 576 /* Already extended to 2 elements by newPADLIST. */
538 av_store (newpadlist, 1, (SV *)newpad); 577 PadlistMAX (newpadlist) = 1;
578
579 padnames = PadlistNAMES (padlist);
580 ++PadnamelistREFCNT (padnames);
581 PadlistNAMES (newpadlist) = padnames;
582
583 PadlistARRAY (newpadlist)[1] = newpad;
539 584
540 return newpadlist; 585 return newpadlist;
541} 586}
542 587
543ECB_INLINE void 588ecb_inline void
544free_padlist (pTHX_ AV *padlist) 589free_padlist (pTHX_ PADLIST *padlist)
545{ 590{
546 /* may be during global destruction */ 591 /* may be during global destruction */
547 if (!IN_DESTRUCT) 592 if (!IN_DESTRUCT)
548 { 593 {
549 I32 i = AvFILLp (padlist); 594 I32 i = PadlistMAX (padlist);
550 595
551 while (i > 0) /* special-case index 0 */ 596 while (i > 0) /* special-case index 0 */
552 { 597 {
553 /* we try to be extra-careful here */ 598 /* we try to be extra-careful here */
554 AV *av = (AV *)AvARRAY (padlist)[i--]; 599 PAD *pad = PadlistARRAY (padlist)[i--];
555 I32 j = AvFILLp (av);
556 600
601 if (pad)
602 {
603 I32 j = PadMAX (pad);
604
557 while (j >= 0) 605 while (j >= 0)
558 SvREFCNT_dec (AvARRAY (av)[j--]); 606 SvREFCNT_dec (PadARRAY (pad)[j--]);
559 607
560 AvFILLp (av) = -1; 608 PadMAX (pad) = -1;
561 SvREFCNT_dec (av); 609 SvREFCNT_dec (pad);
610 }
562 } 611 }
563 612
564 SvREFCNT_dec (AvARRAY (padlist)[0]); 613 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
565 614
615#if NEWPADAPI
616 Safefree (PadlistARRAY (padlist));
617 Safefree (padlist);
618#else
566 AvFILLp (padlist) = -1; 619 AvFILLp (padlist) = -1;
620 AvREAL_off (padlist);
567 SvREFCNT_dec ((SV*)padlist); 621 SvREFCNT_dec ((SV*)padlist);
622#endif
568 } 623 }
569} 624}
570 625
571static int 626static int
572coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 627coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
573{ 628{
574 AV *padlist; 629 PADLIST *padlist;
575 AV *av = (AV *)mg->mg_obj; 630 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
631 size_t len = *(size_t *)mg->mg_ptr;
576 632
577 /* perl manages to free our internal AV and _then_ call us */ 633 /* perl manages to free our internal AV and _then_ call us */
578 if (IN_DESTRUCT) 634 if (IN_DESTRUCT)
579 return 0; 635 return 0;
580 636
581 /* casting is fun. */ 637 while (len--)
582 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
583 free_padlist (aTHX_ padlist); 638 free_padlist (aTHX_ padlists[len]);
584
585 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
586 639
587 return 0; 640 return 0;
588} 641}
589 642
590static MGVTBL coro_cv_vtbl = { 643static MGVTBL coro_cv_vtbl = {
591 0, 0, 0, 0, 644 0, 0, 0, 0,
592 coro_cv_free 645 coro_cv_free
593}; 646};
594 647
595/* the next two functions merely cache the padlists */ 648/* the next two functions merely cache the padlists */
596ECB_INLINE void 649ecb_inline void
597get_padlist (pTHX_ CV *cv) 650get_padlist (pTHX_ CV *cv)
598{ 651{
599 MAGIC *mg = CORO_MAGIC_cv (cv); 652 MAGIC *mg = CORO_MAGIC_cv (cv);
600 AV *av; 653 size_t *lenp;
601 654
602 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 655 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
603 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 656 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
604 else 657 else
605 { 658 {
606#if CORO_PREFER_PERL_FUNCTIONS 659#if CORO_PREFER_PERL_FUNCTIONS
607 /* this is probably cleaner? but also slower! */ 660 /* this is probably cleaner? but also slower! */
608 /* in practise, it seems to be less stable */ 661 /* in practise, it seems to be less stable */
… …
614 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 667 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
615#endif 668#endif
616 } 669 }
617} 670}
618 671
619ECB_INLINE void 672ecb_inline void
620put_padlist (pTHX_ CV *cv) 673put_padlist (pTHX_ CV *cv)
621{ 674{
622 MAGIC *mg = CORO_MAGIC_cv (cv); 675 MAGIC *mg = CORO_MAGIC_cv (cv);
623 AV *av;
624 676
625 if (ecb_expect_false (!mg)) 677 if (ecb_expect_false (!mg))
678 {
626 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 679 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
680 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
681 mg->mg_len = 1; /* so mg_free frees mg_ptr */
682 }
683 else
684 Renew (mg->mg_ptr,
685 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
686 char);
627 687
628 av = (AV *)mg->mg_obj; 688 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
629
630 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
631 av_extend (av, AvFILLp (av) + 1);
632
633 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
634} 689}
635 690
636/** load & save, init *******************************************************/ 691/** load & save, init *******************************************************/
637 692
693ecb_inline void
694swap_sv (SV *a, SV *b)
695{
696 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
697 SV tmp;
698
699 /* swap sv_any */
700 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
701
702 /* swap sv_flags */
703 SvFLAGS (&tmp) = SvFLAGS (a);
704 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
705 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
706
707#if PERL_VERSION_ATLEAST (5,10,0)
708 /* perl 5.10 and later complicates this _quite_ a bit, but it also
709 * is much faster, so no quarrels here. alternatively, we could
710 * sv_upgrade to avoid this.
711 */
712 {
713 /* swap sv_u */
714 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
715
716 /* if SvANY points to the head, we need to adjust the pointers,
717 * as the pointer for a still points to b, and maybe vice versa.
718 */
719 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
720 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
721 svany_in_head_set |= 1 << SVt_NV;
722 #endif
723
724 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
725
726 if (svany_in_head (SvTYPE (a)))
727 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
728
729 if (svany_in_head (SvTYPE (b)))
730 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
731 }
732#endif
733}
734
638/* swap sv heads, at least logically */ 735/* swap sv heads, at least logically */
639static void 736static void
640swap_svs (pTHX_ Coro__State c) 737swap_svs_enter (pTHX_ Coro__State c)
641{ 738{
642 int i; 739 int i;
643 740
644 for (i = 0; i <= AvFILLp (c->swap_sv); ) 741 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
645 { 742 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
646 SV *a = AvARRAY (c->swap_sv)[i++];
647 SV *b = AvARRAY (c->swap_sv)[i++];
648
649 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
650 SV tmp;
651
652 /* swap sv_any */
653 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
654
655 /* swap sv_flags */
656 SvFLAGS (&tmp) = SvFLAGS (a);
657 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
658 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
659
660#if PERL_VERSION_ATLEAST (5,10,0)
661 /* perl 5.10 complicates this _quite_ a bit, but it also is
662 * much faster, so no quarrels here. alternatively, we could
663 * sv_upgrade to avoid this.
664 */
665 {
666 /* swap sv_u */
667 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
668
669 /* if SvANY points to the head, we need to adjust the pointers,
670 * as the pointer for a still points to b, and maybe vice versa.
671 */
672 #define svany_in_head(type) \
673 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
674
675 if (svany_in_head (SvTYPE (a)))
676 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
677
678 if (svany_in_head (SvTYPE (b)))
679 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
680 }
681#endif
682 }
683} 743}
684 744
745static void
746swap_svs_leave (pTHX_ Coro__State c)
747{
748 int i;
749
750 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
751 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
752}
753
685#define SWAP_SVS(coro) \ 754#define SWAP_SVS_ENTER(coro) \
686 if (ecb_expect_false ((coro)->swap_sv)) \ 755 if (ecb_expect_false ((coro)->swap_sv)) \
687 swap_svs (aTHX_ (coro)) 756 swap_svs_enter (aTHX_ (coro))
757
758#define SWAP_SVS_LEAVE(coro) \
759 if (ecb_expect_false ((coro)->swap_sv)) \
760 swap_svs_leave (aTHX_ (coro))
688 761
689static void 762static void
690on_enterleave_call (pTHX_ SV *cb); 763on_enterleave_call (pTHX_ SV *cb);
691 764
692static void 765static void
… …
699 772
700#if CORO_JIT 773#if CORO_JIT
701 load_perl_slots (slot); 774 load_perl_slots (slot);
702#else 775#else
703 #define VARx(name,expr,type) expr = slot->name; 776 #define VARx(name,expr,type) expr = slot->name;
704 # include "state.h" 777 #include "state.h"
705 #undef VARx
706#endif 778#endif
707 779
708 { 780 {
709 dSP; 781 dSP;
710 782
… …
713 /* now do the ugly restore mess */ 785 /* now do the ugly restore mess */
714 while (ecb_expect_true (cv = (CV *)POPs)) 786 while (ecb_expect_true (cv = (CV *)POPs))
715 { 787 {
716 put_padlist (aTHX_ cv); /* mark this padlist as available */ 788 put_padlist (aTHX_ cv); /* mark this padlist as available */
717 CvDEPTH (cv) = PTR2IV (POPs); 789 CvDEPTH (cv) = PTR2IV (POPs);
718 CvPADLIST (cv) = (AV *)POPs; 790 CvPADLIST (cv) = (PADLIST *)POPs;
719 } 791 }
720 792
721 PUTBACK; 793 PUTBACK;
722 } 794 }
723 795
… …
738 810
739 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 811 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
740 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 812 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
741 } 813 }
742 814
815 if (ecb_expect_false (c->on_enter_xs))
816 {
817 int i;
818
819 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
820 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
821 }
822
743 SWAP_SVS (c); 823 SWAP_SVS_ENTER (c);
744} 824}
745 825
746static void 826static void
747save_perl (pTHX_ Coro__State c) 827save_perl (pTHX_ Coro__State c)
748{ 828{
749 SWAP_SVS (c); 829 SWAP_SVS_LEAVE (c);
830
831 if (ecb_expect_false (c->on_leave_xs))
832 {
833 int i;
834
835 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
836 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
837 }
750 838
751 if (ecb_expect_false (c->on_leave)) 839 if (ecb_expect_false (c->on_leave))
752 { 840 {
753 int i; 841 int i;
754 842
… …
813 901
814 PUTBACK; 902 PUTBACK;
815 } 903 }
816 904
817 /* allocate some space on the context stack for our purposes */ 905 /* allocate some space on the context stack for our purposes */
818 if (ecb_expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 906 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
819 { 907 {
820 unsigned int i; 908 unsigned int i;
821 909
822 for (i = 0; i < SLOT_COUNT; ++i) 910 for (i = 0; i < SLOT_COUNT; ++i)
823 CXINC; 911 CXINC;
… …
832 920
833#if CORO_JIT 921#if CORO_JIT
834 save_perl_slots (slot); 922 save_perl_slots (slot);
835#else 923#else
836 #define VARx(name,expr,type) slot->name = expr; 924 #define VARx(name,expr,type) slot->name = expr;
837 # include "state.h" 925 #include "state.h"
838 #undef VARx
839#endif 926#endif
840 } 927 }
841} 928}
842 929
843/* 930/*
… …
875#endif 962#endif
876 963
877 New(54,PL_scopestack,8,I32); 964 New(54,PL_scopestack,8,I32);
878 PL_scopestack_ix = 0; 965 PL_scopestack_ix = 0;
879 PL_scopestack_max = 8; 966 PL_scopestack_max = 8;
967#if HAS_SCOPESTACK_NAME
968 New(54,PL_scopestack_name,8,const char*);
969#endif
880 970
881 New(54,PL_savestack,24,ANY); 971 New(54,PL_savestack,24,ANY);
882 PL_savestack_ix = 0; 972 PL_savestack_ix = 0;
883 PL_savestack_max = 24; 973 PL_savestack_max = 24;
974#if PERL_VERSION_ATLEAST (5,24,0)
975 /* perl 5.24 moves SS_MAXPUSH optimisation from */
976 /* the header macros to PL_savestack_max */
977 PL_savestack_max -= SS_MAXPUSH;
978#endif
884 979
885#if !PERL_VERSION_ATLEAST (5,10,0) 980#if !PERL_VERSION_ATLEAST (5,10,0)
886 New(54,PL_retstack,4,OP*); 981 New(54,PL_retstack,4,OP*);
887 PL_retstack_ix = 0; 982 PL_retstack_ix = 0;
888 PL_retstack_max = 4; 983 PL_retstack_max = 4;
… …
912 } 1007 }
913 1008
914 Safefree (PL_tmps_stack); 1009 Safefree (PL_tmps_stack);
915 Safefree (PL_markstack); 1010 Safefree (PL_markstack);
916 Safefree (PL_scopestack); 1011 Safefree (PL_scopestack);
1012#if HAS_SCOPESTACK_NAME
1013 Safefree (PL_scopestack_name);
1014#endif
917 Safefree (PL_savestack); 1015 Safefree (PL_savestack);
918#if !PERL_VERSION_ATLEAST (5,10,0) 1016#if !PERL_VERSION_ATLEAST (5,10,0)
919 Safefree (PL_retstack); 1017 Safefree (PL_retstack);
920#endif 1018#endif
921} 1019}
… …
951 } 1049 }
952 1050
953 return rss; 1051 return rss;
954} 1052}
955 1053
956/** coroutine stack handling ************************************************/ 1054/** provide custom get/set/clear methods for %SIG elements ******************/
957
958static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
959static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
960static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
961 1055
962/* apparently < 5.8.8 */ 1056/* apparently < 5.8.8 */
963#ifndef MgPV_nolen_const 1057#ifndef MgPV_nolen_const
964#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1058#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
965 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1059 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
966 (const char*)(mg)->mg_ptr) 1060 (const char*)(mg)->mg_ptr)
967#endif 1061#endif
1062
1063/* this will be a patched copy of PL_vtbl_sigelem */
1064static MGVTBL coro_sigelem_vtbl;
1065
1066static int ecb_cold
1067coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1068{
1069 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1070 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1071 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1072 return 1;
1073}
1074
1075/* perl does not have a %SIG vtbl, we provide one so we can override */
1076/* the cwvtblagic for %SIG members */
1077static const MGVTBL coro_sig_vtbl = {
1078 0, 0, 0, 0, 0,
1079 coro_sig_copy
1080};
968 1081
969/* 1082/*
970 * This overrides the default magic get method of %SIG elements. 1083 * This overrides the default magic get method of %SIG elements.
971 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1084 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
972 * and instead of trying to save and restore the hash elements (extremely slow), 1085 * and instead of trying to save and restore the hash elements (extremely slow),
… …
981 { 1094 {
982 SV **svp = 0; 1095 SV **svp = 0;
983 1096
984 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1097 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
985 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1098 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
986 1099
987 if (svp) 1100 if (svp)
988 { 1101 {
989 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1102 SV *ssv;
1103
1104 if (!*svp)
1105 ssv = &PL_sv_undef;
1106 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1107 ssv = sv_2mortal (newRV_inc (*svp));
1108 else
1109 ssv = *svp;
1110
1111 sv_setsv (sv, ssv);
990 return 0; 1112 return 0;
991 } 1113 }
992 } 1114 }
993 1115
994 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1116 return PL_vtbl_sigelem.svt_get ? PL_vtbl_sigelem.svt_get (aTHX_ sv, mg) : 0;
995} 1117}
996 1118
997static int ecb_cold 1119static int ecb_cold
998coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1120coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
999{ 1121{
… …
1013 SvREFCNT_dec (old); 1135 SvREFCNT_dec (old);
1014 return 0; 1136 return 0;
1015 } 1137 }
1016 } 1138 }
1017 1139
1018 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1140 return PL_vtbl_sigelem.svt_clear ? PL_vtbl_sigelem.svt_clear (aTHX_ sv, mg) : 0;
1019} 1141}
1020 1142
1021static int ecb_cold 1143static int ecb_cold
1022coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1144coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1023{ 1145{
… …
1037 SvREFCNT_dec (old); 1159 SvREFCNT_dec (old);
1038 return 0; 1160 return 0;
1039 } 1161 }
1040 } 1162 }
1041 1163
1042 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0; 1164 return PL_vtbl_sigelem.svt_set ? PL_vtbl_sigelem.svt_set (aTHX_ sv, mg) : 0;
1043} 1165}
1044 1166
1045static void 1167static void
1046prepare_nop (pTHX_ struct coro_transfer_args *ta) 1168prepare_nop (pTHX_ struct coro_transfer_args *ta)
1047{ 1169{
… …
1058static int 1180static int
1059slf_check_repeat (pTHX_ struct CoroSLF *frame) 1181slf_check_repeat (pTHX_ struct CoroSLF *frame)
1060{ 1182{
1061 return 1; 1183 return 1;
1062} 1184}
1185
1186/** coroutine stack handling ************************************************/
1063 1187
1064static UNOP init_perl_op; 1188static UNOP init_perl_op;
1065 1189
1066ecb_noinline static void /* noinline to keep it out of the transfer fast path */ 1190ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1067init_perl (pTHX_ struct coro *coro) 1191init_perl (pTHX_ struct coro *coro)
… …
1088 PL_hints = 0; 1212 PL_hints = 0;
1089 1213
1090 /* recreate the die/warn hooks */ 1214 /* recreate the die/warn hooks */
1091 PL_diehook = SvREFCNT_inc (rv_diehook); 1215 PL_diehook = SvREFCNT_inc (rv_diehook);
1092 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1216 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1093 1217
1094 GvSV (PL_defgv) = newSV (0); 1218 GvSV (PL_defgv) = newSV (0);
1095 GvAV (PL_defgv) = coro->args; coro->args = 0; 1219 GvAV (PL_defgv) = coro->args; coro->args = 0;
1096 GvSV (PL_errgv) = newSV (0); 1220 GvSV (PL_errgv) = newSV (0);
1097 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1221 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1098 GvHV (PL_hintgv) = 0; 1222 GvHV (PL_hintgv) = newHV ();
1223#if PERL_VERSION_ATLEAST (5,10,0)
1224 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1225#endif
1099 PL_rs = newSVsv (GvSV (irsgv)); 1226 PL_rs = newSVsv (GvSV (irsgv));
1100 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1227 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1101 1228
1102 { 1229 {
1103 dSP; 1230 dSP;
… …
1131 PL_op = (OP *)&init_perl_op; 1258 PL_op = (OP *)&init_perl_op;
1132 1259
1133 /* copy throw, in case it was set before init_perl */ 1260 /* copy throw, in case it was set before init_perl */
1134 CORO_THROW = coro->except; 1261 CORO_THROW = coro->except;
1135 1262
1136 SWAP_SVS (coro); 1263 SWAP_SVS_ENTER (coro);
1137 1264
1138 if (ecb_expect_false (enable_times)) 1265 if (ecb_expect_false (enable_times))
1139 { 1266 {
1140 coro_times_update (); 1267 coro_times_update ();
1141 coro_times_sub (coro); 1268 coro_times_sub (coro);
… …
1179 /* this will cause transfer_check to croak on block*/ 1306 /* this will cause transfer_check to croak on block*/
1180 SvRV_set (coro_current, (SV *)coro->hv); 1307 SvRV_set (coro_current, (SV *)coro->hv);
1181 1308
1182 load_perl (aTHX_ coro); 1309 load_perl (aTHX_ coro);
1183 1310
1311 /* restore swapped sv's */
1312 SWAP_SVS_LEAVE (coro);
1313
1184 coro_unwind_stacks (aTHX); 1314 coro_unwind_stacks (aTHX);
1185 1315
1186 /* restore swapped sv's */
1187 SWAP_SVS (coro);
1188
1189 coro_destruct_stacks (aTHX); 1316 coro_destruct_stacks (aTHX);
1190 1317
1191 // now save some sv's to be free'd later 1318 /* now save some sv's to be free'd later */
1192 svf [0] = GvSV (PL_defgv); 1319 svf [0] = GvSV (PL_defgv);
1193 svf [1] = (SV *)GvAV (PL_defgv); 1320 svf [1] = (SV *)GvAV (PL_defgv);
1194 svf [2] = GvSV (PL_errgv); 1321 svf [2] = GvSV (PL_errgv);
1195 svf [3] = (SV *)PL_defoutgv; 1322 svf [3] = (SV *)PL_defoutgv;
1196 svf [4] = PL_rs; 1323 svf [4] = PL_rs;
… …
1213 1340
1214 SvREFCNT_dec (coro->saved_deffh); 1341 SvREFCNT_dec (coro->saved_deffh);
1215 SvREFCNT_dec (coro->rouse_cb); 1342 SvREFCNT_dec (coro->rouse_cb);
1216 SvREFCNT_dec (coro->invoke_cb); 1343 SvREFCNT_dec (coro->invoke_cb);
1217 SvREFCNT_dec (coro->invoke_av); 1344 SvREFCNT_dec (coro->invoke_av);
1345 SvREFCNT_dec (coro->on_enter_xs);
1346 SvREFCNT_dec (coro->on_leave_xs);
1218 } 1347 }
1219} 1348}
1220 1349
1221ECB_INLINE void 1350ecb_inline void
1222free_coro_mortal (pTHX) 1351free_coro_mortal (pTHX)
1223{ 1352{
1224 if (ecb_expect_true (coro_mortal)) 1353 if (ecb_expect_true (coro_mortal))
1225 { 1354 {
1226 SvREFCNT_dec ((SV *)coro_mortal); 1355 SvREFCNT_dec ((SV *)coro_mortal);
… …
1285 1414
1286 if (PL_curcop != &PL_compiling) 1415 if (PL_curcop != &PL_compiling)
1287 { 1416 {
1288 SV **cb; 1417 SV **cb;
1289 1418
1290 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1419 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1291 { 1420 {
1292 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1421 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1293 1422
1294 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1423 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1295 { 1424 {
… …
1385 slf_frame.prepare = slf_prepare_set_stacklevel; 1514 slf_frame.prepare = slf_prepare_set_stacklevel;
1386 slf_frame.check = slf_check_set_stacklevel; 1515 slf_frame.check = slf_check_set_stacklevel;
1387} 1516}
1388 1517
1389/* the tail of transfer: execute stuff we can only do after a transfer */ 1518/* the tail of transfer: execute stuff we can only do after a transfer */
1390ECB_INLINE void 1519ecb_inline void
1391transfer_tail (pTHX) 1520transfer_tail (pTHX)
1392{ 1521{
1393 free_coro_mortal (aTHX); 1522 free_coro_mortal (aTHX);
1523}
1524
1525/* try to exit the same way perl's main function would do */
1526/* we do not bother resetting the environment or other things *7
1527/* that are not, uhm, essential */
1528/* this obviously also doesn't work when perl is embedded */
1529static void ecb_noinline ecb_cold
1530perlish_exit (pTHX)
1531{
1532 int exitstatus = perl_destruct (PL_curinterp);
1533 perl_free (PL_curinterp);
1534 exit (exitstatus);
1394} 1535}
1395 1536
1396/* 1537/*
1397 * this is a _very_ stripped down perl interpreter ;) 1538 * this is a _very_ stripped down perl interpreter ;)
1398 */ 1539 */
… …
1425 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1566 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1426 * runtime errors here, as this is just a random interpreter, not a thread. 1567 * runtime errors here, as this is just a random interpreter, not a thread.
1427 */ 1568 */
1428 1569
1429 /* 1570 /*
1571 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1572 * requires PL_scopestack_ix, so do it here if required.
1573 */
1574 if (!PL_scopestack_ix)
1575 ENTER;
1576
1577 /*
1430 * If perl-run returns we assume exit() was being called or the coro 1578 * If perl-run returns we assume exit() was being called or the coro
1431 * fell off the end, which seems to be the only valid (non-bug) 1579 * fell off the end, which seems to be the only valid (non-bug)
1432 * reason for perl_run to return. We try to exit by jumping to the 1580 * reason for perl_run to return. We try to mimic whatever perl is normally
1433 * bootstrap-time "top" top_env, as we cannot restore the "main" 1581 * doing in that case. YMMV.
1434 * coroutine as Coro has no such concept.
1435 * This actually isn't valid with the pthread backend, but OSes requiring
1436 * that backend are too broken to do it in a standards-compliant way.
1437 */ 1582 */
1438 PL_top_env = main_top_env; 1583 perlish_exit (aTHX);
1439 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1440 } 1584 }
1441} 1585}
1442 1586
1443static coro_cctx * 1587static coro_cctx *
1444cctx_new () 1588cctx_new (void)
1445{ 1589{
1446 coro_cctx *cctx; 1590 coro_cctx *cctx;
1447 1591
1448 ++cctx_count; 1592 ++cctx_count;
1449 New (0, cctx, 1, coro_cctx); 1593 New (0, cctx, 1, coro_cctx);
… …
1455 return cctx; 1599 return cctx;
1456} 1600}
1457 1601
1458/* create a new cctx only suitable as source */ 1602/* create a new cctx only suitable as source */
1459static coro_cctx * 1603static coro_cctx *
1460cctx_new_empty () 1604cctx_new_empty (void)
1461{ 1605{
1462 coro_cctx *cctx = cctx_new (); 1606 coro_cctx *cctx = cctx_new ();
1463 1607
1464 cctx->sptr = 0; 1608 cctx->stack.sptr = 0;
1465 coro_create (&cctx->cctx, 0, 0, 0, 0); 1609 coro_create (&cctx->cctx, 0, 0, 0, 0);
1466 1610
1467 return cctx; 1611 return cctx;
1468} 1612}
1469 1613
1470/* create a new cctx suitable as destination/running a perl interpreter */ 1614/* create a new cctx suitable as destination/running a perl interpreter */
1471static coro_cctx * 1615static coro_cctx *
1472cctx_new_run () 1616cctx_new_run (void)
1473{ 1617{
1474 coro_cctx *cctx = cctx_new (); 1618 coro_cctx *cctx = cctx_new ();
1475 void *stack_start;
1476 size_t stack_size;
1477 1619
1478#if HAVE_MMAP 1620 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1479 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1480 /* mmap supposedly does allocate-on-write for us */
1481 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1482
1483 if (cctx->sptr != (void *)-1)
1484 {
1485 #if CORO_STACKGUARD
1486 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1487 #endif
1488 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1489 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1490 cctx->flags |= CC_MAPPED;
1491 } 1621 {
1492 else
1493#endif
1494 {
1495 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1496 New (0, cctx->sptr, cctx_stacksize, long);
1497
1498 if (!cctx->sptr)
1499 {
1500 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1622 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1501 _exit (EXIT_FAILURE); 1623 _exit (EXIT_FAILURE);
1502 }
1503
1504 stack_start = cctx->sptr;
1505 stack_size = cctx->ssize;
1506 } 1624 }
1507 1625
1508 #if CORO_USE_VALGRIND
1509 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1510 #endif
1511
1512 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1626 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1513 1627
1514 return cctx; 1628 return cctx;
1515} 1629}
1516 1630
1517static void 1631static void
… …
1523 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1637 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1524 1638
1525 --cctx_count; 1639 --cctx_count;
1526 coro_destroy (&cctx->cctx); 1640 coro_destroy (&cctx->cctx);
1527 1641
1528 /* coro_transfer creates new, empty cctx's */ 1642 coro_stack_free (&cctx->stack);
1529 if (cctx->sptr)
1530 {
1531 #if CORO_USE_VALGRIND
1532 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1533 #endif
1534
1535#if HAVE_MMAP
1536 if (cctx->flags & CC_MAPPED)
1537 munmap (cctx->sptr, cctx->ssize);
1538 else
1539#endif
1540 Safefree (cctx->sptr);
1541 }
1542 1643
1543 Safefree (cctx); 1644 Safefree (cctx);
1544} 1645}
1545 1646
1546/* wether this cctx should be destructed */ 1647/* wether this cctx should be destructed */
… …
1565} 1666}
1566 1667
1567static void 1668static void
1568cctx_put (coro_cctx *cctx) 1669cctx_put (coro_cctx *cctx)
1569{ 1670{
1570 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1671 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1571 1672
1572 /* free another cctx if overlimit */ 1673 /* free another cctx if overlimit */
1573 if (ecb_expect_false (cctx_idle >= cctx_max_idle)) 1674 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1574 { 1675 {
1575 coro_cctx *first = cctx_first; 1676 coro_cctx *first = cctx_first;
… …
1701 return; 1802 return;
1702 1803
1703 slf_destroy (aTHX_ coro); 1804 slf_destroy (aTHX_ coro);
1704 1805
1705 coro->flags |= CF_ZOMBIE; 1806 coro->flags |= CF_ZOMBIE;
1706 1807
1707 if (coro->flags & CF_READY) 1808 if (coro->flags & CF_READY)
1708 { 1809 {
1709 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1810 /* reduce nready, as destroying a ready coro effectively unreadies it */
1710 /* alternative: look through all ready queues and remove the coro */ 1811 /* alternative: look through all ready queues and remove the coro */
1711 --coro_nready; 1812 --coro_nready;
… …
1788 TRANSFER (ta, 1); 1889 TRANSFER (ta, 1);
1789} 1890}
1790 1891
1791/** Coro ********************************************************************/ 1892/** Coro ********************************************************************/
1792 1893
1793ECB_INLINE void 1894ecb_inline void
1794coro_enq (pTHX_ struct coro *coro) 1895coro_enq (pTHX_ struct coro *coro)
1795{ 1896{
1796 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1897 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1797 1898
1798 SvREFCNT_inc_NN (coro->hv); 1899 SvREFCNT_inc_NN (coro->hv);
… …
1800 coro->next_ready = 0; 1901 coro->next_ready = 0;
1801 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1902 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1802 ready [1] = coro; 1903 ready [1] = coro;
1803} 1904}
1804 1905
1805ECB_INLINE struct coro * 1906ecb_inline struct coro *
1806coro_deq (pTHX) 1907coro_deq (pTHX)
1807{ 1908{
1808 int prio; 1909 int prio;
1809 1910
1810 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1911 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1863{ 1964{
1864 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1965 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1865} 1966}
1866 1967
1867/* expects to own a reference to next->hv */ 1968/* expects to own a reference to next->hv */
1868ECB_INLINE void 1969ecb_inline void
1869prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1970prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1870{ 1971{
1871 SV *prev_sv = SvRV (coro_current); 1972 SV *prev_sv = SvRV (coro_current);
1872 1973
1873 ta->prev = SvSTATE_hv (prev_sv); 1974 ta->prev = SvSTATE_hv (prev_sv);
… …
1907 /* nothing to schedule: call the idle handler */ 2008 /* nothing to schedule: call the idle handler */
1908 if (SvROK (sv_idle) 2009 if (SvROK (sv_idle)
1909 && SvOBJECT (SvRV (sv_idle))) 2010 && SvOBJECT (SvRV (sv_idle)))
1910 { 2011 {
1911 if (SvRV (sv_idle) == SvRV (coro_current)) 2012 if (SvRV (sv_idle) == SvRV (coro_current))
2013 {
2014 require_pv ("Carp");
2015
2016 {
2017 dSP;
2018
2019 ENTER;
2020 SAVETMPS;
2021
2022 PUSHMARK (SP);
1912 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2023 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2024 PUTBACK;
2025 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2026
2027 FREETMPS;
2028 LEAVE;
2029 }
2030 }
1913 2031
1914 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2032 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1915 api_ready (aTHX_ SvRV (sv_idle)); 2033 api_ready (aTHX_ SvRV (sv_idle));
1916 --coro_nready; 2034 --coro_nready;
1917 } 2035 }
… …
1932 } 2050 }
1933 } 2051 }
1934 } 2052 }
1935} 2053}
1936 2054
1937ECB_INLINE void 2055ecb_inline void
1938prepare_cede (pTHX_ struct coro_transfer_args *ta) 2056prepare_cede (pTHX_ struct coro_transfer_args *ta)
1939{ 2057{
1940 api_ready (aTHX_ coro_current); 2058 api_ready (aTHX_ coro_current);
1941 prepare_schedule (aTHX_ ta); 2059 prepare_schedule (aTHX_ ta);
1942} 2060}
1943 2061
1944ECB_INLINE void 2062ecb_inline void
1945prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2063prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1946{ 2064{
1947 SV *prev = SvRV (coro_current); 2065 SV *prev = SvRV (coro_current);
1948 2066
1949 if (coro_nready) 2067 if (coro_nready)
… …
2114{ 2232{
2115 AV *od = coro->on_destroy; 2233 AV *od = coro->on_destroy;
2116 2234
2117 if (!od) 2235 if (!od)
2118 return; 2236 return;
2237
2238 coro->on_destroy = 0;
2239 sv_2mortal ((SV *)od);
2119 2240
2120 while (AvFILLp (od) >= 0) 2241 while (AvFILLp (od) >= 0)
2121 { 2242 {
2122 SV *cb = sv_2mortal (av_pop (od)); 2243 SV *cb = sv_2mortal (av_pop (od));
2123 2244
… …
2144 2265
2145static void 2266static void
2146coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2267coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2147{ 2268{
2148 AV *av; 2269 AV *av;
2149 2270
2150 if (coro->status) 2271 if (coro->status)
2151 { 2272 {
2152 av = coro->status; 2273 av = coro->status;
2153 av_clear (av); 2274 av_clear (av);
2154 } 2275 }
… …
2201 2322
2202 coro = SvSTATE (arg [0]); 2323 coro = SvSTATE (arg [0]);
2203 coro_hv = coro->hv; 2324 coro_hv = coro->hv;
2204 2325
2205 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2326 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2206 2327
2207 if (ecb_expect_false (coro->flags & CF_NOCANCEL)) 2328 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2208 { 2329 {
2209 /* coro currently busy cancelling something, so just notify it */ 2330 /* coro currently busy cancelling something, so just notify it */
2210 coro->slf_frame.data = (void *)coro; 2331 coro->slf_frame.data = (void *)coro;
2211 2332
… …
2218 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2339 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2219 } 2340 }
2220 else 2341 else
2221 { 2342 {
2222 struct coro *self = SvSTATE_current; 2343 struct coro *self = SvSTATE_current;
2344
2345 if (!self)
2346 croak ("Coro::cancel called outside of thread content,");
2223 2347
2224 /* otherwise we cancel directly, purely for speed reasons 2348 /* otherwise we cancel directly, purely for speed reasons
2225 * unfortunately, this requires some magic trickery, as 2349 * unfortunately, this requires some magic trickery, as
2226 * somebody else could cancel us, so we have to fight the cancellation. 2350 * somebody else could cancel us, so we have to fight the cancellation.
2227 * this is ugly, and hopefully fully worth the extra speed. 2351 * this is ugly, and hopefully fully worth the extra speed.
… …
2337 else 2461 else
2338 { 2462 {
2339 av_clear (GvAV (PL_defgv)); 2463 av_clear (GvAV (PL_defgv));
2340 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2464 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2341 2465
2466 if (ecb_expect_false (coro->swap_sv))
2467 {
2468 swap_svs_leave (coro);
2469 SvREFCNT_dec_NN (coro->swap_sv);
2470 coro->swap_sv = 0;
2471 }
2472
2342 coro->prio = 0; 2473 coro->prio = 0;
2343 2474
2344 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2475 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2345 api_trace (aTHX_ coro_current, 0); 2476 api_trace (aTHX_ coro_current, 0);
2346 2477
2347 frame->prepare = prepare_schedule; 2478 frame->prepare = prepare_schedule;
2348 av_push (av_async_pool, SvREFCNT_inc (hv)); 2479 av_push (av_async_pool, SvREFCNT_inc (hv));
2349 } 2480 }
… …
2390 2521
2391static int 2522static int
2392slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2523slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2393{ 2524{
2394 SV *data = (SV *)frame->data; 2525 SV *data = (SV *)frame->data;
2395 2526
2396 if (CORO_THROW) 2527 if (CORO_THROW)
2397 return 0; 2528 return 0;
2398 2529
2399 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2530 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2400 return 1; 2531 return 1;
… …
2436 cb = sv_2mortal (coro->rouse_cb); 2567 cb = sv_2mortal (coro->rouse_cb);
2437 coro->rouse_cb = 0; 2568 coro->rouse_cb = 0;
2438 } 2569 }
2439 2570
2440 if (!SvROK (cb) 2571 if (!SvROK (cb)
2441 || SvTYPE (SvRV (cb)) != SVt_PVCV 2572 || SvTYPE (SvRV (cb)) != SVt_PVCV
2442 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2573 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2443 croak ("Coro::rouse_wait called with illegal callback argument,"); 2574 croak ("Coro::rouse_wait called with illegal callback argument,");
2444 2575
2445 { 2576 {
2446 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2577 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2569 2700
2570/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2701/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2571static void 2702static void
2572slf_destroy (pTHX_ struct coro *coro) 2703slf_destroy (pTHX_ struct coro *coro)
2573{ 2704{
2574 /* this callback is reserved for slf functions needing to do cleanup */ 2705 struct CoroSLF frame = coro->slf_frame;
2575 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2576 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2577 2706
2578 /* 2707 /*
2579 * The on_destroy above most likely is from an SLF call. 2708 * The on_destroy below most likely is from an SLF call.
2580 * Since by definition the SLF call will not finish when we destroy 2709 * Since by definition the SLF call will not finish when we destroy
2581 * the coro, we will have to force-finish it here, otherwise 2710 * the coro, we will have to force-finish it here, otherwise
2582 * cleanup functions cannot call SLF functions. 2711 * cleanup functions cannot call SLF functions.
2583 */ 2712 */
2584 coro->slf_frame.prepare = 0; 2713 coro->slf_frame.prepare = 0;
2714
2715 /* this callback is reserved for slf functions needing to do cleanup */
2716 if (frame.destroy && frame.prepare && !PL_dirty)
2717 frame.destroy (aTHX_ &frame);
2585} 2718}
2586 2719
2587/* 2720/*
2588 * these not obviously related functions are all rolled into one 2721 * these not obviously related functions are all rolled into one
2589 * function to increase chances that they all will call transfer with the same 2722 * function to increase chances that they all will call transfer with the same
… …
2772static void 2905static void
2773coro_pop_on_leave (pTHX_ void *coro) 2906coro_pop_on_leave (pTHX_ void *coro)
2774{ 2907{
2775 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2908 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2776 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2909 on_enterleave_call (aTHX_ sv_2mortal (cb));
2910}
2911
2912static void
2913enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2914{
2915 if (!hook)
2916 return;
2917
2918 if (!*avp)
2919 {
2920 *avp = newAV ();
2921 AvREAL_off (*avp);
2922 }
2923
2924 av_push (*avp, (SV *)hook);
2925 av_push (*avp, (SV *)arg);
2926}
2927
2928static void
2929enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2930{
2931 AV *av = *avp;
2932 int i;
2933
2934 if (!av)
2935 return;
2936
2937 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2938 if (AvARRAY (av)[i] == (SV *)hook)
2939 {
2940 if (execute)
2941 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2942
2943 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2944 av_pop (av);
2945 av_pop (av);
2946 break;
2947 }
2948
2949 if (AvFILLp (av) >= 0)
2950 {
2951 *avp = 0;
2952 SvREFCNT_dec_NN (av);
2953 }
2954}
2955
2956static void
2957api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2958{
2959 struct coro *coro = SvSTATE (coro_sv);
2960
2961 if (SvSTATE_current == coro)
2962 if (enter)
2963 enter (aTHX_ enter_arg);
2964
2965 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2966 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2967}
2968
2969static void
2970api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2971{
2972 struct coro *coro = SvSTATE (coro_sv);
2973
2974 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2975 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2976}
2977
2978static void
2979savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2980{
2981 struct coro *coro = SvSTATE_current;
2982
2983 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2984}
2985
2986static void
2987savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2988{
2989 struct coro *coro = SvSTATE_current;
2990
2991 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2992}
2993
2994static void
2995api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2996{
2997 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2998
2999 /* this ought to be much cheaper than malloc + a single destructor call */
3000 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
3001 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2777} 3002}
2778 3003
2779/*****************************************************************************/ 3004/*****************************************************************************/
2780/* PerlIO::cede */ 3005/* PerlIO::cede */
2781 3006
… …
2911 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3136 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2912 PUTBACK; 3137 PUTBACK;
2913 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3138 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2914 } 3139 }
2915 3140
2916 SvREFCNT_dec (cb); 3141 SvREFCNT_dec_NN (cb);
2917 } 3142 }
2918} 3143}
2919 3144
2920static void 3145static void
2921coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3146coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
2929{ 3154{
2930 AV *av = (AV *)frame->data; 3155 AV *av = (AV *)frame->data;
2931 SV *count_sv = AvARRAY (av)[0]; 3156 SV *count_sv = AvARRAY (av)[0];
2932 SV *coro_hv = SvRV (coro_current); 3157 SV *coro_hv = SvRV (coro_current);
2933 3158
3159 frame->destroy = 0;
3160
2934 /* if we are about to throw, don't actually acquire the lock, just throw */ 3161 /* if we are about to throw, don't actually acquire the lock, just throw */
2935 if (CORO_THROW) 3162 if (ecb_expect_false (CORO_THROW))
3163 {
3164 /* we still might be responsible for the semaphore, so wake up others */
3165 coro_semaphore_adjust (aTHX_ av, 0);
3166
2936 return 0; 3167 return 0;
3168 }
2937 else if (SvIVX (count_sv) > 0) 3169 else if (SvIVX (count_sv) > 0)
2938 { 3170 {
2939 frame->destroy = 0;
2940
2941 if (acquire) 3171 if (acquire)
2942 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3172 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2943 else 3173 else
2944 coro_semaphore_adjust (aTHX_ av, 0); 3174 coro_semaphore_adjust (aTHX_ av, 0);
2945 3175
… …
2949 { 3179 {
2950 int i; 3180 int i;
2951 /* if we were woken up but can't down, we look through the whole */ 3181 /* if we were woken up but can't down, we look through the whole */
2952 /* waiters list and only add us if we aren't in there already */ 3182 /* waiters list and only add us if we aren't in there already */
2953 /* this avoids some degenerate memory usage cases */ 3183 /* this avoids some degenerate memory usage cases */
2954 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug 3184 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2955 if (AvARRAY (av)[i] == coro_hv) 3185 if (AvARRAY (av)[i] == coro_hv)
2956 return 1; 3186 return 1;
2957 3187
2958 av_push (av, SvREFCNT_inc (coro_hv)); 3188 av_push (av, SvREFCNT_inc (coro_hv));
2959 return 1; 3189 return 1;
… …
3056 { 3286 {
3057 api_ready (aTHX_ cb); 3287 api_ready (aTHX_ cb);
3058 sv_setiv (cb, 0); /* signal waiter */ 3288 sv_setiv (cb, 0); /* signal waiter */
3059 } 3289 }
3060 3290
3061 SvREFCNT_dec (cb); 3291 SvREFCNT_dec_NN (cb);
3062 3292
3063 --count; 3293 --count;
3064 } 3294 }
3065} 3295}
3066 3296
… …
3151 } 3381 }
3152 3382
3153 av_push (state, data_sv); 3383 av_push (state, data_sv);
3154 3384
3155 api_ready (aTHX_ coro); 3385 api_ready (aTHX_ coro);
3156 SvREFCNT_dec (coro); 3386 SvREFCNT_dec_NN (coro);
3157 SvREFCNT_dec ((AV *)state); 3387 SvREFCNT_dec_NN ((AV *)state);
3158} 3388}
3159 3389
3160static int 3390static int
3161slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3391slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3162{ 3392{
… …
3167 /* it quickly returns */ 3397 /* it quickly returns */
3168 if (CORO_THROW) 3398 if (CORO_THROW)
3169 return 0; 3399 return 0;
3170 3400
3171 /* one element that is an RV? repeat! */ 3401 /* one element that is an RV? repeat! */
3172 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3402 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3173 return 1; 3403 return 1;
3174 3404
3175 /* restore status */ 3405 /* restore status */
3176 { 3406 {
3177 SV *data_sv = av_pop (state); 3407 SV *data_sv = av_pop (state);
… …
3180 errno = data->errorno; 3410 errno = data->errorno;
3181 PL_laststype = data->laststype; 3411 PL_laststype = data->laststype;
3182 PL_laststatval = data->laststatval; 3412 PL_laststatval = data->laststatval;
3183 PL_statcache = data->statcache; 3413 PL_statcache = data->statcache;
3184 3414
3185 SvREFCNT_dec (data_sv); 3415 SvREFCNT_dec_NN (data_sv);
3186 } 3416 }
3187 3417
3188 /* push result values */ 3418 /* push result values */
3189 { 3419 {
3190 dSP; 3420 dSP;
… …
3339#endif 3569#endif
3340 3570
3341#if CORO_JIT 3571#if CORO_JIT
3342 3572
3343static void ecb_noinline ecb_cold 3573static void ecb_noinline ecb_cold
3344pushav_3uv (pTHX_ UV a, UV b, UV c) 3574pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3345{ 3575{
3346 dSP; 3576 dSP;
3347 AV *av = newAV (); 3577 AV *av = newAV ();
3348 3578
3579 av_store (av, 3, newSVuv (d));
3349 av_store (av, 2, newSVuv (c)); 3580 av_store (av, 2, newSVuv (c));
3350 av_store (av, 1, newSVuv (b)); 3581 av_store (av, 1, newSVuv (b));
3351 av_store (av, 0, newSVuv (a)); 3582 av_store (av, 0, newSVuv (a));
3352 3583
3353 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 3584 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
… …
3360{ 3591{
3361 dSP; 3592 dSP;
3362 SV *load, *save; 3593 SV *load, *save;
3363 char *map_base; 3594 char *map_base;
3364 char *load_ptr, *save_ptr; 3595 char *load_ptr, *save_ptr;
3365 STRLEN load_len, save_len; 3596 STRLEN load_len, save_len, map_len;
3366 int count; 3597 int count;
3367 3598
3599 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3600
3368 PUSHMARK (SP); 3601 PUSHMARK (SP);
3369 PUTBACK;
3370#define VARx(name,expr,type) pushav_3uv (aTHX_ (UV)&(expr), offsetof (perl_slots, name), sizeof (type)); 3602 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3371# include "state.h" 3603 #include "state.h"
3372#undef VARx
3373 count = call_pv ("Coro::State::_jit", G_ARRAY); 3604 count = call_pv ("Coro::State::_jit", G_ARRAY);
3374 SPAGAIN; 3605 SPAGAIN;
3375 3606
3376 save = POPs; save_ptr = SvPVbyte (save, save_len); 3607 save = POPs; save_ptr = SvPVbyte (save, save_len);
3377 load = POPs; load_ptr = SvPVbyte (load, load_len); 3608 load = POPs; load_ptr = SvPVbyte (load, load_len);
3378 3609
3610 map_len = load_len + save_len + 16;
3611
3379 map_base = mmap (0, load_len + save_len + 16, PROT_EXEC | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3612 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3380 3613
3381 assert (("Coro: unable mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3614 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3382 3615
3383 load_perl_slots = (load_save_perl_slots_type)map_base; 3616 load_perl_slots = (load_save_perl_slots_type)map_base;
3384 memcpy (map_base, load_ptr, load_len); 3617 memcpy (map_base, load_ptr, load_len);
3385 3618
3386 map_base += (load_len + 15) & ~15; 3619 map_base += (load_len + 15) & ~15;
3387 3620
3388 save_perl_slots = (load_save_perl_slots_type)map_base; 3621 save_perl_slots = (load_save_perl_slots_type)map_base;
3389 memcpy (map_base, save_ptr, save_len); 3622 memcpy (map_base, save_ptr, save_len);
3623
3624 /* we are good citizens and try to make the page read-only, so the evil evil */
3625 /* hackers might have it a bit more difficult */
3626 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3627
3628 PUTBACK;
3629 eval_pv ("undef &Coro::State::_jit", 1);
3390} 3630}
3391 3631
3392#endif 3632#endif
3393 3633
3394MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3634MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3395 3635
3396PROTOTYPES: DISABLE 3636PROTOTYPES: DISABLE
3397 3637
3398BOOT: 3638BOOT:
3399{ 3639{
3640#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3641#include "state.h"
3400#ifdef USE_ITHREADS 3642#ifdef USE_ITHREADS
3401# if CORO_PTHREAD 3643# if CORO_PTHREAD
3402 coro_thx = PERL_GET_CONTEXT; 3644 coro_thx = PERL_GET_CONTEXT;
3403# endif 3645# endif
3404#endif 3646#endif
3405 BOOT_PAGESIZE;
3406
3407 /* perl defines these to check for existance first, but why it doesn't */ 3647 /* perl defines these to check for existance first, but why it doesn't */
3408 /* just create them one at init time is not clear to me, except for */ 3648 /* just create them one at init time is not clear to me, except for */
3409 /* programs trying to delete them, but... */ 3649 /* programs trying to delete them, but... */
3410 /* anyway, we declare this as invalid and make sure they are initialised here */ 3650 /* anyway, we declare this as invalid and make sure they are initialised here */
3411 DEFSV; 3651 DEFSV;
… …
3414 cctx_current = cctx_new_empty (); 3654 cctx_current = cctx_new_empty ();
3415 3655
3416 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3656 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3417 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3657 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3418 3658
3419 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3659 {
3420 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3660 /*
3421 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3661 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3662 * by coro_sig_vtbl in hash values.
3663 */
3664 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3665
3666 /* this only works if perl doesn't have a vtbl for %SIG */
3667 assert (!mg->mg_virtual);
3668
3669 /*
3670 * The irony is that the perl API itself asserts that mg_virtual
3671 * must be non-const, yet perl5porters insisted on marking their
3672 * vtbls as read-only, just to thwart perl modules from patching
3673 * them.
3674 */
3675 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3676 mg->mg_flags |= MGf_COPY;
3677
3678 coro_sigelem_vtbl = PL_vtbl_sigelem;
3679 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3680 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3681 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3682 }
3422 3683
3423 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3424 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3684 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3425 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3685 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3426 3686
3427 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3687 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3428 3688
… …
3462 time_init (aTHX); 3722 time_init (aTHX);
3463 3723
3464 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3724 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3465#if CORO_JIT 3725#if CORO_JIT
3466 PUTBACK; 3726 PUTBACK;
3467 require_pv ("Coro/jit-" CORO_JIT_TYPE ".pl");
3468 jit_init (aTHX); 3727 jit_init (aTHX);
3469 perl_eval_pv ("undef &Coro::State::_jit", 1);
3470 SPAGAIN; 3728 SPAGAIN;
3471#endif 3729#endif
3472} 3730}
3473 3731
3474SV * 3732SV *
… …
3483void 3741void
3484transfer (...) 3742transfer (...)
3485 PROTOTYPE: $$ 3743 PROTOTYPE: $$
3486 CODE: 3744 CODE:
3487 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3745 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3488
3489void
3490_exit (int code)
3491 PROTOTYPE: $
3492 CODE:
3493 _exit (code);
3494 3746
3495SV * 3747SV *
3496clone (Coro::State coro) 3748clone (Coro::State coro)
3497 CODE: 3749 CODE:
3498{ 3750{
… …
3553void 3805void
3554list () 3806list ()
3555 PROTOTYPE: 3807 PROTOTYPE:
3556 PPCODE: 3808 PPCODE:
3557{ 3809{
3558 struct coro *coro; 3810 struct coro *coro;
3559 for (coro = coro_first; coro; coro = coro->next) 3811 for (coro = coro_first; coro; coro = coro->next)
3560 if (coro->hv) 3812 if (coro->hv)
3561 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3813 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3562} 3814}
3563 3815
… …
3627 RETVAL = boolSV (coro->flags & ix); 3879 RETVAL = boolSV (coro->flags & ix);
3628 OUTPUT: 3880 OUTPUT:
3629 RETVAL 3881 RETVAL
3630 3882
3631void 3883void
3632throw (Coro::State self, SV *exception = &PL_sv_undef) 3884throw (SV *self, SV *exception = &PL_sv_undef)
3633 PROTOTYPE: $;$ 3885 PROTOTYPE: $;$
3634 CODE: 3886 CODE:
3635{ 3887{
3888 struct coro *coro = SvSTATE (self);
3636 struct coro *current = SvSTATE_current; 3889 struct coro *current = SvSTATE_current;
3637 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3890 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3638 SvREFCNT_dec (*exceptionp); 3891 SvREFCNT_dec (*exceptionp);
3639 SvGETMAGIC (exception); 3892 SvGETMAGIC (exception);
3640 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3893 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3894
3895 api_ready (aTHX_ self);
3641} 3896}
3642 3897
3643void 3898void
3644api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3899api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3645 PROTOTYPE: $;$ 3900 PROTOTYPE: $;$
… …
3722 3977
3723void 3978void
3724times (Coro::State self) 3979times (Coro::State self)
3725 PPCODE: 3980 PPCODE:
3726{ 3981{
3727 struct coro *current = SvSTATE (coro_current); 3982 struct coro *current = SvSTATE (coro_current);
3728 3983
3729 if (ecb_expect_false (current == self)) 3984 if (ecb_expect_false (current == self))
3730 { 3985 {
3731 coro_times_update (); 3986 coro_times_update ();
3732 coro_times_add (SvSTATE (coro_current)); 3987 coro_times_add (SvSTATE (coro_current));
… …
3739 if (ecb_expect_false (current == self)) 3994 if (ecb_expect_false (current == self))
3740 coro_times_sub (SvSTATE (coro_current)); 3995 coro_times_sub (SvSTATE (coro_current));
3741} 3996}
3742 3997
3743void 3998void
3744swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3999swap_sv (Coro::State coro, SV *sva, SV *svb)
3745 CODE: 4000 CODE:
3746{ 4001{
3747 struct coro *current = SvSTATE_current; 4002 struct coro *current = SvSTATE_current;
4003 AV *swap_sv;
4004 int i;
4005
4006 sva = SvRV (sva);
4007 svb = SvRV (svb);
3748 4008
3749 if (current == coro) 4009 if (current == coro)
3750 SWAP_SVS (current); 4010 SWAP_SVS_LEAVE (current);
3751 4011
3752 if (!coro->swap_sv) 4012 if (!coro->swap_sv)
3753 coro->swap_sv = newAV (); 4013 coro->swap_sv = newAV ();
3754 4014
4015 swap_sv = coro->swap_sv;
4016
4017 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4018 {
4019 SV *a = AvARRAY (swap_sv)[i ];
4020 SV *b = AvARRAY (swap_sv)[i + 1];
4021
4022 if (a == sva && b == svb)
4023 {
4024 SvREFCNT_dec_NN (a);
4025 SvREFCNT_dec_NN (b);
4026
4027 for (; i <= AvFILLp (swap_sv) - 2; i++)
4028 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4029
4030 AvFILLp (swap_sv) -= 2;
4031
4032 goto removed;
4033 }
4034 }
4035
3755 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4036 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3756 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4037 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4038
4039 removed:
3757 4040
3758 if (current == coro) 4041 if (current == coro)
3759 SWAP_SVS (current); 4042 SWAP_SVS_ENTER (current);
3760} 4043}
3761 4044
3762 4045
3763MODULE = Coro::State PACKAGE = Coro 4046MODULE = Coro::State PACKAGE = Coro
3764 4047
3765BOOT: 4048BOOT:
3766{ 4049{
4050 if (SVt_LAST > 32)
4051 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4052
3767 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4053 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3768 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4054 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3769 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4055 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3770 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4056 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3771 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4057 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3775 4061
3776 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4062 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3777 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4063 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3778 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4064 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3779 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 4065 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3780 4066
3781 coro_stash = gv_stashpv ("Coro", TRUE); 4067 coro_stash = gv_stashpv ("Coro", TRUE);
3782 4068
3783 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4069 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3784 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4070 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3785 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4071 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3797 coroapi.ready = api_ready; 4083 coroapi.ready = api_ready;
3798 coroapi.is_ready = api_is_ready; 4084 coroapi.is_ready = api_is_ready;
3799 coroapi.nready = coro_nready; 4085 coroapi.nready = coro_nready;
3800 coroapi.current = coro_current; 4086 coroapi.current = coro_current;
3801 4087
4088 coroapi.enterleave_hook = api_enterleave_hook;
4089 coroapi.enterleave_unhook = api_enterleave_unhook;
4090 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4091
3802 /*GCoroAPI = &coroapi;*/ 4092 /*GCoroAPI = &coroapi;*/
3803 sv_setiv (sv, (IV)&coroapi); 4093 sv_setiv (sv, (IV)&coroapi);
3804 SvREADONLY_on (sv); 4094 SvREADONLY_on (sv);
3805 } 4095 }
3806} 4096}
… …
3871 4161
3872void 4162void
3873_set_current (SV *current) 4163_set_current (SV *current)
3874 PROTOTYPE: $ 4164 PROTOTYPE: $
3875 CODE: 4165 CODE:
3876 SvREFCNT_dec (SvRV (coro_current)); 4166 SvREFCNT_dec_NN (SvRV (coro_current));
3877 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4167 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3878 4168
3879void 4169void
3880_set_readyhook (SV *hook) 4170_set_readyhook (SV *hook)
3881 PROTOTYPE: $ 4171 PROTOTYPE: $
… …
3965 4255
3966 if ((SV *)hv == &PL_sv_undef) 4256 if ((SV *)hv == &PL_sv_undef)
3967 { 4257 {
3968 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4258 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3969 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4259 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3970 SvREFCNT_dec (sv); 4260 SvREFCNT_dec_NN (sv);
3971 } 4261 }
3972 4262
3973 { 4263 {
3974 struct coro *coro = SvSTATE_hv (hv); 4264 struct coro *coro = SvSTATE_hv (hv);
3975 4265
… …
3982 api_ready (aTHX_ (SV *)hv); 4272 api_ready (aTHX_ (SV *)hv);
3983 4273
3984 if (GIMME_V != G_VOID) 4274 if (GIMME_V != G_VOID)
3985 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4275 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3986 else 4276 else
3987 SvREFCNT_dec (hv); 4277 SvREFCNT_dec_NN (hv);
3988} 4278}
3989 4279
3990SV * 4280SV *
3991rouse_cb () 4281rouse_cb ()
3992 PROTOTYPE: 4282 PROTOTYPE:
… …
4007 on_leave = 1 4297 on_leave = 1
4008 PROTOTYPE: & 4298 PROTOTYPE: &
4009 CODE: 4299 CODE:
4010{ 4300{
4011 struct coro *coro = SvSTATE_current; 4301 struct coro *coro = SvSTATE_current;
4012 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4302 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
4013 4303
4014 block = s_get_cv_croak (block); 4304 block = s_get_cv_croak (block);
4015 4305
4016 if (!*avp) 4306 if (!*avp)
4017 *avp = newAV (); 4307 *avp = newAV ();
… …
4037 4327
4038SV * 4328SV *
4039new (SV *klass, SV *count = 0) 4329new (SV *klass, SV *count = 0)
4040 CODE: 4330 CODE:
4041{ 4331{
4042 int semcnt = 1; 4332 int semcnt = 1;
4043 4333
4044 if (count) 4334 if (count)
4045 { 4335 {
4046 SvGETMAGIC (count); 4336 SvGETMAGIC (count);
4047 4337
… …
4071 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4361 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4072 OUTPUT: 4362 OUTPUT:
4073 RETVAL 4363 RETVAL
4074 4364
4075void 4365void
4076up (SV *self, int adjust = 1) 4366up (SV *self)
4077 ALIAS:
4078 adjust = 1
4079 CODE: 4367 CODE:
4368 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4369
4370void
4371adjust (SV *self, int adjust)
4372 CODE:
4080 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4373 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4081 4374
4082void 4375void
4083down (...) 4376down (...)
4084 CODE: 4377 CODE:
4085 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4378 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
4107 XSRETURN_NO; 4400 XSRETURN_NO;
4108} 4401}
4109 4402
4110void 4403void
4111waiters (SV *self) 4404waiters (SV *self)
4112 PPCODE: 4405 PPCODE:
4113{ 4406{
4114 AV *av = (AV *)SvRV (self); 4407 AV *av = (AV *)SvRV (self);
4115 int wcount = AvFILLp (av) + 1 - 1; 4408 int wcount = AvFILLp (av) + 1 - 1;
4116 4409
4117 if (GIMME_V == G_SCALAR) 4410 if (GIMME_V == G_SCALAR)
… …
4126} 4419}
4127 4420
4128MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4421MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4129 4422
4130void 4423void
4131_may_delete (SV *sem, int count, int extra_refs) 4424_may_delete (SV *sem, int count, unsigned int extra_refs)
4132 PPCODE: 4425 PPCODE:
4133{ 4426{
4134 AV *av = (AV *)SvRV (sem); 4427 AV *av = (AV *)SvRV (sem);
4135 4428
4136 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4429 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4137 && AvFILLp (av) == 0 /* no waiters, just count */ 4430 && AvFILLp (av) == 0 /* no waiters, just count */
4138 && SvIV (AvARRAY (av)[0]) == count) 4431 && SvIV (AvARRAY (av)[0]) == count)
4139 XSRETURN_YES; 4432 XSRETURN_YES;
… …
4160 4453
4161void 4454void
4162broadcast (SV *self) 4455broadcast (SV *self)
4163 CODE: 4456 CODE:
4164{ 4457{
4165 AV *av = (AV *)SvRV (self); 4458 AV *av = (AV *)SvRV (self);
4166 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4459 coro_signal_wake (aTHX_ av, AvFILLp (av));
4167} 4460}
4168 4461
4169void 4462void
4170send (SV *self) 4463send (SV *self)
… …
4178 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4471 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4179} 4472}
4180 4473
4181IV 4474IV
4182awaited (SV *self) 4475awaited (SV *self)
4183 CODE: 4476 CODE:
4184 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4477 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4185 OUTPUT: 4478 OUTPUT:
4186 RETVAL 4479 RETVAL
4187 4480
4188 4481
… …
4193 4486
4194void 4487void
4195_schedule (...) 4488_schedule (...)
4196 CODE: 4489 CODE:
4197{ 4490{
4198 static int incede; 4491 static int incede;
4199 4492
4200 api_cede_notself (aTHX); 4493 api_cede_notself (aTHX);
4201 4494
4202 ++incede; 4495 ++incede;
4203 while (coro_nready >= incede && api_cede (aTHX)) 4496 while (coro_nready >= incede && api_cede (aTHX))
… …
4247 { 4540 {
4248 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4541 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4249 coro_old_pp_sselect = 0; 4542 coro_old_pp_sselect = 0;
4250 } 4543 }
4251 4544
4545MODULE = Coro::State PACKAGE = Coro::Util
4546
4547void
4548_exit (int code)
4549 CODE:
4550 _exit (code);
4551
4552NV
4553time ()
4554 CODE:
4555 RETVAL = nvtime (aTHX);
4556 OUTPUT:
4557 RETVAL
4558
4559NV
4560gettimeofday ()
4561 PPCODE:
4562{
4563 UV tv [2];
4564 u2time (aTHX_ tv);
4565 EXTEND (SP, 2);
4566 PUSHs (sv_2mortal (newSVuv (tv [0])));
4567 PUSHs (sv_2mortal (newSVuv (tv [1])));
4568}
4569

Diff Legend

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