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.390 by root, Thu Mar 31 01:36:58 2011 UTC vs.
Revision 1.480 by root, Fri Jun 25 01:13:21 2021 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */ 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7
8#if CORO_UCONTEXT
9 #define CORO_BACKEND "ucontext"
10#elif CORO_SJLJ
11 #define CORO_BACKEND "sjlj"
12#elif CORO_LINUX
13 #define CORO_BACKEND "linux"
14#elif CORO_LOSER
15 #define CORO_BACKEND "loser"
16#elif CORO_FIBER
17 #define CORO_BACKEND "fiber"
18#elif CORO_IRIX
19 #define CORO_BACKEND "irix"
20#elif CORO_ASM
21 #define CORO_BACKEND "asm"
22#elif CORO_PTHREAD
23 #define CORO_BACKEND "pthread"
24#else
25 #define CORO_BACKEND "unknown"
26#endif
7 27
8#define PERL_NO_GET_CONTEXT 28#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 29#define PERL_EXT
10 30
11#include "EXTERN.h" 31#include "EXTERN.h"
… …
13#include "XSUB.h" 33#include "XSUB.h"
14#include "perliol.h" 34#include "perliol.h"
15 35
16#include "schmorp.h" 36#include "schmorp.h"
17 37
38#define ECB_NO_THREADS 1
39#define ECB_NO_LIBM 1
40#include "ecb.h"
41
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
196 int valgrind_id; 232 int valgrind_id;
197#endif 233#endif
198 unsigned char flags; 234 unsigned char flags;
199} coro_cctx; 235} coro_cctx;
200 236
201coro_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 */
250 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
211}; 251};
212 252
213/* 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 */
214typedef struct 254typedef struct
215{ 255{
216 SV *defsv;
217 AV *defav;
218 SV *errsv;
219 SV *irsgv;
220 HV *hinthv;
221#define VAR(name,type) type name; 256 #define VARx(name,expr,type) type name;
222# include "state.h" 257 #include "state.h"
223#undef VAR
224} perl_slots; 258} perl_slots;
225 259
260/* how many context stack entries do we need for perl_slots */
226#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))
227 262
228/* this is a structure representing a perl-level coroutine */ 263/* this is a structure representing a perl-level coroutine */
229struct coro { 264struct coro
265{
230 /* the C coroutine allocated to this perl coroutine, if any */ 266 /* the C coroutine allocated to this perl coroutine, if any */
231 coro_cctx *cctx; 267 coro_cctx *cctx;
232 268
233 /* ready queue */ 269 /* ready queue */
234 struct coro *next_ready; 270 struct coro *next_ready;
… …
236 /* state data */ 272 /* state data */
237 struct CoroSLF slf_frame; /* saved slf frame */ 273 struct CoroSLF slf_frame; /* saved slf frame */
238 AV *mainstack; 274 AV *mainstack;
239 perl_slots *slot; /* basically the saved sp */ 275 perl_slots *slot; /* basically the saved sp */
240 276
241 CV *startcv; /* the CV to execute */ 277 CV *startcv; /* the CV to execute */
242 AV *args; /* data associated with this coroutine (initial args) */ 278 AV *args; /* data associated with this coroutine (initial args) */
243 int refcnt; /* coroutines are refcounted, yes */
244 int flags; /* CF_ flags */ 279 int flags; /* CF_ flags */
245 HV *hv; /* the perl hash associated with this coro, if any */ 280 HV *hv; /* the perl hash associated with this coro, if any */
246 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
247 281
248 /* statistics */ 282 /* statistics */
249 int usecount; /* number of transfers to this coro */ 283 int usecount; /* number of transfers to this coro */
250 284
251 /* coro process data */ 285 /* coro process data */
252 int prio; 286 int prio;
253 SV *except; /* exception to be thrown */ 287 SV *except; /* exception to be thrown */
254 SV *rouse_cb; 288 SV *rouse_cb; /* most recently created rouse callback */
289 AV *on_destroy; /* callbacks or coros to notify on destroy */
290 AV *status; /* the exit status list */
255 291
256 /* async_pool */ 292 /* async_pool */
257 SV *saved_deffh; 293 SV *saved_deffh;
258 SV *invoke_cb; 294 SV *invoke_cb;
259 AV *invoke_av; 295 AV *invoke_av;
260 296
261 /* on_enter/on_leave */ 297 /* on_enter/on_leave */
262 AV *on_enter; 298 AV *on_enter; AV *on_enter_xs;
263 AV *on_leave; 299 AV *on_leave; AV *on_leave_xs;
264 300
265 /* swap_sv */ 301 /* swap_sv */
266 AV *swap_sv; 302 AV *swap_sv;
267 303
268 /* times */ 304 /* times */
… …
275typedef struct coro *Coro__State; 311typedef struct coro *Coro__State;
276typedef struct coro *Coro__State_or_hashref; 312typedef struct coro *Coro__State_or_hashref;
277 313
278/* the following variables are effectively part of the perl context */ 314/* the following variables are effectively part of the perl context */
279/* and get copied between struct coro and these variables */ 315/* and get copied between struct coro and these variables */
280/* the mainr easonw e don't support windows process emulation */ 316/* the main reason we don't support windows process emulation */
281static struct CoroSLF slf_frame; /* the current slf frame */ 317static struct CoroSLF slf_frame; /* the current slf frame */
282 318
283/** Coro ********************************************************************/ 319/** Coro ********************************************************************/
284 320
285#define CORO_PRIO_MAX 3 321#define CORO_PRIO_MAX 3
… …
291 327
292/* for Coro.pm */ 328/* for Coro.pm */
293static SV *coro_current; 329static SV *coro_current;
294static SV *coro_readyhook; 330static SV *coro_readyhook;
295static 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 */
296static CV *cv_coro_run, *cv_coro_terminate; 332static CV *cv_coro_run;
297static struct coro *coro_first; 333static struct coro *coro_first;
298#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
299 358
300/** Coro::Select ************************************************************/ 359/** Coro::Select ************************************************************/
301 360
302static OP *(*coro_old_pp_sselect) (pTHX); 361static OP *(*coro_old_pp_sselect) (pTHX);
303static SV *coro_select_select; 362static SV *coro_select_select;
… …
319 378
320/** time stuff **************************************************************/ 379/** time stuff **************************************************************/
321 380
322#ifdef HAS_GETTIMEOFDAY 381#ifdef HAS_GETTIMEOFDAY
323 382
324static void 383ecb_inline void
325coro_u2time (pTHX_ UV ret[2]) 384coro_u2time (pTHX_ UV ret[2])
326{ 385{
327 struct timeval tv; 386 struct timeval tv;
328 gettimeofday (&tv, 0); 387 gettimeofday (&tv, 0);
329 388
330 ret [0] = tv.tv_sec; 389 ret [0] = tv.tv_sec;
331 ret [1] = tv.tv_usec; 390 ret [1] = tv.tv_usec;
332} 391}
333 392
334static double 393ecb_inline double
335coro_nvtime () 394coro_nvtime (void)
336{ 395{
337 struct timeval tv; 396 struct timeval tv;
338 gettimeofday (&tv, 0); 397 gettimeofday (&tv, 0);
339 398
340 return tv.tv_sec + tv.tv_usec * 1e-6; 399 return tv.tv_sec + tv.tv_usec * 1e-6;
341} 400}
342 401
343static void 402ecb_inline void
344time_init (pTHX) 403time_init (pTHX)
345{ 404{
346 nvtime = coro_nvtime; 405 nvtime = coro_nvtime;
347 u2time = coro_u2time; 406 u2time = coro_u2time;
348} 407}
349 408
350#else 409#else
351 410
352static void 411ecb_inline void
353time_init (pTHX) 412time_init (pTHX)
354{ 413{
355 SV **svp; 414 SV **svp;
356 415
357 require_pv ("Time/HiRes.pm"); 416 require_pv ("Time/HiRes.pm");
358 417
359 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0); 418 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
360 419
361 if (!svp) croak ("Time::HiRes is required, but missing."); 420 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
362 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 421 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
363 422
364 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 423 nvtime = INT2PTR (double (*)(), SvIV (*svp));
365 424
366 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0); 425 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
367 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp)); 426 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
… …
369 428
370#endif 429#endif
371 430
372/** lowlevel stuff **********************************************************/ 431/** lowlevel stuff **********************************************************/
373 432
374static SV * 433static SV * ecb_noinline
375coro_get_sv (pTHX_ const char *name, int create) 434coro_get_sv (pTHX_ const char *name, int create)
376{ 435{
377#if PERL_VERSION_ATLEAST (5,10,0) 436#if PERL_VERSION_ATLEAST (5,10,0)
378 /* 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 */
379 get_sv (name, create); 438 get_sv (name, create);
380#endif 439#endif
381 return get_sv (name, create); 440 return get_sv (name, create);
382} 441}
383 442
384static AV * 443static AV * ecb_noinline
385coro_get_av (pTHX_ const char *name, int create) 444coro_get_av (pTHX_ const char *name, int create)
386{ 445{
387#if PERL_VERSION_ATLEAST (5,10,0) 446#if PERL_VERSION_ATLEAST (5,10,0)
388 /* 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 */
389 get_av (name, create); 448 get_av (name, create);
390#endif 449#endif
391 return get_av (name, create); 450 return get_av (name, create);
392} 451}
393 452
394static HV * 453static HV * ecb_noinline
395coro_get_hv (pTHX_ const char *name, int create) 454coro_get_hv (pTHX_ const char *name, int create)
396{ 455{
397#if PERL_VERSION_ATLEAST (5,10,0) 456#if PERL_VERSION_ATLEAST (5,10,0)
398 /* 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 */
399 get_hv (name, create); 458 get_hv (name, create);
400#endif 459#endif
401 return get_hv (name, create); 460 return get_hv (name, create);
402} 461}
403 462
404INLINE void 463ecb_inline void
405coro_times_update () 464coro_times_update (void)
406{ 465{
407#ifdef coro_clock_gettime 466#ifdef coro_clock_gettime
408 struct timespec ts; 467 struct timespec ts;
409 468
410 ts.tv_sec = ts.tv_nsec = 0; 469 ts.tv_sec = ts.tv_nsec = 0;
… …
422 time_real [0] = tv [0]; 481 time_real [0] = tv [0];
423 time_real [1] = tv [1] * 1000; 482 time_real [1] = tv [1] * 1000;
424#endif 483#endif
425} 484}
426 485
427INLINE void 486ecb_inline void
428coro_times_add (struct coro *c) 487coro_times_add (struct coro *c)
429{ 488{
430 c->t_real [1] += time_real [1]; 489 c->t_real [1] += time_real [1];
431 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]; }
432 c->t_real [0] += time_real [0]; 491 c->t_real [0] += time_real [0];
… …
434 c->t_cpu [1] += time_cpu [1]; 493 c->t_cpu [1] += time_cpu [1];
435 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]; }
436 c->t_cpu [0] += time_cpu [0]; 495 c->t_cpu [0] += time_cpu [0];
437} 496}
438 497
439INLINE void 498ecb_inline void
440coro_times_sub (struct coro *c) 499coro_times_sub (struct coro *c)
441{ 500{
442 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]; }
443 c->t_real [1] -= time_real [1]; 502 c->t_real [1] -= time_real [1];
444 c->t_real [0] -= time_real [0]; 503 c->t_real [0] -= time_real [0];
… …
452/* magic glue */ 511/* magic glue */
453 512
454#define CORO_MAGIC_type_cv 26 513#define CORO_MAGIC_type_cv 26
455#define CORO_MAGIC_type_state PERL_MAGIC_ext 514#define CORO_MAGIC_type_state PERL_MAGIC_ext
456 515
457#define CORO_MAGIC_NN(sv, type) \ 516#define CORO_MAGIC_NN(sv, type) \
458 (expect_true (SvMAGIC (sv)->mg_type == type) \ 517 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
459 ? SvMAGIC (sv) \ 518 ? SvMAGIC (sv) \
460 : mg_find (sv, type)) 519 : mg_find (sv, type))
461 520
462#define CORO_MAGIC(sv, type) \ 521#define CORO_MAGIC(sv, type) \
463 (expect_true (SvMAGIC (sv)) \ 522 (ecb_expect_true (SvMAGIC (sv)) \
464 ? CORO_MAGIC_NN (sv, type) \ 523 ? CORO_MAGIC_NN (sv, type) \
465 : 0) 524 : 0)
466 525
467#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)
468#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)
469 528
470INLINE struct coro * 529ecb_inline MAGIC *
471SvSTATE_ (pTHX_ SV *coro) 530SvSTATEhv_p (pTHX_ SV *coro)
472{ 531{
473 HV *stash;
474 MAGIC *mg; 532 MAGIC *mg;
475 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
476 if (SvROK (coro)) 549 if (SvROK (coro_sv))
477 coro = SvRV (coro); 550 coro_sv = SvRV (coro_sv);
478 551
479 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 552 mg = SvSTATEhv_p (aTHX_ coro_sv);
553 if (!mg)
480 croak ("Coro::State object required"); 554 croak ("Coro::State object required");
481 555
482 stash = SvSTASH (coro);
483 if (expect_false (stash != coro_stash && stash != coro_state_stash))
484 {
485 /* very slow, but rare, check */
486 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
487 croak ("Coro::State object required");
488 }
489
490 mg = CORO_MAGIC_state (coro);
491 return (struct coro *)mg->mg_ptr; 556 return (struct coro *)mg->mg_ptr;
492} 557}
493 558
494#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 559#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
495 560
… …
498#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 563#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
499 564
500/*****************************************************************************/ 565/*****************************************************************************/
501/* padlist management and caching */ 566/* padlist management and caching */
502 567
503static AV * 568ecb_inline PADLIST *
504coro_derive_padlist (pTHX_ CV *cv) 569coro_derive_padlist (pTHX_ CV *cv)
505{ 570{
506 AV *padlist = CvPADLIST (cv); 571 PADLIST *padlist = CvPADLIST (cv);
507 AV *newpadlist, *newpad; 572 PADLIST *newpadlist;
573 PADNAMELIST *padnames;
574 PAD *newpad;
575 PADOFFSET off = PadlistMAX (padlist) + 1;
508 576
509 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. */
510 AvREAL_off (newpadlist); 605 AvREAL_off (newpadlist);
511#if PERL_VERSION_ATLEAST (5,10,0)
512 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
513#else
514 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
515#endif 606#endif
516 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
517 --AvFILLp (padlist);
518 607
519 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 608 /* Already extended to 2 elements by newPADLIST. */
520 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;
521 616
522 return newpadlist; 617 return newpadlist;
523} 618}
524 619
525static void 620ecb_inline void
526free_padlist (pTHX_ AV *padlist) 621free_padlist (pTHX_ PADLIST *padlist)
527{ 622{
528 /* may be during global destruction */ 623 /* may be during global destruction */
529 if (!IN_DESTRUCT) 624 if (!IN_DESTRUCT)
530 { 625 {
531 I32 i = AvFILLp (padlist); 626 I32 i = PadlistMAX (padlist);
532 627
533 while (i > 0) /* special-case index 0 */ 628 while (i > 0) /* special-case index 0 */
534 { 629 {
535 /* we try to be extra-careful here */ 630 /* we try to be extra-careful here */
536 AV *av = (AV *)AvARRAY (padlist)[i--]; 631 PAD *pad = PadlistARRAY (padlist)[i--];
537 I32 j = AvFILLp (av);
538 632
633 if (pad)
634 {
635 I32 j = PadMAX (pad);
636
539 while (j >= 0) 637 while (j >= 0)
540 SvREFCNT_dec (AvARRAY (av)[j--]); 638 SvREFCNT_dec (PadARRAY (pad)[j--]);
541 639
542 AvFILLp (av) = -1; 640 PadMAX (pad) = -1;
543 SvREFCNT_dec (av); 641 SvREFCNT_dec (pad);
642 }
544 } 643 }
545 644
546 SvREFCNT_dec (AvARRAY (padlist)[0]); 645 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
547 646
647#if NEWPADAPI
648 Safefree (PadlistARRAY (padlist));
649 Safefree (padlist);
650#else
548 AvFILLp (padlist) = -1; 651 AvFILLp (padlist) = -1;
652 AvREAL_off (padlist);
549 SvREFCNT_dec ((SV*)padlist); 653 SvREFCNT_dec ((SV*)padlist);
654#endif
550 } 655 }
551} 656}
552 657
553static int 658static int
554coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 659coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
555{ 660{
556 AV *padlist; 661 PADLIST *padlist;
557 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;
558 664
559 /* perl manages to free our internal AV and _then_ call us */ 665 /* perl manages to free our internal AV and _then_ call us */
560 if (IN_DESTRUCT) 666 if (IN_DESTRUCT)
561 return 0; 667 return 0;
562 668
563 /* casting is fun. */ 669 while (len--)
564 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
565 free_padlist (aTHX_ padlist); 670 free_padlist (aTHX_ padlists[len]);
566
567 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
568 671
569 return 0; 672 return 0;
570} 673}
571 674
572static MGVTBL coro_cv_vtbl = { 675static MGVTBL coro_cv_vtbl = {
573 0, 0, 0, 0, 676 0, 0, 0, 0,
574 coro_cv_free 677 coro_cv_free
575}; 678};
576 679
577/* the next two functions merely cache the padlists */ 680/* the next two functions merely cache the padlists */
578static void 681ecb_inline void
579get_padlist (pTHX_ CV *cv) 682get_padlist (pTHX_ CV *cv)
580{ 683{
581 MAGIC *mg = CORO_MAGIC_cv (cv); 684 MAGIC *mg = CORO_MAGIC_cv (cv);
582 AV *av; 685 size_t *lenp;
583 686
584 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 687 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
585 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 688 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
586 else 689 else
587 { 690 {
588#if CORO_PREFER_PERL_FUNCTIONS 691#if CORO_PREFER_PERL_FUNCTIONS
589 /* this is probably cleaner? but also slower! */ 692 /* this is probably cleaner? but also slower! */
590 /* in practise, it seems to be less stable */ 693 /* in practise, it seems to be less stable */
… …
596 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 699 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
597#endif 700#endif
598 } 701 }
599} 702}
600 703
601static void 704ecb_inline void
602put_padlist (pTHX_ CV *cv) 705put_padlist (pTHX_ CV *cv)
603{ 706{
604 MAGIC *mg = CORO_MAGIC_cv (cv); 707 MAGIC *mg = CORO_MAGIC_cv (cv);
605 AV *av;
606 708
607 if (expect_false (!mg)) 709 if (ecb_expect_false (!mg))
710 {
608 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);
609 719
610 av = (AV *)mg->mg_obj; 720 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
611
612 if (expect_false (AvFILLp (av) >= AvMAX (av)))
613 av_extend (av, AvFILLp (av) + 1);
614
615 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
616} 721}
617 722
618/** load & save, init *******************************************************/ 723/** load & save, init *******************************************************/
619 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
620/* swap sv heads, at least logically */ 767/* swap sv heads, at least logically */
621static void 768static void
622swap_svs (pTHX_ Coro__State c) 769swap_svs_enter (pTHX_ Coro__State c)
623{ 770{
624 int i; 771 int i;
625 772
626 for (i = 0; i <= AvFILLp (c->swap_sv); ) 773 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
627 { 774 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
628 SV *a = AvARRAY (c->swap_sv)[i++];
629 SV *b = AvARRAY (c->swap_sv)[i++];
630
631 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
632 SV tmp;
633
634 /* swap sv_any */
635 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
636
637 /* swap sv_flags */
638 SvFLAGS (&tmp) = SvFLAGS (a);
639 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
640 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
641
642#if PERL_VERSION_ATLEAST (5,10,0)
643 /* perl 5.10 complicates this _quite_ a bit, but it also is
644 * much faster, so no quarrels here. alternatively, we could
645 * sv_upgrade to avoid this.
646 */
647 {
648 /* swap sv_u */
649 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
650
651 /* if SvANY points to the head, we need to adjust the pointers,
652 * as the pointer for a still points to b, and maybe vice versa.
653 */
654 #define svany_in_head(type) \
655 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
656
657 if (svany_in_head (SvTYPE (a)))
658 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
659
660 if (svany_in_head (SvTYPE (b)))
661 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
662 }
663#endif
664 }
665} 775}
666 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
667#define SWAP_SVS(coro) \ 786#define SWAP_SVS_ENTER(coro) \
668 if (expect_false ((coro)->swap_sv)) \ 787 if (ecb_expect_false ((coro)->swap_sv)) \
669 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))
670 793
671static void 794static void
672on_enterleave_call (pTHX_ SV *cb); 795on_enterleave_call (pTHX_ SV *cb);
673 796
674static void 797static void
… …
677 perl_slots *slot = c->slot; 800 perl_slots *slot = c->slot;
678 c->slot = 0; 801 c->slot = 0;
679 802
680 PL_mainstack = c->mainstack; 803 PL_mainstack = c->mainstack;
681 804
682 GvSV (PL_defgv) = slot->defsv; 805#if CORO_JIT
683 GvAV (PL_defgv) = slot->defav; 806 load_perl_slots (slot);
684 GvSV (PL_errgv) = slot->errsv; 807#else
685 GvSV (irsgv) = slot->irsgv;
686 GvHV (PL_hintgv) = slot->hinthv;
687
688 #define VAR(name,type) PL_ ## name = slot->name; 808 #define VARx(name,expr,type) expr = slot->name;
689 # include "state.h" 809 #include "state.h"
690 #undef VAR 810#endif
691 811
692 { 812 {
693 dSP; 813 dSP;
694 814
695 CV *cv; 815 CV *cv;
696 816
697 /* now do the ugly restore mess */ 817 /* now do the ugly restore mess */
698 while (expect_true (cv = (CV *)POPs)) 818 while (ecb_expect_true (cv = (CV *)POPs))
699 { 819 {
700 put_padlist (aTHX_ cv); /* mark this padlist as available */ 820 put_padlist (aTHX_ cv); /* mark this padlist as available */
701 CvDEPTH (cv) = PTR2IV (POPs); 821 CvDEPTH (cv) = PTR2IV (POPs);
702 CvPADLIST (cv) = (AV *)POPs; 822 CvPADLIST (cv) = (PADLIST *)POPs;
703 } 823 }
704 824
705 PUTBACK; 825 PUTBACK;
706 } 826 }
707 827
708 slf_frame = c->slf_frame; 828 slf_frame = c->slf_frame;
709 CORO_THROW = c->except; 829 CORO_THROW = c->except;
710 830
711 if (expect_false (enable_times)) 831 if (ecb_expect_false (enable_times))
712 { 832 {
713 if (expect_false (!times_valid)) 833 if (ecb_expect_false (!times_valid))
714 coro_times_update (); 834 coro_times_update ();
715 835
716 coro_times_sub (c); 836 coro_times_sub (c);
717 } 837 }
718 838
719 if (expect_false (c->on_enter)) 839 if (ecb_expect_false (c->on_enter))
720 { 840 {
721 int i; 841 int i;
722 842
723 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 843 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
724 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 844 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
725 } 845 }
726 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
727 SWAP_SVS (c); 855 SWAP_SVS_ENTER (c);
728} 856}
729 857
730static void 858static void
731save_perl (pTHX_ Coro__State c) 859save_perl (pTHX_ Coro__State c)
732{ 860{
733 SWAP_SVS (c); 861 SWAP_SVS_LEAVE (c);
734 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
735 if (expect_false (c->on_leave)) 871 if (ecb_expect_false (c->on_leave))
736 { 872 {
737 int i; 873 int i;
738 874
739 for (i = AvFILLp (c->on_leave); i >= 0; --i) 875 for (i = AvFILLp (c->on_leave); i >= 0; --i)
740 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 876 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
741 } 877 }
742 878
743 times_valid = 0; 879 times_valid = 0;
744 880
745 if (expect_false (enable_times)) 881 if (ecb_expect_false (enable_times))
746 { 882 {
747 coro_times_update (); times_valid = 1; 883 coro_times_update (); times_valid = 1;
748 coro_times_add (c); 884 coro_times_add (c);
749 } 885 }
750 886
… …
764 900
765 XPUSHs (Nullsv); 901 XPUSHs (Nullsv);
766 /* this loop was inspired by pp_caller */ 902 /* this loop was inspired by pp_caller */
767 for (;;) 903 for (;;)
768 { 904 {
769 while (expect_true (cxix >= 0)) 905 while (ecb_expect_true (cxix >= 0))
770 { 906 {
771 PERL_CONTEXT *cx = &ccstk[cxix--]; 907 PERL_CONTEXT *cx = &ccstk[cxix--];
772 908
773 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))
774 { 910 {
775 CV *cv = cx->blk_sub.cv; 911 CV *cv = cx->blk_sub.cv;
776 912
777 if (expect_true (CvDEPTH (cv))) 913 if (ecb_expect_true (CvDEPTH (cv)))
778 { 914 {
779 EXTEND (SP, 3); 915 EXTEND (SP, 3);
780 PUSHs ((SV *)CvPADLIST (cv)); 916 PUSHs ((SV *)CvPADLIST (cv));
781 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 917 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
782 PUSHs ((SV *)cv); 918 PUSHs ((SV *)cv);
… …
785 get_padlist (aTHX_ cv); 921 get_padlist (aTHX_ cv);
786 } 922 }
787 } 923 }
788 } 924 }
789 925
790 if (expect_true (top_si->si_type == PERLSI_MAIN)) 926 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
791 break; 927 break;
792 928
793 top_si = top_si->si_prev; 929 top_si = top_si->si_prev;
794 ccstk = top_si->si_cxstack; 930 ccstk = top_si->si_cxstack;
795 cxix = top_si->si_cxix; 931 cxix = top_si->si_cxix;
… …
797 933
798 PUTBACK; 934 PUTBACK;
799 } 935 }
800 936
801 /* allocate some space on the context stack for our purposes */ 937 /* allocate some space on the context stack for our purposes */
802 /* we manually unroll here, as usually 2 slots is enough */ 938 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
803 if (SLOT_COUNT >= 1) CXINC;
804 if (SLOT_COUNT >= 2) CXINC;
805 if (SLOT_COUNT >= 3) CXINC;
806 { 939 {
807 unsigned int i; 940 unsigned int i;
941
808 for (i = 3; i < SLOT_COUNT; ++i) 942 for (i = 0; i < SLOT_COUNT; ++i)
809 CXINC; 943 CXINC;
810 } 944
811 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 945 cxstack_ix -= SLOT_COUNT; /* undo allocation */
946 }
812 947
813 c->mainstack = PL_mainstack; 948 c->mainstack = PL_mainstack;
814 949
815 { 950 {
816 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 951 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
817 952
818 slot->defav = GvAV (PL_defgv); 953#if CORO_JIT
819 slot->defsv = DEFSV; 954 save_perl_slots (slot);
820 slot->errsv = ERRSV; 955#else
821 slot->irsgv = GvSV (irsgv);
822 slot->hinthv = GvHV (PL_hintgv);
823
824 #define VAR(name,type) slot->name = PL_ ## name; 956 #define VARx(name,expr,type) slot->name = expr;
825 # include "state.h" 957 #include "state.h"
826 #undef VAR 958#endif
827 } 959 }
828} 960}
829 961
830/* 962/*
831 * allocate various perl stacks. This is almost an exact copy 963 * allocate various perl stacks. This is almost an exact copy
… …
837# define coro_init_stacks(thx) init_stacks () 969# define coro_init_stacks(thx) init_stacks ()
838#else 970#else
839static void 971static void
840coro_init_stacks (pTHX) 972coro_init_stacks (pTHX)
841{ 973{
842 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() */
843 PL_curstackinfo->si_type = PERLSI_MAIN; 975 PL_curstackinfo->si_type = PERLSI_MAIN;
844 PL_curstack = PL_curstackinfo->si_stack; 976 PL_curstack = PL_curstackinfo->si_stack;
845 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 977 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
846 978
847 PL_stack_base = AvARRAY(PL_curstack); 979 PL_stack_base = AvARRAY(PL_curstack);
… …
862#endif 994#endif
863 995
864 New(54,PL_scopestack,8,I32); 996 New(54,PL_scopestack,8,I32);
865 PL_scopestack_ix = 0; 997 PL_scopestack_ix = 0;
866 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
867 1002
868 New(54,PL_savestack,24,ANY); 1003 New(54,PL_savestack,24,ANY);
869 PL_savestack_ix = 0; 1004 PL_savestack_ix = 0;
870 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
871 1011
872#if !PERL_VERSION_ATLEAST (5,10,0) 1012#if !PERL_VERSION_ATLEAST (5,10,0)
873 New(54,PL_retstack,4,OP*); 1013 New(54,PL_retstack,4,OP*);
874 PL_retstack_ix = 0; 1014 PL_retstack_ix = 0;
875 PL_retstack_max = 4; 1015 PL_retstack_max = 4;
… …
899 } 1039 }
900 1040
901 Safefree (PL_tmps_stack); 1041 Safefree (PL_tmps_stack);
902 Safefree (PL_markstack); 1042 Safefree (PL_markstack);
903 Safefree (PL_scopestack); 1043 Safefree (PL_scopestack);
1044#if HAS_SCOPESTACK_NAME
1045 Safefree (PL_scopestack_name);
1046#endif
904 Safefree (PL_savestack); 1047 Safefree (PL_savestack);
905#if !PERL_VERSION_ATLEAST (5,10,0) 1048#if !PERL_VERSION_ATLEAST (5,10,0)
906 Safefree (PL_retstack); 1049 Safefree (PL_retstack);
907#endif 1050#endif
908} 1051}
… …
938 } 1081 }
939 1082
940 return rss; 1083 return rss;
941} 1084}
942 1085
943/** coroutine stack handling ************************************************/ 1086/** provide custom get/set/clear methods for %SIG elements ******************/
944
945static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
946static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
947static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
948 1087
949/* apparently < 5.8.8 */ 1088/* apparently < 5.8.8 */
950#ifndef MgPV_nolen_const 1089#ifndef MgPV_nolen_const
951#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1090#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
952 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1091 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
953 (const char*)(mg)->mg_ptr) 1092 (const char*)(mg)->mg_ptr)
954#endif 1093#endif
955 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
956/* 1123/*
957 * This overrides the default magic get method of %SIG elements. 1124 * This overrides the default magic get method of %SIG elements.
958 * 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
959 * 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),
960 * readback here. 1127 * we just provide our own readback here.
961 */ 1128 */
962static int 1129static int ecb_cold
963coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
964{ 1131{
965 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;
966 1135
967 if (*s == '_') 1136 SV *ssv;
968 {
969 SV **svp = 0;
970 1137
971 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
972 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
973
974 if (svp) 1138 if (!*svp)
975 { 1139 ssv = &PL_sv_undef;
976 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1140 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
977 return 0; 1141 ssv = sv_2mortal (newRV_inc (*svp));
978 } 1142 else
979 } 1143 ssv = *svp;
980 1144
981 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1145 sv_setsv (sv, ssv);
1146 return 0;
982} 1147}
983 1148
984static int 1149static int ecb_cold
985coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1150coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
986{ 1151{
987 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;
988 1155
989 if (*s == '_')
990 {
991 SV **svp = 0;
992
993 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
994 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
995
996 if (svp)
997 {
998 SV *old = *svp; 1156 SV *old = *svp;
999 *svp = 0; 1157 *svp = 0;
1000 SvREFCNT_dec (old); 1158 SvREFCNT_dec (old);
1001 return 0; 1159 return 0;
1002 }
1003 }
1004
1005 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
1006} 1160}
1007 1161
1008static int 1162static int ecb_cold
1009coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1163coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1010{ 1164{
1011 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;
1012 1168
1013 if (*s == '_')
1014 {
1015 SV **svp = 0;
1016
1017 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1018 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1019
1020 if (svp)
1021 {
1022 SV *old = *svp; 1169 SV *old = *svp;
1023 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1170 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1024 SvREFCNT_dec (old); 1171 SvREFCNT_dec (old);
1025 return 0; 1172 return 0;
1026 }
1027 }
1028
1029 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
1030} 1173}
1031 1174
1032static void 1175static void
1033prepare_nop (pTHX_ struct coro_transfer_args *ta) 1176prepare_nop (pTHX_ struct coro_transfer_args *ta)
1034{ 1177{
… …
1046slf_check_repeat (pTHX_ struct CoroSLF *frame) 1189slf_check_repeat (pTHX_ struct CoroSLF *frame)
1047{ 1190{
1048 return 1; 1191 return 1;
1049} 1192}
1050 1193
1194/** coroutine stack handling ************************************************/
1195
1051static UNOP init_perl_op; 1196static UNOP init_perl_op;
1052 1197
1053static 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 */
1054init_perl (pTHX_ struct coro *coro) 1199init_perl (pTHX_ struct coro *coro)
1055{ 1200{
1056 /* 1201 /*
1057 * emulate part of the perl startup here. 1202 * emulate part of the perl startup here.
1058 */ 1203 */
… …
1073 PL_parser = 0; 1218 PL_parser = 0;
1074#endif 1219#endif
1075 PL_hints = 0; 1220 PL_hints = 0;
1076 1221
1077 /* recreate the die/warn hooks */ 1222 /* recreate the die/warn hooks */
1078 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1223 PL_diehook = SvREFCNT_inc (rv_diehook);
1079 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1224 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1080 1225
1081 GvSV (PL_defgv) = newSV (0); 1226 GvSV (PL_defgv) = newSV (0);
1082 GvAV (PL_defgv) = coro->args; coro->args = 0; 1227 GvAV (PL_defgv) = coro->args; coro->args = 0;
1083 GvSV (PL_errgv) = newSV (0); 1228 GvSV (PL_errgv) = newSV (0);
1084 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);
1085 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
1086 PL_rs = newSVsv (GvSV (irsgv)); 1234 PL_rs = newSVsv (GvSV (irsgv));
1087 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1235 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1088 1236
1089 { 1237 {
1090 dSP; 1238 dSP;
… …
1094 myop.op_next = Nullop; 1242 myop.op_next = Nullop;
1095 myop.op_type = OP_ENTERSUB; 1243 myop.op_type = OP_ENTERSUB;
1096 myop.op_flags = OPf_WANT_VOID; 1244 myop.op_flags = OPf_WANT_VOID;
1097 1245
1098 PUSHMARK (SP); 1246 PUSHMARK (SP);
1099 PUSHs ((SV *)coro->startcv); 1247 XPUSHs ((SV *)coro->startcv);
1100 PUTBACK; 1248 PUTBACK;
1101 PL_op = (OP *)&myop; 1249 PL_op = (OP *)&myop;
1102 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1250 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1103 } 1251 }
1104 1252
1105 /* 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
1106 * 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.
1107 */ 1255 */
1108 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 */
1109 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;
1110 1259
1111 /* 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 */
1112 init_perl_op.op_next = PL_op; 1261 init_perl_op.op_next = PL_op;
1113 init_perl_op.op_type = OP_ENTERSUB; 1262 init_perl_op.op_type = OP_ENTERSUB;
1114 init_perl_op.op_ppaddr = pp_slf; 1263 init_perl_op.op_ppaddr = pp_slf;
… …
1117 PL_op = (OP *)&init_perl_op; 1266 PL_op = (OP *)&init_perl_op;
1118 1267
1119 /* copy throw, in case it was set before init_perl */ 1268 /* copy throw, in case it was set before init_perl */
1120 CORO_THROW = coro->except; 1269 CORO_THROW = coro->except;
1121 1270
1122 SWAP_SVS (coro); 1271 SWAP_SVS_ENTER (coro);
1123 1272
1124 if (expect_false (enable_times)) 1273 if (ecb_expect_false (enable_times))
1125 { 1274 {
1126 coro_times_update (); 1275 coro_times_update ();
1127 coro_times_sub (coro); 1276 coro_times_sub (coro);
1128 } 1277 }
1129} 1278}
… …
1153destroy_perl (pTHX_ struct coro *coro) 1302destroy_perl (pTHX_ struct coro *coro)
1154{ 1303{
1155 SV *svf [9]; 1304 SV *svf [9];
1156 1305
1157 { 1306 {
1307 SV *old_current = SvRV (coro_current);
1158 struct coro *current = SvSTATE_current; 1308 struct coro *current = SvSTATE (old_current);
1159 1309
1160 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));
1161 1311
1162 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
1163 load_perl (aTHX_ coro); 1317 load_perl (aTHX_ coro);
1164 1318
1319 /* restore swapped sv's */
1320 SWAP_SVS_LEAVE (coro);
1321
1165 coro_unwind_stacks (aTHX); 1322 coro_unwind_stacks (aTHX);
1323
1166 coro_destruct_stacks (aTHX); 1324 coro_destruct_stacks (aTHX);
1167 1325
1168 /* restore swapped sv's */
1169 SWAP_SVS (coro);
1170
1171 // now save some sv's to be free'd later 1326 /* now save some sv's to be free'd later */
1172 svf [0] = GvSV (PL_defgv); 1327 svf [0] = GvSV (PL_defgv);
1173 svf [1] = (SV *)GvAV (PL_defgv); 1328 svf [1] = (SV *)GvAV (PL_defgv);
1174 svf [2] = GvSV (PL_errgv); 1329 svf [2] = GvSV (PL_errgv);
1175 svf [3] = (SV *)PL_defoutgv; 1330 svf [3] = (SV *)PL_defoutgv;
1176 svf [4] = PL_rs; 1331 svf [4] = PL_rs;
… …
1178 svf [6] = (SV *)GvHV (PL_hintgv); 1333 svf [6] = (SV *)GvHV (PL_hintgv);
1179 svf [7] = PL_diehook; 1334 svf [7] = PL_diehook;
1180 svf [8] = PL_warnhook; 1335 svf [8] = PL_warnhook;
1181 assert (9 == sizeof (svf) / sizeof (*svf)); 1336 assert (9 == sizeof (svf) / sizeof (*svf));
1182 1337
1338 SvRV_set (coro_current, old_current);
1339
1183 load_perl (aTHX_ current); 1340 load_perl (aTHX_ current);
1184 } 1341 }
1185 1342
1186 { 1343 {
1187 unsigned int i; 1344 unsigned int i;
… …
1191 1348
1192 SvREFCNT_dec (coro->saved_deffh); 1349 SvREFCNT_dec (coro->saved_deffh);
1193 SvREFCNT_dec (coro->rouse_cb); 1350 SvREFCNT_dec (coro->rouse_cb);
1194 SvREFCNT_dec (coro->invoke_cb); 1351 SvREFCNT_dec (coro->invoke_cb);
1195 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);
1196 } 1355 }
1197} 1356}
1198 1357
1199INLINE void 1358ecb_inline void
1200free_coro_mortal (pTHX) 1359free_coro_mortal (pTHX)
1201{ 1360{
1202 if (expect_true (coro_mortal)) 1361 if (ecb_expect_true (coro_mortal))
1203 { 1362 {
1204 SvREFCNT_dec (coro_mortal); 1363 SvREFCNT_dec ((SV *)coro_mortal);
1205 coro_mortal = 0; 1364 coro_mortal = 0;
1206 } 1365 }
1207} 1366}
1208 1367
1209static int 1368static int
… …
1241 av_push (av, SvREFCNT_inc_NN (*bot++)); 1400 av_push (av, SvREFCNT_inc_NN (*bot++));
1242 1401
1243 PL_runops = RUNOPS_DEFAULT; 1402 PL_runops = RUNOPS_DEFAULT;
1244 ENTER; 1403 ENTER;
1245 SAVETMPS; 1404 SAVETMPS;
1405 PUSHMARK (SP);
1246 EXTEND (SP, 3); 1406 EXTEND (SP, 3);
1247 PUSHMARK (SP);
1248 PUSHs (&PL_sv_no); 1407 PUSHs (&PL_sv_no);
1249 PUSHs (fullname); 1408 PUSHs (fullname);
1250 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 1409 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
1251 PUTBACK; 1410 PUTBACK;
1252 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);
… …
1263 1422
1264 if (PL_curcop != &PL_compiling) 1423 if (PL_curcop != &PL_compiling)
1265 { 1424 {
1266 SV **cb; 1425 SV **cb;
1267 1426
1268 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1427 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1269 { 1428 {
1270 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1429 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1271 1430
1272 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1431 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1273 { 1432 {
… …
1279 gv_efullname3 (fullname, gv, 0); 1438 gv_efullname3 (fullname, gv, 0);
1280 1439
1281 PL_runops = RUNOPS_DEFAULT; 1440 PL_runops = RUNOPS_DEFAULT;
1282 ENTER; 1441 ENTER;
1283 SAVETMPS; 1442 SAVETMPS;
1443 PUSHMARK (SP);
1284 EXTEND (SP, 3); 1444 EXTEND (SP, 3);
1285 PUSHMARK (SP);
1286 PUSHs (&PL_sv_yes); 1445 PUSHs (&PL_sv_yes);
1287 PUSHs (fullname); 1446 PUSHs (fullname);
1288 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);
1289 PUTBACK; 1448 PUTBACK;
1290 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);
1291 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);
1292 SPAGAIN; 1451 SPAGAIN;
1293 FREETMPS; 1452 FREETMPS;
… …
1303 dSP; 1462 dSP;
1304 1463
1305 PL_runops = RUNOPS_DEFAULT; 1464 PL_runops = RUNOPS_DEFAULT;
1306 ENTER; 1465 ENTER;
1307 SAVETMPS; 1466 SAVETMPS;
1308 EXTEND (SP, 3);
1309 PL_runops = RUNOPS_DEFAULT;
1310 PUSHMARK (SP); 1467 PUSHMARK (SP);
1468 EXTEND (SP, 2);
1311 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1469 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1312 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1470 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1313 PUTBACK; 1471 PUTBACK;
1314 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);
1315 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);
… …
1342 1500
1343 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 */
1344} 1502}
1345 1503
1346/* 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 */
1347static void NOINLINE 1505static void ecb_noinline
1348cctx_prepare (pTHX) 1506cctx_prepare (pTHX)
1349{ 1507{
1350 PL_top_env = &PL_start_env; 1508 PL_top_env = &PL_start_env;
1351 1509
1352 if (cctx_current->flags & CC_TRACE) 1510 if (cctx_current->flags & CC_TRACE)
… …
1363 slf_frame.prepare = slf_prepare_set_stacklevel; 1521 slf_frame.prepare = slf_prepare_set_stacklevel;
1364 slf_frame.check = slf_check_set_stacklevel; 1522 slf_frame.check = slf_check_set_stacklevel;
1365} 1523}
1366 1524
1367/* 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 */
1368INLINE void 1526ecb_inline void
1369transfer_tail (pTHX) 1527transfer_tail (pTHX)
1370{ 1528{
1371 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);
1372} 1542}
1373 1543
1374/* 1544/*
1375 * this is a _very_ stripped down perl interpreter ;) 1545 * this is a _very_ stripped down perl interpreter ;)
1376 */ 1546 */
… …
1403 * 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
1404 * 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.
1405 */ 1575 */
1406 1576
1407 /* 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 /*
1408 * 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
1409 * 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)
1410 * 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
1411 * bootstrap-time "top" top_env, as we cannot restore the "main" 1588 * doing in that case. YMMV.
1412 * coroutine as Coro has no such concept.
1413 * This actually isn't valid with the pthread backend, but OSes requiring
1414 * that backend are too broken to do it in a standards-compliant way.
1415 */ 1589 */
1416 PL_top_env = main_top_env; 1590 perlish_exit (aTHX);
1417 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1418 } 1591 }
1419} 1592}
1420 1593
1421static coro_cctx * 1594static coro_cctx *
1422cctx_new () 1595cctx_new (void)
1423{ 1596{
1424 coro_cctx *cctx; 1597 coro_cctx *cctx;
1425 1598
1426 ++cctx_count; 1599 ++cctx_count;
1427 New (0, cctx, 1, coro_cctx); 1600 New (0, cctx, 1, coro_cctx);
… …
1433 return cctx; 1606 return cctx;
1434} 1607}
1435 1608
1436/* create a new cctx only suitable as source */ 1609/* create a new cctx only suitable as source */
1437static coro_cctx * 1610static coro_cctx *
1438cctx_new_empty () 1611cctx_new_empty (void)
1439{ 1612{
1440 coro_cctx *cctx = cctx_new (); 1613 coro_cctx *cctx = cctx_new ();
1441 1614
1442 cctx->sptr = 0; 1615 cctx->stack.sptr = 0;
1443 coro_create (&cctx->cctx, 0, 0, 0, 0); 1616 coro_create (&cctx->cctx, 0, 0, 0, 0);
1444 1617
1445 return cctx; 1618 return cctx;
1446} 1619}
1447 1620
1448/* create a new cctx suitable as destination/running a perl interpreter */ 1621/* create a new cctx suitable as destination/running a perl interpreter */
1449static coro_cctx * 1622static coro_cctx *
1450cctx_new_run () 1623cctx_new_run (void)
1451{ 1624{
1452 coro_cctx *cctx = cctx_new (); 1625 coro_cctx *cctx = cctx_new ();
1453 void *stack_start;
1454 size_t stack_size;
1455 1626
1456#if HAVE_MMAP 1627 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1457 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1458 /* mmap supposedly does allocate-on-write for us */
1459 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1460
1461 if (cctx->sptr != (void *)-1)
1462 {
1463 #if CORO_STACKGUARD
1464 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1465 #endif
1466 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1467 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1468 cctx->flags |= CC_MAPPED;
1469 } 1628 {
1470 else
1471#endif
1472 {
1473 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1474 New (0, cctx->sptr, cctx_stacksize, long);
1475
1476 if (!cctx->sptr)
1477 {
1478 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1629 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1479 _exit (EXIT_FAILURE); 1630 _exit (EXIT_FAILURE);
1480 }
1481
1482 stack_start = cctx->sptr;
1483 stack_size = cctx->ssize;
1484 } 1631 }
1485 1632
1486 #if CORO_USE_VALGRIND
1487 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1488 #endif
1489
1490 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);
1491 1634
1492 return cctx; 1635 return cctx;
1493} 1636}
1494 1637
1495static void 1638static void
1496cctx_destroy (coro_cctx *cctx) 1639cctx_destroy (coro_cctx *cctx)
1497{ 1640{
1498 if (!cctx) 1641 if (!cctx)
1499 return; 1642 return;
1500 1643
1501 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1644 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1502 1645
1503 --cctx_count; 1646 --cctx_count;
1504 coro_destroy (&cctx->cctx); 1647 coro_destroy (&cctx->cctx);
1505 1648
1506 /* coro_transfer creates new, empty cctx's */ 1649 coro_stack_free (&cctx->stack);
1507 if (cctx->sptr)
1508 {
1509 #if CORO_USE_VALGRIND
1510 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1511 #endif
1512
1513#if HAVE_MMAP
1514 if (cctx->flags & CC_MAPPED)
1515 munmap (cctx->sptr, cctx->ssize);
1516 else
1517#endif
1518 Safefree (cctx->sptr);
1519 }
1520 1650
1521 Safefree (cctx); 1651 Safefree (cctx);
1522} 1652}
1523 1653
1524/* wether this cctx should be destructed */ 1654/* wether this cctx should be destructed */
1525#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))
1526 1656
1527static coro_cctx * 1657static coro_cctx *
1528cctx_get (pTHX) 1658cctx_get (pTHX)
1529{ 1659{
1530 while (expect_true (cctx_first)) 1660 while (ecb_expect_true (cctx_first))
1531 { 1661 {
1532 coro_cctx *cctx = cctx_first; 1662 coro_cctx *cctx = cctx_first;
1533 cctx_first = cctx->next; 1663 cctx_first = cctx->next;
1534 --cctx_idle; 1664 --cctx_idle;
1535 1665
1536 if (expect_true (!CCTX_EXPIRED (cctx))) 1666 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1537 return cctx; 1667 return cctx;
1538 1668
1539 cctx_destroy (cctx); 1669 cctx_destroy (cctx);
1540 } 1670 }
1541 1671
… …
1543} 1673}
1544 1674
1545static void 1675static void
1546cctx_put (coro_cctx *cctx) 1676cctx_put (coro_cctx *cctx)
1547{ 1677{
1548 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));
1549 1679
1550 /* free another cctx if overlimit */ 1680 /* free another cctx if overlimit */
1551 if (expect_false (cctx_idle >= cctx_max_idle)) 1681 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1552 { 1682 {
1553 coro_cctx *first = cctx_first; 1683 coro_cctx *first = cctx_first;
1554 cctx_first = first->next; 1684 cctx_first = first->next;
1555 --cctx_idle; 1685 --cctx_idle;
1556 1686
… …
1567static void 1697static void
1568transfer_check (pTHX_ struct coro *prev, struct coro *next) 1698transfer_check (pTHX_ struct coro *prev, struct coro *next)
1569{ 1699{
1570 /* TODO: throwing up here is considered harmful */ 1700 /* TODO: throwing up here is considered harmful */
1571 1701
1572 if (expect_true (prev != next)) 1702 if (ecb_expect_true (prev != next))
1573 { 1703 {
1574 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1704 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1575 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,");
1576 1706
1577 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1707 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1578 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,");
1579 1709
1580#if !PERL_VERSION_ATLEAST (5,10,0) 1710#if !PERL_VERSION_ATLEAST (5,10,0)
1581 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1711 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1582 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,");
1583#endif 1713#endif
1584 } 1714 }
1585} 1715}
1586 1716
1587/* always use the TRANSFER macro */ 1717/* always use the TRANSFER macro */
1588static void NOINLINE /* noinline so we have a fixed stackframe */ 1718static void ecb_noinline /* noinline so we have a fixed stackframe */
1589transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1719transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1590{ 1720{
1591 dSTACKLEVEL; 1721 dSTACKLEVEL;
1592 1722
1593 /* sometimes transfer is only called to set idle_sp */ 1723 /* sometimes transfer is only called to set idle_sp */
1594 if (expect_false (!prev)) 1724 if (ecb_expect_false (!prev))
1595 { 1725 {
1596 cctx_current->idle_sp = STACKLEVEL; 1726 cctx_current->idle_sp = STACKLEVEL;
1597 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 */
1598 } 1728 }
1599 else if (expect_true (prev != next)) 1729 else if (ecb_expect_true (prev != next))
1600 { 1730 {
1601 coro_cctx *cctx_prev; 1731 coro_cctx *cctx_prev;
1602 1732
1603 if (expect_false (prev->flags & CF_NEW)) 1733 if (ecb_expect_false (prev->flags & CF_NEW))
1604 { 1734 {
1605 /* create a new empty/source context */ 1735 /* create a new empty/source context */
1606 prev->flags &= ~CF_NEW; 1736 prev->flags &= ~CF_NEW;
1607 prev->flags |= CF_RUNNING; 1737 prev->flags |= CF_RUNNING;
1608 } 1738 }
… …
1611 next->flags |= CF_RUNNING; 1741 next->flags |= CF_RUNNING;
1612 1742
1613 /* first get rid of the old state */ 1743 /* first get rid of the old state */
1614 save_perl (aTHX_ prev); 1744 save_perl (aTHX_ prev);
1615 1745
1616 if (expect_false (next->flags & CF_NEW)) 1746 if (ecb_expect_false (next->flags & CF_NEW))
1617 { 1747 {
1618 /* need to start coroutine */ 1748 /* need to start coroutine */
1619 next->flags &= ~CF_NEW; 1749 next->flags &= ~CF_NEW;
1620 /* setup coroutine call */ 1750 /* setup coroutine call */
1621 init_perl (aTHX_ next); 1751 init_perl (aTHX_ next);
1622 } 1752 }
1623 else 1753 else
1624 load_perl (aTHX_ next); 1754 load_perl (aTHX_ next);
1625 1755
1626 /* possibly untie and reuse the cctx */ 1756 /* possibly untie and reuse the cctx */
1627 if (expect_true ( 1757 if (ecb_expect_true (
1628 cctx_current->idle_sp == STACKLEVEL 1758 cctx_current->idle_sp == STACKLEVEL
1629 && !(cctx_current->flags & CC_TRACE) 1759 && !(cctx_current->flags & CC_TRACE)
1630 && !force_cctx 1760 && !force_cctx
1631 )) 1761 ))
1632 { 1762 {
1633 /* 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 */
1634 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));
1635 1765
1636 /* 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. */
1637 /* 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 */
1638 if (expect_false (CCTX_EXPIRED (cctx_current))) 1768 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1639 if (expect_true (!next->cctx)) 1769 if (ecb_expect_true (!next->cctx))
1640 next->cctx = cctx_get (aTHX); 1770 next->cctx = cctx_get (aTHX);
1641 1771
1642 cctx_put (cctx_current); 1772 cctx_put (cctx_current);
1643 } 1773 }
1644 else 1774 else
1645 prev->cctx = cctx_current; 1775 prev->cctx = cctx_current;
1646 1776
1647 ++next->usecount; 1777 ++next->usecount;
1648 1778
1649 cctx_prev = cctx_current; 1779 cctx_prev = cctx_current;
1650 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1780 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1651 1781
1652 next->cctx = 0; 1782 next->cctx = 0;
1653 1783
1654 if (expect_false (cctx_prev != cctx_current)) 1784 if (ecb_expect_false (cctx_prev != cctx_current))
1655 { 1785 {
1656 cctx_prev->top_env = PL_top_env; 1786 cctx_prev->top_env = PL_top_env;
1657 PL_top_env = cctx_current->top_env; 1787 PL_top_env = cctx_current->top_env;
1658 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1788 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1659 } 1789 }
… …
1665#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))
1666#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1796#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1667 1797
1668/** high level stuff ********************************************************/ 1798/** high level stuff ********************************************************/
1669 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 */
1670static int 1802static void
1803coro_call_on_destroy (pTHX_ struct coro *coro);
1804
1805static void
1671coro_state_destroy (pTHX_ struct coro *coro) 1806coro_state_destroy (pTHX_ struct coro *coro)
1672{ 1807{
1673 if (coro->flags & CF_DESTROYED) 1808 if (coro->flags & CF_ZOMBIE)
1674 return 0; 1809 return;
1675 1810
1676 if (coro->on_destroy && !PL_dirty)
1677 coro->on_destroy (aTHX_ coro); 1811 slf_destroy (aTHX_ coro);
1678 1812
1679 coro->flags |= CF_DESTROYED; 1813 coro->flags |= CF_ZOMBIE;
1680 1814
1681 if (coro->flags & CF_READY) 1815 if (coro->flags & CF_READY)
1682 { 1816 {
1683 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1817 /* reduce nready, as destroying a ready coro effectively unreadies it */
1684 /* alternative: look through all ready queues and remove the coro */ 1818 /* alternative: look through all ready queues and remove the coro */
1685 --coro_nready; 1819 --coro_nready;
1686 } 1820 }
1687 else 1821 else
1688 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;
1689 1827
1690 if (coro->mainstack 1828 if (coro->mainstack
1691 && coro->mainstack != main_mainstack 1829 && coro->mainstack != main_mainstack
1692 && coro->slot 1830 && coro->slot
1693 && !PL_dirty) 1831 && !PL_dirty)
1694 destroy_perl (aTHX_ coro); 1832 destroy_perl (aTHX_ coro);
1695 1833
1696 if (coro->next) coro->next->prev = coro->prev;
1697 if (coro->prev) coro->prev->next = coro->next;
1698 if (coro == coro_first) coro_first = coro->next;
1699
1700 cctx_destroy (coro->cctx); 1834 cctx_destroy (coro->cctx);
1701 SvREFCNT_dec (coro->startcv); 1835 SvREFCNT_dec (coro->startcv);
1702 SvREFCNT_dec (coro->args); 1836 SvREFCNT_dec (coro->args);
1703 SvREFCNT_dec (coro->swap_sv); 1837 SvREFCNT_dec (coro->swap_sv);
1704 SvREFCNT_dec (CORO_THROW); 1838 SvREFCNT_dec (CORO_THROW);
1705 1839
1706 return 1; 1840 coro_call_on_destroy (aTHX_ coro);
1841
1842 /* more destruction mayhem in coro_state_free */
1707} 1843}
1708 1844
1709static int 1845static int
1710coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1846coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1711{ 1847{
1712 struct coro *coro = (struct coro *)mg->mg_ptr; 1848 struct coro *coro = (struct coro *)mg->mg_ptr;
1849
1850 coro_state_destroy (aTHX_ coro);
1713 mg->mg_ptr = 0; 1851 mg->mg_ptr = 0;
1714 1852
1715 coro->hv = 0; 1853 SvREFCNT_dec (coro->on_destroy);
1854 SvREFCNT_dec (coro->status);
1716 1855
1717 if (--coro->refcnt < 0)
1718 {
1719 coro_state_destroy (aTHX_ coro);
1720 Safefree (coro); 1856 Safefree (coro);
1721 }
1722 1857
1723 return 0; 1858 return 0;
1724} 1859}
1725 1860
1726static int 1861static int ecb_cold
1727coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1862coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1728{ 1863{
1729 struct coro *coro = (struct coro *)mg->mg_ptr; 1864 /* called when perl clones the current process the slow way (windows process emulation) */
1730 1865 /* we simply nuke the pointers in the copy, causing perl to croak */
1731 ++coro->refcnt; 1866 mg->mg_ptr = 0;
1867 mg->mg_virtual = 0;
1732 1868
1733 return 0; 1869 return 0;
1734} 1870}
1735 1871
1736static MGVTBL coro_state_vtbl = { 1872static MGVTBL coro_state_vtbl = {
… …
1761 TRANSFER (ta, 1); 1897 TRANSFER (ta, 1);
1762} 1898}
1763 1899
1764/** Coro ********************************************************************/ 1900/** Coro ********************************************************************/
1765 1901
1766INLINE void 1902ecb_inline void
1767coro_enq (pTHX_ struct coro *coro) 1903coro_enq (pTHX_ struct coro *coro)
1768{ 1904{
1769 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1905 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1770 1906
1771 SvREFCNT_inc_NN (coro->hv); 1907 SvREFCNT_inc_NN (coro->hv);
… …
1773 coro->next_ready = 0; 1909 coro->next_ready = 0;
1774 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1910 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1775 ready [1] = coro; 1911 ready [1] = coro;
1776} 1912}
1777 1913
1778INLINE struct coro * 1914ecb_inline struct coro *
1779coro_deq (pTHX) 1915coro_deq (pTHX)
1780{ 1916{
1781 int prio; 1917 int prio;
1782 1918
1783 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1919 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1836{ 1972{
1837 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1973 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1838} 1974}
1839 1975
1840/* expects to own a reference to next->hv */ 1976/* expects to own a reference to next->hv */
1841INLINE void 1977ecb_inline void
1842prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1978prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1843{ 1979{
1844 SV *prev_sv = SvRV (coro_current); 1980 SV *prev_sv = SvRV (coro_current);
1845 1981
1846 ta->prev = SvSTATE_hv (prev_sv); 1982 ta->prev = SvSTATE_hv (prev_sv);
… …
1859{ 1995{
1860 for (;;) 1996 for (;;)
1861 { 1997 {
1862 struct coro *next = coro_deq (aTHX); 1998 struct coro *next = coro_deq (aTHX);
1863 1999
1864 if (expect_true (next)) 2000 if (ecb_expect_true (next))
1865 { 2001 {
1866 /* cannot transfer to destroyed coros, skip and look for next */ 2002 /* cannot transfer to destroyed coros, skip and look for next */
1867 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 2003 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1868 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 2004 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1869 else 2005 else
1870 { 2006 {
1871 next->flags &= ~CF_READY; 2007 next->flags &= ~CF_READY;
1872 --coro_nready; 2008 --coro_nready;
… …
1880 /* nothing to schedule: call the idle handler */ 2016 /* nothing to schedule: call the idle handler */
1881 if (SvROK (sv_idle) 2017 if (SvROK (sv_idle)
1882 && SvOBJECT (SvRV (sv_idle))) 2018 && SvOBJECT (SvRV (sv_idle)))
1883 { 2019 {
1884 if (SvRV (sv_idle) == SvRV (coro_current)) 2020 if (SvRV (sv_idle) == SvRV (coro_current))
2021 {
2022 require_pv ("Carp");
2023
2024 {
2025 dSP;
2026
2027 ENTER;
2028 SAVETMPS;
2029
2030 PUSHMARK (SP);
1885 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 2031 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2032 PUTBACK;
2033 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2034
2035 FREETMPS;
2036 LEAVE;
2037 }
2038 }
1886 2039
1887 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2040 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1888 api_ready (aTHX_ SvRV (sv_idle)); 2041 api_ready (aTHX_ SvRV (sv_idle));
1889 --coro_nready; 2042 --coro_nready;
1890 } 2043 }
… …
1905 } 2058 }
1906 } 2059 }
1907 } 2060 }
1908} 2061}
1909 2062
1910INLINE void 2063ecb_inline void
1911prepare_cede (pTHX_ struct coro_transfer_args *ta) 2064prepare_cede (pTHX_ struct coro_transfer_args *ta)
1912{ 2065{
1913 api_ready (aTHX_ coro_current); 2066 api_ready (aTHX_ coro_current);
1914 prepare_schedule (aTHX_ ta); 2067 prepare_schedule (aTHX_ ta);
1915} 2068}
1916 2069
1917INLINE void 2070ecb_inline void
1918prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2071prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1919{ 2072{
1920 SV *prev = SvRV (coro_current); 2073 SV *prev = SvRV (coro_current);
1921 2074
1922 if (coro_nready) 2075 if (coro_nready)
… …
1952{ 2105{
1953 struct coro_transfer_args ta; 2106 struct coro_transfer_args ta;
1954 2107
1955 prepare_cede (aTHX_ &ta); 2108 prepare_cede (aTHX_ &ta);
1956 2109
1957 if (expect_true (ta.prev != ta.next)) 2110 if (ecb_expect_true (ta.prev != ta.next))
1958 { 2111 {
1959 TRANSFER (ta, 1); 2112 TRANSFER (ta, 1);
1960 return 1; 2113 return 1;
1961 } 2114 }
1962 else 2115 else
… …
2005 coro->slot->runops = RUNOPS_DEFAULT; 2158 coro->slot->runops = RUNOPS_DEFAULT;
2006 } 2159 }
2007} 2160}
2008 2161
2009static void 2162static void
2163coro_push_av (pTHX_ AV *av, I32 gimme_v)
2164{
2165 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2166 {
2167 dSP;
2168
2169 if (gimme_v == G_SCALAR)
2170 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2171 else
2172 {
2173 int i;
2174 EXTEND (SP, AvFILLp (av) + 1);
2175
2176 for (i = 0; i <= AvFILLp (av); ++i)
2177 PUSHs (AvARRAY (av)[i]);
2178 }
2179
2180 PUTBACK;
2181 }
2182}
2183
2184static void
2185coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2186{
2187 if (!coro->on_destroy)
2188 coro->on_destroy = newAV ();
2189
2190 av_push (coro->on_destroy, cb);
2191}
2192
2193static void
2194slf_destroy_join (pTHX_ struct CoroSLF *frame)
2195{
2196 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2197}
2198
2199static int
2200slf_check_join (pTHX_ struct CoroSLF *frame)
2201{
2202 struct coro *coro = (struct coro *)frame->data;
2203
2204 if (!coro->status)
2205 return 1;
2206
2207 frame->destroy = 0;
2208
2209 coro_push_av (aTHX_ coro->status, GIMME_V);
2210
2211 SvREFCNT_dec ((SV *)coro->hv);
2212
2213 return 0;
2214}
2215
2216static void
2217slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2218{
2219 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2220
2221 if (items > 1)
2222 croak ("join called with too many arguments");
2223
2224 if (coro->status)
2225 frame->prepare = prepare_nop;
2226 else
2227 {
2228 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2229 frame->prepare = prepare_schedule;
2230 }
2231
2232 frame->check = slf_check_join;
2233 frame->destroy = slf_destroy_join;
2234 frame->data = (void *)coro;
2235 SvREFCNT_inc (coro->hv);
2236}
2237
2238static void
2010coro_call_on_destroy (pTHX_ struct coro *coro) 2239coro_call_on_destroy (pTHX_ struct coro *coro)
2011{ 2240{
2012 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2241 AV *od = coro->on_destroy;
2013 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2014 2242
2015 if (on_destroyp) 2243 if (!od)
2016 { 2244 return;
2017 AV *on_destroy = (AV *)SvRV (*on_destroyp);
2018 2245
2246 coro->on_destroy = 0;
2247 sv_2mortal ((SV *)od);
2248
2019 while (AvFILLp (on_destroy) >= 0) 2249 while (AvFILLp (od) >= 0)
2250 {
2251 SV *cb = sv_2mortal (av_pop (od));
2252
2253 /* coro hv's (and only hv's at the moment) are supported as well */
2254 if (SvSTATEhv_p (aTHX_ cb))
2255 api_ready (aTHX_ cb);
2256 else
2020 { 2257 {
2021 dSP; /* don't disturb outer sp */ 2258 dSP; /* don't disturb outer sp */
2022 SV *cb = av_pop (on_destroy);
2023
2024 PUSHMARK (SP); 2259 PUSHMARK (SP);
2025 2260
2026 if (statusp) 2261 if (coro->status)
2027 { 2262 {
2028 int i; 2263 PUTBACK;
2029 AV *status = (AV *)SvRV (*statusp); 2264 coro_push_av (aTHX_ coro->status, G_ARRAY);
2030 EXTEND (SP, AvFILLp (status) + 1); 2265 SPAGAIN;
2031
2032 for (i = 0; i <= AvFILLp (status); ++i)
2033 PUSHs (AvARRAY (status)[i]);
2034 } 2266 }
2035 2267
2036 PUTBACK; 2268 PUTBACK;
2037 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2269 call_sv (cb, G_VOID | G_DISCARD);
2038 } 2270 }
2039 } 2271 }
2040} 2272}
2041 2273
2042static void 2274static void
2043slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2275coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
2044{ 2276{
2045 int i; 2277 AV *av;
2046 HV *hv = (HV *)SvRV (coro_current); 2278
2047 AV *av = newAV (); 2279 if (coro->status)
2280 {
2281 av = coro->status;
2282 av_clear (av);
2283 }
2284 else
2285 av = coro->status = newAV ();
2048 2286
2049 /* items are actually not so common, so optimise for this case */ 2287 /* items are actually not so common, so optimise for this case */
2050 if (items) 2288 if (items)
2051 { 2289 {
2290 int i;
2291
2052 av_extend (av, items - 1); 2292 av_extend (av, items - 1);
2053 2293
2054 for (i = 0; i < items; ++i) 2294 for (i = 0; i < items; ++i)
2055 av_push (av, SvREFCNT_inc_NN (arg [i])); 2295 av_push (av, SvREFCNT_inc_NN (arg [i]));
2056 } 2296 }
2297}
2057 2298
2058 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2299static void
2059 2300slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2301{
2060 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2302 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2061 api_ready (aTHX_ sv_manager); 2303 api_ready (aTHX_ sv_manager);
2062 2304
2063 frame->prepare = prepare_schedule; 2305 frame->prepare = prepare_schedule;
2064 frame->check = slf_check_repeat; 2306 frame->check = slf_check_repeat;
2065 2307
2066 /* as a minor optimisation, we could unwind all stacks here */ 2308 /* as a minor optimisation, we could unwind all stacks here */
2067 /* but that puts extra pressure on pp_slf, and is not worth much */ 2309 /* but that puts extra pressure on pp_slf, and is not worth much */
2068 /*coro_unwind_stacks (aTHX);*/ 2310 /*coro_unwind_stacks (aTHX);*/
2311}
2312
2313static void
2314slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2315{
2316 HV *coro_hv = (HV *)SvRV (coro_current);
2317
2318 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2319 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2320}
2321
2322static void
2323slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2324{
2325 HV *coro_hv;
2326 struct coro *coro;
2327
2328 if (items <= 0)
2329 croak ("Coro::cancel called without coro object,");
2330
2331 coro = SvSTATE (arg [0]);
2332 coro_hv = coro->hv;
2333
2334 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2335
2336 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2337 {
2338 /* coro currently busy cancelling something, so just notify it */
2339 coro->slf_frame.data = (void *)coro;
2340
2341 frame->prepare = prepare_nop;
2342 frame->check = slf_check_nop;
2343 }
2344 else if (coro_hv == (HV *)SvRV (coro_current))
2345 {
2346 /* cancelling the current coro is allowed, and equals terminate */
2347 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2348 }
2349 else
2350 {
2351 struct coro *self = SvSTATE_current;
2352
2353 if (!self)
2354 croak ("Coro::cancel called outside of thread content,");
2355
2356 /* otherwise we cancel directly, purely for speed reasons
2357 * unfortunately, this requires some magic trickery, as
2358 * somebody else could cancel us, so we have to fight the cancellation.
2359 * this is ugly, and hopefully fully worth the extra speed.
2360 * besides, I can't get the slow-but-safe version working...
2361 */
2362 slf_frame.data = 0;
2363 self->flags |= CF_NOCANCEL;
2364 coro_state_destroy (aTHX_ coro);
2365 self->flags &= ~CF_NOCANCEL;
2366
2367 if (slf_frame.data)
2368 {
2369 /* while we were busy we have been cancelled, so terminate */
2370 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2371 }
2372 else
2373 {
2374 frame->prepare = prepare_nop;
2375 frame->check = slf_check_nop;
2376 }
2377 }
2378}
2379
2380static int
2381slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2382{
2383 frame->prepare = 0;
2384 coro_unwind_stacks (aTHX);
2385
2386 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2387
2388 return 1;
2389}
2390
2391static int
2392safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2393{
2394 if (coro->cctx)
2395 croak ("coro inside C callback, unable to cancel at this time, caught");
2396
2397 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2398 {
2399 coro_set_status (aTHX_ coro, arg, items);
2400 coro_state_destroy (aTHX_ coro);
2401 }
2402 else
2403 {
2404 if (!coro->slf_frame.prepare)
2405 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2406
2407 slf_destroy (aTHX_ coro);
2408
2409 coro_set_status (aTHX_ coro, arg, items);
2410 coro->slf_frame.prepare = prepare_nop;
2411 coro->slf_frame.check = slf_check_safe_cancel;
2412
2413 api_ready (aTHX_ (SV *)coro->hv);
2414 }
2415
2416 return 1;
2069} 2417}
2070 2418
2071/*****************************************************************************/ 2419/*****************************************************************************/
2072/* async pool handler */ 2420/* async pool handler */
2073 2421
… …
2104slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2452slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2105{ 2453{
2106 HV *hv = (HV *)SvRV (coro_current); 2454 HV *hv = (HV *)SvRV (coro_current);
2107 struct coro *coro = SvSTATE_hv ((SV *)hv); 2455 struct coro *coro = SvSTATE_hv ((SV *)hv);
2108 2456
2109 if (expect_true (coro->saved_deffh)) 2457 if (ecb_expect_true (coro->saved_deffh))
2110 { 2458 {
2111 /* subsequent iteration */ 2459 /* subsequent iteration */
2112 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2460 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2113 coro->saved_deffh = 0; 2461 coro->saved_deffh = 0;
2114 2462
2115 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2463 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2116 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2464 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2117 { 2465 {
2118 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2466 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2119 coro->invoke_av = newAV (); 2467 return;
2120
2121 frame->prepare = prepare_nop;
2122 } 2468 }
2123 else 2469 else
2124 { 2470 {
2125 av_clear (GvAV (PL_defgv)); 2471 av_clear (GvAV (PL_defgv));
2126 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2472 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2127 2473
2474 if (ecb_expect_false (coro->swap_sv))
2475 {
2476 SWAP_SVS_LEAVE (coro);
2477 SvREFCNT_dec_NN (coro->swap_sv);
2478 coro->swap_sv = 0;
2479 }
2480
2128 coro->prio = 0; 2481 coro->prio = 0;
2129 2482
2130 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2483 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2131 api_trace (aTHX_ coro_current, 0); 2484 api_trace (aTHX_ coro_current, 0);
2132 2485
2133 frame->prepare = prepare_schedule; 2486 frame->prepare = prepare_schedule;
2134 av_push (av_async_pool, SvREFCNT_inc (hv)); 2487 av_push (av_async_pool, SvREFCNT_inc_NN (hv));
2135 } 2488 }
2136 } 2489 }
2137 else 2490 else
2138 { 2491 {
2139 /* first iteration, simply fall through */ 2492 /* first iteration, simply fall through */
… …
2152static void 2505static void
2153coro_rouse_callback (pTHX_ CV *cv) 2506coro_rouse_callback (pTHX_ CV *cv)
2154{ 2507{
2155 dXSARGS; 2508 dXSARGS;
2156 SV *data = (SV *)S_GENSUB_ARG; 2509 SV *data = (SV *)S_GENSUB_ARG;
2510 SV *coro = SvRV (data);
2157 2511
2512 /* data starts being either undef or a coro, and is replaced by the results when done */
2158 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2513 if (SvTYPE (coro) != SVt_PVAV)
2159 { 2514 {
2160 /* first call, set args */ 2515 /* first call, set args */
2161 SV *coro = SvRV (data);
2162 AV *av = newAV ();
2163 2516
2164 SvRV_set (data, (SV *)av); 2517 assert (&ST (0) < &ST (1)); /* ensure the stack is in the order we expect it to be */
2518 SvRV_set (data, (SV *)av_make (items, &ST (0))); /* av_make copies the SVs */
2165 2519
2166 /* better take a full copy of the arguments */ 2520 if (coro != &PL_sv_undef)
2167 while (items--) 2521 {
2168 av_store (av, items, newSVsv (ST (items)));
2169
2170 api_ready (aTHX_ coro); 2522 api_ready (aTHX_ coro);
2171 SvREFCNT_dec (coro); 2523 SvREFCNT_dec_NN (coro);
2524 }
2172 } 2525 }
2173 2526
2174 XSRETURN_EMPTY; 2527 XSRETURN_EMPTY;
2175} 2528}
2176 2529
2177static int 2530static int
2178slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2531slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2179{ 2532{
2180 SV *data = (SV *)frame->data; 2533 SV *data = (SV *)frame->data;
2181 2534
2182 if (CORO_THROW) 2535 if (CORO_THROW)
2183 return 0; 2536 return 0;
2184 2537
2185 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2538 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2186 return 1; 2539 return 1;
… …
2193 2546
2194 EXTEND (SP, AvFILLp (av) + 1); 2547 EXTEND (SP, AvFILLp (av) + 1);
2195 for (i = 0; i <= AvFILLp (av); ++i) 2548 for (i = 0; i <= AvFILLp (av); ++i)
2196 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2549 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2197 2550
2198 /* we have stolen the elements, so set length to zero and free */ 2551 /* we have stolen the elements, make it unreal and free */
2199 AvFILLp (av) = -1; 2552 AvREAL_off (av);
2200 av_undef (av); 2553 av_undef (av);
2201 2554
2202 PUTBACK; 2555 PUTBACK;
2203 } 2556 }
2204 2557
… …
2222 cb = sv_2mortal (coro->rouse_cb); 2575 cb = sv_2mortal (coro->rouse_cb);
2223 coro->rouse_cb = 0; 2576 coro->rouse_cb = 0;
2224 } 2577 }
2225 2578
2226 if (!SvROK (cb) 2579 if (!SvROK (cb)
2227 || SvTYPE (SvRV (cb)) != SVt_PVCV 2580 || SvTYPE (SvRV (cb)) != SVt_PVCV
2228 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2581 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2229 croak ("Coro::rouse_wait called with illegal callback argument,"); 2582 croak ("Coro::rouse_wait called with illegal callback argument,");
2230 2583
2231 { 2584 {
2232 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2585 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2233 SV *data = (SV *)S_GENSUB_ARG; 2586 SV *data = (SV *)S_GENSUB_ARG;
2587 int data_ready = SvTYPE (SvRV (data)) == SVt_PVAV;
2588
2589 /* if there is no data, we need to store the current coro in the reference so we can be woken up */
2590 if (!data_ready)
2591 if (SvRV (data) != &PL_sv_undef)
2592 croak ("Coro::rouse_wait was called on a calback that is already being waited for - only one thread can wait for a rouse callback, caught");
2593 else
2594 SvRV_set (data, SvREFCNT_inc_NN (SvRV (coro_current)));
2234 2595
2235 frame->data = (void *)data; 2596 frame->data = (void *)data;
2236 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2597 frame->prepare = data_ready ? prepare_nop : prepare_schedule;
2237 frame->check = slf_check_rouse_wait; 2598 frame->check = slf_check_rouse_wait;
2238 } 2599 }
2239} 2600}
2240 2601
2241static SV * 2602static SV *
2242coro_new_rouse_cb (pTHX) 2603coro_new_rouse_cb (pTHX)
2243{ 2604{
2244 HV *hv = (HV *)SvRV (coro_current); 2605 HV *hv = (HV *)SvRV (coro_current);
2245 struct coro *coro = SvSTATE_hv (hv); 2606 struct coro *coro = SvSTATE_hv (hv);
2246 SV *data = newRV_inc ((SV *)hv); 2607 SV *data = newRV_noinc (&PL_sv_undef);
2247 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data); 2608 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2248 2609
2249 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2610 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2250 SvREFCNT_dec (data); /* magicext increases the refcount */ 2611 SvREFCNT_dec_NN (data); /* magicext increases the refcount */
2251 2612
2252 SvREFCNT_dec (coro->rouse_cb); 2613 SvREFCNT_dec (coro->rouse_cb);
2253 coro->rouse_cb = SvREFCNT_inc_NN (cb); 2614 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2254 2615
2255 return cb; 2616 return cb;
… …
2349static void 2710static void
2350slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2711slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2351{ 2712{
2352 frame->prepare = prepare_cede_notself; 2713 frame->prepare = prepare_cede_notself;
2353 frame->check = slf_check_nop; 2714 frame->check = slf_check_nop;
2715}
2716
2717/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2718static void
2719slf_destroy (pTHX_ struct coro *coro)
2720{
2721 struct CoroSLF frame = coro->slf_frame;
2722
2723 /*
2724 * The on_destroy below most likely is from an SLF call.
2725 * Since by definition the SLF call will not finish when we destroy
2726 * the coro, we will have to force-finish it here, otherwise
2727 * cleanup functions cannot call SLF functions.
2728 */
2729 coro->slf_frame.prepare = 0;
2730
2731 /* this callback is reserved for slf functions needing to do cleanup */
2732 if (frame.destroy && frame.prepare && !PL_dirty)
2733 frame.destroy (aTHX_ &frame);
2354} 2734}
2355 2735
2356/* 2736/*
2357 * these not obviously related functions are all rolled into one 2737 * these not obviously related functions are all rolled into one
2358 * function to increase chances that they all will call transfer with the same 2738 * function to increase chances that they all will call transfer with the same
… …
2365 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2745 I32 checkmark; /* mark SP to see how many elements check has pushed */
2366 2746
2367 /* set up the slf frame, unless it has already been set-up */ 2747 /* set up the slf frame, unless it has already been set-up */
2368 /* the latter happens when a new coro has been started */ 2748 /* the latter happens when a new coro has been started */
2369 /* or when a new cctx was attached to an existing coroutine */ 2749 /* or when a new cctx was attached to an existing coroutine */
2370 if (expect_true (!slf_frame.prepare)) 2750 if (ecb_expect_true (!slf_frame.prepare))
2371 { 2751 {
2372 /* first iteration */ 2752 /* first iteration */
2373 dSP; 2753 dSP;
2374 SV **arg = PL_stack_base + TOPMARK + 1; 2754 SV **arg = PL_stack_base + TOPMARK + 1;
2375 int items = SP - arg; /* args without function object */ 2755 int items = SP - arg; /* args without function object */
… …
2416 while (slf_frame.check (aTHX_ &slf_frame)); 2796 while (slf_frame.check (aTHX_ &slf_frame));
2417 2797
2418 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2798 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2419 2799
2420 /* exception handling */ 2800 /* exception handling */
2421 if (expect_false (CORO_THROW)) 2801 if (ecb_expect_false (CORO_THROW))
2422 { 2802 {
2423 SV *exception = sv_2mortal (CORO_THROW); 2803 SV *exception = sv_2mortal (CORO_THROW);
2424 2804
2425 CORO_THROW = 0; 2805 CORO_THROW = 0;
2426 sv_setsv (ERRSV, exception); 2806 sv_setsv (ERRSV, exception);
2427 croak (0); 2807 croak (0);
2428 } 2808 }
2429 2809
2430 /* return value handling - mostly like entersub */ 2810 /* return value handling - mostly like entersub */
2431 /* make sure we put something on the stack in scalar context */ 2811 /* make sure we put something on the stack in scalar context */
2432 if (GIMME_V == G_SCALAR) 2812 if (GIMME_V == G_SCALAR
2813 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2433 { 2814 {
2434 dSP; 2815 dSP;
2435 SV **bot = PL_stack_base + checkmark; 2816 SV **bot = PL_stack_base + checkmark;
2436 2817
2437 if (sp == bot) /* too few, push undef */ 2818 if (sp == bot) /* too few, push undef */
2438 bot [1] = &PL_sv_undef; 2819 bot [1] = &PL_sv_undef;
2439 else if (sp != bot + 1) /* too many, take last one */ 2820 else /* too many, take last one */
2440 bot [1] = *sp; 2821 bot [1] = *sp;
2441 2822
2442 SP = bot + 1; 2823 SP = bot + 1;
2443 2824
2444 PUTBACK; 2825 PUTBACK;
… …
2542{ 2923{
2543 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2924 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2544 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2925 on_enterleave_call (aTHX_ sv_2mortal (cb));
2545} 2926}
2546 2927
2928static void
2929enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2930{
2931 if (!hook)
2932 return;
2933
2934 if (!*avp)
2935 {
2936 *avp = newAV ();
2937 AvREAL_off (*avp);
2938 }
2939
2940 av_push (*avp, (SV *)hook);
2941 av_push (*avp, (SV *)arg);
2942}
2943
2944static void
2945enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2946{
2947 AV *av = *avp;
2948 int i;
2949
2950 if (!av)
2951 return;
2952
2953 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2954 if (AvARRAY (av)[i] == (SV *)hook)
2955 {
2956 if (execute)
2957 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2958
2959 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2960 av_pop (av);
2961 av_pop (av);
2962 break;
2963 }
2964
2965 if (AvFILLp (av) >= 0)
2966 {
2967 *avp = 0;
2968 SvREFCNT_dec_NN (av);
2969 }
2970}
2971
2972static void
2973api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2974{
2975 struct coro *coro = SvSTATE (coro_sv);
2976
2977 if (SvSTATE_current == coro)
2978 if (enter)
2979 enter (aTHX_ enter_arg);
2980
2981 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2982 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2983}
2984
2985static void
2986api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2987{
2988 struct coro *coro = SvSTATE (coro_sv);
2989
2990 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2991 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2992}
2993
2994static void
2995savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2996{
2997 struct coro *coro = SvSTATE_current;
2998
2999 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
3000}
3001
3002static void
3003savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
3004{
3005 struct coro *coro = SvSTATE_current;
3006
3007 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
3008}
3009
3010static void
3011api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
3012{
3013 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
3014
3015 /* this ought to be much cheaper than malloc + a single destructor call */
3016 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
3017 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
3018}
3019
2547/*****************************************************************************/ 3020/*****************************************************************************/
2548/* PerlIO::cede */ 3021/* PerlIO::cede */
2549 3022
2550typedef struct 3023typedef struct
2551{ 3024{
2552 PerlIOBuf base; 3025 PerlIOBuf base;
2553 NV next, every; 3026 NV next, every;
2554} PerlIOCede; 3027} PerlIOCede;
2555 3028
2556static IV 3029static IV ecb_cold
2557PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 3030PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2558{ 3031{
2559 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3032 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2560 3033
2561 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 3034 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2562 self->next = nvtime () + self->every; 3035 self->next = nvtime () + self->every;
2563 3036
2564 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 3037 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2565} 3038}
2566 3039
2567static SV * 3040static SV * ecb_cold
2568PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3041PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2569{ 3042{
2570 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3043 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2571 3044
2572 return newSVnv (self->every); 3045 return newSVnv (self->every);
… …
2679 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3152 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2680 PUTBACK; 3153 PUTBACK;
2681 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3154 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2682 } 3155 }
2683 3156
2684 SvREFCNT_dec (cb); 3157 SvREFCNT_dec_NN (cb);
2685 } 3158 }
2686} 3159}
2687 3160
2688static void 3161static void
2689coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3162coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2690{ 3163{
2691 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3164 /* call $sem->adjust (0) to possibly wake up some other waiters */
2692 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3165 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2693} 3166}
2694 3167
2695static int 3168static int
2696slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3169slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2697{ 3170{
2698 AV *av = (AV *)frame->data; 3171 AV *av = (AV *)frame->data;
2699 SV *count_sv = AvARRAY (av)[0]; 3172 SV *count_sv = AvARRAY (av)[0];
3173 SV *coro_hv = SvRV (coro_current);
3174
3175 frame->destroy = 0;
2700 3176
2701 /* if we are about to throw, don't actually acquire the lock, just throw */ 3177 /* if we are about to throw, don't actually acquire the lock, just throw */
2702 if (CORO_THROW) 3178 if (ecb_expect_false (CORO_THROW))
3179 {
3180 /* we still might be responsible for the semaphore, so wake up others */
3181 coro_semaphore_adjust (aTHX_ av, 0);
3182
2703 return 0; 3183 return 0;
3184 }
2704 else if (SvIVX (count_sv) > 0) 3185 else if (SvIVX (count_sv) > 0)
2705 { 3186 {
2706 SvSTATE_current->on_destroy = 0;
2707
2708 if (acquire) 3187 if (acquire)
2709 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3188 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2710 else 3189 else
2711 coro_semaphore_adjust (aTHX_ av, 0); 3190 coro_semaphore_adjust (aTHX_ av, 0);
2712 3191
… …
2716 { 3195 {
2717 int i; 3196 int i;
2718 /* if we were woken up but can't down, we look through the whole */ 3197 /* if we were woken up but can't down, we look through the whole */
2719 /* waiters list and only add us if we aren't in there already */ 3198 /* waiters list and only add us if we aren't in there already */
2720 /* this avoids some degenerate memory usage cases */ 3199 /* this avoids some degenerate memory usage cases */
2721 3200 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2722 for (i = 1; i <= AvFILLp (av); ++i)
2723 if (AvARRAY (av)[i] == SvRV (coro_current)) 3201 if (AvARRAY (av)[i] == coro_hv)
2724 return 1; 3202 return 1;
2725 3203
2726 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3204 av_push (av, SvREFCNT_inc (coro_hv));
2727 return 1; 3205 return 1;
2728 } 3206 }
2729} 3207}
2730 3208
2731static int 3209static int
… …
2754 { 3232 {
2755 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3233 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2756 3234
2757 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3235 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2758 frame->prepare = prepare_schedule; 3236 frame->prepare = prepare_schedule;
2759
2760 /* to avoid race conditions when a woken-up coro gets terminated */ 3237 /* to avoid race conditions when a woken-up coro gets terminated */
2761 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3238 /* we arrange for a temporary on_destroy that calls adjust (0) */
2762 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3239 frame->destroy = coro_semaphore_destroy;
2763 } 3240 }
2764} 3241}
2765 3242
2766static void 3243static void
2767slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3244slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2825 { 3302 {
2826 api_ready (aTHX_ cb); 3303 api_ready (aTHX_ cb);
2827 sv_setiv (cb, 0); /* signal waiter */ 3304 sv_setiv (cb, 0); /* signal waiter */
2828 } 3305 }
2829 3306
2830 SvREFCNT_dec (cb); 3307 SvREFCNT_dec_NN (cb);
2831 3308
2832 --count; 3309 --count;
2833 } 3310 }
2834} 3311}
2835 3312
… …
2920 } 3397 }
2921 3398
2922 av_push (state, data_sv); 3399 av_push (state, data_sv);
2923 3400
2924 api_ready (aTHX_ coro); 3401 api_ready (aTHX_ coro);
2925 SvREFCNT_dec (coro); 3402 SvREFCNT_dec_NN (coro);
2926 SvREFCNT_dec ((AV *)state); 3403 SvREFCNT_dec_NN ((AV *)state);
2927} 3404}
2928 3405
2929static int 3406static int
2930slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3407slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2931{ 3408{
… …
2936 /* it quickly returns */ 3413 /* it quickly returns */
2937 if (CORO_THROW) 3414 if (CORO_THROW)
2938 return 0; 3415 return 0;
2939 3416
2940 /* one element that is an RV? repeat! */ 3417 /* one element that is an RV? repeat! */
2941 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3418 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2942 return 1; 3419 return 1;
2943 3420
2944 /* restore status */ 3421 /* restore status */
2945 { 3422 {
2946 SV *data_sv = av_pop (state); 3423 SV *data_sv = av_pop (state);
… …
2949 errno = data->errorno; 3426 errno = data->errorno;
2950 PL_laststype = data->laststype; 3427 PL_laststype = data->laststype;
2951 PL_laststatval = data->laststatval; 3428 PL_laststatval = data->laststatval;
2952 PL_statcache = data->statcache; 3429 PL_statcache = data->statcache;
2953 3430
2954 SvREFCNT_dec (data_sv); 3431 SvREFCNT_dec_NN (data_sv);
2955 } 3432 }
2956 3433
2957 /* push result values */ 3434 /* push result values */
2958 { 3435 {
2959 dSP; 3436 dSP;
… …
2985 dSP; 3462 dSP;
2986 3463
2987 static SV *prio_cv; 3464 static SV *prio_cv;
2988 static SV *prio_sv; 3465 static SV *prio_sv;
2989 3466
2990 if (expect_false (!prio_cv)) 3467 if (ecb_expect_false (!prio_cv))
2991 { 3468 {
2992 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3469 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2993 prio_sv = newSViv (0); 3470 prio_sv = newSViv (0);
2994 } 3471 }
2995 3472
… …
3101 } 3578 }
3102 3579
3103 return coro_sv; 3580 return coro_sv;
3104} 3581}
3105 3582
3583#ifndef __cplusplus
3584ecb_cold XS(boot_Coro__State);
3585#endif
3586
3587#if CORO_JIT
3588
3589static void ecb_noinline ecb_cold
3590pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3591{
3592 dSP;
3593 AV *av = newAV ();
3594
3595 av_store (av, 3, newSVuv (d));
3596 av_store (av, 2, newSVuv (c));
3597 av_store (av, 1, newSVuv (b));
3598 av_store (av, 0, newSVuv (a));
3599
3600 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3601
3602 PUTBACK;
3603}
3604
3605static void ecb_noinline ecb_cold
3606jit_init (pTHX)
3607{
3608 dSP;
3609 SV *load, *save;
3610 char *map_base;
3611 char *load_ptr, *save_ptr;
3612 STRLEN load_len, save_len, map_len;
3613 int count;
3614
3615 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3616
3617 PUSHMARK (SP);
3618 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3619 #include "state.h"
3620 count = call_pv ("Coro::State::_jit", G_ARRAY);
3621 SPAGAIN;
3622
3623 save = POPs; save_ptr = SvPVbyte (save, save_len);
3624 load = POPs; load_ptr = SvPVbyte (load, load_len);
3625
3626 map_len = load_len + save_len + 16;
3627
3628 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3629
3630 if (map_base == (char *)MAP_FAILED)
3631 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3632
3633 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3634
3635 load_perl_slots = (load_save_perl_slots_type)map_base;
3636 memcpy (map_base, load_ptr, load_len);
3637
3638 map_base += (load_len + 15) & ~15;
3639
3640 save_perl_slots = (load_save_perl_slots_type)map_base;
3641 memcpy (map_base, save_ptr, save_len);
3642
3643 /* we are good citizens and try to make the page read-only, so the evil evil */
3644 /* hackers might have it a bit more difficult */
3645 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3646
3647 PUTBACK;
3648 eval_pv ("undef &Coro::State::_jit", 1);
3649}
3650
3651#endif
3652
3106MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3653MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3107 3654
3108PROTOTYPES: DISABLE 3655PROTOTYPES: DISABLE
3109 3656
3110BOOT: 3657BOOT:
3111{ 3658{
3659#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3660#include "state.h"
3112#ifdef USE_ITHREADS 3661#ifdef USE_ITHREADS
3113# if CORO_PTHREAD 3662# if CORO_PTHREAD
3114 coro_thx = PERL_GET_CONTEXT; 3663 coro_thx = PERL_GET_CONTEXT;
3115# endif 3664# endif
3116#endif 3665#endif
3117 BOOT_PAGESIZE; 3666 /* perl defines these to check for existance first, but why it doesn't */
3667 /* just create them one at init time is not clear to me, except for */
3668 /* programs trying to delete them, but... */
3669 /* anyway, we declare this as invalid and make sure they are initialised here */
3670 DEFSV;
3671 ERRSV;
3118 3672
3119 cctx_current = cctx_new_empty (); 3673 cctx_current = cctx_new_empty ();
3120 3674
3121 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3675 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3122 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3676 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3123 3677
3124 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3678 {
3125 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3679 /*
3126 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3680 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3681 * by coro_sig_vtbl in hash values.
3682 */
3683 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3684
3685 /* this only works if perl doesn't have a vtbl for %SIG */
3686 assert (!mg->mg_virtual);
3687
3688 /*
3689 * The irony is that the perl API itself asserts that mg_virtual
3690 * must be non-const, yet perl5porters insisted on marking their
3691 * vtbls as read-only, just to thwart perl modules from patching
3692 * them.
3693 */
3694 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3695 mg->mg_flags |= MGf_COPY;
3696
3697 coro_sigelem_vtbl = PL_vtbl_sigelem;
3698 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3699 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3700 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3701 }
3127 3702
3128 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3129 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3703 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3130 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3704 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3131 3705
3132 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3706 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3707
3708 newCONSTSUB (coro_state_stash, "BACKEND", newSVpv (CORO_BACKEND, 0)); /* undocumented */
3133 3709
3134 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 3710 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
3135 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 3711 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
3136 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 3712 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
3137 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 3713 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
… …
3165 coroapi.prepare_cede_notself = prepare_cede_notself; 3741 coroapi.prepare_cede_notself = prepare_cede_notself;
3166 3742
3167 time_init (aTHX); 3743 time_init (aTHX);
3168 3744
3169 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3745 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3746#if CORO_JIT
3747 PUTBACK;
3748 jit_init (aTHX);
3749 SPAGAIN;
3750#endif
3170} 3751}
3171 3752
3172SV * 3753SV *
3173new (SV *klass, ...) 3754new (SV *klass, ...)
3174 ALIAS: 3755 ALIAS:
… …
3181void 3762void
3182transfer (...) 3763transfer (...)
3183 PROTOTYPE: $$ 3764 PROTOTYPE: $$
3184 CODE: 3765 CODE:
3185 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3766 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3186
3187bool
3188_destroy (SV *coro_sv)
3189 CODE:
3190 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3191 OUTPUT:
3192 RETVAL
3193
3194void
3195_exit (int code)
3196 PROTOTYPE: $
3197 CODE:
3198 _exit (code);
3199 3767
3200SV * 3768SV *
3201clone (Coro::State coro) 3769clone (Coro::State coro)
3202 CODE: 3770 CODE:
3203{ 3771{
… …
3258void 3826void
3259list () 3827list ()
3260 PROTOTYPE: 3828 PROTOTYPE:
3261 PPCODE: 3829 PPCODE:
3262{ 3830{
3263 struct coro *coro; 3831 struct coro *coro;
3264 for (coro = coro_first; coro; coro = coro->next) 3832 for (coro = coro_first; coro; coro = coro->next)
3265 if (coro->hv) 3833 if (coro->hv)
3266 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3834 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3267} 3835}
3268 3836
… …
3270call (Coro::State coro, SV *coderef) 3838call (Coro::State coro, SV *coderef)
3271 ALIAS: 3839 ALIAS:
3272 eval = 1 3840 eval = 1
3273 CODE: 3841 CODE:
3274{ 3842{
3843 struct coro *current = SvSTATE_current;
3844
3275 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3845 if ((coro == current) || (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)))
3276 { 3846 {
3277 struct coro *current = SvSTATE_current; 3847 struct CoroSLF slf_save;
3278 3848
3279 if (current != coro) 3849 if (current != coro)
3280 { 3850 {
3281 PUTBACK; 3851 PUTBACK;
3282 save_perl (aTHX_ current); 3852 save_perl (aTHX_ current);
3283 load_perl (aTHX_ coro); 3853 load_perl (aTHX_ coro);
3854 /* the coro is most likely in an active SLF call.
3855 * while not strictly required (the code we execute is
3856 * not allowed to call any SLF functions), it's cleaner
3857 * to reinitialise the slf_frame and restore it later.
3858 * This might one day allow us to actually do SLF calls
3859 * from code executed here.
3860 */
3861 slf_save = slf_frame;
3862 slf_frame.prepare = 0;
3284 SPAGAIN; 3863 SPAGAIN;
3285 } 3864 }
3286 3865
3287 PUSHSTACK; 3866 PUSHSTACK;
3288 3867
… …
3298 SPAGAIN; 3877 SPAGAIN;
3299 3878
3300 if (current != coro) 3879 if (current != coro)
3301 { 3880 {
3302 PUTBACK; 3881 PUTBACK;
3882 slf_frame = slf_save;
3303 save_perl (aTHX_ coro); 3883 save_perl (aTHX_ coro);
3304 load_perl (aTHX_ current); 3884 load_perl (aTHX_ current);
3305 SPAGAIN; 3885 SPAGAIN;
3306 } 3886 }
3307 } 3887 }
… …
3312 PROTOTYPE: $ 3892 PROTOTYPE: $
3313 ALIAS: 3893 ALIAS:
3314 is_ready = CF_READY 3894 is_ready = CF_READY
3315 is_running = CF_RUNNING 3895 is_running = CF_RUNNING
3316 is_new = CF_NEW 3896 is_new = CF_NEW
3317 is_destroyed = CF_DESTROYED 3897 is_destroyed = CF_ZOMBIE
3898 is_zombie = CF_ZOMBIE
3318 is_suspended = CF_SUSPENDED 3899 is_suspended = CF_SUSPENDED
3319 CODE: 3900 CODE:
3320 RETVAL = boolSV (coro->flags & ix); 3901 RETVAL = boolSV (coro->flags & ix);
3321 OUTPUT: 3902 OUTPUT:
3322 RETVAL 3903 RETVAL
3323 3904
3324void 3905void
3325throw (Coro::State self, SV *exception = &PL_sv_undef) 3906throw (SV *self, SV *exception = &PL_sv_undef)
3326 PROTOTYPE: $;$ 3907 PROTOTYPE: $;$
3327 CODE: 3908 CODE:
3328{ 3909{
3910 struct coro *coro = SvSTATE (self);
3329 struct coro *current = SvSTATE_current; 3911 struct coro *current = SvSTATE_current;
3330 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3912 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3331 SvREFCNT_dec (*exceptionp); 3913 SvREFCNT_dec (*exceptionp);
3332 SvGETMAGIC (exception); 3914 SvGETMAGIC (exception);
3333 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3915 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3916
3917 api_ready (aTHX_ self);
3334} 3918}
3335 3919
3336void 3920void
3337api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3921api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3338 PROTOTYPE: $;$ 3922 PROTOTYPE: $;$
… …
3393 3977
3394void 3978void
3395cancel (Coro::State self) 3979cancel (Coro::State self)
3396 CODE: 3980 CODE:
3397 coro_state_destroy (aTHX_ self); 3981 coro_state_destroy (aTHX_ self);
3398 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3399 3982
3400SV * 3983SV *
3401enable_times (int enabled = enable_times) 3984enable_times (int enabled = enable_times)
3402 CODE: 3985 CODE:
3403{ 3986{
… …
3416 3999
3417void 4000void
3418times (Coro::State self) 4001times (Coro::State self)
3419 PPCODE: 4002 PPCODE:
3420{ 4003{
3421 struct coro *current = SvSTATE (coro_current); 4004 struct coro *current = SvSTATE (coro_current);
3422 4005
3423 if (expect_false (current == self)) 4006 if (ecb_expect_false (current == self))
3424 { 4007 {
3425 coro_times_update (); 4008 coro_times_update ();
3426 coro_times_add (SvSTATE (coro_current)); 4009 coro_times_add (SvSTATE (coro_current));
3427 } 4010 }
3428 4011
3429 EXTEND (SP, 2); 4012 EXTEND (SP, 2);
3430 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 4013 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3431 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 4014 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3432 4015
3433 if (expect_false (current == self)) 4016 if (ecb_expect_false (current == self))
3434 coro_times_sub (SvSTATE (coro_current)); 4017 coro_times_sub (SvSTATE (coro_current));
3435} 4018}
3436 4019
3437void 4020void
3438swap_sv (Coro::State coro, SV *sv, SV *swapsv) 4021swap_sv (Coro::State coro, SV *sva, SV *svb)
3439 CODE: 4022 CODE:
3440{ 4023{
3441 struct coro *current = SvSTATE_current; 4024 struct coro *current = SvSTATE_current;
4025 AV *swap_sv;
4026 int i;
4027
4028 sva = SvRV (sva);
4029 svb = SvRV (svb);
3442 4030
3443 if (current == coro) 4031 if (current == coro)
3444 SWAP_SVS (current); 4032 SWAP_SVS_LEAVE (current);
3445 4033
3446 if (!coro->swap_sv) 4034 if (!coro->swap_sv)
3447 coro->swap_sv = newAV (); 4035 coro->swap_sv = newAV ();
3448 4036
4037 swap_sv = coro->swap_sv;
4038
4039 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4040 {
4041 SV *a = AvARRAY (swap_sv)[i ];
4042 SV *b = AvARRAY (swap_sv)[i + 1];
4043
4044 if (a == sva && b == svb)
4045 {
4046 SvREFCNT_dec_NN (a);
4047 SvREFCNT_dec_NN (b);
4048
4049 for (; i <= AvFILLp (swap_sv) - 2; i++)
4050 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4051
4052 AvFILLp (swap_sv) -= 2;
4053
4054 goto removed;
4055 }
4056 }
4057
3449 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 4058 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3450 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 4059 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4060
4061 removed:
3451 4062
3452 if (current == coro) 4063 if (current == coro)
3453 SWAP_SVS (current); 4064 SWAP_SVS_ENTER (current);
3454} 4065}
3455 4066
3456 4067
3457MODULE = Coro::State PACKAGE = Coro 4068MODULE = Coro::State PACKAGE = Coro
3458 4069
3459BOOT: 4070BOOT:
3460{ 4071{
4072 if (SVt_LAST > 32)
4073 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4074
3461 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4075 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3462 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4076 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3463 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4077 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3464 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3465 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4078 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3466 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4079 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3467 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4080 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3468 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4081 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3469 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4082 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3470 4083
3471 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4084 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3472 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4085 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3473 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4086 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3474 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 4087 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3475 4088
3476 coro_stash = gv_stashpv ("Coro", TRUE); 4089 coro_stash = gv_stashpv ("Coro", TRUE);
3477 4090
3478 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4091 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3479 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4092 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3480 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4093 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3492 coroapi.ready = api_ready; 4105 coroapi.ready = api_ready;
3493 coroapi.is_ready = api_is_ready; 4106 coroapi.is_ready = api_is_ready;
3494 coroapi.nready = coro_nready; 4107 coroapi.nready = coro_nready;
3495 coroapi.current = coro_current; 4108 coroapi.current = coro_current;
3496 4109
4110 coroapi.enterleave_hook = api_enterleave_hook;
4111 coroapi.enterleave_unhook = api_enterleave_unhook;
4112 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4113
3497 /*GCoroAPI = &coroapi;*/ 4114 /*GCoroAPI = &coroapi;*/
3498 sv_setiv (sv, (IV)&coroapi); 4115 sv_setiv (sv, PTR2IV (&coroapi));
3499 SvREADONLY_on (sv); 4116 SvREADONLY_on (sv);
3500 } 4117 }
3501} 4118}
3502 4119
3503SV * 4120SV *
… …
3508 api_ready (aTHX_ RETVAL); 4125 api_ready (aTHX_ RETVAL);
3509 OUTPUT: 4126 OUTPUT:
3510 RETVAL 4127 RETVAL
3511 4128
3512void 4129void
4130_destroy (Coro::State coro)
4131 CODE:
4132 /* used by the manager thread */
4133 coro_state_destroy (aTHX_ coro);
4134
4135void
4136on_destroy (Coro::State coro, SV *cb)
4137 CODE:
4138 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4139
4140void
4141join (...)
4142 CODE:
4143 CORO_EXECUTE_SLF_XS (slf_init_join);
4144
4145void
3513terminate (...) 4146terminate (...)
3514 CODE: 4147 CODE:
3515 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4148 CORO_EXECUTE_SLF_XS (slf_init_terminate);
4149
4150void
4151cancel (...)
4152 CODE:
4153 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4154
4155int
4156safe_cancel (Coro::State self, ...)
4157 C_ARGS: aTHX_ self, &ST (1), items - 1
3516 4158
3517void 4159void
3518schedule (...) 4160schedule (...)
3519 CODE: 4161 CODE:
3520 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4162 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3541 4183
3542void 4184void
3543_set_current (SV *current) 4185_set_current (SV *current)
3544 PROTOTYPE: $ 4186 PROTOTYPE: $
3545 CODE: 4187 CODE:
3546 SvREFCNT_dec (SvRV (coro_current)); 4188 SvREFCNT_dec_NN (SvRV (coro_current));
3547 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4189 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3548 4190
3549void 4191void
3550_set_readyhook (SV *hook) 4192_set_readyhook (SV *hook)
3551 PROTOTYPE: $ 4193 PROTOTYPE: $
… …
3635 4277
3636 if ((SV *)hv == &PL_sv_undef) 4278 if ((SV *)hv == &PL_sv_undef)
3637 { 4279 {
3638 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4280 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3639 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4281 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3640 SvREFCNT_dec (sv); 4282 SvREFCNT_dec_NN (sv);
3641 } 4283 }
3642 4284
3643 { 4285 {
3644 struct coro *coro = SvSTATE_hv (hv); 4286 struct coro *coro = SvSTATE_hv (hv);
3645 4287
… …
3652 api_ready (aTHX_ (SV *)hv); 4294 api_ready (aTHX_ (SV *)hv);
3653 4295
3654 if (GIMME_V != G_VOID) 4296 if (GIMME_V != G_VOID)
3655 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4297 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3656 else 4298 else
3657 SvREFCNT_dec (hv); 4299 SvREFCNT_dec_NN (hv);
3658} 4300}
3659 4301
3660SV * 4302SV *
3661rouse_cb () 4303rouse_cb ()
3662 PROTOTYPE: 4304 PROTOTYPE:
… …
3677 on_leave = 1 4319 on_leave = 1
3678 PROTOTYPE: & 4320 PROTOTYPE: &
3679 CODE: 4321 CODE:
3680{ 4322{
3681 struct coro *coro = SvSTATE_current; 4323 struct coro *coro = SvSTATE_current;
3682 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4324 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3683 4325
3684 block = s_get_cv_croak (block); 4326 block = s_get_cv_croak (block);
3685 4327
3686 if (!*avp) 4328 if (!*avp)
3687 *avp = newAV (); 4329 *avp = newAV ();
… …
3707 4349
3708SV * 4350SV *
3709new (SV *klass, SV *count = 0) 4351new (SV *klass, SV *count = 0)
3710 CODE: 4352 CODE:
3711{ 4353{
3712 int semcnt = 1; 4354 int semcnt = 1;
3713 4355
3714 if (count) 4356 if (count)
3715 { 4357 {
3716 SvGETMAGIC (count); 4358 SvGETMAGIC (count);
3717 4359
… …
3741 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4383 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3742 OUTPUT: 4384 OUTPUT:
3743 RETVAL 4385 RETVAL
3744 4386
3745void 4387void
3746up (SV *self, int adjust = 1) 4388up (SV *self)
3747 ALIAS:
3748 adjust = 1
3749 CODE: 4389 CODE:
4390 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4391
4392void
4393adjust (SV *self, int adjust)
4394 CODE:
3750 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4395 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3751 4396
3752void 4397void
3753down (...) 4398down (...)
3754 CODE: 4399 CODE:
3755 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4400 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3777 XSRETURN_NO; 4422 XSRETURN_NO;
3778} 4423}
3779 4424
3780void 4425void
3781waiters (SV *self) 4426waiters (SV *self)
3782 PPCODE: 4427 PPCODE:
3783{ 4428{
3784 AV *av = (AV *)SvRV (self); 4429 AV *av = (AV *)SvRV (self);
3785 int wcount = AvFILLp (av) + 1 - 1; 4430 int wcount = AvFILLp (av) + 1 - 1;
3786 4431
3787 if (GIMME_V == G_SCALAR) 4432 if (GIMME_V == G_SCALAR)
… …
3796} 4441}
3797 4442
3798MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4443MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3799 4444
3800void 4445void
3801_may_delete (SV *sem, int count, int extra_refs) 4446_may_delete (SV *sem, int count, unsigned int extra_refs)
3802 PPCODE: 4447 PPCODE:
3803{ 4448{
3804 AV *av = (AV *)SvRV (sem); 4449 AV *av = (AV *)SvRV (sem);
3805 4450
3806 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4451 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3807 && AvFILLp (av) == 0 /* no waiters, just count */ 4452 && AvFILLp (av) == 0 /* no waiters, just count */
3808 && SvIV (AvARRAY (av)[0]) == count) 4453 && SvIV (AvARRAY (av)[0]) == count)
3809 XSRETURN_YES; 4454 XSRETURN_YES;
… …
3830 4475
3831void 4476void
3832broadcast (SV *self) 4477broadcast (SV *self)
3833 CODE: 4478 CODE:
3834{ 4479{
3835 AV *av = (AV *)SvRV (self); 4480 AV *av = (AV *)SvRV (self);
3836 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4481 coro_signal_wake (aTHX_ av, AvFILLp (av));
3837} 4482}
3838 4483
3839void 4484void
3840send (SV *self) 4485send (SV *self)
… …
3848 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4493 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3849} 4494}
3850 4495
3851IV 4496IV
3852awaited (SV *self) 4497awaited (SV *self)
3853 CODE: 4498 CODE:
3854 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4499 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3855 OUTPUT: 4500 OUTPUT:
3856 RETVAL 4501 RETVAL
3857 4502
3858 4503
… …
3863 4508
3864void 4509void
3865_schedule (...) 4510_schedule (...)
3866 CODE: 4511 CODE:
3867{ 4512{
3868 static int incede; 4513 static int incede;
3869 4514
3870 api_cede_notself (aTHX); 4515 api_cede_notself (aTHX);
3871 4516
3872 ++incede; 4517 ++incede;
3873 while (coro_nready >= incede && api_cede (aTHX)) 4518 while (coro_nready >= incede && api_cede (aTHX))
… …
3917 { 4562 {
3918 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4563 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3919 coro_old_pp_sselect = 0; 4564 coro_old_pp_sselect = 0;
3920 } 4565 }
3921 4566
4567MODULE = Coro::State PACKAGE = Coro::Util
4568
4569void
4570_exit (int code)
4571 CODE:
4572 _exit (code);
4573
4574NV
4575time ()
4576 CODE:
4577 RETVAL = nvtime (aTHX);
4578 OUTPUT:
4579 RETVAL
4580
4581NV
4582gettimeofday ()
4583 PPCODE:
4584{
4585 UV tv [2];
4586 u2time (aTHX_ tv);
4587 EXTEND (SP, 2);
4588 PUSHs (sv_2mortal (newSVuv (tv [0])));
4589 PUSHs (sv_2mortal (newSVuv (tv [1])));
4590}
4591

Diff Legend

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