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.403 by root, Sun May 22 20:13:33 2011 UTC vs.
Revision 1.481 by root, Thu Aug 19 22:43:02 2021 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
8#if CORO_UCONTEXT
9 #define CORO_BACKEND "ucontext"
10#elif CORO_SJLJ
11 #define CORO_BACKEND "sjlj"
12#elif CORO_LINUX
13 #define CORO_BACKEND "linux"
14#elif CORO_LOSER
15 #define CORO_BACKEND "loser"
16#elif CORO_FIBER
17 #define CORO_BACKEND "fiber"
18#elif CORO_IRIX
19 #define CORO_BACKEND "irix"
20#elif CORO_ASM
21 #define CORO_BACKEND "asm"
22#elif CORO_PTHREAD
23 #define CORO_BACKEND "pthread"
24#else
25 #define CORO_BACKEND "unknown"
26#endif
7 27
8#define PERL_NO_GET_CONTEXT 28#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 29#define PERL_EXT
10 30
11#include "EXTERN.h" 31#include "EXTERN.h"
… …
13#include "XSUB.h" 33#include "XSUB.h"
14#include "perliol.h" 34#include "perliol.h"
15 35
16#include "schmorp.h" 36#include "schmorp.h"
17 37
38#define ECB_NO_THREADS 1
39#define ECB_NO_LIBM 1
40#include "ecb.h"
41
18#include <stddef.h> 42#include <stddef.h>
19#include <stdio.h> 43#include <stdio.h>
20#include <errno.h> 44#include <errno.h>
21#include <assert.h> 45#include <assert.h>
22 46
47#ifndef SvREFCNT_dec_NN
48 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
49#endif
50
51#ifndef SvREFCNT_inc_NN
52 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
53#endif
54
23#ifndef SVs_PADSTALE 55#ifndef SVs_PADSTALE
24# define SVs_PADSTALE 0 56# define SVs_PADSTALE 0
57#endif
58
59#ifdef PadARRAY
60# define NEWPADAPI 1
61# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
62#else
63typedef AV PADNAMELIST;
64# if !PERL_VERSION_ATLEAST(5,8,0)
65typedef AV PADLIST;
66typedef AV PAD;
67# endif
68# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
69# define PadlistMAX(pl) AvFILLp (pl)
70# define PadlistNAMES(pl) (*PadlistARRAY (pl))
71# define PadARRAY AvARRAY
72# define PadMAX AvFILLp
73# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
74#endif
75#ifndef PadnamelistREFCNT
76# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
77#endif
78#ifndef PadnamelistREFCNT_dec
79# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
80#endif
81
82/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
83/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
84#if PERL_VERSION_ATLEAST(5,19,0)
85# define SVt_BIND SVt_IV
25#endif 86#endif
26 87
27#if defined(_WIN32) 88#if defined(_WIN32)
28# undef HAS_GETTIMEOFDAY 89# undef HAS_GETTIMEOFDAY
29# undef setjmp 90# undef setjmp
… …
32# define setjmp _setjmp /* deep magic */ 93# define setjmp _setjmp /* deep magic */
33#else 94#else
34# include <inttypes.h> /* most portable stdint.h */ 95# include <inttypes.h> /* most portable stdint.h */
35#endif 96#endif
36 97
37#ifdef HAVE_MMAP
38# include <unistd.h>
39# include <sys/mman.h>
40# ifndef MAP_ANONYMOUS
41# ifdef MAP_ANON
42# define MAP_ANONYMOUS MAP_ANON
43# else
44# undef HAVE_MMAP
45# endif
46# endif
47# include <limits.h>
48# ifndef PAGESIZE
49# define PAGESIZE pagesize
50# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
51static long pagesize;
52# else
53# define BOOT_PAGESIZE (void)0
54# endif
55#else
56# define PAGESIZE 0
57# define BOOT_PAGESIZE (void)0
58#endif
59
60#if CORO_USE_VALGRIND
61# include <valgrind/valgrind.h>
62#endif
63
64/* the maximum number of idle cctx that will be pooled */ 98/* the maximum number of idle cctx that will be pooled */
65static int cctx_max_idle = 4; 99static int cctx_max_idle = 4;
66 100
67#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 101#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
68# undef CORO_STACKGUARD 102# define HAS_SCOPESTACK_NAME 1
69#endif
70
71#ifndef CORO_STACKGUARD
72# define CORO_STACKGUARD 0
73#endif 103#endif
74 104
75/* prefer perl internal functions over our own? */ 105/* prefer perl internal functions over our own? */
76#ifndef CORO_PREFER_PERL_FUNCTIONS 106#ifndef CORO_PREFER_PERL_FUNCTIONS
77# define CORO_PREFER_PERL_FUNCTIONS 0 107# define CORO_PREFER_PERL_FUNCTIONS 0
… …
87# define STACKLEVEL ((void *)&stacklevel) 117# define STACKLEVEL ((void *)&stacklevel)
88#endif 118#endif
89 119
90#define IN_DESTRUCT PL_dirty 120#define IN_DESTRUCT PL_dirty
91 121
92#if __GNUC__ >= 3
93# define attribute(x) __attribute__(x)
94# define expect(expr,value) __builtin_expect ((expr), (value))
95# define INLINE static inline
96#else
97# define attribute(x)
98# define expect(expr,value) (expr)
99# define INLINE static
100#endif
101
102#define expect_false(expr) expect ((expr) != 0, 0)
103#define expect_true(expr) expect ((expr) != 0, 1)
104
105#define NOINLINE attribute ((noinline))
106
107#include "CoroAPI.h" 122#include "CoroAPI.h"
108#define GCoroAPI (&coroapi) /* very sneaky */ 123#define GCoroAPI (&coroapi) /* very sneaky */
109 124
110#ifdef USE_ITHREADS 125#ifdef USE_ITHREADS
111# if CORO_PTHREAD 126# if CORO_PTHREAD
… …
121# define CORO_CLOCK_MONOTONIC 1 136# define CORO_CLOCK_MONOTONIC 1
122# define CORO_CLOCK_THREAD_CPUTIME_ID 3 137# define CORO_CLOCK_THREAD_CPUTIME_ID 3
123# endif 138# endif
124#endif 139#endif
125 140
141/* one off bugfix for perl 5.22 */
142#if PERL_VERSION_ATLEAST(5,22,0) && !PERL_VERSION_ATLEAST(5,24,0)
143# undef PadlistNAMES
144# define PadlistNAMES(pl) *((PADNAMELIST **)PadlistARRAY (pl))
145#endif
146
147#if PERL_VERSION_ATLEAST(5,24,0)
148# define SUB_ARGARRAY PL_curpad[0]
149#else
150# define SUB_ARGARRAY (SV *)cx->blk_sub.argarray
151#endif
152
153/* perl usually suppresses asserts. for debugging, we sometimes force it to be on */
154#if 0
155# undef NDEBUG
156# include <assert.h>
157#endif
158
126static double (*nvtime)(); /* so why doesn't it take void? */ 159static double (*nvtime)(); /* so why doesn't it take void? */
127static void (*u2time)(pTHX_ UV ret[2]); 160static void (*u2time)(pTHX_ UV ret[2]);
128 161
129/* we hijack an hopefully unused CV flag for our purposes */ 162/* we hijack an hopefully unused CV flag for our purposes */
130#define CVf_SLF 0x4000 163#define CVf_SLF 0x4000
… …
145 178
146static GV *irsgv; /* $/ */ 179static GV *irsgv; /* $/ */
147static GV *stdoutgv; /* *STDOUT */ 180static GV *stdoutgv; /* *STDOUT */
148static SV *rv_diehook; 181static SV *rv_diehook;
149static SV *rv_warnhook; 182static SV *rv_warnhook;
150static HV *hv_sig; /* %SIG */
151 183
152/* async_pool helper stuff */ 184/* async_pool helper stuff */
153static SV *sv_pool_rss; 185static SV *sv_pool_rss;
154static SV *sv_pool_size; 186static SV *sv_pool_size;
155static SV *sv_async_pool_idle; /* description string */ 187static SV *sv_async_pool_idle; /* description string */
… …
183typedef struct coro_cctx 215typedef struct coro_cctx
184{ 216{
185 struct coro_cctx *next; 217 struct coro_cctx *next;
186 218
187 /* the stack */ 219 /* the stack */
188 void *sptr; 220 struct coro_stack stack;
189 size_t ssize;
190 221
191 /* cpu state */ 222 /* cpu state */
192 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 223 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
224#ifndef NDEBUG
193 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 225 JMPENV *idle_te; /* same as idle_sp, but for top_env */
226#endif
194 JMPENV *top_env; 227 JMPENV *top_env;
195 coro_context cctx; 228 coro_context cctx;
196 229
197 U32 gen; 230 U32 gen;
198#if CORO_USE_VALGRIND 231#if CORO_USE_VALGRIND
… …
218}; 251};
219 252
220/* the structure where most of the perl state is stored, overlaid on the cxstack */ 253/* the structure where most of the perl state is stored, overlaid on the cxstack */
221typedef struct 254typedef struct
222{ 255{
223 SV *defsv;
224 AV *defav;
225 SV *errsv;
226 SV *irsgv;
227 HV *hinthv;
228#define VAR(name,type) type name; 256 #define VARx(name,expr,type) type name;
229# include "state.h" 257 #include "state.h"
230#undef VAR
231} perl_slots; 258} perl_slots;
232 259
233// how many context stack entries do we need for perl_slots 260/* how many context stack entries do we need for perl_slots */
234#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 261#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
235 262
236/* this is a structure representing a perl-level coroutine */ 263/* this is a structure representing a perl-level coroutine */
237struct coro 264struct coro
238{ 265{
… …
256 int usecount; /* number of transfers to this coro */ 283 int usecount; /* number of transfers to this coro */
257 284
258 /* coro process data */ 285 /* coro process data */
259 int prio; 286 int prio;
260 SV *except; /* exception to be thrown */ 287 SV *except; /* exception to be thrown */
261 SV *rouse_cb; /* last rouse callback */ 288 SV *rouse_cb; /* most recently created rouse callback */
262 AV *on_destroy; /* callbacks or coros to notify on destroy */ 289 AV *on_destroy; /* callbacks or coros to notify on destroy */
263 AV *status; /* the exit status list */ 290 AV *status; /* the exit status list */
264 291
265 /* async_pool */ 292 /* async_pool */
266 SV *saved_deffh; 293 SV *saved_deffh;
267 SV *invoke_cb; 294 SV *invoke_cb;
268 AV *invoke_av; 295 AV *invoke_av;
269 296
270 /* on_enter/on_leave */ 297 /* on_enter/on_leave */
271 AV *on_enter; 298 AV *on_enter; AV *on_enter_xs;
272 AV *on_leave; 299 AV *on_leave; AV *on_leave_xs;
273 300
274 /* swap_sv */ 301 /* swap_sv */
275 AV *swap_sv; 302 AV *swap_sv;
276 303
277 /* times */ 304 /* times */
… …
304static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 331static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
305static CV *cv_coro_run; 332static CV *cv_coro_run;
306static struct coro *coro_first; 333static struct coro *coro_first;
307#define coro_nready coroapi.nready 334#define coro_nready coroapi.nready
308 335
336/** JIT *********************************************************************/
337
338#if CORO_JIT
339 /* APPLE doesn't have mmap though */
340 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
341 #ifndef CORO_JIT_TYPE
342 #if ECB_AMD64 && CORO_JIT_UNIXY
343 #define CORO_JIT_TYPE "amd64-unix"
344 #elif __i386 && CORO_JIT_UNIXY
345 #define CORO_JIT_TYPE "x86-unix"
346 #endif
347 #endif
348#endif
349
350#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
351 #undef CORO_JIT
352#endif
353
354#if CORO_JIT
355 typedef void (*load_save_perl_slots_type)(perl_slots *);
356 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
357#endif
358
309/** Coro::Select ************************************************************/ 359/** Coro::Select ************************************************************/
310 360
311static OP *(*coro_old_pp_sselect) (pTHX); 361static OP *(*coro_old_pp_sselect) (pTHX);
312static SV *coro_select_select; 362static SV *coro_select_select;
313 363
… …
328 378
329/** time stuff **************************************************************/ 379/** time stuff **************************************************************/
330 380
331#ifdef HAS_GETTIMEOFDAY 381#ifdef HAS_GETTIMEOFDAY
332 382
333static void 383ecb_inline void
334coro_u2time (pTHX_ UV ret[2]) 384coro_u2time (pTHX_ UV ret[2])
335{ 385{
336 struct timeval tv; 386 struct timeval tv;
337 gettimeofday (&tv, 0); 387 gettimeofday (&tv, 0);
338 388
339 ret [0] = tv.tv_sec; 389 ret [0] = tv.tv_sec;
340 ret [1] = tv.tv_usec; 390 ret [1] = tv.tv_usec;
341} 391}
342 392
343static double 393ecb_inline double
344coro_nvtime () 394coro_nvtime (void)
345{ 395{
346 struct timeval tv; 396 struct timeval tv;
347 gettimeofday (&tv, 0); 397 gettimeofday (&tv, 0);
348 398
349 return tv.tv_sec + tv.tv_usec * 1e-6; 399 return tv.tv_sec + tv.tv_usec * 1e-6;
350} 400}
351 401
352static void 402ecb_inline void
353time_init (pTHX) 403time_init (pTHX)
354{ 404{
355 nvtime = coro_nvtime; 405 nvtime = coro_nvtime;
356 u2time = coro_u2time; 406 u2time = coro_u2time;
357} 407}
358 408
359#else 409#else
360 410
361static void 411ecb_inline void
362time_init (pTHX) 412time_init (pTHX)
363{ 413{
364 SV **svp; 414 SV **svp;
365 415
366 require_pv ("Time/HiRes.pm"); 416 require_pv ("Time/HiRes.pm");
367 417
368 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 418 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
369 419
370 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 420 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
371 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught"); 421 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
372 422
… …
378 428
379#endif 429#endif
380 430
381/** lowlevel stuff **********************************************************/ 431/** lowlevel stuff **********************************************************/
382 432
383static SV * 433static SV * ecb_noinline
384coro_get_sv (pTHX_ const char *name, int create) 434coro_get_sv (pTHX_ const char *name, int create)
385{ 435{
386#if PERL_VERSION_ATLEAST (5,10,0) 436#if PERL_VERSION_ATLEAST (5,10,0)
387 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 437 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
388 get_sv (name, create); 438 get_sv (name, create);
389#endif 439#endif
390 return get_sv (name, create); 440 return get_sv (name, create);
391} 441}
392 442
393static AV * 443static AV * ecb_noinline
394coro_get_av (pTHX_ const char *name, int create) 444coro_get_av (pTHX_ const char *name, int create)
395{ 445{
396#if PERL_VERSION_ATLEAST (5,10,0) 446#if PERL_VERSION_ATLEAST (5,10,0)
397 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 447 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
398 get_av (name, create); 448 get_av (name, create);
399#endif 449#endif
400 return get_av (name, create); 450 return get_av (name, create);
401} 451}
402 452
403static HV * 453static HV * ecb_noinline
404coro_get_hv (pTHX_ const char *name, int create) 454coro_get_hv (pTHX_ const char *name, int create)
405{ 455{
406#if PERL_VERSION_ATLEAST (5,10,0) 456#if PERL_VERSION_ATLEAST (5,10,0)
407 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 457 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
408 get_hv (name, create); 458 get_hv (name, create);
409#endif 459#endif
410 return get_hv (name, create); 460 return get_hv (name, create);
411} 461}
412 462
413INLINE void 463ecb_inline void
414coro_times_update () 464coro_times_update (void)
415{ 465{
416#ifdef coro_clock_gettime 466#ifdef coro_clock_gettime
417 struct timespec ts; 467 struct timespec ts;
418 468
419 ts.tv_sec = ts.tv_nsec = 0; 469 ts.tv_sec = ts.tv_nsec = 0;
… …
431 time_real [0] = tv [0]; 481 time_real [0] = tv [0];
432 time_real [1] = tv [1] * 1000; 482 time_real [1] = tv [1] * 1000;
433#endif 483#endif
434} 484}
435 485
436INLINE void 486ecb_inline void
437coro_times_add (struct coro *c) 487coro_times_add (struct coro *c)
438{ 488{
439 c->t_real [1] += time_real [1]; 489 c->t_real [1] += time_real [1];
440 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 490 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
441 c->t_real [0] += time_real [0]; 491 c->t_real [0] += time_real [0];
… …
443 c->t_cpu [1] += time_cpu [1]; 493 c->t_cpu [1] += time_cpu [1];
444 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 494 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
445 c->t_cpu [0] += time_cpu [0]; 495 c->t_cpu [0] += time_cpu [0];
446} 496}
447 497
448INLINE void 498ecb_inline void
449coro_times_sub (struct coro *c) 499coro_times_sub (struct coro *c)
450{ 500{
451 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 501 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
452 c->t_real [1] -= time_real [1]; 502 c->t_real [1] -= time_real [1];
453 c->t_real [0] -= time_real [0]; 503 c->t_real [0] -= time_real [0];
… …
461/* magic glue */ 511/* magic glue */
462 512
463#define CORO_MAGIC_type_cv 26 513#define CORO_MAGIC_type_cv 26
464#define CORO_MAGIC_type_state PERL_MAGIC_ext 514#define CORO_MAGIC_type_state PERL_MAGIC_ext
465 515
466#define CORO_MAGIC_NN(sv, type) \ 516#define CORO_MAGIC_NN(sv, type) \
467 (expect_true (SvMAGIC (sv)->mg_type == type) \ 517 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
468 ? SvMAGIC (sv) \ 518 ? SvMAGIC (sv) \
469 : mg_find (sv, type)) 519 : mg_find (sv, type))
470 520
471#define CORO_MAGIC(sv, type) \ 521#define CORO_MAGIC(sv, type) \
472 (expect_true (SvMAGIC (sv)) \ 522 (ecb_expect_true (SvMAGIC (sv)) \
473 ? CORO_MAGIC_NN (sv, type) \ 523 ? CORO_MAGIC_NN (sv, type) \
474 : 0) 524 : 0)
475 525
476#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 526#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
477#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 527#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
478 528
479INLINE MAGIC * 529ecb_inline MAGIC *
480SvSTATEhv_p (pTHX_ SV *coro) 530SvSTATEhv_p (pTHX_ SV *coro)
481{ 531{
482 MAGIC *mg; 532 MAGIC *mg;
483 533
484 if (expect_true ( 534 if (ecb_expect_true (
485 SvTYPE (coro) == SVt_PVHV 535 SvTYPE (coro) == SVt_PVHV
486 && (mg = CORO_MAGIC_state (coro)) 536 && (mg = CORO_MAGIC_state (coro))
487 && mg->mg_virtual == &coro_state_vtbl 537 && mg->mg_virtual == &coro_state_vtbl
488 )) 538 ))
489 return mg; 539 return mg;
490 540
491 return 0; 541 return 0;
492} 542}
493 543
494INLINE struct coro * 544ecb_inline struct coro *
495SvSTATE_ (pTHX_ SV *coro) 545SvSTATE_ (pTHX_ SV *coro_sv)
496{ 546{
497 MAGIC *mg; 547 MAGIC *mg;
498 548
499 if (SvROK (coro)) 549 if (SvROK (coro_sv))
500 coro = SvRV (coro); 550 coro_sv = SvRV (coro_sv);
501 551
502 mg = SvSTATEhv_p (aTHX_ coro); 552 mg = SvSTATEhv_p (aTHX_ coro_sv);
503 if (!mg) 553 if (!mg)
504 croak ("Coro::State object required"); 554 croak ("Coro::State object required");
505 555
506 return (struct coro *)mg->mg_ptr; 556 return (struct coro *)mg->mg_ptr;
507} 557}
… …
513#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 563#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
514 564
515/*****************************************************************************/ 565/*****************************************************************************/
516/* padlist management and caching */ 566/* padlist management and caching */
517 567
518static AV * 568ecb_inline PADLIST *
519coro_derive_padlist (pTHX_ CV *cv) 569coro_derive_padlist (pTHX_ CV *cv)
520{ 570{
521 AV *padlist = CvPADLIST (cv); 571 PADLIST *padlist = CvPADLIST (cv);
522 AV *newpadlist, *newpad; 572 PADLIST *newpadlist;
573 PADNAMELIST *padnames;
574 PAD *newpad;
575 PADOFFSET off = PadlistMAX (padlist) + 1;
523 576
524 newpadlist = newAV (); 577#if NEWPADAPI
578
579 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
580 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
581 while (!PadlistARRAY (padlist)[off - 1])
582 --off;
583
584 Perl_pad_push (aTHX_ padlist, off);
585
586 newpad = PadlistARRAY (padlist)[off];
587 PadlistARRAY (padlist)[off] = 0;
588
589#else
590
591#if PERL_VERSION_ATLEAST (5,10,0)
592 Perl_pad_push (aTHX_ padlist, off);
593#else
594 Perl_pad_push (aTHX_ padlist, off, 1);
595#endif
596
597 newpad = PadlistARRAY (padlist)[off];
598 PadlistMAX (padlist) = off - 1;
599
600#endif
601
602 newPADLIST (newpadlist);
603#if !PERL_VERSION_ATLEAST(5,15,3)
604 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
525 AvREAL_off (newpadlist); 605 AvREAL_off (newpadlist);
526#if PERL_VERSION_ATLEAST (5,10,0)
527 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
528#else
529 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
530#endif 606#endif
531 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
532 --AvFILLp (padlist);
533 607
534 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 608 /* Already extended to 2 elements by newPADLIST. */
535 av_store (newpadlist, 1, (SV *)newpad); 609 PadlistMAX (newpadlist) = 1;
610
611 padnames = PadlistNAMES (padlist);
612 ++PadnamelistREFCNT (padnames);
613 PadlistNAMES (newpadlist) = padnames;
614
615 PadlistARRAY (newpadlist)[1] = newpad;
536 616
537 return newpadlist; 617 return newpadlist;
538} 618}
539 619
540static void 620ecb_inline void
541free_padlist (pTHX_ AV *padlist) 621free_padlist (pTHX_ PADLIST *padlist)
542{ 622{
543 /* may be during global destruction */ 623 /* may be during global destruction */
544 if (!IN_DESTRUCT) 624 if (!IN_DESTRUCT)
545 { 625 {
546 I32 i = AvFILLp (padlist); 626 I32 i = PadlistMAX (padlist);
547 627
548 while (i > 0) /* special-case index 0 */ 628 while (i > 0) /* special-case index 0 */
549 { 629 {
550 /* we try to be extra-careful here */ 630 /* we try to be extra-careful here */
551 AV *av = (AV *)AvARRAY (padlist)[i--]; 631 PAD *pad = PadlistARRAY (padlist)[i--];
552 I32 j = AvFILLp (av);
553 632
633 if (pad)
634 {
635 I32 j = PadMAX (pad);
636
554 while (j >= 0) 637 while (j >= 0)
555 SvREFCNT_dec (AvARRAY (av)[j--]); 638 SvREFCNT_dec (PadARRAY (pad)[j--]);
556 639
557 AvFILLp (av) = -1; 640 PadMAX (pad) = -1;
558 SvREFCNT_dec (av); 641 SvREFCNT_dec (pad);
642 }
559 } 643 }
560 644
561 SvREFCNT_dec (AvARRAY (padlist)[0]); 645 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
562 646
647#if NEWPADAPI
648 Safefree (PadlistARRAY (padlist));
649 Safefree (padlist);
650#else
563 AvFILLp (padlist) = -1; 651 AvFILLp (padlist) = -1;
652 AvREAL_off (padlist);
564 SvREFCNT_dec ((SV*)padlist); 653 SvREFCNT_dec ((SV*)padlist);
654#endif
565 } 655 }
566} 656}
567 657
568static int 658static int
569coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 659coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
570{ 660{
571 AV *padlist; 661 PADLIST *padlist;
572 AV *av = (AV *)mg->mg_obj; 662 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
663 size_t len = *(size_t *)mg->mg_ptr;
573 664
574 /* perl manages to free our internal AV and _then_ call us */ 665 /* perl manages to free our internal AV and _then_ call us */
575 if (IN_DESTRUCT) 666 if (IN_DESTRUCT)
576 return 0; 667 return 0;
577 668
578 /* casting is fun. */ 669 while (len--)
579 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
580 free_padlist (aTHX_ padlist); 670 free_padlist (aTHX_ padlists[len]);
581
582 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
583 671
584 return 0; 672 return 0;
585} 673}
586 674
587static MGVTBL coro_cv_vtbl = { 675static MGVTBL coro_cv_vtbl = {
588 0, 0, 0, 0, 676 0, 0, 0, 0,
589 coro_cv_free 677 coro_cv_free
590}; 678};
591 679
592/* the next two functions merely cache the padlists */ 680/* the next two functions merely cache the padlists */
593static void 681ecb_inline void
594get_padlist (pTHX_ CV *cv) 682get_padlist (pTHX_ CV *cv)
595{ 683{
596 MAGIC *mg = CORO_MAGIC_cv (cv); 684 MAGIC *mg = CORO_MAGIC_cv (cv);
597 AV *av; 685 size_t *lenp;
598 686
599 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 687 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
600 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 688 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
601 else 689 else
602 { 690 {
603#if CORO_PREFER_PERL_FUNCTIONS 691#if CORO_PREFER_PERL_FUNCTIONS
604 /* this is probably cleaner? but also slower! */ 692 /* this is probably cleaner? but also slower! */
605 /* in practise, it seems to be less stable */ 693 /* in practise, it seems to be less stable */
… …
611 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 699 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
612#endif 700#endif
613 } 701 }
614} 702}
615 703
616static void 704ecb_inline void
617put_padlist (pTHX_ CV *cv) 705put_padlist (pTHX_ CV *cv)
618{ 706{
619 MAGIC *mg = CORO_MAGIC_cv (cv); 707 MAGIC *mg = CORO_MAGIC_cv (cv);
620 AV *av;
621 708
622 if (expect_false (!mg)) 709 if (ecb_expect_false (!mg))
710 {
623 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 711 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
712 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
713 mg->mg_len = 1; /* so mg_free frees mg_ptr */
714 }
715 else
716 Renew (mg->mg_ptr,
717 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
718 char);
624 719
625 av = (AV *)mg->mg_obj; 720 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
626
627 if (expect_false (AvFILLp (av) >= AvMAX (av)))
628 av_extend (av, AvFILLp (av) + 1);
629
630 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
631} 721}
632 722
633/** load & save, init *******************************************************/ 723/** load & save, init *******************************************************/
634 724
725ecb_inline void
726swap_sv (SV *a, SV *b)
727{
728 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
729 SV tmp;
730
731 /* swap sv_any */
732 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
733
734 /* swap sv_flags */
735 SvFLAGS (&tmp) = SvFLAGS (a);
736 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
737 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
738
739#if PERL_VERSION_ATLEAST (5,10,0)
740 /* perl 5.10 and later complicates this _quite_ a bit, but it also
741 * is much faster, so no quarrels here. alternatively, we could
742 * sv_upgrade to avoid this.
743 */
744 {
745 /* swap sv_u */
746 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
747
748 /* if SvANY points to the head, we need to adjust the pointers,
749 * as the pointer for a still points to b, and maybe vice versa.
750 */
751 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
752 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
753 svany_in_head_set |= 1 << SVt_NV;
754 #endif
755
756 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
757
758 if (svany_in_head (SvTYPE (a)))
759 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
760
761 if (svany_in_head (SvTYPE (b)))
762 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
763 }
764#endif
765}
766
635/* swap sv heads, at least logically */ 767/* swap sv heads, at least logically */
636static void 768static void
637swap_svs (pTHX_ Coro__State c) 769swap_svs_enter (pTHX_ Coro__State c)
638{ 770{
639 int i; 771 int i;
640 772
641 for (i = 0; i <= AvFILLp (c->swap_sv); ) 773 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
642 { 774 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
643 SV *a = AvARRAY (c->swap_sv)[i++];
644 SV *b = AvARRAY (c->swap_sv)[i++];
645
646 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
647 SV tmp;
648
649 /* swap sv_any */
650 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
651
652 /* swap sv_flags */
653 SvFLAGS (&tmp) = SvFLAGS (a);
654 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
655 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
656
657#if PERL_VERSION_ATLEAST (5,10,0)
658 /* perl 5.10 complicates this _quite_ a bit, but it also is
659 * much faster, so no quarrels here. alternatively, we could
660 * sv_upgrade to avoid this.
661 */
662 {
663 /* swap sv_u */
664 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
665
666 /* if SvANY points to the head, we need to adjust the pointers,
667 * as the pointer for a still points to b, and maybe vice versa.
668 */
669 #define svany_in_head(type) \
670 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
671
672 if (svany_in_head (SvTYPE (a)))
673 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
674
675 if (svany_in_head (SvTYPE (b)))
676 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
677 }
678#endif
679 }
680} 775}
681 776
777static void
778swap_svs_leave (pTHX_ Coro__State c)
779{
780 int i;
781
782 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
783 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
784}
785
682#define SWAP_SVS(coro) \ 786#define SWAP_SVS_ENTER(coro) \
683 if (expect_false ((coro)->swap_sv)) \ 787 if (ecb_expect_false ((coro)->swap_sv)) \
684 swap_svs (aTHX_ (coro)) 788 swap_svs_enter (aTHX_ (coro))
789
790#define SWAP_SVS_LEAVE(coro) \
791 if (ecb_expect_false ((coro)->swap_sv)) \
792 swap_svs_leave (aTHX_ (coro))
685 793
686static void 794static void
687on_enterleave_call (pTHX_ SV *cb); 795on_enterleave_call (pTHX_ SV *cb);
688 796
689static void 797static void
… …
692 perl_slots *slot = c->slot; 800 perl_slots *slot = c->slot;
693 c->slot = 0; 801 c->slot = 0;
694 802
695 PL_mainstack = c->mainstack; 803 PL_mainstack = c->mainstack;
696 804
697 GvSV (PL_defgv) = slot->defsv; 805#if CORO_JIT
698 GvAV (PL_defgv) = slot->defav; 806 load_perl_slots (slot);
699 GvSV (PL_errgv) = slot->errsv; 807#else
700 GvSV (irsgv) = slot->irsgv;
701 GvHV (PL_hintgv) = slot->hinthv;
702
703 #define VAR(name,type) PL_ ## name = slot->name; 808 #define VARx(name,expr,type) expr = slot->name;
704 # include "state.h" 809 #include "state.h"
705 #undef VAR 810#endif
706 811
707 { 812 {
708 dSP; 813 dSP;
709 814
710 CV *cv; 815 CV *cv;
711 816
712 /* now do the ugly restore mess */ 817 /* now do the ugly restore mess */
713 while (expect_true (cv = (CV *)POPs)) 818 while (ecb_expect_true (cv = (CV *)POPs))
714 { 819 {
715 put_padlist (aTHX_ cv); /* mark this padlist as available */ 820 put_padlist (aTHX_ cv); /* mark this padlist as available */
716 CvDEPTH (cv) = PTR2IV (POPs); 821 CvDEPTH (cv) = PTR2IV (POPs);
717 CvPADLIST (cv) = (AV *)POPs; 822 CvPADLIST (cv) = (PADLIST *)POPs;
718 } 823 }
719 824
720 PUTBACK; 825 PUTBACK;
721 } 826 }
722 827
723 slf_frame = c->slf_frame; 828 slf_frame = c->slf_frame;
724 CORO_THROW = c->except; 829 CORO_THROW = c->except;
725 830
726 if (expect_false (enable_times)) 831 if (ecb_expect_false (enable_times))
727 { 832 {
728 if (expect_false (!times_valid)) 833 if (ecb_expect_false (!times_valid))
729 coro_times_update (); 834 coro_times_update ();
730 835
731 coro_times_sub (c); 836 coro_times_sub (c);
732 } 837 }
733 838
734 if (expect_false (c->on_enter)) 839 if (ecb_expect_false (c->on_enter))
735 { 840 {
736 int i; 841 int i;
737 842
738 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 843 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
739 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 844 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
740 } 845 }
741 846
847 if (ecb_expect_false (c->on_enter_xs))
848 {
849 int i;
850
851 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
852 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
853 }
854
742 SWAP_SVS (c); 855 SWAP_SVS_ENTER (c);
743} 856}
744 857
745static void 858static void
746save_perl (pTHX_ Coro__State c) 859save_perl (pTHX_ Coro__State c)
747{ 860{
748 SWAP_SVS (c); 861 SWAP_SVS_LEAVE (c);
749 862
863 if (ecb_expect_false (c->on_leave_xs))
864 {
865 int i;
866
867 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
868 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
869 }
870
750 if (expect_false (c->on_leave)) 871 if (ecb_expect_false (c->on_leave))
751 { 872 {
752 int i; 873 int i;
753 874
754 for (i = AvFILLp (c->on_leave); i >= 0; --i) 875 for (i = AvFILLp (c->on_leave); i >= 0; --i)
755 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 876 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
756 } 877 }
757 878
758 times_valid = 0; 879 times_valid = 0;
759 880
760 if (expect_false (enable_times)) 881 if (ecb_expect_false (enable_times))
761 { 882 {
762 coro_times_update (); times_valid = 1; 883 coro_times_update (); times_valid = 1;
763 coro_times_add (c); 884 coro_times_add (c);
764 } 885 }
765 886
… …
779 900
780 XPUSHs (Nullsv); 901 XPUSHs (Nullsv);
781 /* this loop was inspired by pp_caller */ 902 /* this loop was inspired by pp_caller */
782 for (;;) 903 for (;;)
783 { 904 {
784 while (expect_true (cxix >= 0)) 905 while (ecb_expect_true (cxix >= 0))
785 { 906 {
786 PERL_CONTEXT *cx = &ccstk[cxix--]; 907 PERL_CONTEXT *cx = &ccstk[cxix--];
787 908
788 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 909 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
789 { 910 {
790 CV *cv = cx->blk_sub.cv; 911 CV *cv = cx->blk_sub.cv;
791 912
792 if (expect_true (CvDEPTH (cv))) 913 if (ecb_expect_true (CvDEPTH (cv)))
793 { 914 {
794 EXTEND (SP, 3); 915 EXTEND (SP, 3);
795 PUSHs ((SV *)CvPADLIST (cv)); 916 PUSHs ((SV *)CvPADLIST (cv));
796 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 917 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
797 PUSHs ((SV *)cv); 918 PUSHs ((SV *)cv);
… …
800 get_padlist (aTHX_ cv); 921 get_padlist (aTHX_ cv);
801 } 922 }
802 } 923 }
803 } 924 }
804 925
805 if (expect_true (top_si->si_type == PERLSI_MAIN)) 926 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
806 break; 927 break;
807 928
808 top_si = top_si->si_prev; 929 top_si = top_si->si_prev;
809 ccstk = top_si->si_cxstack; 930 ccstk = top_si->si_cxstack;
810 cxix = top_si->si_cxix; 931 cxix = top_si->si_cxix;
… …
812 933
813 PUTBACK; 934 PUTBACK;
814 } 935 }
815 936
816 /* allocate some space on the context stack for our purposes */ 937 /* allocate some space on the context stack for our purposes */
817 if (expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max)) 938 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
818 { 939 {
819 unsigned int i; 940 unsigned int i;
820 941
821 for (i = 0; i < SLOT_COUNT; ++i) 942 for (i = 0; i < SLOT_COUNT; ++i)
822 CXINC; 943 CXINC;
… …
827 c->mainstack = PL_mainstack; 948 c->mainstack = PL_mainstack;
828 949
829 { 950 {
830 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 951 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
831 952
832 slot->defav = GvAV (PL_defgv); 953#if CORO_JIT
833 slot->defsv = DEFSV; 954 save_perl_slots (slot);
834 slot->errsv = ERRSV; 955#else
835 slot->irsgv = GvSV (irsgv);
836 slot->hinthv = GvHV (PL_hintgv);
837
838 #define VAR(name,type) slot->name = PL_ ## name; 956 #define VARx(name,expr,type) slot->name = expr;
839 # include "state.h" 957 #include "state.h"
840 #undef VAR 958#endif
841 } 959 }
842} 960}
843 961
844/* 962/*
845 * allocate various perl stacks. This is almost an exact copy 963 * allocate various perl stacks. This is almost an exact copy
… …
876#endif 994#endif
877 995
878 New(54,PL_scopestack,8,I32); 996 New(54,PL_scopestack,8,I32);
879 PL_scopestack_ix = 0; 997 PL_scopestack_ix = 0;
880 PL_scopestack_max = 8; 998 PL_scopestack_max = 8;
999#if HAS_SCOPESTACK_NAME
1000 New(54,PL_scopestack_name,8,const char*);
1001#endif
881 1002
882 New(54,PL_savestack,24,ANY); 1003 New(54,PL_savestack,24,ANY);
883 PL_savestack_ix = 0; 1004 PL_savestack_ix = 0;
884 PL_savestack_max = 24; 1005 PL_savestack_max = 24;
1006#if PERL_VERSION_ATLEAST (5,24,0)
1007 /* perl 5.24 moves SS_MAXPUSH optimisation from */
1008 /* the header macros to PL_savestack_max */
1009 PL_savestack_max -= SS_MAXPUSH;
1010#endif
885 1011
886#if !PERL_VERSION_ATLEAST (5,10,0) 1012#if !PERL_VERSION_ATLEAST (5,10,0)
887 New(54,PL_retstack,4,OP*); 1013 New(54,PL_retstack,4,OP*);
888 PL_retstack_ix = 0; 1014 PL_retstack_ix = 0;
889 PL_retstack_max = 4; 1015 PL_retstack_max = 4;
… …
913 } 1039 }
914 1040
915 Safefree (PL_tmps_stack); 1041 Safefree (PL_tmps_stack);
916 Safefree (PL_markstack); 1042 Safefree (PL_markstack);
917 Safefree (PL_scopestack); 1043 Safefree (PL_scopestack);
1044#if HAS_SCOPESTACK_NAME
1045 Safefree (PL_scopestack_name);
1046#endif
918 Safefree (PL_savestack); 1047 Safefree (PL_savestack);
919#if !PERL_VERSION_ATLEAST (5,10,0) 1048#if !PERL_VERSION_ATLEAST (5,10,0)
920 Safefree (PL_retstack); 1049 Safefree (PL_retstack);
921#endif 1050#endif
922} 1051}
… …
952 } 1081 }
953 1082
954 return rss; 1083 return rss;
955} 1084}
956 1085
957/** coroutine stack handling ************************************************/ 1086/** provide custom get/set/clear methods for %SIG elements ******************/
958
959static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
960static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
961static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
962 1087
963/* apparently < 5.8.8 */ 1088/* apparently < 5.8.8 */
964#ifndef MgPV_nolen_const 1089#ifndef MgPV_nolen_const
965#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1090#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
966 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1091 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
967 (const char*)(mg)->mg_ptr) 1092 (const char*)(mg)->mg_ptr)
968#endif 1093#endif
1094
1095/* this will be a patched copy of PL_vtbl_sigelem */
1096static MGVTBL coro_sigelem_vtbl;
1097
1098static int ecb_cold
1099coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1100{
1101 char *key = SvPV_nolen ((SV *)name);
1102
1103 /* do what mg_copy normally does */
1104 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1105 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1106
1107 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1108 if (*key == '_'
1109 && (strEQ (key, "__DIE__")
1110 || strEQ (key, "__WARN__")))
1111 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1112
1113 return 1;
1114}
1115
1116/* perl does not have a %SIG vtbl, we provide one so we can override */
1117/* the magic vtbl for the __DIE__ and __WARN__ members */
1118static const MGVTBL coro_sig_vtbl = {
1119 0, 0, 0, 0, 0,
1120 coro_sig_copy
1121};
969 1122
970/* 1123/*
971 * This overrides the default magic get method of %SIG elements. 1124 * This overrides the default magic get method of %SIG elements.
972 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1125 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
973 * and instead of trying to save and restore the hash elements (extremely slow), 1126 * and instead of trying to save and restore the hash elements (extremely slow),
974 * we just provide our own readback here. 1127 * we just provide our own readback here.
975 */ 1128 */
976static int 1129static int ecb_cold
977coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
978{ 1131{
979 const char *s = MgPV_nolen_const (mg); 1132 const char *s = MgPV_nolen_const (mg);
1133 /* the key must be either __DIE__ or __WARN__ here */
1134 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
980 1135
981 if (*s == '_') 1136 SV *ssv;
982 {
983 SV **svp = 0;
984 1137
985 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
986 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
987
988 if (svp) 1138 if (!*svp)
989 { 1139 ssv = &PL_sv_undef;
990 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1140 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
991 return 0; 1141 ssv = sv_2mortal (newRV_inc (*svp));
992 } 1142 else
993 } 1143 ssv = *svp;
994 1144
995 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1145 sv_setsv (sv, ssv);
1146 return 0;
996} 1147}
997 1148
998static int 1149static int ecb_cold
999coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1150coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1000{ 1151{
1001 const char *s = MgPV_nolen_const (mg); 1152 const char *s = MgPV_nolen_const (mg);
1153 /* the key must be either __DIE__ or __WARN__ here */
1154 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1002 1155
1003 if (*s == '_')
1004 {
1005 SV **svp = 0;
1006
1007 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1008 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1009
1010 if (svp)
1011 {
1012 SV *old = *svp; 1156 SV *old = *svp;
1013 *svp = 0; 1157 *svp = 0;
1014 SvREFCNT_dec (old); 1158 SvREFCNT_dec (old);
1015 return 0; 1159 return 0;
1016 }
1017 }
1018
1019 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1020} 1160}
1021 1161
1022static int 1162static int ecb_cold
1023coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1163coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1024{ 1164{
1025 const char *s = MgPV_nolen_const (mg); 1165 const char *s = MgPV_nolen_const (mg);
1166 /* the key must be either __DIE__ or __WARN__ here */
1167 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1026 1168
1027 if (*s == '_')
1028 {
1029 SV **svp = 0;
1030
1031 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1032 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1033
1034 if (svp)
1035 {
1036 SV *old = *svp; 1169 SV *old = *svp;
1037 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1170 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1038 SvREFCNT_dec (old); 1171 SvREFCNT_dec (old);
1039 return 0; 1172 return 0;
1040 }
1041 }
1042
1043 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1044} 1173}
1045 1174
1046static void 1175static void
1047prepare_nop (pTHX_ struct coro_transfer_args *ta) 1176prepare_nop (pTHX_ struct coro_transfer_args *ta)
1048{ 1177{
… …
1060slf_check_repeat (pTHX_ struct CoroSLF *frame) 1189slf_check_repeat (pTHX_ struct CoroSLF *frame)
1061{ 1190{
1062 return 1; 1191 return 1;
1063} 1192}
1064 1193
1194/** coroutine stack handling ************************************************/
1195
1065static UNOP init_perl_op; 1196static UNOP init_perl_op;
1066 1197
1067static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1198ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1068init_perl (pTHX_ struct coro *coro) 1199init_perl (pTHX_ struct coro *coro)
1069{ 1200{
1070 /* 1201 /*
1071 * emulate part of the perl startup here. 1202 * emulate part of the perl startup here.
1072 */ 1203 */
… …
1089 PL_hints = 0; 1220 PL_hints = 0;
1090 1221
1091 /* recreate the die/warn hooks */ 1222 /* recreate the die/warn hooks */
1092 PL_diehook = SvREFCNT_inc (rv_diehook); 1223 PL_diehook = SvREFCNT_inc (rv_diehook);
1093 PL_warnhook = SvREFCNT_inc (rv_warnhook); 1224 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1094 1225
1095 GvSV (PL_defgv) = newSV (0); 1226 GvSV (PL_defgv) = newSV (0);
1096 GvAV (PL_defgv) = coro->args; coro->args = 0; 1227 GvAV (PL_defgv) = coro->args; coro->args = 0;
1097 GvSV (PL_errgv) = newSV (0); 1228 GvSV (PL_errgv) = newSV (0);
1098 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1229 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1099 GvHV (PL_hintgv) = 0; 1230 GvHV (PL_hintgv) = newHV ();
1231#if PERL_VERSION_ATLEAST (5,10,0)
1232 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1233#endif
1100 PL_rs = newSVsv (GvSV (irsgv)); 1234 PL_rs = newSVsv (GvSV (irsgv));
1101 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1235 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1102 1236
1103 { 1237 {
1104 dSP; 1238 dSP;
… …
1108 myop.op_next = Nullop; 1242 myop.op_next = Nullop;
1109 myop.op_type = OP_ENTERSUB; 1243 myop.op_type = OP_ENTERSUB;
1110 myop.op_flags = OPf_WANT_VOID; 1244 myop.op_flags = OPf_WANT_VOID;
1111 1245
1112 PUSHMARK (SP); 1246 PUSHMARK (SP);
1113 PUSHs ((SV *)coro->startcv); 1247 XPUSHs ((SV *)coro->startcv);
1114 PUTBACK; 1248 PUTBACK;
1115 PL_op = (OP *)&myop; 1249 PL_op = (OP *)&myop;
1116 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1250 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1117 } 1251 }
1118 1252
… …
1132 PL_op = (OP *)&init_perl_op; 1266 PL_op = (OP *)&init_perl_op;
1133 1267
1134 /* copy throw, in case it was set before init_perl */ 1268 /* copy throw, in case it was set before init_perl */
1135 CORO_THROW = coro->except; 1269 CORO_THROW = coro->except;
1136 1270
1137 SWAP_SVS (coro); 1271 SWAP_SVS_ENTER (coro);
1138 1272
1139 if (expect_false (enable_times)) 1273 if (ecb_expect_false (enable_times))
1140 { 1274 {
1141 coro_times_update (); 1275 coro_times_update ();
1142 coro_times_sub (coro); 1276 coro_times_sub (coro);
1143 } 1277 }
1144} 1278}
… …
1175 1309
1176 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1310 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1177 1311
1178 save_perl (aTHX_ current); 1312 save_perl (aTHX_ current);
1179 1313
1180 /* this will cause transfer_check to croak on block*/ 1314 /* this will cause transfer_check to croak on block */
1181 SvRV_set (coro_current, (SV *)coro->hv); 1315 SvRV_set (coro_current, (SV *)coro->hv);
1182 1316
1183 load_perl (aTHX_ coro); 1317 load_perl (aTHX_ coro);
1184 1318
1319 /* restore swapped sv's */
1320 SWAP_SVS_LEAVE (coro);
1321
1185 coro_unwind_stacks (aTHX); 1322 coro_unwind_stacks (aTHX);
1186 1323
1187 /* restore swapped sv's */
1188 SWAP_SVS (coro);
1189
1190 coro_destruct_stacks (aTHX); 1324 coro_destruct_stacks (aTHX);
1191 1325
1192 // now save some sv's to be free'd later 1326 /* now save some sv's to be free'd later */
1193 svf [0] = GvSV (PL_defgv); 1327 svf [0] = GvSV (PL_defgv);
1194 svf [1] = (SV *)GvAV (PL_defgv); 1328 svf [1] = (SV *)GvAV (PL_defgv);
1195 svf [2] = GvSV (PL_errgv); 1329 svf [2] = GvSV (PL_errgv);
1196 svf [3] = (SV *)PL_defoutgv; 1330 svf [3] = (SV *)PL_defoutgv;
1197 svf [4] = PL_rs; 1331 svf [4] = PL_rs;
… …
1214 1348
1215 SvREFCNT_dec (coro->saved_deffh); 1349 SvREFCNT_dec (coro->saved_deffh);
1216 SvREFCNT_dec (coro->rouse_cb); 1350 SvREFCNT_dec (coro->rouse_cb);
1217 SvREFCNT_dec (coro->invoke_cb); 1351 SvREFCNT_dec (coro->invoke_cb);
1218 SvREFCNT_dec (coro->invoke_av); 1352 SvREFCNT_dec (coro->invoke_av);
1353 SvREFCNT_dec (coro->on_enter_xs);
1354 SvREFCNT_dec (coro->on_leave_xs);
1219 } 1355 }
1220} 1356}
1221 1357
1222INLINE void 1358ecb_inline void
1223free_coro_mortal (pTHX) 1359free_coro_mortal (pTHX)
1224{ 1360{
1225 if (expect_true (coro_mortal)) 1361 if (ecb_expect_true (coro_mortal))
1226 { 1362 {
1227 SvREFCNT_dec ((SV *)coro_mortal); 1363 SvREFCNT_dec ((SV *)coro_mortal);
1228 coro_mortal = 0; 1364 coro_mortal = 0;
1229 } 1365 }
1230} 1366}
… …
1264 av_push (av, SvREFCNT_inc_NN (*bot++)); 1400 av_push (av, SvREFCNT_inc_NN (*bot++));
1265 1401
1266 PL_runops = RUNOPS_DEFAULT; 1402 PL_runops = RUNOPS_DEFAULT;
1267 ENTER; 1403 ENTER;
1268 SAVETMPS; 1404 SAVETMPS;
1405 PUSHMARK (SP);
1269 EXTEND (SP, 3); 1406 EXTEND (SP, 3);
1270 PUSHMARK (SP);
1271 PUSHs (&PL_sv_no); 1407 PUSHs (&PL_sv_no);
1272 PUSHs (fullname); 1408 PUSHs (fullname);
1273 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 1409 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
1274 PUTBACK; 1410 PUTBACK;
1275 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1411 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
… …
1286 1422
1287 if (PL_curcop != &PL_compiling) 1423 if (PL_curcop != &PL_compiling)
1288 { 1424 {
1289 SV **cb; 1425 SV **cb;
1290 1426
1291 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1427 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1292 { 1428 {
1293 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1429 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1294 1430
1295 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1431 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1296 { 1432 {
… …
1302 gv_efullname3 (fullname, gv, 0); 1438 gv_efullname3 (fullname, gv, 0);
1303 1439
1304 PL_runops = RUNOPS_DEFAULT; 1440 PL_runops = RUNOPS_DEFAULT;
1305 ENTER; 1441 ENTER;
1306 SAVETMPS; 1442 SAVETMPS;
1443 PUSHMARK (SP);
1307 EXTEND (SP, 3); 1444 EXTEND (SP, 3);
1308 PUSHMARK (SP);
1309 PUSHs (&PL_sv_yes); 1445 PUSHs (&PL_sv_yes);
1310 PUSHs (fullname); 1446 PUSHs (fullname);
1311 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1447 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (SUB_ARGARRAY)) : &PL_sv_undef);
1312 PUTBACK; 1448 PUTBACK;
1313 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1449 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1314 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1450 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1315 SPAGAIN; 1451 SPAGAIN;
1316 FREETMPS; 1452 FREETMPS;
… …
1326 dSP; 1462 dSP;
1327 1463
1328 PL_runops = RUNOPS_DEFAULT; 1464 PL_runops = RUNOPS_DEFAULT;
1329 ENTER; 1465 ENTER;
1330 SAVETMPS; 1466 SAVETMPS;
1331 EXTEND (SP, 3);
1332 PL_runops = RUNOPS_DEFAULT;
1333 PUSHMARK (SP); 1467 PUSHMARK (SP);
1468 EXTEND (SP, 2);
1334 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1469 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1335 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1470 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1336 PUTBACK; 1471 PUTBACK;
1337 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0); 1472 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
1338 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1473 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
… …
1365 1500
1366 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1501 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1367} 1502}
1368 1503
1369/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1504/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1370static void NOINLINE 1505static void ecb_noinline
1371cctx_prepare (pTHX) 1506cctx_prepare (pTHX)
1372{ 1507{
1373 PL_top_env = &PL_start_env; 1508 PL_top_env = &PL_start_env;
1374 1509
1375 if (cctx_current->flags & CC_TRACE) 1510 if (cctx_current->flags & CC_TRACE)
… …
1386 slf_frame.prepare = slf_prepare_set_stacklevel; 1521 slf_frame.prepare = slf_prepare_set_stacklevel;
1387 slf_frame.check = slf_check_set_stacklevel; 1522 slf_frame.check = slf_check_set_stacklevel;
1388} 1523}
1389 1524
1390/* the tail of transfer: execute stuff we can only do after a transfer */ 1525/* the tail of transfer: execute stuff we can only do after a transfer */
1391INLINE void 1526ecb_inline void
1392transfer_tail (pTHX) 1527transfer_tail (pTHX)
1393{ 1528{
1394 free_coro_mortal (aTHX); 1529 free_coro_mortal (aTHX);
1530}
1531
1532/* try to exit the same way perl's main function would do */
1533/* we do not bother resetting the environment or other things *7
1534/* that are not, uhm, essential */
1535/* this obviously also doesn't work when perl is embedded */
1536static void ecb_noinline ecb_cold
1537perlish_exit (pTHX)
1538{
1539 int exitstatus = perl_destruct (PL_curinterp);
1540 perl_free (PL_curinterp);
1541 exit (exitstatus);
1395} 1542}
1396 1543
1397/* 1544/*
1398 * this is a _very_ stripped down perl interpreter ;) 1545 * this is a _very_ stripped down perl interpreter ;)
1399 */ 1546 */
… …
1426 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1573 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1427 * runtime errors here, as this is just a random interpreter, not a thread. 1574 * runtime errors here, as this is just a random interpreter, not a thread.
1428 */ 1575 */
1429 1576
1430 /* 1577 /*
1578 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1579 * requires PL_scopestack_ix, so do it here if required.
1580 */
1581 if (!PL_scopestack_ix)
1582 ENTER;
1583
1584 /*
1431 * If perl-run returns we assume exit() was being called or the coro 1585 * If perl-run returns we assume exit() was being called or the coro
1432 * fell off the end, which seems to be the only valid (non-bug) 1586 * fell off the end, which seems to be the only valid (non-bug)
1433 * reason for perl_run to return. We try to exit by jumping to the 1587 * reason for perl_run to return. We try to mimic whatever perl is normally
1434 * bootstrap-time "top" top_env, as we cannot restore the "main" 1588 * doing in that case. YMMV.
1435 * coroutine as Coro has no such concept.
1436 * This actually isn't valid with the pthread backend, but OSes requiring
1437 * that backend are too broken to do it in a standards-compliant way.
1438 */ 1589 */
1439 PL_top_env = main_top_env; 1590 perlish_exit (aTHX);
1440 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1441 } 1591 }
1442} 1592}
1443 1593
1444static coro_cctx * 1594static coro_cctx *
1445cctx_new () 1595cctx_new (void)
1446{ 1596{
1447 coro_cctx *cctx; 1597 coro_cctx *cctx;
1448 1598
1449 ++cctx_count; 1599 ++cctx_count;
1450 New (0, cctx, 1, coro_cctx); 1600 New (0, cctx, 1, coro_cctx);
… …
1456 return cctx; 1606 return cctx;
1457} 1607}
1458 1608
1459/* create a new cctx only suitable as source */ 1609/* create a new cctx only suitable as source */
1460static coro_cctx * 1610static coro_cctx *
1461cctx_new_empty () 1611cctx_new_empty (void)
1462{ 1612{
1463 coro_cctx *cctx = cctx_new (); 1613 coro_cctx *cctx = cctx_new ();
1464 1614
1465 cctx->sptr = 0; 1615 cctx->stack.sptr = 0;
1466 coro_create (&cctx->cctx, 0, 0, 0, 0); 1616 coro_create (&cctx->cctx, 0, 0, 0, 0);
1467 1617
1468 return cctx; 1618 return cctx;
1469} 1619}
1470 1620
1471/* create a new cctx suitable as destination/running a perl interpreter */ 1621/* create a new cctx suitable as destination/running a perl interpreter */
1472static coro_cctx * 1622static coro_cctx *
1473cctx_new_run () 1623cctx_new_run (void)
1474{ 1624{
1475 coro_cctx *cctx = cctx_new (); 1625 coro_cctx *cctx = cctx_new ();
1476 void *stack_start;
1477 size_t stack_size;
1478 1626
1479#if HAVE_MMAP 1627 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1480 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1481 /* mmap supposedly does allocate-on-write for us */
1482 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1483
1484 if (cctx->sptr != (void *)-1)
1485 {
1486 #if CORO_STACKGUARD
1487 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1488 #endif
1489 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1490 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1491 cctx->flags |= CC_MAPPED;
1492 } 1628 {
1493 else
1494#endif
1495 {
1496 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1497 New (0, cctx->sptr, cctx_stacksize, long);
1498
1499 if (!cctx->sptr)
1500 {
1501 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1629 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1502 _exit (EXIT_FAILURE); 1630 _exit (EXIT_FAILURE);
1503 }
1504
1505 stack_start = cctx->sptr;
1506 stack_size = cctx->ssize;
1507 } 1631 }
1508 1632
1509 #if CORO_USE_VALGRIND
1510 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1511 #endif
1512
1513 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1633 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1514 1634
1515 return cctx; 1635 return cctx;
1516} 1636}
1517 1637
1518static void 1638static void
… …
1524 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1644 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1525 1645
1526 --cctx_count; 1646 --cctx_count;
1527 coro_destroy (&cctx->cctx); 1647 coro_destroy (&cctx->cctx);
1528 1648
1529 /* coro_transfer creates new, empty cctx's */ 1649 coro_stack_free (&cctx->stack);
1530 if (cctx->sptr)
1531 {
1532 #if CORO_USE_VALGRIND
1533 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1534 #endif
1535
1536#if HAVE_MMAP
1537 if (cctx->flags & CC_MAPPED)
1538 munmap (cctx->sptr, cctx->ssize);
1539 else
1540#endif
1541 Safefree (cctx->sptr);
1542 }
1543 1650
1544 Safefree (cctx); 1651 Safefree (cctx);
1545} 1652}
1546 1653
1547/* wether this cctx should be destructed */ 1654/* wether this cctx should be destructed */
1548#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1655#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1549 1656
1550static coro_cctx * 1657static coro_cctx *
1551cctx_get (pTHX) 1658cctx_get (pTHX)
1552{ 1659{
1553 while (expect_true (cctx_first)) 1660 while (ecb_expect_true (cctx_first))
1554 { 1661 {
1555 coro_cctx *cctx = cctx_first; 1662 coro_cctx *cctx = cctx_first;
1556 cctx_first = cctx->next; 1663 cctx_first = cctx->next;
1557 --cctx_idle; 1664 --cctx_idle;
1558 1665
1559 if (expect_true (!CCTX_EXPIRED (cctx))) 1666 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1560 return cctx; 1667 return cctx;
1561 1668
1562 cctx_destroy (cctx); 1669 cctx_destroy (cctx);
1563 } 1670 }
1564 1671
… …
1566} 1673}
1567 1674
1568static void 1675static void
1569cctx_put (coro_cctx *cctx) 1676cctx_put (coro_cctx *cctx)
1570{ 1677{
1571 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1678 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1572 1679
1573 /* free another cctx if overlimit */ 1680 /* free another cctx if overlimit */
1574 if (expect_false (cctx_idle >= cctx_max_idle)) 1681 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1575 { 1682 {
1576 coro_cctx *first = cctx_first; 1683 coro_cctx *first = cctx_first;
1577 cctx_first = first->next; 1684 cctx_first = first->next;
1578 --cctx_idle; 1685 --cctx_idle;
1579 1686
… …
1590static void 1697static void
1591transfer_check (pTHX_ struct coro *prev, struct coro *next) 1698transfer_check (pTHX_ struct coro *prev, struct coro *next)
1592{ 1699{
1593 /* TODO: throwing up here is considered harmful */ 1700 /* TODO: throwing up here is considered harmful */
1594 1701
1595 if (expect_true (prev != next)) 1702 if (ecb_expect_true (prev != next))
1596 { 1703 {
1597 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1704 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1598 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1705 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1599 1706
1600 if (expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED))) 1707 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1601 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1708 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1602 1709
1603#if !PERL_VERSION_ATLEAST (5,10,0) 1710#if !PERL_VERSION_ATLEAST (5,10,0)
1604 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1711 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1605 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1712 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1606#endif 1713#endif
1607 } 1714 }
1608} 1715}
1609 1716
1610/* always use the TRANSFER macro */ 1717/* always use the TRANSFER macro */
1611static void NOINLINE /* noinline so we have a fixed stackframe */ 1718static void ecb_noinline /* noinline so we have a fixed stackframe */
1612transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1719transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1613{ 1720{
1614 dSTACKLEVEL; 1721 dSTACKLEVEL;
1615 1722
1616 /* sometimes transfer is only called to set idle_sp */ 1723 /* sometimes transfer is only called to set idle_sp */
1617 if (expect_false (!prev)) 1724 if (ecb_expect_false (!prev))
1618 { 1725 {
1619 cctx_current->idle_sp = STACKLEVEL; 1726 cctx_current->idle_sp = STACKLEVEL;
1620 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1727 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1621 } 1728 }
1622 else if (expect_true (prev != next)) 1729 else if (ecb_expect_true (prev != next))
1623 { 1730 {
1624 coro_cctx *cctx_prev; 1731 coro_cctx *cctx_prev;
1625 1732
1626 if (expect_false (prev->flags & CF_NEW)) 1733 if (ecb_expect_false (prev->flags & CF_NEW))
1627 { 1734 {
1628 /* create a new empty/source context */ 1735 /* create a new empty/source context */
1629 prev->flags &= ~CF_NEW; 1736 prev->flags &= ~CF_NEW;
1630 prev->flags |= CF_RUNNING; 1737 prev->flags |= CF_RUNNING;
1631 } 1738 }
… …
1634 next->flags |= CF_RUNNING; 1741 next->flags |= CF_RUNNING;
1635 1742
1636 /* first get rid of the old state */ 1743 /* first get rid of the old state */
1637 save_perl (aTHX_ prev); 1744 save_perl (aTHX_ prev);
1638 1745
1639 if (expect_false (next->flags & CF_NEW)) 1746 if (ecb_expect_false (next->flags & CF_NEW))
1640 { 1747 {
1641 /* need to start coroutine */ 1748 /* need to start coroutine */
1642 next->flags &= ~CF_NEW; 1749 next->flags &= ~CF_NEW;
1643 /* setup coroutine call */ 1750 /* setup coroutine call */
1644 init_perl (aTHX_ next); 1751 init_perl (aTHX_ next);
1645 } 1752 }
1646 else 1753 else
1647 load_perl (aTHX_ next); 1754 load_perl (aTHX_ next);
1648 1755
1649 /* possibly untie and reuse the cctx */ 1756 /* possibly untie and reuse the cctx */
1650 if (expect_true ( 1757 if (ecb_expect_true (
1651 cctx_current->idle_sp == STACKLEVEL 1758 cctx_current->idle_sp == STACKLEVEL
1652 && !(cctx_current->flags & CC_TRACE) 1759 && !(cctx_current->flags & CC_TRACE)
1653 && !force_cctx 1760 && !force_cctx
1654 )) 1761 ))
1655 { 1762 {
1656 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1763 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1657 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1764 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1658 1765
1659 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1766 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1660 /* without this the next cctx_get might destroy the running cctx while still in use */ 1767 /* without this the next cctx_get might destroy the running cctx while still in use */
1661 if (expect_false (CCTX_EXPIRED (cctx_current))) 1768 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1662 if (expect_true (!next->cctx)) 1769 if (ecb_expect_true (!next->cctx))
1663 next->cctx = cctx_get (aTHX); 1770 next->cctx = cctx_get (aTHX);
1664 1771
1665 cctx_put (cctx_current); 1772 cctx_put (cctx_current);
1666 } 1773 }
1667 else 1774 else
1668 prev->cctx = cctx_current; 1775 prev->cctx = cctx_current;
1669 1776
1670 ++next->usecount; 1777 ++next->usecount;
1671 1778
1672 cctx_prev = cctx_current; 1779 cctx_prev = cctx_current;
1673 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1780 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1674 1781
1675 next->cctx = 0; 1782 next->cctx = 0;
1676 1783
1677 if (expect_false (cctx_prev != cctx_current)) 1784 if (ecb_expect_false (cctx_prev != cctx_current))
1678 { 1785 {
1679 cctx_prev->top_env = PL_top_env; 1786 cctx_prev->top_env = PL_top_env;
1680 PL_top_env = cctx_current->top_env; 1787 PL_top_env = cctx_current->top_env;
1681 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1788 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1682 } 1789 }
… …
1702 return; 1809 return;
1703 1810
1704 slf_destroy (aTHX_ coro); 1811 slf_destroy (aTHX_ coro);
1705 1812
1706 coro->flags |= CF_ZOMBIE; 1813 coro->flags |= CF_ZOMBIE;
1707 1814
1708 if (coro->flags & CF_READY) 1815 if (coro->flags & CF_READY)
1709 { 1816 {
1710 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1817 /* reduce nready, as destroying a ready coro effectively unreadies it */
1711 /* alternative: look through all ready queues and remove the coro */ 1818 /* alternative: look through all ready queues and remove the coro */
1712 --coro_nready; 1819 --coro_nready;
… …
1737 1844
1738static int 1845static int
1739coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1846coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1740{ 1847{
1741 struct coro *coro = (struct coro *)mg->mg_ptr; 1848 struct coro *coro = (struct coro *)mg->mg_ptr;
1849
1850 coro_state_destroy (aTHX_ coro);
1742 mg->mg_ptr = 0; 1851 mg->mg_ptr = 0;
1743 1852
1744 coro_state_destroy (aTHX_ coro);
1745 SvREFCNT_dec (coro->on_destroy); 1853 SvREFCNT_dec (coro->on_destroy);
1746 SvREFCNT_dec (coro->status); 1854 SvREFCNT_dec (coro->status);
1747 1855
1748 Safefree (coro); 1856 Safefree (coro);
1749 1857
1750 return 0; 1858 return 0;
1751} 1859}
1752 1860
1753static int 1861static int ecb_cold
1754coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1862coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1755{ 1863{
1756 /* called when perl clones the current process the slow way (windows process emulation) */ 1864 /* called when perl clones the current process the slow way (windows process emulation) */
1757 /* WE SIMply nuke the pointers in the copy, causing perl to croak */ 1865 /* we simply nuke the pointers in the copy, causing perl to croak */
1758 mg->mg_ptr = 0; 1866 mg->mg_ptr = 0;
1759 mg->mg_virtual = 0; 1867 mg->mg_virtual = 0;
1760 1868
1761 return 0; 1869 return 0;
1762} 1870}
… …
1789 TRANSFER (ta, 1); 1897 TRANSFER (ta, 1);
1790} 1898}
1791 1899
1792/** Coro ********************************************************************/ 1900/** Coro ********************************************************************/
1793 1901
1794INLINE void 1902ecb_inline void
1795coro_enq (pTHX_ struct coro *coro) 1903coro_enq (pTHX_ struct coro *coro)
1796{ 1904{
1797 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1905 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1798 1906
1799 SvREFCNT_inc_NN (coro->hv); 1907 SvREFCNT_inc_NN (coro->hv);
… …
1801 coro->next_ready = 0; 1909 coro->next_ready = 0;
1802 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1910 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1803 ready [1] = coro; 1911 ready [1] = coro;
1804} 1912}
1805 1913
1806INLINE struct coro * 1914ecb_inline struct coro *
1807coro_deq (pTHX) 1915coro_deq (pTHX)
1808{ 1916{
1809 int prio; 1917 int prio;
1810 1918
1811 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1919 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1864{ 1972{
1865 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1973 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1866} 1974}
1867 1975
1868/* expects to own a reference to next->hv */ 1976/* expects to own a reference to next->hv */
1869INLINE void 1977ecb_inline void
1870prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1978prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1871{ 1979{
1872 SV *prev_sv = SvRV (coro_current); 1980 SV *prev_sv = SvRV (coro_current);
1873 1981
1874 ta->prev = SvSTATE_hv (prev_sv); 1982 ta->prev = SvSTATE_hv (prev_sv);
… …
1887{ 1995{
1888 for (;;) 1996 for (;;)
1889 { 1997 {
1890 struct coro *next = coro_deq (aTHX); 1998 struct coro *next = coro_deq (aTHX);
1891 1999
1892 if (expect_true (next)) 2000 if (ecb_expect_true (next))
1893 { 2001 {
1894 /* cannot transfer to destroyed coros, skip and look for next */ 2002 /* cannot transfer to destroyed coros, skip and look for next */
1895 if (expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED))) 2003 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1896 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 2004 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1897 else 2005 else
1898 { 2006 {
1899 next->flags &= ~CF_READY; 2007 next->flags &= ~CF_READY;
1900 --coro_nready; 2008 --coro_nready;
… …
1908 /* nothing to schedule: call the idle handler */ 2016 /* nothing to schedule: call the idle handler */
1909 if (SvROK (sv_idle) 2017 if (SvROK (sv_idle)
1910 && SvOBJECT (SvRV (sv_idle))) 2018 && SvOBJECT (SvRV (sv_idle)))
1911 { 2019 {
1912 if (SvRV (sv_idle) == SvRV (coro_current)) 2020 if (SvRV (sv_idle) == SvRV (coro_current))
2021 {
2022 require_pv ("Carp");
2023
2024 {
2025 dSP;
2026
2027 ENTER;
2028 SAVETMPS;
2029
2030 PUSHMARK (SP);
1913 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2031 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2032 PUTBACK;
2033 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2034
2035 FREETMPS;
2036 LEAVE;
2037 }
2038 }
1914 2039
1915 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2040 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1916 api_ready (aTHX_ SvRV (sv_idle)); 2041 api_ready (aTHX_ SvRV (sv_idle));
1917 --coro_nready; 2042 --coro_nready;
1918 } 2043 }
… …
1933 } 2058 }
1934 } 2059 }
1935 } 2060 }
1936} 2061}
1937 2062
1938INLINE void 2063ecb_inline void
1939prepare_cede (pTHX_ struct coro_transfer_args *ta) 2064prepare_cede (pTHX_ struct coro_transfer_args *ta)
1940{ 2065{
1941 api_ready (aTHX_ coro_current); 2066 api_ready (aTHX_ coro_current);
1942 prepare_schedule (aTHX_ ta); 2067 prepare_schedule (aTHX_ ta);
1943} 2068}
1944 2069
1945INLINE void 2070ecb_inline void
1946prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2071prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1947{ 2072{
1948 SV *prev = SvRV (coro_current); 2073 SV *prev = SvRV (coro_current);
1949 2074
1950 if (coro_nready) 2075 if (coro_nready)
… …
1980{ 2105{
1981 struct coro_transfer_args ta; 2106 struct coro_transfer_args ta;
1982 2107
1983 prepare_cede (aTHX_ &ta); 2108 prepare_cede (aTHX_ &ta);
1984 2109
1985 if (expect_true (ta.prev != ta.next)) 2110 if (ecb_expect_true (ta.prev != ta.next))
1986 { 2111 {
1987 TRANSFER (ta, 1); 2112 TRANSFER (ta, 1);
1988 return 1; 2113 return 1;
1989 } 2114 }
1990 else 2115 else
… …
2115{ 2240{
2116 AV *od = coro->on_destroy; 2241 AV *od = coro->on_destroy;
2117 2242
2118 if (!od) 2243 if (!od)
2119 return; 2244 return;
2245
2246 coro->on_destroy = 0;
2247 sv_2mortal ((SV *)od);
2120 2248
2121 while (AvFILLp (od) >= 0) 2249 while (AvFILLp (od) >= 0)
2122 { 2250 {
2123 SV *cb = sv_2mortal (av_pop (od)); 2251 SV *cb = sv_2mortal (av_pop (od));
2124 2252
… …
2145 2273
2146static void 2274static void
2147coro_set_status (pTHX_ struct coro *coro, SV **arg, int items) 2275coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2148{ 2276{
2149 AV *av; 2277 AV *av;
2150 2278
2151 if (coro->status) 2279 if (coro->status)
2152 { 2280 {
2153 av = coro->status; 2281 av = coro->status;
2154 av_clear (av); 2282 av_clear (av);
2155 } 2283 }
… …
2202 2330
2203 coro = SvSTATE (arg [0]); 2331 coro = SvSTATE (arg [0]);
2204 coro_hv = coro->hv; 2332 coro_hv = coro->hv;
2205 2333
2206 coro_set_status (aTHX_ coro, arg + 1, items - 1); 2334 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2207 2335
2208 if (expect_false (coro->flags & CF_NOCANCEL)) 2336 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2209 { 2337 {
2210 /* coro currently busy cancelling something, so just notify it */ 2338 /* coro currently busy cancelling something, so just notify it */
2211 coro->slf_frame.data = (void *)coro; 2339 coro->slf_frame.data = (void *)coro;
2212 2340
2213 frame->prepare = prepare_nop; 2341 frame->prepare = prepare_nop;
… …
2219 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv); 2347 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2220 } 2348 }
2221 else 2349 else
2222 { 2350 {
2223 struct coro *self = SvSTATE_current; 2351 struct coro *self = SvSTATE_current;
2352
2353 if (!self)
2354 croak ("Coro::cancel called outside of thread content,");
2224 2355
2225 /* otherwise we cancel directly, purely for speed reasons 2356 /* otherwise we cancel directly, purely for speed reasons
2226 * unfortunately, this requires some magic trickery, as 2357 * unfortunately, this requires some magic trickery, as
2227 * somebody else could cancel us, so we have to fight the cancellation. 2358 * somebody else could cancel us, so we have to fight the cancellation.
2228 * this is ugly, and hopefully fully worth the extra speed. 2359 * this is ugly, and hopefully fully worth the extra speed.
… …
2261safe_cancel (pTHX_ struct coro *coro, SV **arg, int items) 2392safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2262{ 2393{
2263 if (coro->cctx) 2394 if (coro->cctx)
2264 croak ("coro inside C callback, unable to cancel at this time, caught"); 2395 croak ("coro inside C callback, unable to cancel at this time, caught");
2265 2396
2266 if (coro->flags & CF_NEW) 2397 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2267 { 2398 {
2268 coro_set_status (aTHX_ coro, arg, items); 2399 coro_set_status (aTHX_ coro, arg, items);
2269 coro_state_destroy (aTHX_ coro); 2400 coro_state_destroy (aTHX_ coro);
2270 } 2401 }
2271 else 2402 else
… …
2321slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2452slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2322{ 2453{
2323 HV *hv = (HV *)SvRV (coro_current); 2454 HV *hv = (HV *)SvRV (coro_current);
2324 struct coro *coro = SvSTATE_hv ((SV *)hv); 2455 struct coro *coro = SvSTATE_hv ((SV *)hv);
2325 2456
2326 if (expect_true (coro->saved_deffh)) 2457 if (ecb_expect_true (coro->saved_deffh))
2327 { 2458 {
2328 /* subsequent iteration */ 2459 /* subsequent iteration */
2329 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2460 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2330 coro->saved_deffh = 0; 2461 coro->saved_deffh = 0;
2331 2462
… …
2338 else 2469 else
2339 { 2470 {
2340 av_clear (GvAV (PL_defgv)); 2471 av_clear (GvAV (PL_defgv));
2341 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2472 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2342 2473
2474 if (ecb_expect_false (coro->swap_sv))
2475 {
2476 SWAP_SVS_LEAVE (coro);
2477 SvREFCNT_dec_NN (coro->swap_sv);
2478 coro->swap_sv = 0;
2479 }
2480
2343 coro->prio = 0; 2481 coro->prio = 0;
2344 2482
2345 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2483 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2346 api_trace (aTHX_ coro_current, 0); 2484 api_trace (aTHX_ coro_current, 0);
2347 2485
2348 frame->prepare = prepare_schedule; 2486 frame->prepare = prepare_schedule;
2349 av_push (av_async_pool, SvREFCNT_inc (hv)); 2487 av_push (av_async_pool, SvREFCNT_inc_NN (hv));
2350 } 2488 }
2351 } 2489 }
2352 else 2490 else
2353 { 2491 {
2354 /* first iteration, simply fall through */ 2492 /* first iteration, simply fall through */
… …
2367static void 2505static void
2368coro_rouse_callback (pTHX_ CV *cv) 2506coro_rouse_callback (pTHX_ CV *cv)
2369{ 2507{
2370 dXSARGS; 2508 dXSARGS;
2371 SV *data = (SV *)S_GENSUB_ARG; 2509 SV *data = (SV *)S_GENSUB_ARG;
2510 SV *coro = SvRV (data);
2372 2511
2512 /* data starts being either undef or a coro, and is replaced by the results when done */
2373 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2513 if (SvTYPE (coro) != SVt_PVAV)
2374 { 2514 {
2375 /* first call, set args */ 2515 /* first call, set args */
2376 SV *coro = SvRV (data);
2377 AV *av = newAV ();
2378 2516
2379 SvRV_set (data, (SV *)av); 2517 assert (&ST (0) < &ST (1)); /* ensure the stack is in the order we expect it to be */
2518 SvRV_set (data, (SV *)av_make (items, &ST (0))); /* av_make copies the SVs */
2380 2519
2381 /* better take a full copy of the arguments */ 2520 if (coro != &PL_sv_undef)
2382 while (items--) 2521 {
2383 av_store (av, items, newSVsv (ST (items)));
2384
2385 api_ready (aTHX_ coro); 2522 api_ready (aTHX_ coro);
2386 SvREFCNT_dec (coro); 2523 SvREFCNT_dec_NN (coro);
2524 }
2387 } 2525 }
2388 2526
2389 XSRETURN_EMPTY; 2527 XSRETURN_EMPTY;
2390} 2528}
2391 2529
2392static int 2530static int
2393slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2531slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2394{ 2532{
2395 SV *data = (SV *)frame->data; 2533 SV *data = (SV *)frame->data;
2396 2534
2397 if (CORO_THROW) 2535 if (CORO_THROW)
2398 return 0; 2536 return 0;
2399 2537
2400 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2538 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2401 return 1; 2539 return 1;
… …
2408 2546
2409 EXTEND (SP, AvFILLp (av) + 1); 2547 EXTEND (SP, AvFILLp (av) + 1);
2410 for (i = 0; i <= AvFILLp (av); ++i) 2548 for (i = 0; i <= AvFILLp (av); ++i)
2411 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2549 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2412 2550
2413 /* we have stolen the elements, so set length to zero and free */ 2551 /* we have stolen the elements, make it unreal and free */
2414 AvFILLp (av) = -1; 2552 AvREAL_off (av);
2415 av_undef (av); 2553 av_undef (av);
2416 2554
2417 PUTBACK; 2555 PUTBACK;
2418 } 2556 }
2419 2557
… …
2437 cb = sv_2mortal (coro->rouse_cb); 2575 cb = sv_2mortal (coro->rouse_cb);
2438 coro->rouse_cb = 0; 2576 coro->rouse_cb = 0;
2439 } 2577 }
2440 2578
2441 if (!SvROK (cb) 2579 if (!SvROK (cb)
2442 || SvTYPE (SvRV (cb)) != SVt_PVCV 2580 || SvTYPE (SvRV (cb)) != SVt_PVCV
2443 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2581 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2444 croak ("Coro::rouse_wait called with illegal callback argument,"); 2582 croak ("Coro::rouse_wait called with illegal callback argument,");
2445 2583
2446 { 2584 {
2447 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2585 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2448 SV *data = (SV *)S_GENSUB_ARG; 2586 SV *data = (SV *)S_GENSUB_ARG;
2587 int data_ready = SvTYPE (SvRV (data)) == SVt_PVAV;
2588
2589 /* if there is no data, we need to store the current coro in the reference so we can be woken up */
2590 if (!data_ready)
2591 if (SvRV (data) != &PL_sv_undef)
2592 croak ("Coro::rouse_wait was called on a calback that is already being waited for - only one thread can wait for a rouse callback, caught");
2593 else
2594 SvRV_set (data, SvREFCNT_inc_NN (SvRV (coro_current)));
2449 2595
2450 frame->data = (void *)data; 2596 frame->data = (void *)data;
2451 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2597 frame->prepare = data_ready ? prepare_nop : prepare_schedule;
2452 frame->check = slf_check_rouse_wait; 2598 frame->check = slf_check_rouse_wait;
2453 } 2599 }
2454} 2600}
2455 2601
2456static SV * 2602static SV *
2457coro_new_rouse_cb (pTHX) 2603coro_new_rouse_cb (pTHX)
2458{ 2604{
2459 HV *hv = (HV *)SvRV (coro_current); 2605 HV *hv = (HV *)SvRV (coro_current);
2460 struct coro *coro = SvSTATE_hv (hv); 2606 struct coro *coro = SvSTATE_hv (hv);
2461 SV *data = newRV_inc ((SV *)hv); 2607 SV *data = newRV_noinc (&PL_sv_undef);
2462 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data); 2608 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2463 2609
2464 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2610 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2465 SvREFCNT_dec (data); /* magicext increases the refcount */ 2611 SvREFCNT_dec_NN (data); /* magicext increases the refcount */
2466 2612
2467 SvREFCNT_dec (coro->rouse_cb); 2613 SvREFCNT_dec (coro->rouse_cb);
2468 coro->rouse_cb = SvREFCNT_inc_NN (cb); 2614 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2469 2615
2470 return cb; 2616 return cb;
… …
2570 2716
2571/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */ 2717/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2572static void 2718static void
2573slf_destroy (pTHX_ struct coro *coro) 2719slf_destroy (pTHX_ struct coro *coro)
2574{ 2720{
2575 /* this callback is reserved for slf functions needing to do cleanup */ 2721 struct CoroSLF frame = coro->slf_frame;
2576 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2577 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2578 2722
2579 /* 2723 /*
2580 * The on_destroy above most likely is from an SLF call. 2724 * The on_destroy below most likely is from an SLF call.
2581 * Since by definition the SLF call will not finish when we destroy 2725 * Since by definition the SLF call will not finish when we destroy
2582 * the coro, we will have to force-finish it here, otherwise 2726 * the coro, we will have to force-finish it here, otherwise
2583 * cleanup functions cannot call SLF functions. 2727 * cleanup functions cannot call SLF functions.
2584 */ 2728 */
2585 coro->slf_frame.prepare = 0; 2729 coro->slf_frame.prepare = 0;
2730
2731 /* this callback is reserved for slf functions needing to do cleanup */
2732 if (frame.destroy && frame.prepare && !PL_dirty)
2733 frame.destroy (aTHX_ &frame);
2586} 2734}
2587 2735
2588/* 2736/*
2589 * these not obviously related functions are all rolled into one 2737 * these not obviously related functions are all rolled into one
2590 * function to increase chances that they all will call transfer with the same 2738 * function to increase chances that they all will call transfer with the same
… …
2597 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2745 I32 checkmark; /* mark SP to see how many elements check has pushed */
2598 2746
2599 /* set up the slf frame, unless it has already been set-up */ 2747 /* set up the slf frame, unless it has already been set-up */
2600 /* the latter happens when a new coro has been started */ 2748 /* the latter happens when a new coro has been started */
2601 /* or when a new cctx was attached to an existing coroutine */ 2749 /* or when a new cctx was attached to an existing coroutine */
2602 if (expect_true (!slf_frame.prepare)) 2750 if (ecb_expect_true (!slf_frame.prepare))
2603 { 2751 {
2604 /* first iteration */ 2752 /* first iteration */
2605 dSP; 2753 dSP;
2606 SV **arg = PL_stack_base + TOPMARK + 1; 2754 SV **arg = PL_stack_base + TOPMARK + 1;
2607 int items = SP - arg; /* args without function object */ 2755 int items = SP - arg; /* args without function object */
… …
2648 while (slf_frame.check (aTHX_ &slf_frame)); 2796 while (slf_frame.check (aTHX_ &slf_frame));
2649 2797
2650 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2798 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2651 2799
2652 /* exception handling */ 2800 /* exception handling */
2653 if (expect_false (CORO_THROW)) 2801 if (ecb_expect_false (CORO_THROW))
2654 { 2802 {
2655 SV *exception = sv_2mortal (CORO_THROW); 2803 SV *exception = sv_2mortal (CORO_THROW);
2656 2804
2657 CORO_THROW = 0; 2805 CORO_THROW = 0;
2658 sv_setsv (ERRSV, exception); 2806 sv_setsv (ERRSV, exception);
… …
2660 } 2808 }
2661 2809
2662 /* return value handling - mostly like entersub */ 2810 /* return value handling - mostly like entersub */
2663 /* make sure we put something on the stack in scalar context */ 2811 /* make sure we put something on the stack in scalar context */
2664 if (GIMME_V == G_SCALAR 2812 if (GIMME_V == G_SCALAR
2665 && expect_false (PL_stack_sp != PL_stack_base + checkmark + 1)) 2813 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2666 { 2814 {
2667 dSP; 2815 dSP;
2668 SV **bot = PL_stack_base + checkmark; 2816 SV **bot = PL_stack_base + checkmark;
2669 2817
2670 if (sp == bot) /* too few, push undef */ 2818 if (sp == bot) /* too few, push undef */
… …
2775{ 2923{
2776 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2924 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2777 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2925 on_enterleave_call (aTHX_ sv_2mortal (cb));
2778} 2926}
2779 2927
2928static void
2929enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2930{
2931 if (!hook)
2932 return;
2933
2934 if (!*avp)
2935 {
2936 *avp = newAV ();
2937 AvREAL_off (*avp);
2938 }
2939
2940 av_push (*avp, (SV *)hook);
2941 av_push (*avp, (SV *)arg);
2942}
2943
2944static void
2945enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2946{
2947 AV *av = *avp;
2948 int i;
2949
2950 if (!av)
2951 return;
2952
2953 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2954 if (AvARRAY (av)[i] == (SV *)hook)
2955 {
2956 if (execute)
2957 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2958
2959 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2960 av_pop (av);
2961 av_pop (av);
2962 break;
2963 }
2964
2965 if (AvFILLp (av) >= 0)
2966 {
2967 *avp = 0;
2968 SvREFCNT_dec_NN (av);
2969 }
2970}
2971
2972static void
2973api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2974{
2975 struct coro *coro = SvSTATE (coro_sv);
2976
2977 if (SvSTATE_current == coro)
2978 if (enter)
2979 enter (aTHX_ enter_arg);
2980
2981 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2982 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2983}
2984
2985static void
2986api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2987{
2988 struct coro *coro = SvSTATE (coro_sv);
2989
2990 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2991 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2992}
2993
2994static void
2995savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2996{
2997 struct coro *coro = SvSTATE_current;
2998
2999 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
3000}
3001
3002static void
3003savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
3004{
3005 struct coro *coro = SvSTATE_current;
3006
3007 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
3008}
3009
3010static void
3011api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
3012{
3013 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
3014
3015 /* this ought to be much cheaper than malloc + a single destructor call */
3016 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
3017 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
3018}
3019
2780/*****************************************************************************/ 3020/*****************************************************************************/
2781/* PerlIO::cede */ 3021/* PerlIO::cede */
2782 3022
2783typedef struct 3023typedef struct
2784{ 3024{
2785 PerlIOBuf base; 3025 PerlIOBuf base;
2786 NV next, every; 3026 NV next, every;
2787} PerlIOCede; 3027} PerlIOCede;
2788 3028
2789static IV 3029static IV ecb_cold
2790PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 3030PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2791{ 3031{
2792 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3032 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2793 3033
2794 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 3034 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2795 self->next = nvtime () + self->every; 3035 self->next = nvtime () + self->every;
2796 3036
2797 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 3037 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2798} 3038}
2799 3039
2800static SV * 3040static SV * ecb_cold
2801PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3041PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2802{ 3042{
2803 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3043 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2804 3044
2805 return newSVnv (self->every); 3045 return newSVnv (self->every);
… …
2912 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3152 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2913 PUTBACK; 3153 PUTBACK;
2914 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3154 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2915 } 3155 }
2916 3156
2917 SvREFCNT_dec (cb); 3157 SvREFCNT_dec_NN (cb);
2918 } 3158 }
2919} 3159}
2920 3160
2921static void 3161static void
2922coro_semaphore_destroy (pTHX_ struct CoroSLF *frame) 3162coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
… …
2930{ 3170{
2931 AV *av = (AV *)frame->data; 3171 AV *av = (AV *)frame->data;
2932 SV *count_sv = AvARRAY (av)[0]; 3172 SV *count_sv = AvARRAY (av)[0];
2933 SV *coro_hv = SvRV (coro_current); 3173 SV *coro_hv = SvRV (coro_current);
2934 3174
3175 frame->destroy = 0;
3176
2935 /* if we are about to throw, don't actually acquire the lock, just throw */ 3177 /* if we are about to throw, don't actually acquire the lock, just throw */
2936 if (CORO_THROW) 3178 if (ecb_expect_false (CORO_THROW))
3179 {
3180 /* we still might be responsible for the semaphore, so wake up others */
3181 coro_semaphore_adjust (aTHX_ av, 0);
3182
2937 return 0; 3183 return 0;
3184 }
2938 else if (SvIVX (count_sv) > 0) 3185 else if (SvIVX (count_sv) > 0)
2939 { 3186 {
2940 frame->destroy = 0;
2941
2942 if (acquire) 3187 if (acquire)
2943 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3188 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2944 else 3189 else
2945 coro_semaphore_adjust (aTHX_ av, 0); 3190 coro_semaphore_adjust (aTHX_ av, 0);
2946 3191
… …
2950 { 3195 {
2951 int i; 3196 int i;
2952 /* if we were woken up but can't down, we look through the whole */ 3197 /* if we were woken up but can't down, we look through the whole */
2953 /* waiters list and only add us if we aren't in there already */ 3198 /* waiters list and only add us if we aren't in there already */
2954 /* this avoids some degenerate memory usage cases */ 3199 /* this avoids some degenerate memory usage cases */
2955 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug 3200 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2956 if (AvARRAY (av)[i] == coro_hv) 3201 if (AvARRAY (av)[i] == coro_hv)
2957 return 1; 3202 return 1;
2958 3203
2959 av_push (av, SvREFCNT_inc (coro_hv)); 3204 av_push (av, SvREFCNT_inc (coro_hv));
2960 return 1; 3205 return 1;
… …
3057 { 3302 {
3058 api_ready (aTHX_ cb); 3303 api_ready (aTHX_ cb);
3059 sv_setiv (cb, 0); /* signal waiter */ 3304 sv_setiv (cb, 0); /* signal waiter */
3060 } 3305 }
3061 3306
3062 SvREFCNT_dec (cb); 3307 SvREFCNT_dec_NN (cb);
3063 3308
3064 --count; 3309 --count;
3065 } 3310 }
3066} 3311}
3067 3312
… …
3152 } 3397 }
3153 3398
3154 av_push (state, data_sv); 3399 av_push (state, data_sv);
3155 3400
3156 api_ready (aTHX_ coro); 3401 api_ready (aTHX_ coro);
3157 SvREFCNT_dec (coro); 3402 SvREFCNT_dec_NN (coro);
3158 SvREFCNT_dec ((AV *)state); 3403 SvREFCNT_dec_NN ((AV *)state);
3159} 3404}
3160 3405
3161static int 3406static int
3162slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3407slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3163{ 3408{
… …
3168 /* it quickly returns */ 3413 /* it quickly returns */
3169 if (CORO_THROW) 3414 if (CORO_THROW)
3170 return 0; 3415 return 0;
3171 3416
3172 /* one element that is an RV? repeat! */ 3417 /* one element that is an RV? repeat! */
3173 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3418 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3174 return 1; 3419 return 1;
3175 3420
3176 /* restore status */ 3421 /* restore status */
3177 { 3422 {
3178 SV *data_sv = av_pop (state); 3423 SV *data_sv = av_pop (state);
… …
3181 errno = data->errorno; 3426 errno = data->errorno;
3182 PL_laststype = data->laststype; 3427 PL_laststype = data->laststype;
3183 PL_laststatval = data->laststatval; 3428 PL_laststatval = data->laststatval;
3184 PL_statcache = data->statcache; 3429 PL_statcache = data->statcache;
3185 3430
3186 SvREFCNT_dec (data_sv); 3431 SvREFCNT_dec_NN (data_sv);
3187 } 3432 }
3188 3433
3189 /* push result values */ 3434 /* push result values */
3190 { 3435 {
3191 dSP; 3436 dSP;
… …
3217 dSP; 3462 dSP;
3218 3463
3219 static SV *prio_cv; 3464 static SV *prio_cv;
3220 static SV *prio_sv; 3465 static SV *prio_sv;
3221 3466
3222 if (expect_false (!prio_cv)) 3467 if (ecb_expect_false (!prio_cv))
3223 { 3468 {
3224 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3469 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3225 prio_sv = newSViv (0); 3470 prio_sv = newSViv (0);
3226 } 3471 }
3227 3472
… …
3333 } 3578 }
3334 3579
3335 return coro_sv; 3580 return coro_sv;
3336} 3581}
3337 3582
3583#ifndef __cplusplus
3584ecb_cold XS(boot_Coro__State);
3585#endif
3586
3587#if CORO_JIT
3588
3589static void ecb_noinline ecb_cold
3590pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3591{
3592 dSP;
3593 AV *av = newAV ();
3594
3595 av_store (av, 3, newSVuv (d));
3596 av_store (av, 2, newSVuv (c));
3597 av_store (av, 1, newSVuv (b));
3598 av_store (av, 0, newSVuv (a));
3599
3600 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3601
3602 PUTBACK;
3603}
3604
3605static void ecb_noinline ecb_cold
3606jit_init (pTHX)
3607{
3608 dSP;
3609 SV *load, *save;
3610 char *map_base;
3611 char *load_ptr, *save_ptr;
3612 STRLEN load_len, save_len, map_len;
3613 int count;
3614
3615 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3616
3617 PUSHMARK (SP);
3618 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3619 #include "state.h"
3620 count = call_pv ("Coro::State::_jit", G_ARRAY);
3621 SPAGAIN;
3622
3623 save = POPs; save_ptr = SvPVbyte (save, save_len);
3624 load = POPs; load_ptr = SvPVbyte (load, load_len);
3625
3626 map_len = load_len + save_len + 16;
3627
3628 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3629
3630 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3631
3632 load_perl_slots = (load_save_perl_slots_type)map_base;
3633 memcpy (load_perl_slots, load_ptr, load_len);
3634
3635 save_perl_slots = (load_save_perl_slots_type)(map_base + ((load_len + 15) & ~15));
3636 memcpy (save_perl_slots, save_ptr, save_len);
3637
3638 /* we are good citizens and try to make the page read-only, so the evil evil */
3639 /* hackers might have it a bit more difficult */
3640 /* we do this in two steps, to potentially appease some security frameworks */
3641 mprotect (map_base, map_len, PROT_READ);
3642 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3643
3644 PUTBACK;
3645 eval_pv ("undef &Coro::State::_jit", 1);
3646}
3647
3648#endif
3649
3338MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3650MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3339 3651
3340PROTOTYPES: DISABLE 3652PROTOTYPES: DISABLE
3341 3653
3342BOOT: 3654BOOT:
3343{ 3655{
3656#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3657#include "state.h"
3344#ifdef USE_ITHREADS 3658#ifdef USE_ITHREADS
3345# if CORO_PTHREAD 3659# if CORO_PTHREAD
3346 coro_thx = PERL_GET_CONTEXT; 3660 coro_thx = PERL_GET_CONTEXT;
3347# endif 3661# endif
3348#endif 3662#endif
3349 BOOT_PAGESIZE; 3663 /* perl defines these to check for existance first, but why it doesn't */
3664 /* just create them one at init time is not clear to me, except for */
3665 /* programs trying to delete them, but... */
3666 /* anyway, we declare this as invalid and make sure they are initialised here */
3667 DEFSV;
3668 ERRSV;
3350 3669
3351 cctx_current = cctx_new_empty (); 3670 cctx_current = cctx_new_empty ();
3352 3671
3353 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3672 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3354 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3673 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3355 3674
3356 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3675 {
3357 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3676 /*
3358 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3677 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3678 * by coro_sig_vtbl in hash values.
3679 */
3680 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3681
3682 /* this only works if perl doesn't have a vtbl for %SIG */
3683 assert (!mg->mg_virtual);
3684
3685 /*
3686 * The irony is that the perl API itself asserts that mg_virtual
3687 * must be non-const, yet perl5porters insisted on marking their
3688 * vtbls as read-only, just to thwart perl modules from patching
3689 * them.
3690 */
3691 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3692 mg->mg_flags |= MGf_COPY;
3693
3694 coro_sigelem_vtbl = PL_vtbl_sigelem;
3695 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3696 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3697 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3698 }
3359 3699
3360 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3361 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3700 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3362 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3701 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3363 3702
3364 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3703 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3704
3705 newCONSTSUB (coro_state_stash, "BACKEND", newSVpv (CORO_BACKEND, 0)); /* undocumented */
3365 3706
3366 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 3707 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
3367 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 3708 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
3368 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 3709 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
3369 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 3710 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
… …
3397 coroapi.prepare_cede_notself = prepare_cede_notself; 3738 coroapi.prepare_cede_notself = prepare_cede_notself;
3398 3739
3399 time_init (aTHX); 3740 time_init (aTHX);
3400 3741
3401 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3742 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3743#if CORO_JIT
3744 PUTBACK;
3745 jit_init (aTHX);
3746 SPAGAIN;
3747#endif
3402} 3748}
3403 3749
3404SV * 3750SV *
3405new (SV *klass, ...) 3751new (SV *klass, ...)
3406 ALIAS: 3752 ALIAS:
… …
3413void 3759void
3414transfer (...) 3760transfer (...)
3415 PROTOTYPE: $$ 3761 PROTOTYPE: $$
3416 CODE: 3762 CODE:
3417 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3763 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3418
3419void
3420_exit (int code)
3421 PROTOTYPE: $
3422 CODE:
3423 _exit (code);
3424 3764
3425SV * 3765SV *
3426clone (Coro::State coro) 3766clone (Coro::State coro)
3427 CODE: 3767 CODE:
3428{ 3768{
… …
3483void 3823void
3484list () 3824list ()
3485 PROTOTYPE: 3825 PROTOTYPE:
3486 PPCODE: 3826 PPCODE:
3487{ 3827{
3488 struct coro *coro; 3828 struct coro *coro;
3489 for (coro = coro_first; coro; coro = coro->next) 3829 for (coro = coro_first; coro; coro = coro->next)
3490 if (coro->hv) 3830 if (coro->hv)
3491 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3831 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3492} 3832}
3493 3833
… …
3495call (Coro::State coro, SV *coderef) 3835call (Coro::State coro, SV *coderef)
3496 ALIAS: 3836 ALIAS:
3497 eval = 1 3837 eval = 1
3498 CODE: 3838 CODE:
3499{ 3839{
3840 struct coro *current = SvSTATE_current;
3841
3500 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3842 if ((coro == current) || (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)))
3501 { 3843 {
3502 struct coro *current = SvSTATE_current;
3503 struct CoroSLF slf_save; 3844 struct CoroSLF slf_save;
3504 3845
3505 if (current != coro) 3846 if (current != coro)
3506 { 3847 {
3507 PUTBACK; 3848 PUTBACK;
… …
3557 RETVAL = boolSV (coro->flags & ix); 3898 RETVAL = boolSV (coro->flags & ix);
3558 OUTPUT: 3899 OUTPUT:
3559 RETVAL 3900 RETVAL
3560 3901
3561void 3902void
3562throw (Coro::State self, SV *exception = &PL_sv_undef) 3903throw (SV *self, SV *exception = &PL_sv_undef)
3563 PROTOTYPE: $;$ 3904 PROTOTYPE: $;$
3564 CODE: 3905 CODE:
3565{ 3906{
3907 struct coro *coro = SvSTATE (self);
3566 struct coro *current = SvSTATE_current; 3908 struct coro *current = SvSTATE_current;
3567 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3909 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3568 SvREFCNT_dec (*exceptionp); 3910 SvREFCNT_dec (*exceptionp);
3569 SvGETMAGIC (exception); 3911 SvGETMAGIC (exception);
3570 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3912 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3913
3914 api_ready (aTHX_ self);
3571} 3915}
3572 3916
3573void 3917void
3574api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3918api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3575 PROTOTYPE: $;$ 3919 PROTOTYPE: $;$
… …
3652 3996
3653void 3997void
3654times (Coro::State self) 3998times (Coro::State self)
3655 PPCODE: 3999 PPCODE:
3656{ 4000{
3657 struct coro *current = SvSTATE (coro_current); 4001 struct coro *current = SvSTATE (coro_current);
3658 4002
3659 if (expect_false (current == self)) 4003 if (ecb_expect_false (current == self))
3660 { 4004 {
3661 coro_times_update (); 4005 coro_times_update ();
3662 coro_times_add (SvSTATE (coro_current)); 4006 coro_times_add (SvSTATE (coro_current));
3663 } 4007 }
3664 4008
3665 EXTEND (SP, 2); 4009 EXTEND (SP, 2);
3666 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 4010 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3667 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 4011 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3668 4012
3669 if (expect_false (current == self)) 4013 if (ecb_expect_false (current == self))
3670 coro_times_sub (SvSTATE (coro_current)); 4014 coro_times_sub (SvSTATE (coro_current));
3671} 4015}
3672 4016
3673void 4017void
3674swap_sv (Coro::State coro, SV *sv, SV *swapsv) 4018swap_sv (Coro::State coro, SV *sva, SV *svb)
3675 CODE: 4019 CODE:
3676{ 4020{
3677 struct coro *current = SvSTATE_current; 4021 struct coro *current = SvSTATE_current;
4022 AV *swap_sv;
4023 int i;
4024
4025 sva = SvRV (sva);
4026 svb = SvRV (svb);
3678 4027
3679 if (current == coro) 4028 if (current == coro)
3680 SWAP_SVS (current); 4029 SWAP_SVS_LEAVE (current);
3681 4030
3682 if (!coro->swap_sv) 4031 if (!coro->swap_sv)
3683 coro->swap_sv = newAV (); 4032 coro->swap_sv = newAV ();
3684 4033
4034 swap_sv = coro->swap_sv;
4035
4036 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4037 {
4038 SV *a = AvARRAY (swap_sv)[i ];
4039 SV *b = AvARRAY (swap_sv)[i + 1];
4040
4041 if (a == sva && b == svb)
4042 {
4043 SvREFCNT_dec_NN (a);
4044 SvREFCNT_dec_NN (b);
4045
4046 for (; i <= AvFILLp (swap_sv) - 2; i++)
4047 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4048
4049 AvFILLp (swap_sv) -= 2;
4050
4051 goto removed;
4052 }
4053 }
4054
3685 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4055 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3686 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4056 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4057
4058 removed:
3687 4059
3688 if (current == coro) 4060 if (current == coro)
3689 SWAP_SVS (current); 4061 SWAP_SVS_ENTER (current);
3690} 4062}
3691 4063
3692 4064
3693MODULE = Coro::State PACKAGE = Coro 4065MODULE = Coro::State PACKAGE = Coro
3694 4066
3695BOOT: 4067BOOT:
3696{ 4068{
4069 if (SVt_LAST > 32)
4070 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4071
3697 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4072 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3698 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4073 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3699 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4074 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3700 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4075 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3701 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4076 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
… …
3705 4080
3706 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4081 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3707 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4082 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3708 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4083 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3709 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 4084 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3710 4085
3711 coro_stash = gv_stashpv ("Coro", TRUE); 4086 coro_stash = gv_stashpv ("Coro", TRUE);
3712 4087
3713 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4088 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3714 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4089 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3715 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4090 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3727 coroapi.ready = api_ready; 4102 coroapi.ready = api_ready;
3728 coroapi.is_ready = api_is_ready; 4103 coroapi.is_ready = api_is_ready;
3729 coroapi.nready = coro_nready; 4104 coroapi.nready = coro_nready;
3730 coroapi.current = coro_current; 4105 coroapi.current = coro_current;
3731 4106
4107 coroapi.enterleave_hook = api_enterleave_hook;
4108 coroapi.enterleave_unhook = api_enterleave_unhook;
4109 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4110
3732 /*GCoroAPI = &coroapi;*/ 4111 /*GCoroAPI = &coroapi;*/
3733 sv_setiv (sv, (IV)&coroapi); 4112 sv_setiv (sv, PTR2IV (&coroapi));
3734 SvREADONLY_on (sv); 4113 SvREADONLY_on (sv);
3735 } 4114 }
3736} 4115}
3737 4116
3738SV * 4117SV *
… …
3801 4180
3802void 4181void
3803_set_current (SV *current) 4182_set_current (SV *current)
3804 PROTOTYPE: $ 4183 PROTOTYPE: $
3805 CODE: 4184 CODE:
3806 SvREFCNT_dec (SvRV (coro_current)); 4185 SvREFCNT_dec_NN (SvRV (coro_current));
3807 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4186 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3808 4187
3809void 4188void
3810_set_readyhook (SV *hook) 4189_set_readyhook (SV *hook)
3811 PROTOTYPE: $ 4190 PROTOTYPE: $
… …
3895 4274
3896 if ((SV *)hv == &PL_sv_undef) 4275 if ((SV *)hv == &PL_sv_undef)
3897 { 4276 {
3898 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4277 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3899 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4278 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3900 SvREFCNT_dec (sv); 4279 SvREFCNT_dec_NN (sv);
3901 } 4280 }
3902 4281
3903 { 4282 {
3904 struct coro *coro = SvSTATE_hv (hv); 4283 struct coro *coro = SvSTATE_hv (hv);
3905 4284
… …
3912 api_ready (aTHX_ (SV *)hv); 4291 api_ready (aTHX_ (SV *)hv);
3913 4292
3914 if (GIMME_V != G_VOID) 4293 if (GIMME_V != G_VOID)
3915 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4294 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3916 else 4295 else
3917 SvREFCNT_dec (hv); 4296 SvREFCNT_dec_NN (hv);
3918} 4297}
3919 4298
3920SV * 4299SV *
3921rouse_cb () 4300rouse_cb ()
3922 PROTOTYPE: 4301 PROTOTYPE:
… …
3937 on_leave = 1 4316 on_leave = 1
3938 PROTOTYPE: & 4317 PROTOTYPE: &
3939 CODE: 4318 CODE:
3940{ 4319{
3941 struct coro *coro = SvSTATE_current; 4320 struct coro *coro = SvSTATE_current;
3942 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4321 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3943 4322
3944 block = s_get_cv_croak (block); 4323 block = s_get_cv_croak (block);
3945 4324
3946 if (!*avp) 4325 if (!*avp)
3947 *avp = newAV (); 4326 *avp = newAV ();
… …
3967 4346
3968SV * 4347SV *
3969new (SV *klass, SV *count = 0) 4348new (SV *klass, SV *count = 0)
3970 CODE: 4349 CODE:
3971{ 4350{
3972 int semcnt = 1; 4351 int semcnt = 1;
3973 4352
3974 if (count) 4353 if (count)
3975 { 4354 {
3976 SvGETMAGIC (count); 4355 SvGETMAGIC (count);
3977 4356
… …
4001 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4380 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
4002 OUTPUT: 4381 OUTPUT:
4003 RETVAL 4382 RETVAL
4004 4383
4005void 4384void
4006up (SV *self, int adjust = 1) 4385up (SV *self)
4007 ALIAS:
4008 adjust = 1
4009 CODE: 4386 CODE:
4387 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4388
4389void
4390adjust (SV *self, int adjust)
4391 CODE:
4010 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4392 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
4011 4393
4012void 4394void
4013down (...) 4395down (...)
4014 CODE: 4396 CODE:
4015 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4397 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
4037 XSRETURN_NO; 4419 XSRETURN_NO;
4038} 4420}
4039 4421
4040void 4422void
4041waiters (SV *self) 4423waiters (SV *self)
4042 PPCODE: 4424 PPCODE:
4043{ 4425{
4044 AV *av = (AV *)SvRV (self); 4426 AV *av = (AV *)SvRV (self);
4045 int wcount = AvFILLp (av) + 1 - 1; 4427 int wcount = AvFILLp (av) + 1 - 1;
4046 4428
4047 if (GIMME_V == G_SCALAR) 4429 if (GIMME_V == G_SCALAR)
… …
4056} 4438}
4057 4439
4058MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4440MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4059 4441
4060void 4442void
4061_may_delete (SV *sem, int count, int extra_refs) 4443_may_delete (SV *sem, int count, unsigned int extra_refs)
4062 PPCODE: 4444 PPCODE:
4063{ 4445{
4064 AV *av = (AV *)SvRV (sem); 4446 AV *av = (AV *)SvRV (sem);
4065 4447
4066 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4448 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4067 && AvFILLp (av) == 0 /* no waiters, just count */ 4449 && AvFILLp (av) == 0 /* no waiters, just count */
4068 && SvIV (AvARRAY (av)[0]) == count) 4450 && SvIV (AvARRAY (av)[0]) == count)
4069 XSRETURN_YES; 4451 XSRETURN_YES;
… …
4090 4472
4091void 4473void
4092broadcast (SV *self) 4474broadcast (SV *self)
4093 CODE: 4475 CODE:
4094{ 4476{
4095 AV *av = (AV *)SvRV (self); 4477 AV *av = (AV *)SvRV (self);
4096 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4478 coro_signal_wake (aTHX_ av, AvFILLp (av));
4097} 4479}
4098 4480
4099void 4481void
4100send (SV *self) 4482send (SV *self)
… …
4108 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4490 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
4109} 4491}
4110 4492
4111IV 4493IV
4112awaited (SV *self) 4494awaited (SV *self)
4113 CODE: 4495 CODE:
4114 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4496 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
4115 OUTPUT: 4497 OUTPUT:
4116 RETVAL 4498 RETVAL
4117 4499
4118 4500
… …
4123 4505
4124void 4506void
4125_schedule (...) 4507_schedule (...)
4126 CODE: 4508 CODE:
4127{ 4509{
4128 static int incede; 4510 static int incede;
4129 4511
4130 api_cede_notself (aTHX); 4512 api_cede_notself (aTHX);
4131 4513
4132 ++incede; 4514 ++incede;
4133 while (coro_nready >= incede && api_cede (aTHX)) 4515 while (coro_nready >= incede && api_cede (aTHX))
… …
4177 { 4559 {
4178 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4560 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4179 coro_old_pp_sselect = 0; 4561 coro_old_pp_sselect = 0;
4180 } 4562 }
4181 4563
4564MODULE = Coro::State PACKAGE = Coro::Util
4565
4566void
4567_exit (int code)
4568 CODE:
4569 _exit (code);
4570
4571NV
4572time ()
4573 CODE:
4574 RETVAL = nvtime (aTHX);
4575 OUTPUT:
4576 RETVAL
4577
4578NV
4579gettimeofday ()
4580 PPCODE:
4581{
4582 UV tv [2];
4583 u2time (aTHX_ tv);
4584 EXTEND (SP, 2);
4585 PUSHs (sv_2mortal (newSVuv (tv [0])));
4586 PUSHs (sv_2mortal (newSVuv (tv [1])));
4587}
4588

Diff Legend

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