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.393 by root, Fri Apr 29 17:38:56 2011 UTC vs.
Revision 1.477 by root, Sat Feb 29 21:40:22 2020 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
42#include <stddef.h>
18#include <stdio.h> 43#include <stdio.h>
19#include <errno.h> 44#include <errno.h>
20#include <assert.h> 45#include <assert.h>
21 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
22#ifndef SVs_PADSTALE 55#ifndef SVs_PADSTALE
23# 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
24#endif 86#endif
25 87
26#if defined(_WIN32) 88#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY 89# undef HAS_GETTIMEOFDAY
28# undef setjmp 90# undef setjmp
… …
31# define setjmp _setjmp /* deep magic */ 93# define setjmp _setjmp /* deep magic */
32#else 94#else
33# include <inttypes.h> /* most portable stdint.h */ 95# include <inttypes.h> /* most portable stdint.h */
34#endif 96#endif
35 97
36#ifdef HAVE_MMAP
37# include <unistd.h>
38# include <sys/mman.h>
39# ifndef MAP_ANONYMOUS
40# ifdef MAP_ANON
41# define MAP_ANONYMOUS MAP_ANON
42# else
43# undef HAVE_MMAP
44# endif
45# endif
46# include <limits.h>
47# ifndef PAGESIZE
48# define PAGESIZE pagesize
49# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
50static long pagesize;
51# else
52# define BOOT_PAGESIZE (void)0
53# endif
54#else
55# define PAGESIZE 0
56# define BOOT_PAGESIZE (void)0
57#endif
58
59#if CORO_USE_VALGRIND
60# include <valgrind/valgrind.h>
61#endif
62
63/* the maximum number of idle cctx that will be pooled */ 98/* the maximum number of idle cctx that will be pooled */
64static int cctx_max_idle = 4; 99static int cctx_max_idle = 4;
65 100
66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 101#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
67# undef CORO_STACKGUARD 102# define HAS_SCOPESTACK_NAME 1
68#endif
69
70#ifndef CORO_STACKGUARD
71# define CORO_STACKGUARD 0
72#endif 103#endif
73 104
74/* prefer perl internal functions over our own? */ 105/* prefer perl internal functions over our own? */
75#ifndef CORO_PREFER_PERL_FUNCTIONS 106#ifndef CORO_PREFER_PERL_FUNCTIONS
76# define CORO_PREFER_PERL_FUNCTIONS 0 107# define CORO_PREFER_PERL_FUNCTIONS 0
… …
86# define STACKLEVEL ((void *)&stacklevel) 117# define STACKLEVEL ((void *)&stacklevel)
87#endif 118#endif
88 119
89#define IN_DESTRUCT PL_dirty 120#define IN_DESTRUCT PL_dirty
90 121
91#if __GNUC__ >= 3
92# define attribute(x) __attribute__(x)
93# define expect(expr,value) __builtin_expect ((expr), (value))
94# define INLINE static inline
95#else
96# define attribute(x)
97# define expect(expr,value) (expr)
98# define INLINE static
99#endif
100
101#define expect_false(expr) expect ((expr) != 0, 0)
102#define expect_true(expr) expect ((expr) != 0, 1)
103
104#define NOINLINE attribute ((noinline))
105
106#include "CoroAPI.h" 122#include "CoroAPI.h"
107#define GCoroAPI (&coroapi) /* very sneaky */ 123#define GCoroAPI (&coroapi) /* very sneaky */
108 124
109#ifdef USE_ITHREADS 125#ifdef USE_ITHREADS
110# if CORO_PTHREAD 126# if CORO_PTHREAD
… …
120# define CORO_CLOCK_MONOTONIC 1 136# define CORO_CLOCK_MONOTONIC 1
121# define CORO_CLOCK_THREAD_CPUTIME_ID 3 137# define CORO_CLOCK_THREAD_CPUTIME_ID 3
122# endif 138# endif
123#endif 139#endif
124 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
125static double (*nvtime)(); /* so why doesn't it take void? */ 159static double (*nvtime)(); /* so why doesn't it take void? */
126static void (*u2time)(pTHX_ UV ret[2]); 160static void (*u2time)(pTHX_ UV ret[2]);
127 161
128/* we hijack an hopefully unused CV flag for our purposes */ 162/* we hijack an hopefully unused CV flag for our purposes */
129#define CVf_SLF 0x4000 163#define CVf_SLF 0x4000
130static OP *pp_slf (pTHX); 164static OP *pp_slf (pTHX);
165static void slf_destroy (pTHX_ struct coro *coro);
131 166
132static U32 cctx_gen; 167static U32 cctx_gen;
133static size_t cctx_stacksize = CORO_STACKSIZE; 168static size_t cctx_stacksize = CORO_STACKSIZE;
134static struct CoroAPI coroapi; 169static struct CoroAPI coroapi;
135static AV *main_mainstack; /* used to differentiate between $main and others */ 170static AV *main_mainstack; /* used to differentiate between $main and others */
… …
143 178
144static GV *irsgv; /* $/ */ 179static GV *irsgv; /* $/ */
145static GV *stdoutgv; /* *STDOUT */ 180static GV *stdoutgv; /* *STDOUT */
146static SV *rv_diehook; 181static SV *rv_diehook;
147static SV *rv_warnhook; 182static SV *rv_warnhook;
148static HV *hv_sig; /* %SIG */
149 183
150/* async_pool helper stuff */ 184/* async_pool helper stuff */
151static SV *sv_pool_rss; 185static SV *sv_pool_rss;
152static SV *sv_pool_size; 186static SV *sv_pool_size;
153static SV *sv_async_pool_idle; /* description string */ 187static SV *sv_async_pool_idle; /* description string */
… …
165static char times_valid; 199static char times_valid;
166 200
167static struct coro_cctx *cctx_first; 201static struct coro_cctx *cctx_first;
168static int cctx_count, cctx_idle; 202static int cctx_count, cctx_idle;
169 203
170enum { 204enum
205{
171 CC_MAPPED = 0x01, 206 CC_MAPPED = 0x01,
172 CC_NOREUSE = 0x02, /* throw this away after tracing */ 207 CC_NOREUSE = 0x02, /* throw this away after tracing */
173 CC_TRACE = 0x04, 208 CC_TRACE = 0x04,
174 CC_TRACE_SUB = 0x08, /* trace sub calls */ 209 CC_TRACE_SUB = 0x08, /* trace sub calls */
175 CC_TRACE_LINE = 0x10, /* trace each statement */ 210 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
180typedef struct coro_cctx 215typedef struct coro_cctx
181{ 216{
182 struct coro_cctx *next; 217 struct coro_cctx *next;
183 218
184 /* the stack */ 219 /* the stack */
185 void *sptr; 220 struct coro_stack stack;
186 size_t ssize;
187 221
188 /* cpu state */ 222 /* cpu state */
189 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
190 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
191 JMPENV *top_env; 227 JMPENV *top_env;
192 coro_context cctx; 228 coro_context cctx;
193 229
194 U32 gen; 230 U32 gen;
195#if CORO_USE_VALGRIND 231#if CORO_USE_VALGRIND
… …
200 236
201static coro_cctx *cctx_current; /* the currently running cctx */ 237static coro_cctx *cctx_current; /* the currently running cctx */
202 238
203/*****************************************************************************/ 239/*****************************************************************************/
204 240
241static MGVTBL coro_state_vtbl;
242
205enum { 243enum
244{
206 CF_RUNNING = 0x0001, /* coroutine is running */ 245 CF_RUNNING = 0x0001, /* coroutine is running */
207 CF_READY = 0x0002, /* coroutine is ready */ 246 CF_READY = 0x0002, /* coroutine is ready */
208 CF_NEW = 0x0004, /* has never been switched to */ 247 CF_NEW = 0x0004, /* has never been switched to */
209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 248 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 249 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
211 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */ 250 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
212}; 251};
213 252
214/* 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 */
215typedef struct 254typedef struct
216{ 255{
217 SV *defsv;
218 AV *defav;
219 SV *errsv;
220 SV *irsgv;
221 HV *hinthv;
222#define VAR(name,type) type name; 256 #define VARx(name,expr,type) type name;
223# include "state.h" 257 #include "state.h"
224#undef VAR
225} perl_slots; 258} perl_slots;
226 259
260/* how many context stack entries do we need for perl_slots */
227#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))
228 262
229/* this is a structure representing a perl-level coroutine */ 263/* this is a structure representing a perl-level coroutine */
230struct coro { 264struct coro
265{
231 /* the C coroutine allocated to this perl coroutine, if any */ 266 /* the C coroutine allocated to this perl coroutine, if any */
232 coro_cctx *cctx; 267 coro_cctx *cctx;
233 268
234 /* ready queue */ 269 /* ready queue */
235 struct coro *next_ready; 270 struct coro *next_ready;
… …
237 /* state data */ 272 /* state data */
238 struct CoroSLF slf_frame; /* saved slf frame */ 273 struct CoroSLF slf_frame; /* saved slf frame */
239 AV *mainstack; 274 AV *mainstack;
240 perl_slots *slot; /* basically the saved sp */ 275 perl_slots *slot; /* basically the saved sp */
241 276
242 CV *startcv; /* the CV to execute */ 277 CV *startcv; /* the CV to execute */
243 AV *args; /* data associated with this coroutine (initial args) */ 278 AV *args; /* data associated with this coroutine (initial args) */
244 int refcnt; /* coroutines are refcounted, yes */
245 int flags; /* CF_ flags */ 279 int flags; /* CF_ flags */
246 HV *hv; /* the perl hash associated with this coro, if any */ 280 HV *hv; /* the perl hash associated with this coro, if any */
247 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
248 281
249 /* statistics */ 282 /* statistics */
250 int usecount; /* number of transfers to this coro */ 283 int usecount; /* number of transfers to this coro */
251 284
252 /* coro process data */ 285 /* coro process data */
253 int prio; 286 int prio;
254 SV *except; /* exception to be thrown */ 287 SV *except; /* exception to be thrown */
255 SV *rouse_cb; 288 SV *rouse_cb; /* last rouse callback */
289 AV *on_destroy; /* callbacks or coros to notify on destroy */
290 AV *status; /* the exit status list */
256 291
257 /* async_pool */ 292 /* async_pool */
258 SV *saved_deffh; 293 SV *saved_deffh;
259 SV *invoke_cb; 294 SV *invoke_cb;
260 AV *invoke_av; 295 AV *invoke_av;
261 296
262 /* on_enter/on_leave */ 297 /* on_enter/on_leave */
263 AV *on_enter; 298 AV *on_enter; AV *on_enter_xs;
264 AV *on_leave; 299 AV *on_leave; AV *on_leave_xs;
265 300
266 /* swap_sv */ 301 /* swap_sv */
267 AV *swap_sv; 302 AV *swap_sv;
268 303
269 /* times */ 304 /* times */
… …
292 327
293/* for Coro.pm */ 328/* for Coro.pm */
294static SV *coro_current; 329static SV *coro_current;
295static SV *coro_readyhook; 330static SV *coro_readyhook;
296static 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 */
297static CV *cv_coro_run, *cv_coro_terminate; 332static CV *cv_coro_run;
298static struct coro *coro_first; 333static struct coro *coro_first;
299#define coro_nready coroapi.nready 334#define coro_nready coroapi.nready
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
300 358
301/** Coro::Select ************************************************************/ 359/** Coro::Select ************************************************************/
302 360
303static OP *(*coro_old_pp_sselect) (pTHX); 361static OP *(*coro_old_pp_sselect) (pTHX);
304static SV *coro_select_select; 362static SV *coro_select_select;
… …
320 378
321/** time stuff **************************************************************/ 379/** time stuff **************************************************************/
322 380
323#ifdef HAS_GETTIMEOFDAY 381#ifdef HAS_GETTIMEOFDAY
324 382
325static void 383ecb_inline void
326coro_u2time (pTHX_ UV ret[2]) 384coro_u2time (pTHX_ UV ret[2])
327{ 385{
328 struct timeval tv; 386 struct timeval tv;
329 gettimeofday (&tv, 0); 387 gettimeofday (&tv, 0);
330 388
331 ret [0] = tv.tv_sec; 389 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec; 390 ret [1] = tv.tv_usec;
333} 391}
334 392
335static double 393ecb_inline double
336coro_nvtime () 394coro_nvtime (void)
337{ 395{
338 struct timeval tv; 396 struct timeval tv;
339 gettimeofday (&tv, 0); 397 gettimeofday (&tv, 0);
340 398
341 return tv.tv_sec + tv.tv_usec * 1e-6; 399 return tv.tv_sec + tv.tv_usec * 1e-6;
342} 400}
343 401
344static void 402ecb_inline void
345time_init (pTHX) 403time_init (pTHX)
346{ 404{
347 nvtime = coro_nvtime; 405 nvtime = coro_nvtime;
348 u2time = coro_u2time; 406 u2time = coro_u2time;
349} 407}
350 408
351#else 409#else
352 410
353static void 411ecb_inline void
354time_init (pTHX) 412time_init (pTHX)
355{ 413{
356 SV **svp; 414 SV **svp;
357 415
358 require_pv ("Time/HiRes.pm"); 416 require_pv ("Time/HiRes.pm");
359 417
360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 418 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
361 419
362 if (!svp) croak ("Time::HiRes is required, but missing. Caught"); 420 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
363 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");
364 422
… …
370 428
371#endif 429#endif
372 430
373/** lowlevel stuff **********************************************************/ 431/** lowlevel stuff **********************************************************/
374 432
375static SV * 433static SV * ecb_noinline
376coro_get_sv (pTHX_ const char *name, int create) 434coro_get_sv (pTHX_ const char *name, int create)
377{ 435{
378#if PERL_VERSION_ATLEAST (5,10,0) 436#if PERL_VERSION_ATLEAST (5,10,0)
379 /* 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 */
380 get_sv (name, create); 438 get_sv (name, create);
381#endif 439#endif
382 return get_sv (name, create); 440 return get_sv (name, create);
383} 441}
384 442
385static AV * 443static AV * ecb_noinline
386coro_get_av (pTHX_ const char *name, int create) 444coro_get_av (pTHX_ const char *name, int create)
387{ 445{
388#if PERL_VERSION_ATLEAST (5,10,0) 446#if PERL_VERSION_ATLEAST (5,10,0)
389 /* 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 */
390 get_av (name, create); 448 get_av (name, create);
391#endif 449#endif
392 return get_av (name, create); 450 return get_av (name, create);
393} 451}
394 452
395static HV * 453static HV * ecb_noinline
396coro_get_hv (pTHX_ const char *name, int create) 454coro_get_hv (pTHX_ const char *name, int create)
397{ 455{
398#if PERL_VERSION_ATLEAST (5,10,0) 456#if PERL_VERSION_ATLEAST (5,10,0)
399 /* 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 */
400 get_hv (name, create); 458 get_hv (name, create);
401#endif 459#endif
402 return get_hv (name, create); 460 return get_hv (name, create);
403} 461}
404 462
405INLINE void 463ecb_inline void
406coro_times_update () 464coro_times_update (void)
407{ 465{
408#ifdef coro_clock_gettime 466#ifdef coro_clock_gettime
409 struct timespec ts; 467 struct timespec ts;
410 468
411 ts.tv_sec = ts.tv_nsec = 0; 469 ts.tv_sec = ts.tv_nsec = 0;
… …
423 time_real [0] = tv [0]; 481 time_real [0] = tv [0];
424 time_real [1] = tv [1] * 1000; 482 time_real [1] = tv [1] * 1000;
425#endif 483#endif
426} 484}
427 485
428INLINE void 486ecb_inline void
429coro_times_add (struct coro *c) 487coro_times_add (struct coro *c)
430{ 488{
431 c->t_real [1] += time_real [1]; 489 c->t_real [1] += time_real [1];
432 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]; }
433 c->t_real [0] += time_real [0]; 491 c->t_real [0] += time_real [0];
… …
435 c->t_cpu [1] += time_cpu [1]; 493 c->t_cpu [1] += time_cpu [1];
436 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]; }
437 c->t_cpu [0] += time_cpu [0]; 495 c->t_cpu [0] += time_cpu [0];
438} 496}
439 497
440INLINE void 498ecb_inline void
441coro_times_sub (struct coro *c) 499coro_times_sub (struct coro *c)
442{ 500{
443 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]; }
444 c->t_real [1] -= time_real [1]; 502 c->t_real [1] -= time_real [1];
445 c->t_real [0] -= time_real [0]; 503 c->t_real [0] -= time_real [0];
… …
453/* magic glue */ 511/* magic glue */
454 512
455#define CORO_MAGIC_type_cv 26 513#define CORO_MAGIC_type_cv 26
456#define CORO_MAGIC_type_state PERL_MAGIC_ext 514#define CORO_MAGIC_type_state PERL_MAGIC_ext
457 515
458#define CORO_MAGIC_NN(sv, type) \ 516#define CORO_MAGIC_NN(sv, type) \
459 (expect_true (SvMAGIC (sv)->mg_type == type) \ 517 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
460 ? SvMAGIC (sv) \ 518 ? SvMAGIC (sv) \
461 : mg_find (sv, type)) 519 : mg_find (sv, type))
462 520
463#define CORO_MAGIC(sv, type) \ 521#define CORO_MAGIC(sv, type) \
464 (expect_true (SvMAGIC (sv)) \ 522 (ecb_expect_true (SvMAGIC (sv)) \
465 ? CORO_MAGIC_NN (sv, type) \ 523 ? CORO_MAGIC_NN (sv, type) \
466 : 0) 524 : 0)
467 525
468#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)
469#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)
470 528
471INLINE struct coro * 529ecb_inline MAGIC *
472SvSTATE_ (pTHX_ SV *coro) 530SvSTATEhv_p (pTHX_ SV *coro)
473{ 531{
474 HV *stash;
475 MAGIC *mg; 532 MAGIC *mg;
476 533
534 if (ecb_expect_true (
535 SvTYPE (coro) == SVt_PVHV
536 && (mg = CORO_MAGIC_state (coro))
537 && mg->mg_virtual == &coro_state_vtbl
538 ))
539 return mg;
540
541 return 0;
542}
543
544ecb_inline struct coro *
545SvSTATE_ (pTHX_ SV *coro_sv)
546{
547 MAGIC *mg;
548
477 if (SvROK (coro)) 549 if (SvROK (coro_sv))
478 coro = SvRV (coro); 550 coro_sv = SvRV (coro_sv);
479 551
480 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 552 mg = SvSTATEhv_p (aTHX_ coro_sv);
553 if (!mg)
481 croak ("Coro::State object required"); 554 croak ("Coro::State object required");
482 555
483 stash = SvSTASH (coro);
484 if (expect_false (stash != coro_stash && stash != coro_state_stash))
485 {
486 /* very slow, but rare, check */
487 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
488 croak ("Coro::State object required");
489 }
490
491 mg = CORO_MAGIC_state (coro);
492 return (struct coro *)mg->mg_ptr; 556 return (struct coro *)mg->mg_ptr;
493} 557}
494 558
495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 559#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
496 560
… …
499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 563#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
500 564
501/*****************************************************************************/ 565/*****************************************************************************/
502/* padlist management and caching */ 566/* padlist management and caching */
503 567
504static AV * 568ecb_inline PADLIST *
505coro_derive_padlist (pTHX_ CV *cv) 569coro_derive_padlist (pTHX_ CV *cv)
506{ 570{
507 AV *padlist = CvPADLIST (cv); 571 PADLIST *padlist = CvPADLIST (cv);
508 AV *newpadlist, *newpad; 572 PADLIST *newpadlist;
573 PADNAMELIST *padnames;
574 PAD *newpad;
575 PADOFFSET off = PadlistMAX (padlist) + 1;
509 576
510 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. */
511 AvREAL_off (newpadlist); 605 AvREAL_off (newpadlist);
512#if PERL_VERSION_ATLEAST (5,10,0)
513 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
514#else
515 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
516#endif 606#endif
517 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
518 --AvFILLp (padlist);
519 607
520 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 608 /* Already extended to 2 elements by newPADLIST. */
521 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;
522 616
523 return newpadlist; 617 return newpadlist;
524} 618}
525 619
526static void 620ecb_inline void
527free_padlist (pTHX_ AV *padlist) 621free_padlist (pTHX_ PADLIST *padlist)
528{ 622{
529 /* may be during global destruction */ 623 /* may be during global destruction */
530 if (!IN_DESTRUCT) 624 if (!IN_DESTRUCT)
531 { 625 {
532 I32 i = AvFILLp (padlist); 626 I32 i = PadlistMAX (padlist);
533 627
534 while (i > 0) /* special-case index 0 */ 628 while (i > 0) /* special-case index 0 */
535 { 629 {
536 /* we try to be extra-careful here */ 630 /* we try to be extra-careful here */
537 AV *av = (AV *)AvARRAY (padlist)[i--]; 631 PAD *pad = PadlistARRAY (padlist)[i--];
538 I32 j = AvFILLp (av);
539 632
633 if (pad)
634 {
635 I32 j = PadMAX (pad);
636
540 while (j >= 0) 637 while (j >= 0)
541 SvREFCNT_dec (AvARRAY (av)[j--]); 638 SvREFCNT_dec (PadARRAY (pad)[j--]);
542 639
543 AvFILLp (av) = -1; 640 PadMAX (pad) = -1;
544 SvREFCNT_dec (av); 641 SvREFCNT_dec (pad);
642 }
545 } 643 }
546 644
547 SvREFCNT_dec (AvARRAY (padlist)[0]); 645 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
548 646
647#if NEWPADAPI
648 Safefree (PadlistARRAY (padlist));
649 Safefree (padlist);
650#else
549 AvFILLp (padlist) = -1; 651 AvFILLp (padlist) = -1;
652 AvREAL_off (padlist);
550 SvREFCNT_dec ((SV*)padlist); 653 SvREFCNT_dec ((SV*)padlist);
654#endif
551 } 655 }
552} 656}
553 657
554static int 658static int
555coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 659coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
556{ 660{
557 AV *padlist; 661 PADLIST *padlist;
558 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;
559 664
560 /* perl manages to free our internal AV and _then_ call us */ 665 /* perl manages to free our internal AV and _then_ call us */
561 if (IN_DESTRUCT) 666 if (IN_DESTRUCT)
562 return 0; 667 return 0;
563 668
564 /* casting is fun. */ 669 while (len--)
565 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
566 free_padlist (aTHX_ padlist); 670 free_padlist (aTHX_ padlists[len]);
567
568 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
569 671
570 return 0; 672 return 0;
571} 673}
572 674
573static MGVTBL coro_cv_vtbl = { 675static MGVTBL coro_cv_vtbl = {
574 0, 0, 0, 0, 676 0, 0, 0, 0,
575 coro_cv_free 677 coro_cv_free
576}; 678};
577 679
578/* the next two functions merely cache the padlists */ 680/* the next two functions merely cache the padlists */
579static void 681ecb_inline void
580get_padlist (pTHX_ CV *cv) 682get_padlist (pTHX_ CV *cv)
581{ 683{
582 MAGIC *mg = CORO_MAGIC_cv (cv); 684 MAGIC *mg = CORO_MAGIC_cv (cv);
583 AV *av; 685 size_t *lenp;
584 686
585 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 687 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
586 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 688 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
587 else 689 else
588 { 690 {
589#if CORO_PREFER_PERL_FUNCTIONS 691#if CORO_PREFER_PERL_FUNCTIONS
590 /* this is probably cleaner? but also slower! */ 692 /* this is probably cleaner? but also slower! */
591 /* in practise, it seems to be less stable */ 693 /* in practise, it seems to be less stable */
… …
597 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 699 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
598#endif 700#endif
599 } 701 }
600} 702}
601 703
602static void 704ecb_inline void
603put_padlist (pTHX_ CV *cv) 705put_padlist (pTHX_ CV *cv)
604{ 706{
605 MAGIC *mg = CORO_MAGIC_cv (cv); 707 MAGIC *mg = CORO_MAGIC_cv (cv);
606 AV *av;
607 708
608 if (expect_false (!mg)) 709 if (ecb_expect_false (!mg))
710 {
609 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);
610 719
611 av = (AV *)mg->mg_obj; 720 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
612
613 if (expect_false (AvFILLp (av) >= AvMAX (av)))
614 av_extend (av, AvFILLp (av) + 1);
615
616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
617} 721}
618 722
619/** load & save, init *******************************************************/ 723/** load & save, init *******************************************************/
620 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
621/* swap sv heads, at least logically */ 767/* swap sv heads, at least logically */
622static void 768static void
623swap_svs (pTHX_ Coro__State c) 769swap_svs_enter (pTHX_ Coro__State c)
624{ 770{
625 int i; 771 int i;
626 772
627 for (i = 0; i <= AvFILLp (c->swap_sv); ) 773 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
628 { 774 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
629 SV *a = AvARRAY (c->swap_sv)[i++];
630 SV *b = AvARRAY (c->swap_sv)[i++];
631
632 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
633 SV tmp;
634
635 /* swap sv_any */
636 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
637
638 /* swap sv_flags */
639 SvFLAGS (&tmp) = SvFLAGS (a);
640 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
641 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
642
643#if PERL_VERSION_ATLEAST (5,10,0)
644 /* perl 5.10 complicates this _quite_ a bit, but it also is
645 * much faster, so no quarrels here. alternatively, we could
646 * sv_upgrade to avoid this.
647 */
648 {
649 /* swap sv_u */
650 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
651
652 /* if SvANY points to the head, we need to adjust the pointers,
653 * as the pointer for a still points to b, and maybe vice versa.
654 */
655 #define svany_in_head(type) \
656 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
657
658 if (svany_in_head (SvTYPE (a)))
659 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
660
661 if (svany_in_head (SvTYPE (b)))
662 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
663 }
664#endif
665 }
666} 775}
667 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
668#define SWAP_SVS(coro) \ 786#define SWAP_SVS_ENTER(coro) \
669 if (expect_false ((coro)->swap_sv)) \ 787 if (ecb_expect_false ((coro)->swap_sv)) \
670 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))
671 793
672static void 794static void
673on_enterleave_call (pTHX_ SV *cb); 795on_enterleave_call (pTHX_ SV *cb);
674 796
675static void 797static void
… …
678 perl_slots *slot = c->slot; 800 perl_slots *slot = c->slot;
679 c->slot = 0; 801 c->slot = 0;
680 802
681 PL_mainstack = c->mainstack; 803 PL_mainstack = c->mainstack;
682 804
683 GvSV (PL_defgv) = slot->defsv; 805#if CORO_JIT
684 GvAV (PL_defgv) = slot->defav; 806 load_perl_slots (slot);
685 GvSV (PL_errgv) = slot->errsv; 807#else
686 GvSV (irsgv) = slot->irsgv;
687 GvHV (PL_hintgv) = slot->hinthv;
688
689 #define VAR(name,type) PL_ ## name = slot->name; 808 #define VARx(name,expr,type) expr = slot->name;
690 # include "state.h" 809 #include "state.h"
691 #undef VAR 810#endif
692 811
693 { 812 {
694 dSP; 813 dSP;
695 814
696 CV *cv; 815 CV *cv;
697 816
698 /* now do the ugly restore mess */ 817 /* now do the ugly restore mess */
699 while (expect_true (cv = (CV *)POPs)) 818 while (ecb_expect_true (cv = (CV *)POPs))
700 { 819 {
701 put_padlist (aTHX_ cv); /* mark this padlist as available */ 820 put_padlist (aTHX_ cv); /* mark this padlist as available */
702 CvDEPTH (cv) = PTR2IV (POPs); 821 CvDEPTH (cv) = PTR2IV (POPs);
703 CvPADLIST (cv) = (AV *)POPs; 822 CvPADLIST (cv) = (PADLIST *)POPs;
704 } 823 }
705 824
706 PUTBACK; 825 PUTBACK;
707 } 826 }
708 827
709 slf_frame = c->slf_frame; 828 slf_frame = c->slf_frame;
710 CORO_THROW = c->except; 829 CORO_THROW = c->except;
711 830
712 if (expect_false (enable_times)) 831 if (ecb_expect_false (enable_times))
713 { 832 {
714 if (expect_false (!times_valid)) 833 if (ecb_expect_false (!times_valid))
715 coro_times_update (); 834 coro_times_update ();
716 835
717 coro_times_sub (c); 836 coro_times_sub (c);
718 } 837 }
719 838
720 if (expect_false (c->on_enter)) 839 if (ecb_expect_false (c->on_enter))
721 { 840 {
722 int i; 841 int i;
723 842
724 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 843 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 844 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
726 } 845 }
727 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
728 SWAP_SVS (c); 855 SWAP_SVS_ENTER (c);
729} 856}
730 857
731static void 858static void
732save_perl (pTHX_ Coro__State c) 859save_perl (pTHX_ Coro__State c)
733{ 860{
734 SWAP_SVS (c); 861 SWAP_SVS_LEAVE (c);
735 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
736 if (expect_false (c->on_leave)) 871 if (ecb_expect_false (c->on_leave))
737 { 872 {
738 int i; 873 int i;
739 874
740 for (i = AvFILLp (c->on_leave); i >= 0; --i) 875 for (i = AvFILLp (c->on_leave); i >= 0; --i)
741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 876 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 } 877 }
743 878
744 times_valid = 0; 879 times_valid = 0;
745 880
746 if (expect_false (enable_times)) 881 if (ecb_expect_false (enable_times))
747 { 882 {
748 coro_times_update (); times_valid = 1; 883 coro_times_update (); times_valid = 1;
749 coro_times_add (c); 884 coro_times_add (c);
750 } 885 }
751 886
… …
765 900
766 XPUSHs (Nullsv); 901 XPUSHs (Nullsv);
767 /* this loop was inspired by pp_caller */ 902 /* this loop was inspired by pp_caller */
768 for (;;) 903 for (;;)
769 { 904 {
770 while (expect_true (cxix >= 0)) 905 while (ecb_expect_true (cxix >= 0))
771 { 906 {
772 PERL_CONTEXT *cx = &ccstk[cxix--]; 907 PERL_CONTEXT *cx = &ccstk[cxix--];
773 908
774 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))
775 { 910 {
776 CV *cv = cx->blk_sub.cv; 911 CV *cv = cx->blk_sub.cv;
777 912
778 if (expect_true (CvDEPTH (cv))) 913 if (ecb_expect_true (CvDEPTH (cv)))
779 { 914 {
780 EXTEND (SP, 3); 915 EXTEND (SP, 3);
781 PUSHs ((SV *)CvPADLIST (cv)); 916 PUSHs ((SV *)CvPADLIST (cv));
782 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 917 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
783 PUSHs ((SV *)cv); 918 PUSHs ((SV *)cv);
… …
786 get_padlist (aTHX_ cv); 921 get_padlist (aTHX_ cv);
787 } 922 }
788 } 923 }
789 } 924 }
790 925
791 if (expect_true (top_si->si_type == PERLSI_MAIN)) 926 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
792 break; 927 break;
793 928
794 top_si = top_si->si_prev; 929 top_si = top_si->si_prev;
795 ccstk = top_si->si_cxstack; 930 ccstk = top_si->si_cxstack;
796 cxix = top_si->si_cxix; 931 cxix = top_si->si_cxix;
… …
798 933
799 PUTBACK; 934 PUTBACK;
800 } 935 }
801 936
802 /* allocate some space on the context stack for our purposes */ 937 /* allocate some space on the context stack for our purposes */
803 /* we manually unroll here, as usually 2 slots is enough */ 938 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
804 if (SLOT_COUNT >= 1) CXINC;
805 if (SLOT_COUNT >= 2) CXINC;
806 if (SLOT_COUNT >= 3) CXINC;
807 { 939 {
808 unsigned int i; 940 unsigned int i;
941
809 for (i = 3; i < SLOT_COUNT; ++i) 942 for (i = 0; i < SLOT_COUNT; ++i)
810 CXINC; 943 CXINC;
811 } 944
812 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 945 cxstack_ix -= SLOT_COUNT; /* undo allocation */
946 }
813 947
814 c->mainstack = PL_mainstack; 948 c->mainstack = PL_mainstack;
815 949
816 { 950 {
817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 951 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
818 952
819 slot->defav = GvAV (PL_defgv); 953#if CORO_JIT
820 slot->defsv = DEFSV; 954 save_perl_slots (slot);
821 slot->errsv = ERRSV; 955#else
822 slot->irsgv = GvSV (irsgv);
823 slot->hinthv = GvHV (PL_hintgv);
824
825 #define VAR(name,type) slot->name = PL_ ## name; 956 #define VARx(name,expr,type) slot->name = expr;
826 # include "state.h" 957 #include "state.h"
827 #undef VAR 958#endif
828 } 959 }
829} 960}
830 961
831/* 962/*
832 * allocate various perl stacks. This is almost an exact copy 963 * allocate various perl stacks. This is almost an exact copy
… …
838# define coro_init_stacks(thx) init_stacks () 969# define coro_init_stacks(thx) init_stacks ()
839#else 970#else
840static void 971static void
841coro_init_stacks (pTHX) 972coro_init_stacks (pTHX)
842{ 973{
843 PL_curstackinfo = new_stackinfo(32, 8); 974 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
844 PL_curstackinfo->si_type = PERLSI_MAIN; 975 PL_curstackinfo->si_type = PERLSI_MAIN;
845 PL_curstack = PL_curstackinfo->si_stack; 976 PL_curstack = PL_curstackinfo->si_stack;
846 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 977 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
847 978
848 PL_stack_base = AvARRAY(PL_curstack); 979 PL_stack_base = AvARRAY(PL_curstack);
… …
863#endif 994#endif
864 995
865 New(54,PL_scopestack,8,I32); 996 New(54,PL_scopestack,8,I32);
866 PL_scopestack_ix = 0; 997 PL_scopestack_ix = 0;
867 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
868 1002
869 New(54,PL_savestack,24,ANY); 1003 New(54,PL_savestack,24,ANY);
870 PL_savestack_ix = 0; 1004 PL_savestack_ix = 0;
871 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
872 1011
873#if !PERL_VERSION_ATLEAST (5,10,0) 1012#if !PERL_VERSION_ATLEAST (5,10,0)
874 New(54,PL_retstack,4,OP*); 1013 New(54,PL_retstack,4,OP*);
875 PL_retstack_ix = 0; 1014 PL_retstack_ix = 0;
876 PL_retstack_max = 4; 1015 PL_retstack_max = 4;
… …
900 } 1039 }
901 1040
902 Safefree (PL_tmps_stack); 1041 Safefree (PL_tmps_stack);
903 Safefree (PL_markstack); 1042 Safefree (PL_markstack);
904 Safefree (PL_scopestack); 1043 Safefree (PL_scopestack);
1044#if HAS_SCOPESTACK_NAME
1045 Safefree (PL_scopestack_name);
1046#endif
905 Safefree (PL_savestack); 1047 Safefree (PL_savestack);
906#if !PERL_VERSION_ATLEAST (5,10,0) 1048#if !PERL_VERSION_ATLEAST (5,10,0)
907 Safefree (PL_retstack); 1049 Safefree (PL_retstack);
908#endif 1050#endif
909} 1051}
… …
939 } 1081 }
940 1082
941 return rss; 1083 return rss;
942} 1084}
943 1085
944/** coroutine stack handling ************************************************/ 1086/** provide custom get/set/clear methods for %SIG elements ******************/
945
946static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
947static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
948static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
949 1087
950/* apparently < 5.8.8 */ 1088/* apparently < 5.8.8 */
951#ifndef MgPV_nolen_const 1089#ifndef MgPV_nolen_const
952#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1090#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
953 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1091 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
954 (const char*)(mg)->mg_ptr) 1092 (const char*)(mg)->mg_ptr)
955#endif 1093#endif
956 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};
1122
957/* 1123/*
958 * This overrides the default magic get method of %SIG elements. 1124 * This overrides the default magic get method of %SIG elements.
959 * 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
960 * and instead of trying to save and restore the hash elements, we just provide 1126 * and instead of trying to save and restore the hash elements (extremely slow),
961 * readback here. 1127 * we just provide our own readback here.
962 */ 1128 */
963static int 1129static int ecb_cold
964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
965{ 1131{
966 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;
967 1135
968 if (*s == '_') 1136 SV *ssv;
969 {
970 SV **svp = 0;
971 1137
972 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
973 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
974
975 if (svp) 1138 if (!*svp)
976 { 1139 ssv = &PL_sv_undef;
977 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1140 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
978 return 0; 1141 ssv = sv_2mortal (newRV_inc (*svp));
979 } 1142 else
980 } 1143 ssv = *svp;
981 1144
982 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1145 sv_setsv (sv, ssv);
1146 return 0;
983} 1147}
984 1148
985static int 1149static int ecb_cold
986coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1150coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
987{ 1151{
988 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;
989 1155
990 if (*s == '_')
991 {
992 SV **svp = 0;
993
994 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
995 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
996
997 if (svp)
998 {
999 SV *old = *svp; 1156 SV *old = *svp;
1000 *svp = 0; 1157 *svp = 0;
1001 SvREFCNT_dec (old); 1158 SvREFCNT_dec (old);
1002 return 0; 1159 return 0;
1003 }
1004 }
1005
1006 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1007} 1160}
1008 1161
1009static int 1162static int ecb_cold
1010coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1163coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1011{ 1164{
1012 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;
1013 1168
1014 if (*s == '_')
1015 {
1016 SV **svp = 0;
1017
1018 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1019 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1020
1021 if (svp)
1022 {
1023 SV *old = *svp; 1169 SV *old = *svp;
1024 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1170 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1025 SvREFCNT_dec (old); 1171 SvREFCNT_dec (old);
1026 return 0; 1172 return 0;
1027 }
1028 }
1029
1030 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1031} 1173}
1032 1174
1033static void 1175static void
1034prepare_nop (pTHX_ struct coro_transfer_args *ta) 1176prepare_nop (pTHX_ struct coro_transfer_args *ta)
1035{ 1177{
… …
1047slf_check_repeat (pTHX_ struct CoroSLF *frame) 1189slf_check_repeat (pTHX_ struct CoroSLF *frame)
1048{ 1190{
1049 return 1; 1191 return 1;
1050} 1192}
1051 1193
1194/** coroutine stack handling ************************************************/
1195
1052static UNOP init_perl_op; 1196static UNOP init_perl_op;
1053 1197
1054static 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 */
1055init_perl (pTHX_ struct coro *coro) 1199init_perl (pTHX_ struct coro *coro)
1056{ 1200{
1057 /* 1201 /*
1058 * emulate part of the perl startup here. 1202 * emulate part of the perl startup here.
1059 */ 1203 */
… …
1074 PL_parser = 0; 1218 PL_parser = 0;
1075#endif 1219#endif
1076 PL_hints = 0; 1220 PL_hints = 0;
1077 1221
1078 /* recreate the die/warn hooks */ 1222 /* recreate the die/warn hooks */
1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1223 PL_diehook = SvREFCNT_inc (rv_diehook);
1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1224 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1081 1225
1082 GvSV (PL_defgv) = newSV (0); 1226 GvSV (PL_defgv) = newSV (0);
1083 GvAV (PL_defgv) = coro->args; coro->args = 0; 1227 GvAV (PL_defgv) = coro->args; coro->args = 0;
1084 GvSV (PL_errgv) = newSV (0); 1228 GvSV (PL_errgv) = newSV (0);
1085 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);
1086 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
1087 PL_rs = newSVsv (GvSV (irsgv)); 1234 PL_rs = newSVsv (GvSV (irsgv));
1088 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1235 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1089 1236
1090 { 1237 {
1091 dSP; 1238 dSP;
… …
1095 myop.op_next = Nullop; 1242 myop.op_next = Nullop;
1096 myop.op_type = OP_ENTERSUB; 1243 myop.op_type = OP_ENTERSUB;
1097 myop.op_flags = OPf_WANT_VOID; 1244 myop.op_flags = OPf_WANT_VOID;
1098 1245
1099 PUSHMARK (SP); 1246 PUSHMARK (SP);
1100 PUSHs ((SV *)coro->startcv); 1247 XPUSHs ((SV *)coro->startcv);
1101 PUTBACK; 1248 PUTBACK;
1102 PL_op = (OP *)&myop; 1249 PL_op = (OP *)&myop;
1103 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1250 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1104 } 1251 }
1105 1252
1106 /* this newly created coroutine might be run on an existing cctx which most 1253 /* this newly created coroutine might be run on an existing cctx which most
1107 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1254 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1108 */ 1255 */
1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1256 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1110 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1257 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1258 slf_frame.destroy = 0;
1111 1259
1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1260 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1113 init_perl_op.op_next = PL_op; 1261 init_perl_op.op_next = PL_op;
1114 init_perl_op.op_type = OP_ENTERSUB; 1262 init_perl_op.op_type = OP_ENTERSUB;
1115 init_perl_op.op_ppaddr = pp_slf; 1263 init_perl_op.op_ppaddr = pp_slf;
… …
1118 PL_op = (OP *)&init_perl_op; 1266 PL_op = (OP *)&init_perl_op;
1119 1267
1120 /* copy throw, in case it was set before init_perl */ 1268 /* copy throw, in case it was set before init_perl */
1121 CORO_THROW = coro->except; 1269 CORO_THROW = coro->except;
1122 1270
1123 SWAP_SVS (coro); 1271 SWAP_SVS_ENTER (coro);
1124 1272
1125 if (expect_false (enable_times)) 1273 if (ecb_expect_false (enable_times))
1126 { 1274 {
1127 coro_times_update (); 1275 coro_times_update ();
1128 coro_times_sub (coro); 1276 coro_times_sub (coro);
1129 } 1277 }
1130} 1278}
… …
1154destroy_perl (pTHX_ struct coro *coro) 1302destroy_perl (pTHX_ struct coro *coro)
1155{ 1303{
1156 SV *svf [9]; 1304 SV *svf [9];
1157 1305
1158 { 1306 {
1307 SV *old_current = SvRV (coro_current);
1159 struct coro *current = SvSTATE_current; 1308 struct coro *current = SvSTATE (old_current);
1160 1309
1161 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));
1162 1311
1163 save_perl (aTHX_ current); 1312 save_perl (aTHX_ current);
1313
1314 /* this will cause transfer_check to croak on block*/
1315 SvRV_set (coro_current, (SV *)coro->hv);
1316
1164 load_perl (aTHX_ coro); 1317 load_perl (aTHX_ coro);
1165 1318
1319 /* restore swapped sv's */
1320 SWAP_SVS_LEAVE (coro);
1321
1166 coro_unwind_stacks (aTHX); 1322 coro_unwind_stacks (aTHX);
1323
1167 coro_destruct_stacks (aTHX); 1324 coro_destruct_stacks (aTHX);
1168 1325
1169 /* restore swapped sv's */
1170 SWAP_SVS (coro);
1171
1172 // now save some sv's to be free'd later 1326 /* now save some sv's to be free'd later */
1173 svf [0] = GvSV (PL_defgv); 1327 svf [0] = GvSV (PL_defgv);
1174 svf [1] = (SV *)GvAV (PL_defgv); 1328 svf [1] = (SV *)GvAV (PL_defgv);
1175 svf [2] = GvSV (PL_errgv); 1329 svf [2] = GvSV (PL_errgv);
1176 svf [3] = (SV *)PL_defoutgv; 1330 svf [3] = (SV *)PL_defoutgv;
1177 svf [4] = PL_rs; 1331 svf [4] = PL_rs;
… …
1179 svf [6] = (SV *)GvHV (PL_hintgv); 1333 svf [6] = (SV *)GvHV (PL_hintgv);
1180 svf [7] = PL_diehook; 1334 svf [7] = PL_diehook;
1181 svf [8] = PL_warnhook; 1335 svf [8] = PL_warnhook;
1182 assert (9 == sizeof (svf) / sizeof (*svf)); 1336 assert (9 == sizeof (svf) / sizeof (*svf));
1183 1337
1338 SvRV_set (coro_current, old_current);
1339
1184 load_perl (aTHX_ current); 1340 load_perl (aTHX_ current);
1185 } 1341 }
1186 1342
1187 { 1343 {
1188 unsigned int i; 1344 unsigned int i;
… …
1192 1348
1193 SvREFCNT_dec (coro->saved_deffh); 1349 SvREFCNT_dec (coro->saved_deffh);
1194 SvREFCNT_dec (coro->rouse_cb); 1350 SvREFCNT_dec (coro->rouse_cb);
1195 SvREFCNT_dec (coro->invoke_cb); 1351 SvREFCNT_dec (coro->invoke_cb);
1196 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);
1197 } 1355 }
1198} 1356}
1199 1357
1200INLINE void 1358ecb_inline void
1201free_coro_mortal (pTHX) 1359free_coro_mortal (pTHX)
1202{ 1360{
1203 if (expect_true (coro_mortal)) 1361 if (ecb_expect_true (coro_mortal))
1204 { 1362 {
1205 SvREFCNT_dec (coro_mortal); 1363 SvREFCNT_dec ((SV *)coro_mortal);
1206 coro_mortal = 0; 1364 coro_mortal = 0;
1207 } 1365 }
1208} 1366}
1209 1367
1210static int 1368static int
… …
1242 av_push (av, SvREFCNT_inc_NN (*bot++)); 1400 av_push (av, SvREFCNT_inc_NN (*bot++));
1243 1401
1244 PL_runops = RUNOPS_DEFAULT; 1402 PL_runops = RUNOPS_DEFAULT;
1245 ENTER; 1403 ENTER;
1246 SAVETMPS; 1404 SAVETMPS;
1405 PUSHMARK (SP);
1247 EXTEND (SP, 3); 1406 EXTEND (SP, 3);
1248 PUSHMARK (SP);
1249 PUSHs (&PL_sv_no); 1407 PUSHs (&PL_sv_no);
1250 PUSHs (fullname); 1408 PUSHs (fullname);
1251 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 1409 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
1252 PUTBACK; 1410 PUTBACK;
1253 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);
… …
1264 1422
1265 if (PL_curcop != &PL_compiling) 1423 if (PL_curcop != &PL_compiling)
1266 { 1424 {
1267 SV **cb; 1425 SV **cb;
1268 1426
1269 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1427 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1270 { 1428 {
1271 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1429 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1272 1430
1273 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1431 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1274 { 1432 {
… …
1280 gv_efullname3 (fullname, gv, 0); 1438 gv_efullname3 (fullname, gv, 0);
1281 1439
1282 PL_runops = RUNOPS_DEFAULT; 1440 PL_runops = RUNOPS_DEFAULT;
1283 ENTER; 1441 ENTER;
1284 SAVETMPS; 1442 SAVETMPS;
1443 PUSHMARK (SP);
1285 EXTEND (SP, 3); 1444 EXTEND (SP, 3);
1286 PUSHMARK (SP);
1287 PUSHs (&PL_sv_yes); 1445 PUSHs (&PL_sv_yes);
1288 PUSHs (fullname); 1446 PUSHs (fullname);
1289 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);
1290 PUTBACK; 1448 PUTBACK;
1291 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);
1292 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);
1293 SPAGAIN; 1451 SPAGAIN;
1294 FREETMPS; 1452 FREETMPS;
… …
1304 dSP; 1462 dSP;
1305 1463
1306 PL_runops = RUNOPS_DEFAULT; 1464 PL_runops = RUNOPS_DEFAULT;
1307 ENTER; 1465 ENTER;
1308 SAVETMPS; 1466 SAVETMPS;
1309 EXTEND (SP, 3);
1310 PL_runops = RUNOPS_DEFAULT;
1311 PUSHMARK (SP); 1467 PUSHMARK (SP);
1468 EXTEND (SP, 2);
1312 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1469 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1313 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1470 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1314 PUTBACK; 1471 PUTBACK;
1315 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);
1316 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);
… …
1343 1500
1344 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 */
1345} 1502}
1346 1503
1347/* 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 */
1348static void NOINLINE 1505static void ecb_noinline
1349cctx_prepare (pTHX) 1506cctx_prepare (pTHX)
1350{ 1507{
1351 PL_top_env = &PL_start_env; 1508 PL_top_env = &PL_start_env;
1352 1509
1353 if (cctx_current->flags & CC_TRACE) 1510 if (cctx_current->flags & CC_TRACE)
… …
1364 slf_frame.prepare = slf_prepare_set_stacklevel; 1521 slf_frame.prepare = slf_prepare_set_stacklevel;
1365 slf_frame.check = slf_check_set_stacklevel; 1522 slf_frame.check = slf_check_set_stacklevel;
1366} 1523}
1367 1524
1368/* 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 */
1369INLINE void 1526ecb_inline void
1370transfer_tail (pTHX) 1527transfer_tail (pTHX)
1371{ 1528{
1372 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);
1373} 1542}
1374 1543
1375/* 1544/*
1376 * this is a _very_ stripped down perl interpreter ;) 1545 * this is a _very_ stripped down perl interpreter ;)
1377 */ 1546 */
… …
1404 * 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
1405 * 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.
1406 */ 1575 */
1407 1576
1408 /* 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 /*
1409 * 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
1410 * 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)
1411 * 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
1412 * bootstrap-time "top" top_env, as we cannot restore the "main" 1588 * doing in that case. YMMV.
1413 * coroutine as Coro has no such concept.
1414 * This actually isn't valid with the pthread backend, but OSes requiring
1415 * that backend are too broken to do it in a standards-compliant way.
1416 */ 1589 */
1417 PL_top_env = main_top_env; 1590 perlish_exit (aTHX);
1418 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1419 } 1591 }
1420} 1592}
1421 1593
1422static coro_cctx * 1594static coro_cctx *
1423cctx_new () 1595cctx_new (void)
1424{ 1596{
1425 coro_cctx *cctx; 1597 coro_cctx *cctx;
1426 1598
1427 ++cctx_count; 1599 ++cctx_count;
1428 New (0, cctx, 1, coro_cctx); 1600 New (0, cctx, 1, coro_cctx);
… …
1434 return cctx; 1606 return cctx;
1435} 1607}
1436 1608
1437/* create a new cctx only suitable as source */ 1609/* create a new cctx only suitable as source */
1438static coro_cctx * 1610static coro_cctx *
1439cctx_new_empty () 1611cctx_new_empty (void)
1440{ 1612{
1441 coro_cctx *cctx = cctx_new (); 1613 coro_cctx *cctx = cctx_new ();
1442 1614
1443 cctx->sptr = 0; 1615 cctx->stack.sptr = 0;
1444 coro_create (&cctx->cctx, 0, 0, 0, 0); 1616 coro_create (&cctx->cctx, 0, 0, 0, 0);
1445 1617
1446 return cctx; 1618 return cctx;
1447} 1619}
1448 1620
1449/* create a new cctx suitable as destination/running a perl interpreter */ 1621/* create a new cctx suitable as destination/running a perl interpreter */
1450static coro_cctx * 1622static coro_cctx *
1451cctx_new_run () 1623cctx_new_run (void)
1452{ 1624{
1453 coro_cctx *cctx = cctx_new (); 1625 coro_cctx *cctx = cctx_new ();
1454 void *stack_start;
1455 size_t stack_size;
1456 1626
1457#if HAVE_MMAP 1627 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1458 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1459 /* mmap supposedly does allocate-on-write for us */
1460 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1461
1462 if (cctx->sptr != (void *)-1)
1463 {
1464 #if CORO_STACKGUARD
1465 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1466 #endif
1467 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1468 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1469 cctx->flags |= CC_MAPPED;
1470 } 1628 {
1471 else
1472#endif
1473 {
1474 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1475 New (0, cctx->sptr, cctx_stacksize, long);
1476
1477 if (!cctx->sptr)
1478 {
1479 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1629 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1480 _exit (EXIT_FAILURE); 1630 _exit (EXIT_FAILURE);
1481 }
1482
1483 stack_start = cctx->sptr;
1484 stack_size = cctx->ssize;
1485 } 1631 }
1486 1632
1487 #if CORO_USE_VALGRIND
1488 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1489 #endif
1490
1491 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);
1492 1634
1493 return cctx; 1635 return cctx;
1494} 1636}
1495 1637
1496static void 1638static void
… …
1502 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current)); 1644 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1503 1645
1504 --cctx_count; 1646 --cctx_count;
1505 coro_destroy (&cctx->cctx); 1647 coro_destroy (&cctx->cctx);
1506 1648
1507 /* coro_transfer creates new, empty cctx's */ 1649 coro_stack_free (&cctx->stack);
1508 if (cctx->sptr)
1509 {
1510 #if CORO_USE_VALGRIND
1511 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1512 #endif
1513
1514#if HAVE_MMAP
1515 if (cctx->flags & CC_MAPPED)
1516 munmap (cctx->sptr, cctx->ssize);
1517 else
1518#endif
1519 Safefree (cctx->sptr);
1520 }
1521 1650
1522 Safefree (cctx); 1651 Safefree (cctx);
1523} 1652}
1524 1653
1525/* wether this cctx should be destructed */ 1654/* wether this cctx should be destructed */
1526#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))
1527 1656
1528static coro_cctx * 1657static coro_cctx *
1529cctx_get (pTHX) 1658cctx_get (pTHX)
1530{ 1659{
1531 while (expect_true (cctx_first)) 1660 while (ecb_expect_true (cctx_first))
1532 { 1661 {
1533 coro_cctx *cctx = cctx_first; 1662 coro_cctx *cctx = cctx_first;
1534 cctx_first = cctx->next; 1663 cctx_first = cctx->next;
1535 --cctx_idle; 1664 --cctx_idle;
1536 1665
1537 if (expect_true (!CCTX_EXPIRED (cctx))) 1666 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1538 return cctx; 1667 return cctx;
1539 1668
1540 cctx_destroy (cctx); 1669 cctx_destroy (cctx);
1541 } 1670 }
1542 1671
… …
1544} 1673}
1545 1674
1546static void 1675static void
1547cctx_put (coro_cctx *cctx) 1676cctx_put (coro_cctx *cctx)
1548{ 1677{
1549 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));
1550 1679
1551 /* free another cctx if overlimit */ 1680 /* free another cctx if overlimit */
1552 if (expect_false (cctx_idle >= cctx_max_idle)) 1681 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1553 { 1682 {
1554 coro_cctx *first = cctx_first; 1683 coro_cctx *first = cctx_first;
1555 cctx_first = first->next; 1684 cctx_first = first->next;
1556 --cctx_idle; 1685 --cctx_idle;
1557 1686
… …
1568static void 1697static void
1569transfer_check (pTHX_ struct coro *prev, struct coro *next) 1698transfer_check (pTHX_ struct coro *prev, struct coro *next)
1570{ 1699{
1571 /* TODO: throwing up here is considered harmful */ 1700 /* TODO: throwing up here is considered harmful */
1572 1701
1573 if (expect_true (prev != next)) 1702 if (ecb_expect_true (prev != next))
1574 { 1703 {
1575 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1704 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1576 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,");
1577 1706
1578 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1707 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1579 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,");
1580 1709
1581#if !PERL_VERSION_ATLEAST (5,10,0) 1710#if !PERL_VERSION_ATLEAST (5,10,0)
1582 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1711 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1583 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,");
1584#endif 1713#endif
1585 } 1714 }
1586} 1715}
1587 1716
1588/* always use the TRANSFER macro */ 1717/* always use the TRANSFER macro */
1589static void NOINLINE /* noinline so we have a fixed stackframe */ 1718static void ecb_noinline /* noinline so we have a fixed stackframe */
1590transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1719transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1591{ 1720{
1592 dSTACKLEVEL; 1721 dSTACKLEVEL;
1593 1722
1594 /* sometimes transfer is only called to set idle_sp */ 1723 /* sometimes transfer is only called to set idle_sp */
1595 if (expect_false (!prev)) 1724 if (ecb_expect_false (!prev))
1596 { 1725 {
1597 cctx_current->idle_sp = STACKLEVEL; 1726 cctx_current->idle_sp = STACKLEVEL;
1598 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 */
1599 } 1728 }
1600 else if (expect_true (prev != next)) 1729 else if (ecb_expect_true (prev != next))
1601 { 1730 {
1602 coro_cctx *cctx_prev; 1731 coro_cctx *cctx_prev;
1603 1732
1604 if (expect_false (prev->flags & CF_NEW)) 1733 if (ecb_expect_false (prev->flags & CF_NEW))
1605 { 1734 {
1606 /* create a new empty/source context */ 1735 /* create a new empty/source context */
1607 prev->flags &= ~CF_NEW; 1736 prev->flags &= ~CF_NEW;
1608 prev->flags |= CF_RUNNING; 1737 prev->flags |= CF_RUNNING;
1609 } 1738 }
… …
1612 next->flags |= CF_RUNNING; 1741 next->flags |= CF_RUNNING;
1613 1742
1614 /* first get rid of the old state */ 1743 /* first get rid of the old state */
1615 save_perl (aTHX_ prev); 1744 save_perl (aTHX_ prev);
1616 1745
1617 if (expect_false (next->flags & CF_NEW)) 1746 if (ecb_expect_false (next->flags & CF_NEW))
1618 { 1747 {
1619 /* need to start coroutine */ 1748 /* need to start coroutine */
1620 next->flags &= ~CF_NEW; 1749 next->flags &= ~CF_NEW;
1621 /* setup coroutine call */ 1750 /* setup coroutine call */
1622 init_perl (aTHX_ next); 1751 init_perl (aTHX_ next);
1623 } 1752 }
1624 else 1753 else
1625 load_perl (aTHX_ next); 1754 load_perl (aTHX_ next);
1626 1755
1627 /* possibly untie and reuse the cctx */ 1756 /* possibly untie and reuse the cctx */
1628 if (expect_true ( 1757 if (ecb_expect_true (
1629 cctx_current->idle_sp == STACKLEVEL 1758 cctx_current->idle_sp == STACKLEVEL
1630 && !(cctx_current->flags & CC_TRACE) 1759 && !(cctx_current->flags & CC_TRACE)
1631 && !force_cctx 1760 && !force_cctx
1632 )) 1761 ))
1633 { 1762 {
1634 /* 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 */
1635 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));
1636 1765
1637 /* 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. */
1638 /* 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 */
1639 if (expect_false (CCTX_EXPIRED (cctx_current))) 1768 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1640 if (expect_true (!next->cctx)) 1769 if (ecb_expect_true (!next->cctx))
1641 next->cctx = cctx_get (aTHX); 1770 next->cctx = cctx_get (aTHX);
1642 1771
1643 cctx_put (cctx_current); 1772 cctx_put (cctx_current);
1644 } 1773 }
1645 else 1774 else
1646 prev->cctx = cctx_current; 1775 prev->cctx = cctx_current;
1647 1776
1648 ++next->usecount; 1777 ++next->usecount;
1649 1778
1650 cctx_prev = cctx_current; 1779 cctx_prev = cctx_current;
1651 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1780 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1652 1781
1653 next->cctx = 0; 1782 next->cctx = 0;
1654 1783
1655 if (expect_false (cctx_prev != cctx_current)) 1784 if (ecb_expect_false (cctx_prev != cctx_current))
1656 { 1785 {
1657 cctx_prev->top_env = PL_top_env; 1786 cctx_prev->top_env = PL_top_env;
1658 PL_top_env = cctx_current->top_env; 1787 PL_top_env = cctx_current->top_env;
1659 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1788 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1660 } 1789 }
… …
1666#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1795#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1667#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1796#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1668 1797
1669/** high level stuff ********************************************************/ 1798/** high level stuff ********************************************************/
1670 1799
1800/* this function is actually Coro, not Coro::State, but we call it from here */
1801/* because it is convenient - but it hasn't been declared yet for that reason */
1671static int 1802static void
1803coro_call_on_destroy (pTHX_ struct coro *coro);
1804
1805static void
1672coro_state_destroy (pTHX_ struct coro *coro) 1806coro_state_destroy (pTHX_ struct coro *coro)
1673{ 1807{
1674 if (coro->flags & CF_DESTROYED) 1808 if (coro->flags & CF_ZOMBIE)
1675 return 0; 1809 return;
1676 1810
1677 if (coro->on_destroy && !PL_dirty)
1678 coro->on_destroy (aTHX_ coro); 1811 slf_destroy (aTHX_ coro);
1679 1812
1680 /*
1681 * The on_destroy above most likely is from an SLF call.
1682 * Since by definition the SLF call will not finish when we destroy
1683 * the coro, we will have to force-finish it here, otherwise
1684 * cleanup functions cannot call SLF functions.
1685 */
1686 coro->slf_frame.prepare = 0;
1687
1688 coro->flags |= CF_DESTROYED; 1813 coro->flags |= CF_ZOMBIE;
1689 1814
1690 if (coro->flags & CF_READY) 1815 if (coro->flags & CF_READY)
1691 { 1816 {
1692 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1817 /* reduce nready, as destroying a ready coro effectively unreadies it */
1693 /* alternative: look through all ready queues and remove the coro */ 1818 /* alternative: look through all ready queues and remove the coro */
1694 --coro_nready; 1819 --coro_nready;
1695 } 1820 }
1696 else 1821 else
1697 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1822 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1823
1824 if (coro->next) coro->next->prev = coro->prev;
1825 if (coro->prev) coro->prev->next = coro->next;
1826 if (coro == coro_first) coro_first = coro->next;
1698 1827
1699 if (coro->mainstack 1828 if (coro->mainstack
1700 && coro->mainstack != main_mainstack 1829 && coro->mainstack != main_mainstack
1701 && coro->slot 1830 && coro->slot
1702 && !PL_dirty) 1831 && !PL_dirty)
1703 destroy_perl (aTHX_ coro); 1832 destroy_perl (aTHX_ coro);
1704 1833
1705 if (coro->next) coro->next->prev = coro->prev;
1706 if (coro->prev) coro->prev->next = coro->next;
1707 if (coro == coro_first) coro_first = coro->next;
1708
1709 cctx_destroy (coro->cctx); 1834 cctx_destroy (coro->cctx);
1710 SvREFCNT_dec (coro->startcv); 1835 SvREFCNT_dec (coro->startcv);
1711 SvREFCNT_dec (coro->args); 1836 SvREFCNT_dec (coro->args);
1712 SvREFCNT_dec (coro->swap_sv); 1837 SvREFCNT_dec (coro->swap_sv);
1713 SvREFCNT_dec (CORO_THROW); 1838 SvREFCNT_dec (CORO_THROW);
1714 1839
1715 return 1; 1840 coro_call_on_destroy (aTHX_ coro);
1841
1842 /* more destruction mayhem in coro_state_free */
1716} 1843}
1717 1844
1718static int 1845static int
1719coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1846coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1720{ 1847{
1721 struct coro *coro = (struct coro *)mg->mg_ptr; 1848 struct coro *coro = (struct coro *)mg->mg_ptr;
1722 mg->mg_ptr = 0; 1849 mg->mg_ptr = 0;
1723 1850
1724 coro->hv = 0;
1725
1726 if (--coro->refcnt < 0)
1727 {
1728 coro_state_destroy (aTHX_ coro); 1851 coro_state_destroy (aTHX_ coro);
1852 SvREFCNT_dec (coro->on_destroy);
1853 SvREFCNT_dec (coro->status);
1854
1729 Safefree (coro); 1855 Safefree (coro);
1730 }
1731 1856
1732 return 0; 1857 return 0;
1733} 1858}
1734 1859
1735static int 1860static int ecb_cold
1736coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1861coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1737{ 1862{
1738 struct coro *coro = (struct coro *)mg->mg_ptr; 1863 /* called when perl clones the current process the slow way (windows process emulation) */
1739 1864 /* we simply nuke the pointers in the copy, causing perl to croak */
1740 ++coro->refcnt; 1865 mg->mg_ptr = 0;
1866 mg->mg_virtual = 0;
1741 1867
1742 return 0; 1868 return 0;
1743} 1869}
1744 1870
1745static MGVTBL coro_state_vtbl = { 1871static MGVTBL coro_state_vtbl = {
… …
1770 TRANSFER (ta, 1); 1896 TRANSFER (ta, 1);
1771} 1897}
1772 1898
1773/** Coro ********************************************************************/ 1899/** Coro ********************************************************************/
1774 1900
1775INLINE void 1901ecb_inline void
1776coro_enq (pTHX_ struct coro *coro) 1902coro_enq (pTHX_ struct coro *coro)
1777{ 1903{
1778 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1904 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1779 1905
1780 SvREFCNT_inc_NN (coro->hv); 1906 SvREFCNT_inc_NN (coro->hv);
… …
1782 coro->next_ready = 0; 1908 coro->next_ready = 0;
1783 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1909 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1784 ready [1] = coro; 1910 ready [1] = coro;
1785} 1911}
1786 1912
1787INLINE struct coro * 1913ecb_inline struct coro *
1788coro_deq (pTHX) 1914coro_deq (pTHX)
1789{ 1915{
1790 int prio; 1916 int prio;
1791 1917
1792 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1918 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1845{ 1971{
1846 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1972 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1847} 1973}
1848 1974
1849/* expects to own a reference to next->hv */ 1975/* expects to own a reference to next->hv */
1850INLINE void 1976ecb_inline void
1851prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1977prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1852{ 1978{
1853 SV *prev_sv = SvRV (coro_current); 1979 SV *prev_sv = SvRV (coro_current);
1854 1980
1855 ta->prev = SvSTATE_hv (prev_sv); 1981 ta->prev = SvSTATE_hv (prev_sv);
… …
1868{ 1994{
1869 for (;;) 1995 for (;;)
1870 { 1996 {
1871 struct coro *next = coro_deq (aTHX); 1997 struct coro *next = coro_deq (aTHX);
1872 1998
1873 if (expect_true (next)) 1999 if (ecb_expect_true (next))
1874 { 2000 {
1875 /* cannot transfer to destroyed coros, skip and look for next */ 2001 /* cannot transfer to destroyed coros, skip and look for next */
1876 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 2002 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1877 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 2003 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1878 else 2004 else
1879 { 2005 {
1880 next->flags &= ~CF_READY; 2006 next->flags &= ~CF_READY;
1881 --coro_nready; 2007 --coro_nready;
… …
1889 /* nothing to schedule: call the idle handler */ 2015 /* nothing to schedule: call the idle handler */
1890 if (SvROK (sv_idle) 2016 if (SvROK (sv_idle)
1891 && SvOBJECT (SvRV (sv_idle))) 2017 && SvOBJECT (SvRV (sv_idle)))
1892 { 2018 {
1893 if (SvRV (sv_idle) == SvRV (coro_current)) 2019 if (SvRV (sv_idle) == SvRV (coro_current))
2020 {
2021 require_pv ("Carp");
2022
2023 {
2024 dSP;
2025
2026 ENTER;
2027 SAVETMPS;
2028
2029 PUSHMARK (SP);
1894 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2030 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2031 PUTBACK;
2032 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2033
2034 FREETMPS;
2035 LEAVE;
2036 }
2037 }
1895 2038
1896 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2039 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1897 api_ready (aTHX_ SvRV (sv_idle)); 2040 api_ready (aTHX_ SvRV (sv_idle));
1898 --coro_nready; 2041 --coro_nready;
1899 } 2042 }
… …
1914 } 2057 }
1915 } 2058 }
1916 } 2059 }
1917} 2060}
1918 2061
1919INLINE void 2062ecb_inline void
1920prepare_cede (pTHX_ struct coro_transfer_args *ta) 2063prepare_cede (pTHX_ struct coro_transfer_args *ta)
1921{ 2064{
1922 api_ready (aTHX_ coro_current); 2065 api_ready (aTHX_ coro_current);
1923 prepare_schedule (aTHX_ ta); 2066 prepare_schedule (aTHX_ ta);
1924} 2067}
1925 2068
1926INLINE void 2069ecb_inline void
1927prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2070prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1928{ 2071{
1929 SV *prev = SvRV (coro_current); 2072 SV *prev = SvRV (coro_current);
1930 2073
1931 if (coro_nready) 2074 if (coro_nready)
… …
1961{ 2104{
1962 struct coro_transfer_args ta; 2105 struct coro_transfer_args ta;
1963 2106
1964 prepare_cede (aTHX_ &ta); 2107 prepare_cede (aTHX_ &ta);
1965 2108
1966 if (expect_true (ta.prev != ta.next)) 2109 if (ecb_expect_true (ta.prev != ta.next))
1967 { 2110 {
1968 TRANSFER (ta, 1); 2111 TRANSFER (ta, 1);
1969 return 1; 2112 return 1;
1970 } 2113 }
1971 else 2114 else
… …
2014 coro->slot->runops = RUNOPS_DEFAULT; 2157 coro->slot->runops = RUNOPS_DEFAULT;
2015 } 2158 }
2016} 2159}
2017 2160
2018static void 2161static void
2162coro_push_av (pTHX_ AV *av, I32 gimme_v)
2163{
2164 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2165 {
2166 dSP;
2167
2168 if (gimme_v == G_SCALAR)
2169 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2170 else
2171 {
2172 int i;
2173 EXTEND (SP, AvFILLp (av) + 1);
2174
2175 for (i = 0; i <= AvFILLp (av); ++i)
2176 PUSHs (AvARRAY (av)[i]);
2177 }
2178
2179 PUTBACK;
2180 }
2181}
2182
2183static void
2184coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2185{
2186 if (!coro->on_destroy)
2187 coro->on_destroy = newAV ();
2188
2189 av_push (coro->on_destroy, cb);
2190}
2191
2192static void
2193slf_destroy_join (pTHX_ struct CoroSLF *frame)
2194{
2195 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2196}
2197
2198static int
2199slf_check_join (pTHX_ struct CoroSLF *frame)
2200{
2201 struct coro *coro = (struct coro *)frame->data;
2202
2203 if (!coro->status)
2204 return 1;
2205
2206 frame->destroy = 0;
2207
2208 coro_push_av (aTHX_ coro->status, GIMME_V);
2209
2210 SvREFCNT_dec ((SV *)coro->hv);
2211
2212 return 0;
2213}
2214
2215static void
2216slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2217{
2218 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2219
2220 if (items > 1)
2221 croak ("join called with too many arguments");
2222
2223 if (coro->status)
2224 frame->prepare = prepare_nop;
2225 else
2226 {
2227 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2228 frame->prepare = prepare_schedule;
2229 }
2230
2231 frame->check = slf_check_join;
2232 frame->destroy = slf_destroy_join;
2233 frame->data = (void *)coro;
2234 SvREFCNT_inc (coro->hv);
2235}
2236
2237static void
2019coro_call_on_destroy (pTHX_ struct coro *coro) 2238coro_call_on_destroy (pTHX_ struct coro *coro)
2020{ 2239{
2021 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2240 AV *od = coro->on_destroy;
2022 2241
2023 if (on_destroyp) 2242 if (!od)
2024 { 2243 return;
2025 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2026 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2027 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
2028 2244
2245 coro->on_destroy = 0;
2246 sv_2mortal ((SV *)od);
2247
2029 while (AvFILLp (on_destroy) >= 0) 2248 while (AvFILLp (od) >= 0)
2249 {
2250 SV *cb = sv_2mortal (av_pop (od));
2251
2252 /* coro hv's (and only hv's at the moment) are supported as well */
2253 if (SvSTATEhv_p (aTHX_ cb))
2254 api_ready (aTHX_ cb);
2255 else
2030 { 2256 {
2031 dSP; /* don't disturb outer sp */ 2257 dSP; /* don't disturb outer sp */
2032 SV *cb = av_pop (on_destroy);
2033
2034 PUSHMARK (SP); 2258 PUSHMARK (SP);
2035 2259
2036 if (statusp) 2260 if (coro->status)
2037 { 2261 {
2038 int i; 2262 PUTBACK;
2039 EXTEND (SP, AvFILLp (status) + 1); 2263 coro_push_av (aTHX_ coro->status, G_ARRAY);
2040 2264 SPAGAIN;
2041 for (i = 0; i <= AvFILLp (status); ++i)
2042 PUSHs (AvARRAY (status)[i]);
2043 } 2265 }
2044 2266
2045 PUTBACK; 2267 PUTBACK;
2046 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2268 call_sv (cb, G_VOID | G_DISCARD);
2047 } 2269 }
2048 } 2270 }
2049} 2271}
2050 2272
2051static void 2273static void
2052coro_set_status (HV *coro_hv, SV **arg, int items) 2274coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2053{ 2275{
2054 AV *av = newAV (); 2276 AV *av;
2277
2278 if (coro->status)
2279 {
2280 av = coro->status;
2281 av_clear (av);
2282 }
2283 else
2284 av = coro->status = newAV ();
2055 2285
2056 /* items are actually not so common, so optimise for this case */ 2286 /* items are actually not so common, so optimise for this case */
2057 if (items) 2287 if (items)
2058 { 2288 {
2059 int i; 2289 int i;
… …
2061 av_extend (av, items - 1); 2291 av_extend (av, items - 1);
2062 2292
2063 for (i = 0; i < items; ++i) 2293 for (i = 0; i < items; ++i)
2064 av_push (av, SvREFCNT_inc_NN (arg [i])); 2294 av_push (av, SvREFCNT_inc_NN (arg [i]));
2065 } 2295 }
2066
2067 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2068} 2296}
2069 2297
2070static void 2298static void
2071slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv) 2299slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2072{ 2300{
… …
2084static void 2312static void
2085slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2313slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2086{ 2314{
2087 HV *coro_hv = (HV *)SvRV (coro_current); 2315 HV *coro_hv = (HV *)SvRV (coro_current);
2088 2316
2089 coro_set_status (coro_hv, arg, items); 2317 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2090 slf_init_terminate_cancel_common (frame, coro_hv); 2318 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2091} 2319}
2092 2320
2093static void 2321static void
2094slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2322slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2095{ 2323{
… …
2100 croak ("Coro::cancel called without coro object,"); 2328 croak ("Coro::cancel called without coro object,");
2101 2329
2102 coro = SvSTATE (arg [0]); 2330 coro = SvSTATE (arg [0]);
2103 coro_hv = coro->hv; 2331 coro_hv = coro->hv;
2104 2332
2105 coro_set_status (coro_hv, arg + 1, items - 1); 2333 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2106 2334
2107 if (expect_false (coro->flags & CF_NOCANCEL)) 2335 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2108 { 2336 {
2109 /* coro currently busy cancelling something, so just notify it */ 2337 /* coro currently busy cancelling something, so just notify it */
2110 coro->slf_frame.data = (void *)coro; 2338 coro->slf_frame.data = (void *)coro;
2111 2339
2112 frame->prepare = prepare_nop; 2340 frame->prepare = prepare_nop;
2113 frame->check = slf_check_nop; 2341 frame->check = slf_check_nop;
2114 } 2342 }
2115 else if (coro_hv == (HV *)SvRV (coro_current)) 2343 else if (coro_hv == (HV *)SvRV (coro_current))
2116 { 2344 {
2117 /* cancelling the current coro is allowed, and equals terminate */ 2345 /* cancelling the current coro is allowed, and equals terminate */
2118 slf_init_terminate_cancel_common (frame, coro_hv); 2346 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2119 } 2347 }
2120 else 2348 else
2121 { 2349 {
2122 struct coro *self = SvSTATE_current; 2350 struct coro *self = SvSTATE_current;
2351
2352 if (!self)
2353 croak ("Coro::cancel called outside of thread content,");
2123 2354
2124 /* otherwise we cancel directly, purely for speed reasons 2355 /* otherwise we cancel directly, purely for speed reasons
2125 * unfortunately, this requires some magic trickery, as 2356 * unfortunately, this requires some magic trickery, as
2126 * somebody else could cancel us, so we have to fight the cancellation. 2357 * somebody else could cancel us, so we have to fight the cancellation.
2127 * this is ugly, and hopefully fully worth the extra speed. 2358 * this is ugly, and hopefully fully worth the extra speed.
2128 * besides, I can't get the slow-but-safe version working... 2359 * besides, I can't get the slow-but-safe version working...
2129 */ 2360 */
2130 slf_frame.data = 0; 2361 slf_frame.data = 0;
2131 self->flags |= CF_NOCANCEL; 2362 self->flags |= CF_NOCANCEL;
2132
2133 coro_state_destroy (aTHX_ coro); 2363 coro_state_destroy (aTHX_ coro);
2134 coro_call_on_destroy (aTHX_ coro);
2135
2136 self->flags &= ~CF_NOCANCEL; 2364 self->flags &= ~CF_NOCANCEL;
2137 2365
2138 if (slf_frame.data) 2366 if (slf_frame.data)
2139 { 2367 {
2140 /* while we were busy we have been cancelled, so terminate */ 2368 /* while we were busy we have been cancelled, so terminate */
2141 slf_init_terminate_cancel_common (frame, self->hv); 2369 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2142 } 2370 }
2143 else 2371 else
2144 { 2372 {
2145 frame->prepare = prepare_nop; 2373 frame->prepare = prepare_nop;
2146 frame->check = slf_check_nop; 2374 frame->check = slf_check_nop;
2147 } 2375 }
2148 } 2376 }
2149} 2377}
2150 2378
2379static int
2380slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2381{
2382 frame->prepare = 0;
2383 coro_unwind_stacks (aTHX);
2384
2385 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2386
2387 return 1;
2388}
2389
2390static int
2391safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2392{
2393 if (coro->cctx)
2394 croak ("coro inside C callback, unable to cancel at this time, caught");
2395
2396 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2397 {
2398 coro_set_status (aTHX_ coro, arg, items);
2399 coro_state_destroy (aTHX_ coro);
2400 }
2401 else
2402 {
2403 if (!coro->slf_frame.prepare)
2404 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2405
2406 slf_destroy (aTHX_ coro);
2407
2408 coro_set_status (aTHX_ coro, arg, items);
2409 coro->slf_frame.prepare = prepare_nop;
2410 coro->slf_frame.check = slf_check_safe_cancel;
2411
2412 api_ready (aTHX_ (SV *)coro->hv);
2413 }
2414
2415 return 1;
2416}
2417
2151/*****************************************************************************/ 2418/*****************************************************************************/
2152/* async pool handler */ 2419/* async pool handler */
2153 2420
2154static int 2421static int
2155slf_check_pool_handler (pTHX_ struct CoroSLF *frame) 2422slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
… …
2184slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2451slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2185{ 2452{
2186 HV *hv = (HV *)SvRV (coro_current); 2453 HV *hv = (HV *)SvRV (coro_current);
2187 struct coro *coro = SvSTATE_hv ((SV *)hv); 2454 struct coro *coro = SvSTATE_hv ((SV *)hv);
2188 2455
2189 if (expect_true (coro->saved_deffh)) 2456 if (ecb_expect_true (coro->saved_deffh))
2190 { 2457 {
2191 /* subsequent iteration */ 2458 /* subsequent iteration */
2192 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2459 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2193 coro->saved_deffh = 0; 2460 coro->saved_deffh = 0;
2194 2461
2195 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2462 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2196 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2463 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2197 { 2464 {
2198 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2465 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2199 coro->invoke_av = newAV (); 2466 return;
2200
2201 frame->prepare = prepare_nop;
2202 } 2467 }
2203 else 2468 else
2204 { 2469 {
2205 av_clear (GvAV (PL_defgv)); 2470 av_clear (GvAV (PL_defgv));
2206 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2471 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2207 2472
2473 if (ecb_expect_false (coro->swap_sv))
2474 {
2475 SWAP_SVS_LEAVE (coro);
2476 SvREFCNT_dec_NN (coro->swap_sv);
2477 coro->swap_sv = 0;
2478 }
2479
2208 coro->prio = 0; 2480 coro->prio = 0;
2209 2481
2210 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2482 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2211 api_trace (aTHX_ coro_current, 0); 2483 api_trace (aTHX_ coro_current, 0);
2212 2484
2213 frame->prepare = prepare_schedule; 2485 frame->prepare = prepare_schedule;
2214 av_push (av_async_pool, SvREFCNT_inc (hv)); 2486 av_push (av_async_pool, SvREFCNT_inc_NN (hv));
2215 } 2487 }
2216 } 2488 }
2217 else 2489 else
2218 { 2490 {
2219 /* first iteration, simply fall through */ 2491 /* first iteration, simply fall through */
… …
2233coro_rouse_callback (pTHX_ CV *cv) 2505coro_rouse_callback (pTHX_ CV *cv)
2234{ 2506{
2235 dXSARGS; 2507 dXSARGS;
2236 SV *data = (SV *)S_GENSUB_ARG; 2508 SV *data = (SV *)S_GENSUB_ARG;
2237 2509
2510 /* data starts being the coro, and is replaced by the results when done */
2238 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2511 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2239 { 2512 {
2240 /* first call, set args */ 2513 /* first call, set args */
2241 SV *coro = SvRV (data); 2514 SV *coro = SvRV (data);
2242 AV *av = newAV (); 2515 AV *av = newAV ();
… …
2246 /* better take a full copy of the arguments */ 2519 /* better take a full copy of the arguments */
2247 while (items--) 2520 while (items--)
2248 av_store (av, items, newSVsv (ST (items))); 2521 av_store (av, items, newSVsv (ST (items)));
2249 2522
2250 api_ready (aTHX_ coro); 2523 api_ready (aTHX_ coro);
2251 SvREFCNT_dec (coro); 2524 SvREFCNT_dec_NN (coro);
2252 } 2525 }
2253 2526
2254 XSRETURN_EMPTY; 2527 XSRETURN_EMPTY;
2255} 2528}
2256 2529
2257static int 2530static int
2258slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2531slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2259{ 2532{
2260 SV *data = (SV *)frame->data; 2533 SV *data = (SV *)frame->data;
2261 2534
2262 if (CORO_THROW) 2535 if (CORO_THROW)
2263 return 0; 2536 return 0;
2264 2537
2265 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2538 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2266 return 1; 2539 return 1;
… …
2302 cb = sv_2mortal (coro->rouse_cb); 2575 cb = sv_2mortal (coro->rouse_cb);
2303 coro->rouse_cb = 0; 2576 coro->rouse_cb = 0;
2304 } 2577 }
2305 2578
2306 if (!SvROK (cb) 2579 if (!SvROK (cb)
2307 || SvTYPE (SvRV (cb)) != SVt_PVCV 2580 || SvTYPE (SvRV (cb)) != SVt_PVCV
2308 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2581 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2309 croak ("Coro::rouse_wait called with illegal callback argument,"); 2582 croak ("Coro::rouse_wait called with illegal callback argument,");
2310 2583
2311 { 2584 {
2312 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2585 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2325 struct coro *coro = SvSTATE_hv (hv); 2598 struct coro *coro = SvSTATE_hv (hv);
2326 SV *data = newRV_inc ((SV *)hv); 2599 SV *data = newRV_inc ((SV *)hv);
2327 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data); 2600 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2328 2601
2329 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2602 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2330 SvREFCNT_dec (data); /* magicext increases the refcount */ 2603 SvREFCNT_dec_NN (data); /* magicext increases the refcount */
2331 2604
2332 SvREFCNT_dec (coro->rouse_cb); 2605 SvREFCNT_dec (coro->rouse_cb);
2333 coro->rouse_cb = SvREFCNT_inc_NN (cb); 2606 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2334 2607
2335 return cb; 2608 return cb;
… …
2429static void 2702static void
2430slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2703slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2431{ 2704{
2432 frame->prepare = prepare_cede_notself; 2705 frame->prepare = prepare_cede_notself;
2433 frame->check = slf_check_nop; 2706 frame->check = slf_check_nop;
2707}
2708
2709/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2710static void
2711slf_destroy (pTHX_ struct coro *coro)
2712{
2713 struct CoroSLF frame = coro->slf_frame;
2714
2715 /*
2716 * The on_destroy below most likely is from an SLF call.
2717 * Since by definition the SLF call will not finish when we destroy
2718 * the coro, we will have to force-finish it here, otherwise
2719 * cleanup functions cannot call SLF functions.
2720 */
2721 coro->slf_frame.prepare = 0;
2722
2723 /* this callback is reserved for slf functions needing to do cleanup */
2724 if (frame.destroy && frame.prepare && !PL_dirty)
2725 frame.destroy (aTHX_ &frame);
2434} 2726}
2435 2727
2436/* 2728/*
2437 * these not obviously related functions are all rolled into one 2729 * these not obviously related functions are all rolled into one
2438 * function to increase chances that they all will call transfer with the same 2730 * function to increase chances that they all will call transfer with the same
… …
2445 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2737 I32 checkmark; /* mark SP to see how many elements check has pushed */
2446 2738
2447 /* set up the slf frame, unless it has already been set-up */ 2739 /* set up the slf frame, unless it has already been set-up */
2448 /* the latter happens when a new coro has been started */ 2740 /* the latter happens when a new coro has been started */
2449 /* or when a new cctx was attached to an existing coroutine */ 2741 /* or when a new cctx was attached to an existing coroutine */
2450 if (expect_true (!slf_frame.prepare)) 2742 if (ecb_expect_true (!slf_frame.prepare))
2451 { 2743 {
2452 /* first iteration */ 2744 /* first iteration */
2453 dSP; 2745 dSP;
2454 SV **arg = PL_stack_base + TOPMARK + 1; 2746 SV **arg = PL_stack_base + TOPMARK + 1;
2455 int items = SP - arg; /* args without function object */ 2747 int items = SP - arg; /* args without function object */
… …
2496 while (slf_frame.check (aTHX_ &slf_frame)); 2788 while (slf_frame.check (aTHX_ &slf_frame));
2497 2789
2498 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2790 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2499 2791
2500 /* exception handling */ 2792 /* exception handling */
2501 if (expect_false (CORO_THROW)) 2793 if (ecb_expect_false (CORO_THROW))
2502 { 2794 {
2503 SV *exception = sv_2mortal (CORO_THROW); 2795 SV *exception = sv_2mortal (CORO_THROW);
2504 2796
2505 CORO_THROW = 0; 2797 CORO_THROW = 0;
2506 sv_setsv (ERRSV, exception); 2798 sv_setsv (ERRSV, exception);
2507 croak (0); 2799 croak (0);
2508 } 2800 }
2509 2801
2510 /* return value handling - mostly like entersub */ 2802 /* return value handling - mostly like entersub */
2511 /* make sure we put something on the stack in scalar context */ 2803 /* make sure we put something on the stack in scalar context */
2512 if (GIMME_V == G_SCALAR) 2804 if (GIMME_V == G_SCALAR
2805 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2513 { 2806 {
2514 dSP; 2807 dSP;
2515 SV **bot = PL_stack_base + checkmark; 2808 SV **bot = PL_stack_base + checkmark;
2516 2809
2517 if (sp == bot) /* too few, push undef */ 2810 if (sp == bot) /* too few, push undef */
2518 bot [1] = &PL_sv_undef; 2811 bot [1] = &PL_sv_undef;
2519 else if (sp != bot + 1) /* too many, take last one */ 2812 else /* too many, take last one */
2520 bot [1] = *sp; 2813 bot [1] = *sp;
2521 2814
2522 SP = bot + 1; 2815 SP = bot + 1;
2523 2816
2524 PUTBACK; 2817 PUTBACK;
… …
2622{ 2915{
2623 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2916 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2624 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2917 on_enterleave_call (aTHX_ sv_2mortal (cb));
2625} 2918}
2626 2919
2920static void
2921enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2922{
2923 if (!hook)
2924 return;
2925
2926 if (!*avp)
2927 {
2928 *avp = newAV ();
2929 AvREAL_off (*avp);
2930 }
2931
2932 av_push (*avp, (SV *)hook);
2933 av_push (*avp, (SV *)arg);
2934}
2935
2936static void
2937enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2938{
2939 AV *av = *avp;
2940 int i;
2941
2942 if (!av)
2943 return;
2944
2945 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2946 if (AvARRAY (av)[i] == (SV *)hook)
2947 {
2948 if (execute)
2949 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2950
2951 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2952 av_pop (av);
2953 av_pop (av);
2954 break;
2955 }
2956
2957 if (AvFILLp (av) >= 0)
2958 {
2959 *avp = 0;
2960 SvREFCNT_dec_NN (av);
2961 }
2962}
2963
2964static void
2965api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2966{
2967 struct coro *coro = SvSTATE (coro_sv);
2968
2969 if (SvSTATE_current == coro)
2970 if (enter)
2971 enter (aTHX_ enter_arg);
2972
2973 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2974 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2975}
2976
2977static void
2978api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2979{
2980 struct coro *coro = SvSTATE (coro_sv);
2981
2982 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2983 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2984}
2985
2986static void
2987savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2988{
2989 struct coro *coro = SvSTATE_current;
2990
2991 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2992}
2993
2994static void
2995savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2996{
2997 struct coro *coro = SvSTATE_current;
2998
2999 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
3000}
3001
3002static void
3003api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
3004{
3005 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
3006
3007 /* this ought to be much cheaper than malloc + a single destructor call */
3008 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
3009 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
3010}
3011
2627/*****************************************************************************/ 3012/*****************************************************************************/
2628/* PerlIO::cede */ 3013/* PerlIO::cede */
2629 3014
2630typedef struct 3015typedef struct
2631{ 3016{
2632 PerlIOBuf base; 3017 PerlIOBuf base;
2633 NV next, every; 3018 NV next, every;
2634} PerlIOCede; 3019} PerlIOCede;
2635 3020
2636static IV 3021static IV ecb_cold
2637PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 3022PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2638{ 3023{
2639 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3024 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2640 3025
2641 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 3026 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2642 self->next = nvtime () + self->every; 3027 self->next = nvtime () + self->every;
2643 3028
2644 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 3029 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2645} 3030}
2646 3031
2647static SV * 3032static SV * ecb_cold
2648PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3033PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2649{ 3034{
2650 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3035 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2651 3036
2652 return newSVnv (self->every); 3037 return newSVnv (self->every);
… …
2759 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3144 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2760 PUTBACK; 3145 PUTBACK;
2761 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3146 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2762 } 3147 }
2763 3148
2764 SvREFCNT_dec (cb); 3149 SvREFCNT_dec_NN (cb);
2765 } 3150 }
2766} 3151}
2767 3152
2768static void 3153static void
2769coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3154coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2770{ 3155{
2771 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3156 /* call $sem->adjust (0) to possibly wake up some other waiters */
2772 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3157 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2773} 3158}
2774 3159
2775static int 3160static int
2776slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3161slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2777{ 3162{
2778 AV *av = (AV *)frame->data; 3163 AV *av = (AV *)frame->data;
2779 SV *count_sv = AvARRAY (av)[0]; 3164 SV *count_sv = AvARRAY (av)[0];
3165 SV *coro_hv = SvRV (coro_current);
3166
3167 frame->destroy = 0;
2780 3168
2781 /* if we are about to throw, don't actually acquire the lock, just throw */ 3169 /* if we are about to throw, don't actually acquire the lock, just throw */
2782 if (CORO_THROW) 3170 if (ecb_expect_false (CORO_THROW))
3171 {
3172 /* we still might be responsible for the semaphore, so wake up others */
3173 coro_semaphore_adjust (aTHX_ av, 0);
3174
2783 return 0; 3175 return 0;
3176 }
2784 else if (SvIVX (count_sv) > 0) 3177 else if (SvIVX (count_sv) > 0)
2785 { 3178 {
2786 SvSTATE_current->on_destroy = 0;
2787
2788 if (acquire) 3179 if (acquire)
2789 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3180 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2790 else 3181 else
2791 coro_semaphore_adjust (aTHX_ av, 0); 3182 coro_semaphore_adjust (aTHX_ av, 0);
2792 3183
… …
2796 { 3187 {
2797 int i; 3188 int i;
2798 /* if we were woken up but can't down, we look through the whole */ 3189 /* if we were woken up but can't down, we look through the whole */
2799 /* waiters list and only add us if we aren't in there already */ 3190 /* waiters list and only add us if we aren't in there already */
2800 /* this avoids some degenerate memory usage cases */ 3191 /* this avoids some degenerate memory usage cases */
2801 3192 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2802 for (i = 1; i <= AvFILLp (av); ++i)
2803 if (AvARRAY (av)[i] == SvRV (coro_current)) 3193 if (AvARRAY (av)[i] == coro_hv)
2804 return 1; 3194 return 1;
2805 3195
2806 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3196 av_push (av, SvREFCNT_inc (coro_hv));
2807 return 1; 3197 return 1;
2808 } 3198 }
2809} 3199}
2810 3200
2811static int 3201static int
… …
2834 { 3224 {
2835 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3225 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2836 3226
2837 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3227 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2838 frame->prepare = prepare_schedule; 3228 frame->prepare = prepare_schedule;
2839
2840 /* to avoid race conditions when a woken-up coro gets terminated */ 3229 /* to avoid race conditions when a woken-up coro gets terminated */
2841 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3230 /* we arrange for a temporary on_destroy that calls adjust (0) */
2842 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3231 frame->destroy = coro_semaphore_destroy;
2843 } 3232 }
2844} 3233}
2845 3234
2846static void 3235static void
2847slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3236slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2905 { 3294 {
2906 api_ready (aTHX_ cb); 3295 api_ready (aTHX_ cb);
2907 sv_setiv (cb, 0); /* signal waiter */ 3296 sv_setiv (cb, 0); /* signal waiter */
2908 } 3297 }
2909 3298
2910 SvREFCNT_dec (cb); 3299 SvREFCNT_dec_NN (cb);
2911 3300
2912 --count; 3301 --count;
2913 } 3302 }
2914} 3303}
2915 3304
… …
3000 } 3389 }
3001 3390
3002 av_push (state, data_sv); 3391 av_push (state, data_sv);
3003 3392
3004 api_ready (aTHX_ coro); 3393 api_ready (aTHX_ coro);
3005 SvREFCNT_dec (coro); 3394 SvREFCNT_dec_NN (coro);
3006 SvREFCNT_dec ((AV *)state); 3395 SvREFCNT_dec_NN ((AV *)state);
3007} 3396}
3008 3397
3009static int 3398static int
3010slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3399slf_check_aio_req (pTHX_ struct CoroSLF *frame)
3011{ 3400{
… …
3016 /* it quickly returns */ 3405 /* it quickly returns */
3017 if (CORO_THROW) 3406 if (CORO_THROW)
3018 return 0; 3407 return 0;
3019 3408
3020 /* one element that is an RV? repeat! */ 3409 /* one element that is an RV? repeat! */
3021 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3410 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
3022 return 1; 3411 return 1;
3023 3412
3024 /* restore status */ 3413 /* restore status */
3025 { 3414 {
3026 SV *data_sv = av_pop (state); 3415 SV *data_sv = av_pop (state);
… …
3029 errno = data->errorno; 3418 errno = data->errorno;
3030 PL_laststype = data->laststype; 3419 PL_laststype = data->laststype;
3031 PL_laststatval = data->laststatval; 3420 PL_laststatval = data->laststatval;
3032 PL_statcache = data->statcache; 3421 PL_statcache = data->statcache;
3033 3422
3034 SvREFCNT_dec (data_sv); 3423 SvREFCNT_dec_NN (data_sv);
3035 } 3424 }
3036 3425
3037 /* push result values */ 3426 /* push result values */
3038 { 3427 {
3039 dSP; 3428 dSP;
… …
3065 dSP; 3454 dSP;
3066 3455
3067 static SV *prio_cv; 3456 static SV *prio_cv;
3068 static SV *prio_sv; 3457 static SV *prio_sv;
3069 3458
3070 if (expect_false (!prio_cv)) 3459 if (ecb_expect_false (!prio_cv))
3071 { 3460 {
3072 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3461 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
3073 prio_sv = newSViv (0); 3462 prio_sv = newSViv (0);
3074 } 3463 }
3075 3464
… …
3181 } 3570 }
3182 3571
3183 return coro_sv; 3572 return coro_sv;
3184} 3573}
3185 3574
3575#ifndef __cplusplus
3576ecb_cold XS(boot_Coro__State);
3577#endif
3578
3579#if CORO_JIT
3580
3581static void ecb_noinline ecb_cold
3582pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3583{
3584 dSP;
3585 AV *av = newAV ();
3586
3587 av_store (av, 3, newSVuv (d));
3588 av_store (av, 2, newSVuv (c));
3589 av_store (av, 1, newSVuv (b));
3590 av_store (av, 0, newSVuv (a));
3591
3592 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3593
3594 PUTBACK;
3595}
3596
3597static void ecb_noinline ecb_cold
3598jit_init (pTHX)
3599{
3600 dSP;
3601 SV *load, *save;
3602 char *map_base;
3603 char *load_ptr, *save_ptr;
3604 STRLEN load_len, save_len, map_len;
3605 int count;
3606
3607 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3608
3609 PUSHMARK (SP);
3610 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3611 #include "state.h"
3612 count = call_pv ("Coro::State::_jit", G_ARRAY);
3613 SPAGAIN;
3614
3615 save = POPs; save_ptr = SvPVbyte (save, save_len);
3616 load = POPs; load_ptr = SvPVbyte (load, load_len);
3617
3618 map_len = load_len + save_len + 16;
3619
3620 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3621
3622 if (map_base == (char *)MAP_FAILED)
3623 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3624
3625 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3626
3627 load_perl_slots = (load_save_perl_slots_type)map_base;
3628 memcpy (map_base, load_ptr, load_len);
3629
3630 map_base += (load_len + 15) & ~15;
3631
3632 save_perl_slots = (load_save_perl_slots_type)map_base;
3633 memcpy (map_base, save_ptr, save_len);
3634
3635 /* we are good citizens and try to make the page read-only, so the evil evil */
3636 /* hackers might have it a bit more difficult */
3637 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3638
3639 PUTBACK;
3640 eval_pv ("undef &Coro::State::_jit", 1);
3641}
3642
3643#endif
3644
3186MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3645MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3187 3646
3188PROTOTYPES: DISABLE 3647PROTOTYPES: DISABLE
3189 3648
3190BOOT: 3649BOOT:
3191{ 3650{
3651#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3652#include "state.h"
3192#ifdef USE_ITHREADS 3653#ifdef USE_ITHREADS
3193# if CORO_PTHREAD 3654# if CORO_PTHREAD
3194 coro_thx = PERL_GET_CONTEXT; 3655 coro_thx = PERL_GET_CONTEXT;
3195# endif 3656# endif
3196#endif 3657#endif
3197 BOOT_PAGESIZE; 3658 /* perl defines these to check for existance first, but why it doesn't */
3659 /* just create them one at init time is not clear to me, except for */
3660 /* programs trying to delete them, but... */
3661 /* anyway, we declare this as invalid and make sure they are initialised here */
3662 DEFSV;
3663 ERRSV;
3198 3664
3199 cctx_current = cctx_new_empty (); 3665 cctx_current = cctx_new_empty ();
3200 3666
3201 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3667 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3202 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3668 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3203 3669
3204 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3670 {
3205 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3671 /*
3206 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3672 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3673 * by coro_sig_vtbl in hash values.
3674 */
3675 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3676
3677 /* this only works if perl doesn't have a vtbl for %SIG */
3678 assert (!mg->mg_virtual);
3679
3680 /*
3681 * The irony is that the perl API itself asserts that mg_virtual
3682 * must be non-const, yet perl5porters insisted on marking their
3683 * vtbls as read-only, just to thwart perl modules from patching
3684 * them.
3685 */
3686 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3687 mg->mg_flags |= MGf_COPY;
3688
3689 coro_sigelem_vtbl = PL_vtbl_sigelem;
3690 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3691 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3692 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3693 }
3207 3694
3208 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3209 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3695 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3210 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3696 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3211 3697
3212 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3698 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3699
3700 newCONSTSUB (coro_state_stash, "BACKEND", newSVpv (CORO_BACKEND, 0)); /* undocumented */
3213 3701
3214 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 3702 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
3215 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 3703 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
3216 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 3704 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
3217 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 3705 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
… …
3245 coroapi.prepare_cede_notself = prepare_cede_notself; 3733 coroapi.prepare_cede_notself = prepare_cede_notself;
3246 3734
3247 time_init (aTHX); 3735 time_init (aTHX);
3248 3736
3249 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3737 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3738#if CORO_JIT
3739 PUTBACK;
3740 jit_init (aTHX);
3741 SPAGAIN;
3742#endif
3250} 3743}
3251 3744
3252SV * 3745SV *
3253new (SV *klass, ...) 3746new (SV *klass, ...)
3254 ALIAS: 3747 ALIAS:
… …
3261void 3754void
3262transfer (...) 3755transfer (...)
3263 PROTOTYPE: $$ 3756 PROTOTYPE: $$
3264 CODE: 3757 CODE:
3265 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3758 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3266
3267void
3268_exit (int code)
3269 PROTOTYPE: $
3270 CODE:
3271 _exit (code);
3272 3759
3273SV * 3760SV *
3274clone (Coro::State coro) 3761clone (Coro::State coro)
3275 CODE: 3762 CODE:
3276{ 3763{
… …
3331void 3818void
3332list () 3819list ()
3333 PROTOTYPE: 3820 PROTOTYPE:
3334 PPCODE: 3821 PPCODE:
3335{ 3822{
3336 struct coro *coro; 3823 struct coro *coro;
3337 for (coro = coro_first; coro; coro = coro->next) 3824 for (coro = coro_first; coro; coro = coro->next)
3338 if (coro->hv) 3825 if (coro->hv)
3339 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3826 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3340} 3827}
3341 3828
… …
3343call (Coro::State coro, SV *coderef) 3830call (Coro::State coro, SV *coderef)
3344 ALIAS: 3831 ALIAS:
3345 eval = 1 3832 eval = 1
3346 CODE: 3833 CODE:
3347{ 3834{
3835 struct coro *current = SvSTATE_current;
3836
3348 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3837 if ((coro == current) || (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)))
3349 { 3838 {
3350 struct coro *current = SvSTATE_current;
3351 struct CoroSLF slf_save; 3839 struct CoroSLF slf_save;
3352 3840
3353 if (current != coro) 3841 if (current != coro)
3354 { 3842 {
3355 PUTBACK; 3843 PUTBACK;
… …
3396 PROTOTYPE: $ 3884 PROTOTYPE: $
3397 ALIAS: 3885 ALIAS:
3398 is_ready = CF_READY 3886 is_ready = CF_READY
3399 is_running = CF_RUNNING 3887 is_running = CF_RUNNING
3400 is_new = CF_NEW 3888 is_new = CF_NEW
3401 is_destroyed = CF_DESTROYED 3889 is_destroyed = CF_ZOMBIE
3890 is_zombie = CF_ZOMBIE
3402 is_suspended = CF_SUSPENDED 3891 is_suspended = CF_SUSPENDED
3403 CODE: 3892 CODE:
3404 RETVAL = boolSV (coro->flags & ix); 3893 RETVAL = boolSV (coro->flags & ix);
3405 OUTPUT: 3894 OUTPUT:
3406 RETVAL 3895 RETVAL
3407 3896
3408void 3897void
3409throw (Coro::State self, SV *exception = &PL_sv_undef) 3898throw (SV *self, SV *exception = &PL_sv_undef)
3410 PROTOTYPE: $;$ 3899 PROTOTYPE: $;$
3411 CODE: 3900 CODE:
3412{ 3901{
3902 struct coro *coro = SvSTATE (self);
3413 struct coro *current = SvSTATE_current; 3903 struct coro *current = SvSTATE_current;
3414 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3904 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3415 SvREFCNT_dec (*exceptionp); 3905 SvREFCNT_dec (*exceptionp);
3416 SvGETMAGIC (exception); 3906 SvGETMAGIC (exception);
3417 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3907 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3908
3909 api_ready (aTHX_ self);
3418} 3910}
3419 3911
3420void 3912void
3421api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3913api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3422 PROTOTYPE: $;$ 3914 PROTOTYPE: $;$
… …
3499 3991
3500void 3992void
3501times (Coro::State self) 3993times (Coro::State self)
3502 PPCODE: 3994 PPCODE:
3503{ 3995{
3504 struct coro *current = SvSTATE (coro_current); 3996 struct coro *current = SvSTATE (coro_current);
3505 3997
3506 if (expect_false (current == self)) 3998 if (ecb_expect_false (current == self))
3507 { 3999 {
3508 coro_times_update (); 4000 coro_times_update ();
3509 coro_times_add (SvSTATE (coro_current)); 4001 coro_times_add (SvSTATE (coro_current));
3510 } 4002 }
3511 4003
3512 EXTEND (SP, 2); 4004 EXTEND (SP, 2);
3513 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 4005 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3514 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 4006 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3515 4007
3516 if (expect_false (current == self)) 4008 if (ecb_expect_false (current == self))
3517 coro_times_sub (SvSTATE (coro_current)); 4009 coro_times_sub (SvSTATE (coro_current));
3518} 4010}
3519 4011
3520void 4012void
3521swap_sv (Coro::State coro, SV *sv, SV *swapsv) 4013swap_sv (Coro::State coro, SV *sva, SV *svb)
3522 CODE: 4014 CODE:
3523{ 4015{
3524 struct coro *current = SvSTATE_current; 4016 struct coro *current = SvSTATE_current;
4017 AV *swap_sv;
4018 int i;
4019
4020 sva = SvRV (sva);
4021 svb = SvRV (svb);
3525 4022
3526 if (current == coro) 4023 if (current == coro)
3527 SWAP_SVS (current); 4024 SWAP_SVS_LEAVE (current);
3528 4025
3529 if (!coro->swap_sv) 4026 if (!coro->swap_sv)
3530 coro->swap_sv = newAV (); 4027 coro->swap_sv = newAV ();
3531 4028
4029 swap_sv = coro->swap_sv;
4030
4031 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4032 {
4033 SV *a = AvARRAY (swap_sv)[i ];
4034 SV *b = AvARRAY (swap_sv)[i + 1];
4035
4036 if (a == sva && b == svb)
4037 {
4038 SvREFCNT_dec_NN (a);
4039 SvREFCNT_dec_NN (b);
4040
4041 for (; i <= AvFILLp (swap_sv) - 2; i++)
4042 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4043
4044 AvFILLp (swap_sv) -= 2;
4045
4046 goto removed;
4047 }
4048 }
4049
3532 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4050 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3533 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4051 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4052
4053 removed:
3534 4054
3535 if (current == coro) 4055 if (current == coro)
3536 SWAP_SVS (current); 4056 SWAP_SVS_ENTER (current);
3537} 4057}
3538 4058
3539 4059
3540MODULE = Coro::State PACKAGE = Coro 4060MODULE = Coro::State PACKAGE = Coro
3541 4061
3542BOOT: 4062BOOT:
3543{ 4063{
4064 if (SVt_LAST > 32)
4065 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4066
3544 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4067 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3545 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4068 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3546 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4069 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3547 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3548 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4070 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3549 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4071 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3550 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4072 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3551 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4073 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3552 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4074 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3553 4075
3554 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4076 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3555 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4077 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3556 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4078 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3557 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 4079 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3558 4080
3559 coro_stash = gv_stashpv ("Coro", TRUE); 4081 coro_stash = gv_stashpv ("Coro", TRUE);
3560 4082
3561 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4083 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3562 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4084 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3563 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4085 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3575 coroapi.ready = api_ready; 4097 coroapi.ready = api_ready;
3576 coroapi.is_ready = api_is_ready; 4098 coroapi.is_ready = api_is_ready;
3577 coroapi.nready = coro_nready; 4099 coroapi.nready = coro_nready;
3578 coroapi.current = coro_current; 4100 coroapi.current = coro_current;
3579 4101
4102 coroapi.enterleave_hook = api_enterleave_hook;
4103 coroapi.enterleave_unhook = api_enterleave_unhook;
4104 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4105
3580 /*GCoroAPI = &coroapi;*/ 4106 /*GCoroAPI = &coroapi;*/
3581 sv_setiv (sv, (IV)&coroapi); 4107 sv_setiv (sv, PTR2IV (&coroapi));
3582 SvREADONLY_on (sv); 4108 SvREADONLY_on (sv);
3583 } 4109 }
3584} 4110}
3585 4111
3586SV * 4112SV *
… …
3595void 4121void
3596_destroy (Coro::State coro) 4122_destroy (Coro::State coro)
3597 CODE: 4123 CODE:
3598 /* used by the manager thread */ 4124 /* used by the manager thread */
3599 coro_state_destroy (aTHX_ coro); 4125 coro_state_destroy (aTHX_ coro);
4126
4127void
4128on_destroy (Coro::State coro, SV *cb)
4129 CODE:
3600 coro_call_on_destroy (aTHX_ coro); 4130 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4131
4132void
4133join (...)
4134 CODE:
4135 CORO_EXECUTE_SLF_XS (slf_init_join);
3601 4136
3602void 4137void
3603terminate (...) 4138terminate (...)
3604 CODE: 4139 CODE:
3605 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4140 CORO_EXECUTE_SLF_XS (slf_init_terminate);
… …
3607void 4142void
3608cancel (...) 4143cancel (...)
3609 CODE: 4144 CODE:
3610 CORO_EXECUTE_SLF_XS (slf_init_cancel); 4145 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3611 4146
4147int
4148safe_cancel (Coro::State self, ...)
4149 C_ARGS: aTHX_ self, &ST (1), items - 1
4150
3612void 4151void
3613schedule (...) 4152schedule (...)
3614 CODE: 4153 CODE:
3615 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4154 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3616 4155
… …
3636 4175
3637void 4176void
3638_set_current (SV *current) 4177_set_current (SV *current)
3639 PROTOTYPE: $ 4178 PROTOTYPE: $
3640 CODE: 4179 CODE:
3641 SvREFCNT_dec (SvRV (coro_current)); 4180 SvREFCNT_dec_NN (SvRV (coro_current));
3642 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4181 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3643 4182
3644void 4183void
3645_set_readyhook (SV *hook) 4184_set_readyhook (SV *hook)
3646 PROTOTYPE: $ 4185 PROTOTYPE: $
… …
3730 4269
3731 if ((SV *)hv == &PL_sv_undef) 4270 if ((SV *)hv == &PL_sv_undef)
3732 { 4271 {
3733 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4272 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3734 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4273 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3735 SvREFCNT_dec (sv); 4274 SvREFCNT_dec_NN (sv);
3736 } 4275 }
3737 4276
3738 { 4277 {
3739 struct coro *coro = SvSTATE_hv (hv); 4278 struct coro *coro = SvSTATE_hv (hv);
3740 4279
… …
3747 api_ready (aTHX_ (SV *)hv); 4286 api_ready (aTHX_ (SV *)hv);
3748 4287
3749 if (GIMME_V != G_VOID) 4288 if (GIMME_V != G_VOID)
3750 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4289 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3751 else 4290 else
3752 SvREFCNT_dec (hv); 4291 SvREFCNT_dec_NN (hv);
3753} 4292}
3754 4293
3755SV * 4294SV *
3756rouse_cb () 4295rouse_cb ()
3757 PROTOTYPE: 4296 PROTOTYPE:
… …
3772 on_leave = 1 4311 on_leave = 1
3773 PROTOTYPE: & 4312 PROTOTYPE: &
3774 CODE: 4313 CODE:
3775{ 4314{
3776 struct coro *coro = SvSTATE_current; 4315 struct coro *coro = SvSTATE_current;
3777 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4316 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3778 4317
3779 block = s_get_cv_croak (block); 4318 block = s_get_cv_croak (block);
3780 4319
3781 if (!*avp) 4320 if (!*avp)
3782 *avp = newAV (); 4321 *avp = newAV ();
… …
3802 4341
3803SV * 4342SV *
3804new (SV *klass, SV *count = 0) 4343new (SV *klass, SV *count = 0)
3805 CODE: 4344 CODE:
3806{ 4345{
3807 int semcnt = 1; 4346 int semcnt = 1;
3808 4347
3809 if (count) 4348 if (count)
3810 { 4349 {
3811 SvGETMAGIC (count); 4350 SvGETMAGIC (count);
3812 4351
… …
3836 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4375 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3837 OUTPUT: 4376 OUTPUT:
3838 RETVAL 4377 RETVAL
3839 4378
3840void 4379void
3841up (SV *self, int adjust = 1) 4380up (SV *self)
3842 ALIAS:
3843 adjust = 1
3844 CODE: 4381 CODE:
4382 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4383
4384void
4385adjust (SV *self, int adjust)
4386 CODE:
3845 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4387 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3846 4388
3847void 4389void
3848down (...) 4390down (...)
3849 CODE: 4391 CODE:
3850 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4392 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3872 XSRETURN_NO; 4414 XSRETURN_NO;
3873} 4415}
3874 4416
3875void 4417void
3876waiters (SV *self) 4418waiters (SV *self)
3877 PPCODE: 4419 PPCODE:
3878{ 4420{
3879 AV *av = (AV *)SvRV (self); 4421 AV *av = (AV *)SvRV (self);
3880 int wcount = AvFILLp (av) + 1 - 1; 4422 int wcount = AvFILLp (av) + 1 - 1;
3881 4423
3882 if (GIMME_V == G_SCALAR) 4424 if (GIMME_V == G_SCALAR)
… …
3891} 4433}
3892 4434
3893MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4435MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3894 4436
3895void 4437void
3896_may_delete (SV *sem, int count, int extra_refs) 4438_may_delete (SV *sem, int count, unsigned int extra_refs)
3897 PPCODE: 4439 PPCODE:
3898{ 4440{
3899 AV *av = (AV *)SvRV (sem); 4441 AV *av = (AV *)SvRV (sem);
3900 4442
3901 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4443 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3902 && AvFILLp (av) == 0 /* no waiters, just count */ 4444 && AvFILLp (av) == 0 /* no waiters, just count */
3903 && SvIV (AvARRAY (av)[0]) == count) 4445 && SvIV (AvARRAY (av)[0]) == count)
3904 XSRETURN_YES; 4446 XSRETURN_YES;
… …
3925 4467
3926void 4468void
3927broadcast (SV *self) 4469broadcast (SV *self)
3928 CODE: 4470 CODE:
3929{ 4471{
3930 AV *av = (AV *)SvRV (self); 4472 AV *av = (AV *)SvRV (self);
3931 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4473 coro_signal_wake (aTHX_ av, AvFILLp (av));
3932} 4474}
3933 4475
3934void 4476void
3935send (SV *self) 4477send (SV *self)
… …
3943 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4485 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3944} 4486}
3945 4487
3946IV 4488IV
3947awaited (SV *self) 4489awaited (SV *self)
3948 CODE: 4490 CODE:
3949 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4491 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3950 OUTPUT: 4492 OUTPUT:
3951 RETVAL 4493 RETVAL
3952 4494
3953 4495
… …
3958 4500
3959void 4501void
3960_schedule (...) 4502_schedule (...)
3961 CODE: 4503 CODE:
3962{ 4504{
3963 static int incede; 4505 static int incede;
3964 4506
3965 api_cede_notself (aTHX); 4507 api_cede_notself (aTHX);
3966 4508
3967 ++incede; 4509 ++incede;
3968 while (coro_nready >= incede && api_cede (aTHX)) 4510 while (coro_nready >= incede && api_cede (aTHX))
… …
4012 { 4554 {
4013 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4555 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4014 coro_old_pp_sselect = 0; 4556 coro_old_pp_sselect = 0;
4015 } 4557 }
4016 4558
4559MODULE = Coro::State PACKAGE = Coro::Util
4560
4561void
4562_exit (int code)
4563 CODE:
4564 _exit (code);
4565
4566NV
4567time ()
4568 CODE:
4569 RETVAL = nvtime (aTHX);
4570 OUTPUT:
4571 RETVAL
4572
4573NV
4574gettimeofday ()
4575 PPCODE:
4576{
4577 UV tv [2];
4578 u2time (aTHX_ tv);
4579 EXTEND (SP, 2);
4580 PUSHs (sv_2mortal (newSVuv (tv [0])));
4581 PUSHs (sv_2mortal (newSVuv (tv [1])));
4582}
4583

Diff Legend

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