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.360 by root, Mon Jun 29 06:14:23 2009 UTC vs.
Revision 1.417 by root, Sun Feb 19 11:14:45 2012 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
17#include "ecb.h"
12 18
19#include <stddef.h>
13#include <stdio.h> 20#include <stdio.h>
14#include <errno.h> 21#include <errno.h>
15#include <assert.h> 22#include <assert.h>
16 23
17#ifdef WIN32 24#ifndef SVs_PADSTALE
25# define SVs_PADSTALE 0
26#endif
27
28#if defined(_WIN32)
29# undef HAS_GETTIMEOFDAY
18# undef setjmp 30# undef setjmp
19# undef longjmp 31# undef longjmp
20# undef _exit 32# undef _exit
21# define setjmp _setjmp /* deep magic */ 33# define setjmp _setjmp /* deep magic */
22#else 34#else
23# include <inttypes.h> /* most portable stdint.h */ 35# include <inttypes.h> /* most portable stdint.h */
24#endif 36#endif
25 37
26#ifdef HAVE_MMAP 38#if HAVE_MMAP
27# include <unistd.h> 39# include <unistd.h>
28# include <sys/mman.h> 40# include <sys/mman.h>
29# ifndef MAP_ANONYMOUS 41# ifndef MAP_ANONYMOUS
30# ifdef MAP_ANON 42# ifdef MAP_ANON
31# define MAP_ANONYMOUS MAP_ANON 43# define MAP_ANONYMOUS MAP_ANON
… …
51#endif 63#endif
52 64
53/* the maximum number of idle cctx that will be pooled */ 65/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 66static int cctx_max_idle = 4;
55 67
56#define PERL_VERSION_ATLEAST(a,b,c) \ 68#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57 (PERL_REVISION > (a) \ 69# define HAS_SCOPESTACK_NAME 1
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif 70#endif
114 71
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 72#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 73# undef CORO_STACKGUARD
117#endif 74#endif
… …
135# define STACKLEVEL ((void *)&stacklevel) 92# define STACKLEVEL ((void *)&stacklevel)
136#endif 93#endif
137 94
138#define IN_DESTRUCT PL_dirty 95#define IN_DESTRUCT PL_dirty
139 96
140#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr), (value))
143# define INLINE static inline
144#else
145# define attribute(x)
146# define expect(expr,value) (expr)
147# define INLINE static
148#endif
149
150#define expect_false(expr) expect ((expr) != 0, 0)
151#define expect_true(expr) expect ((expr) != 0, 1)
152
153#define NOINLINE attribute ((noinline))
154
155#include "CoroAPI.h" 97#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */ 98#define GCoroAPI (&coroapi) /* very sneaky */
157 99
158#ifdef USE_ITHREADS 100#ifdef USE_ITHREADS
159# if CORO_PTHREAD 101# if CORO_PTHREAD
160static void *coro_thx; 102static void *coro_thx;
161# endif 103# endif
162#endif 104#endif
105
106/* used in state.h */
107#define VAR(name,type) VARx(name, PL_ ## name, type)
163 108
164#ifdef __linux 109#ifdef __linux
165# include <time.h> /* for timespec */ 110# include <time.h> /* for timespec */
166# include <syscall.h> /* for SYS_* */ 111# include <syscall.h> /* for SYS_* */
167# ifdef SYS_clock_gettime 112# ifdef SYS_clock_gettime
… …
175static void (*u2time)(pTHX_ UV ret[2]); 120static void (*u2time)(pTHX_ UV ret[2]);
176 121
177/* we hijack an hopefully unused CV flag for our purposes */ 122/* we hijack an hopefully unused CV flag for our purposes */
178#define CVf_SLF 0x4000 123#define CVf_SLF 0x4000
179static OP *pp_slf (pTHX); 124static OP *pp_slf (pTHX);
125static void slf_destroy (pTHX_ struct coro *coro);
180 126
181static U32 cctx_gen; 127static U32 cctx_gen;
182static size_t cctx_stacksize = CORO_STACKSIZE; 128static size_t cctx_stacksize = CORO_STACKSIZE;
183static struct CoroAPI coroapi; 129static struct CoroAPI coroapi;
184static AV *main_mainstack; /* used to differentiate between $main and others */ 130static AV *main_mainstack; /* used to differentiate between $main and others */
… …
201static SV *sv_pool_size; 147static SV *sv_pool_size;
202static SV *sv_async_pool_idle; /* description string */ 148static SV *sv_async_pool_idle; /* description string */
203static AV *av_async_pool; /* idle pool */ 149static AV *av_async_pool; /* idle pool */
204static SV *sv_Coro; /* class string */ 150static SV *sv_Coro; /* class string */
205static CV *cv_pool_handler; 151static CV *cv_pool_handler;
206static CV *cv_coro_state_new;
207 152
208/* Coro::AnyEvent */ 153/* Coro::AnyEvent */
209static SV *sv_activity; 154static SV *sv_activity;
210 155
211/* enable processtime/realtime profiling */ 156/* enable processtime/realtime profiling */
… …
215static char times_valid; 160static char times_valid;
216 161
217static struct coro_cctx *cctx_first; 162static struct coro_cctx *cctx_first;
218static int cctx_count, cctx_idle; 163static int cctx_count, cctx_idle;
219 164
220enum { 165enum
166{
221 CC_MAPPED = 0x01, 167 CC_MAPPED = 0x01,
222 CC_NOREUSE = 0x02, /* throw this away after tracing */ 168 CC_NOREUSE = 0x02, /* throw this away after tracing */
223 CC_TRACE = 0x04, 169 CC_TRACE = 0x04,
224 CC_TRACE_SUB = 0x08, /* trace sub calls */ 170 CC_TRACE_SUB = 0x08, /* trace sub calls */
225 CC_TRACE_LINE = 0x10, /* trace each statement */ 171 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
235 void *sptr; 181 void *sptr;
236 size_t ssize; 182 size_t ssize;
237 183
238 /* cpu state */ 184 /* cpu state */
239 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
186#ifndef NDEBUG
240 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 187 JMPENV *idle_te; /* same as idle_sp, but for top_env */
188#endif
241 JMPENV *top_env; 189 JMPENV *top_env;
242 coro_context cctx; 190 coro_context cctx;
243 191
244 U32 gen; 192 U32 gen;
245#if CORO_USE_VALGRIND 193#if CORO_USE_VALGRIND
246 int valgrind_id; 194 int valgrind_id;
247#endif 195#endif
248 unsigned char flags; 196 unsigned char flags;
249} coro_cctx; 197} coro_cctx;
250 198
251coro_cctx *cctx_current; /* the currently running cctx */ 199static coro_cctx *cctx_current; /* the currently running cctx */
252 200
253/*****************************************************************************/ 201/*****************************************************************************/
254 202
203static MGVTBL coro_state_vtbl;
204
255enum { 205enum
206{
256 CF_RUNNING = 0x0001, /* coroutine is running */ 207 CF_RUNNING = 0x0001, /* coroutine is running */
257 CF_READY = 0x0002, /* coroutine is ready */ 208 CF_READY = 0x0002, /* coroutine is ready */
258 CF_NEW = 0x0004, /* has never been switched to */ 209 CF_NEW = 0x0004, /* has never been switched to */
259 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 210 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
260 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
261}; 213};
262 214
263/* the structure where most of the perl state is stored, overlaid on the cxstack */ 215/* the structure where most of the perl state is stored, overlaid on the cxstack */
264typedef struct 216typedef struct
265{ 217{
266 SV *defsv;
267 AV *defav;
268 SV *errsv;
269 SV *irsgv;
270 HV *hinthv;
271#define VAR(name,type) type name; 218#define VARx(name,expr,type) type name;
272# include "state.h" 219# include "state.h"
273#undef VAR 220#undef VARx
274} perl_slots; 221} perl_slots;
275 222
223/* how many context stack entries do we need for perl_slots */
276#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 224#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
277 225
278/* this is a structure representing a perl-level coroutine */ 226/* this is a structure representing a perl-level coroutine */
279struct coro { 227struct coro
228{
280 /* the C coroutine allocated to this perl coroutine, if any */ 229 /* the C coroutine allocated to this perl coroutine, if any */
281 coro_cctx *cctx; 230 coro_cctx *cctx;
282 231
283 /* ready queue */ 232 /* ready queue */
284 struct coro *next_ready; 233 struct coro *next_ready;
… …
286 /* state data */ 235 /* state data */
287 struct CoroSLF slf_frame; /* saved slf frame */ 236 struct CoroSLF slf_frame; /* saved slf frame */
288 AV *mainstack; 237 AV *mainstack;
289 perl_slots *slot; /* basically the saved sp */ 238 perl_slots *slot; /* basically the saved sp */
290 239
291 CV *startcv; /* the CV to execute */ 240 CV *startcv; /* the CV to execute */
292 AV *args; /* data associated with this coroutine (initial args) */ 241 AV *args; /* data associated with this coroutine (initial args) */
293 int refcnt; /* coroutines are refcounted, yes */
294 int flags; /* CF_ flags */ 242 int flags; /* CF_ flags */
295 HV *hv; /* the perl hash associated with this coro, if any */ 243 HV *hv; /* the perl hash associated with this coro, if any */
296 void (*on_destroy)(pTHX_ struct coro *coro);
297 244
298 /* statistics */ 245 /* statistics */
299 int usecount; /* number of transfers to this coro */ 246 int usecount; /* number of transfers to this coro */
300 247
301 /* coro process data */ 248 /* coro process data */
302 int prio; 249 int prio;
303 SV *except; /* exception to be thrown */ 250 SV *except; /* exception to be thrown */
304 SV *rouse_cb; 251 SV *rouse_cb; /* last rouse callback */
252 AV *on_destroy; /* callbacks or coros to notify on destroy */
253 AV *status; /* the exit status list */
305 254
306 /* async_pool */ 255 /* async_pool */
307 SV *saved_deffh; 256 SV *saved_deffh;
308 SV *invoke_cb; 257 SV *invoke_cb;
309 AV *invoke_av; 258 AV *invoke_av;
310 259
311 /* on_enter/on_leave */ 260 /* on_enter/on_leave */
312 AV *on_enter; 261 AV *on_enter;
313 AV *on_leave; 262 AV *on_leave;
314 263
264 /* swap_sv */
265 AV *swap_sv;
266
315 /* times */ 267 /* times */
316 coro_ts t_cpu, t_real; 268 coro_ts t_cpu, t_real;
317 269
318 /* linked list */ 270 /* linked list */
319 struct coro *next, *prev; 271 struct coro *next, *prev;
… …
322typedef struct coro *Coro__State; 274typedef struct coro *Coro__State;
323typedef struct coro *Coro__State_or_hashref; 275typedef struct coro *Coro__State_or_hashref;
324 276
325/* the following variables are effectively part of the perl context */ 277/* the following variables are effectively part of the perl context */
326/* and get copied between struct coro and these variables */ 278/* and get copied between struct coro and these variables */
327/* the mainr easonw e don't support windows process emulation */ 279/* the main reason we don't support windows process emulation */
328static struct CoroSLF slf_frame; /* the current slf frame */ 280static struct CoroSLF slf_frame; /* the current slf frame */
329 281
330/** Coro ********************************************************************/ 282/** Coro ********************************************************************/
331 283
332#define CORO_PRIO_MAX 3 284#define CORO_PRIO_MAX 3
… …
338 290
339/* for Coro.pm */ 291/* for Coro.pm */
340static SV *coro_current; 292static SV *coro_current;
341static SV *coro_readyhook; 293static SV *coro_readyhook;
342static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
343static CV *cv_coro_run, *cv_coro_terminate; 295static CV *cv_coro_run;
344static struct coro *coro_first; 296static struct coro *coro_first;
345#define coro_nready coroapi.nready 297#define coro_nready coroapi.nready
346 298
299/** JIT *********************************************************************/
300
301#if CORO_JIT
302 /* APPLE doesn't have HAVE_MMAP though */
303 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
304 #ifndef CORO_JIT_TYPE
305 #if __x86_64 && CORO_JIT_UNIXY
306 #define CORO_JIT_TYPE "amd64-unix"
307 #elif __i386 && CORO_JIT_UNIXY
308 #define CORO_JIT_TYPE "x86-unix"
309 #endif
310 #endif
311#endif
312
313#if !defined(CORO_JIT_TYPE) || !HAVE_MMAP
314 #undef CORO_JIT
315#endif
316
317#if CORO_JIT
318 typedef void (*load_save_perl_slots_type)(perl_slots *);
319 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
320#endif
321
322/** Coro::Select ************************************************************/
323
324static OP *(*coro_old_pp_sselect) (pTHX);
325static SV *coro_select_select;
326
327/* horrible hack, but if it works... */
328static OP *
329coro_pp_sselect (pTHX)
330{
331 dSP;
332 PUSHMARK (SP - 4); /* fake argument list */
333 XPUSHs (coro_select_select);
334 PUTBACK;
335
336 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
337 PL_op->op_flags |= OPf_STACKED;
338 PL_op->op_private = 0;
339 return PL_ppaddr [OP_ENTERSUB](aTHX);
340}
341
342/** time stuff **************************************************************/
343
344#ifdef HAS_GETTIMEOFDAY
345
346ecb_inline void
347coro_u2time (pTHX_ UV ret[2])
348{
349 struct timeval tv;
350 gettimeofday (&tv, 0);
351
352 ret [0] = tv.tv_sec;
353 ret [1] = tv.tv_usec;
354}
355
356ecb_inline double
357coro_nvtime (void)
358{
359 struct timeval tv;
360 gettimeofday (&tv, 0);
361
362 return tv.tv_sec + tv.tv_usec * 1e-6;
363}
364
365ecb_inline void
366time_init (pTHX)
367{
368 nvtime = coro_nvtime;
369 u2time = coro_u2time;
370}
371
372#else
373
374ecb_inline void
375time_init (pTHX)
376{
377 SV **svp;
378
379 require_pv ("Time/HiRes.pm");
380
381 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
382
383 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
384 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
385
386 nvtime = INT2PTR (double (*)(), SvIV (*svp));
387
388 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
389 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
390}
391
392#endif
393
347/** lowlevel stuff **********************************************************/ 394/** lowlevel stuff **********************************************************/
348 395
349static SV * 396static SV * ecb_noinline
350coro_get_sv (pTHX_ const char *name, int create) 397coro_get_sv (pTHX_ const char *name, int create)
351{ 398{
352#if PERL_VERSION_ATLEAST (5,10,0) 399#if PERL_VERSION_ATLEAST (5,10,0)
353 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 400 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
354 get_sv (name, create); 401 get_sv (name, create);
355#endif 402#endif
356 return get_sv (name, create); 403 return get_sv (name, create);
357} 404}
358 405
359static AV * 406static AV * ecb_noinline
360coro_get_av (pTHX_ const char *name, int create) 407coro_get_av (pTHX_ const char *name, int create)
361{ 408{
362#if PERL_VERSION_ATLEAST (5,10,0) 409#if PERL_VERSION_ATLEAST (5,10,0)
363 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 410 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
364 get_av (name, create); 411 get_av (name, create);
365#endif 412#endif
366 return get_av (name, create); 413 return get_av (name, create);
367} 414}
368 415
369static HV * 416static HV * ecb_noinline
370coro_get_hv (pTHX_ const char *name, int create) 417coro_get_hv (pTHX_ const char *name, int create)
371{ 418{
372#if PERL_VERSION_ATLEAST (5,10,0) 419#if PERL_VERSION_ATLEAST (5,10,0)
373 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 420 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
374 get_hv (name, create); 421 get_hv (name, create);
375#endif 422#endif
376 return get_hv (name, create); 423 return get_hv (name, create);
377} 424}
378 425
379/* may croak */ 426ecb_inline void
380INLINE CV *
381coro_sv_2cv (pTHX_ SV *sv)
382{
383 HV *st;
384 GV *gvp;
385 CV *cv = sv_2cv (sv, &st, &gvp, 0);
386
387 if (!cv)
388 croak ("code reference expected");
389
390 return cv;
391}
392
393INLINE void
394coro_times_update () 427coro_times_update (void)
395{ 428{
396#ifdef coro_clock_gettime 429#ifdef coro_clock_gettime
397 struct timespec ts; 430 struct timespec ts;
398 431
399 ts.tv_sec = ts.tv_nsec = 0; 432 ts.tv_sec = ts.tv_nsec = 0;
… …
402 435
403 ts.tv_sec = ts.tv_nsec = 0; 436 ts.tv_sec = ts.tv_nsec = 0;
404 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts); 437 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
405 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec; 438 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
406#else 439#else
440 dTHX;
407 UV tv[2]; 441 UV tv[2];
408 442
409 u2time (aTHX_ &tv); 443 u2time (aTHX_ tv);
410 time_real [0] = tv [0]; 444 time_real [0] = tv [0];
411 time_real [1] = tv [1] * 1000; 445 time_real [1] = tv [1] * 1000;
412#endif 446#endif
413} 447}
414 448
415INLINE void 449ecb_inline void
416coro_times_add (struct coro *c) 450coro_times_add (struct coro *c)
417{ 451{
418 c->t_real [1] += time_real [1]; 452 c->t_real [1] += time_real [1];
419 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 453 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
420 c->t_real [0] += time_real [0]; 454 c->t_real [0] += time_real [0];
… …
422 c->t_cpu [1] += time_cpu [1]; 456 c->t_cpu [1] += time_cpu [1];
423 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 457 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
424 c->t_cpu [0] += time_cpu [0]; 458 c->t_cpu [0] += time_cpu [0];
425} 459}
426 460
427INLINE void 461ecb_inline void
428coro_times_sub (struct coro *c) 462coro_times_sub (struct coro *c)
429{ 463{
430 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 464 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
431 c->t_real [1] -= time_real [1]; 465 c->t_real [1] -= time_real [1];
432 c->t_real [0] -= time_real [0]; 466 c->t_real [0] -= time_real [0];
… …
440/* magic glue */ 474/* magic glue */
441 475
442#define CORO_MAGIC_type_cv 26 476#define CORO_MAGIC_type_cv 26
443#define CORO_MAGIC_type_state PERL_MAGIC_ext 477#define CORO_MAGIC_type_state PERL_MAGIC_ext
444 478
445#define CORO_MAGIC_NN(sv, type) \ 479#define CORO_MAGIC_NN(sv, type) \
446 (expect_true (SvMAGIC (sv)->mg_type == type) \ 480 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
447 ? SvMAGIC (sv) \ 481 ? SvMAGIC (sv) \
448 : mg_find (sv, type)) 482 : mg_find (sv, type))
449 483
450#define CORO_MAGIC(sv, type) \ 484#define CORO_MAGIC(sv, type) \
451 (expect_true (SvMAGIC (sv)) \ 485 (ecb_expect_true (SvMAGIC (sv)) \
452 ? CORO_MAGIC_NN (sv, type) \ 486 ? CORO_MAGIC_NN (sv, type) \
453 : 0) 487 : 0)
454 488
455#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 489#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
456#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 490#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
457 491
458INLINE struct coro * 492ecb_inline MAGIC *
493SvSTATEhv_p (pTHX_ SV *coro)
494{
495 MAGIC *mg;
496
497 if (ecb_expect_true (
498 SvTYPE (coro) == SVt_PVHV
499 && (mg = CORO_MAGIC_state (coro))
500 && mg->mg_virtual == &coro_state_vtbl
501 ))
502 return mg;
503
504 return 0;
505}
506
507ecb_inline struct coro *
459SvSTATE_ (pTHX_ SV *coro) 508SvSTATE_ (pTHX_ SV *coro)
460{ 509{
461 HV *stash;
462 MAGIC *mg; 510 MAGIC *mg;
463 511
464 if (SvROK (coro)) 512 if (SvROK (coro))
465 coro = SvRV (coro); 513 coro = SvRV (coro);
466 514
467 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 515 mg = SvSTATEhv_p (aTHX_ coro);
516 if (!mg)
468 croak ("Coro::State object required"); 517 croak ("Coro::State object required");
469 518
470 stash = SvSTASH (coro);
471 if (expect_false (stash != coro_stash && stash != coro_state_stash))
472 {
473 /* very slow, but rare, check */
474 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
475 croak ("Coro::State object required");
476 }
477
478 mg = CORO_MAGIC_state (coro);
479 return (struct coro *)mg->mg_ptr; 519 return (struct coro *)mg->mg_ptr;
480} 520}
481 521
482#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 522#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
483 523
… …
486#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 526#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
487 527
488/*****************************************************************************/ 528/*****************************************************************************/
489/* padlist management and caching */ 529/* padlist management and caching */
490 530
491static AV * 531ecb_inline AV *
492coro_derive_padlist (pTHX_ CV *cv) 532coro_derive_padlist (pTHX_ CV *cv)
493{ 533{
494 AV *padlist = CvPADLIST (cv); 534 AV *padlist = CvPADLIST (cv);
495 AV *newpadlist, *newpad; 535 AV *newpadlist, *newpad;
496 536
… …
508 av_store (newpadlist, 1, (SV *)newpad); 548 av_store (newpadlist, 1, (SV *)newpad);
509 549
510 return newpadlist; 550 return newpadlist;
511} 551}
512 552
513static void 553ecb_inline void
514free_padlist (pTHX_ AV *padlist) 554free_padlist (pTHX_ AV *padlist)
515{ 555{
516 /* may be during global destruction */ 556 /* may be during global destruction */
517 if (!IN_DESTRUCT) 557 if (!IN_DESTRUCT)
518 { 558 {
… …
544 AV *padlist; 584 AV *padlist;
545 AV *av = (AV *)mg->mg_obj; 585 AV *av = (AV *)mg->mg_obj;
546 586
547 /* perl manages to free our internal AV and _then_ call us */ 587 /* perl manages to free our internal AV and _then_ call us */
548 if (IN_DESTRUCT) 588 if (IN_DESTRUCT)
549 return; 589 return 0;
550 590
551 /* casting is fun. */ 591 /* casting is fun. */
552 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 592 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
553 free_padlist (aTHX_ padlist); 593 free_padlist (aTHX_ padlist);
554 594
… …
561 0, 0, 0, 0, 601 0, 0, 0, 0,
562 coro_cv_free 602 coro_cv_free
563}; 603};
564 604
565/* the next two functions merely cache the padlists */ 605/* the next two functions merely cache the padlists */
566static void 606ecb_inline void
567get_padlist (pTHX_ CV *cv) 607get_padlist (pTHX_ CV *cv)
568{ 608{
569 MAGIC *mg = CORO_MAGIC_cv (cv); 609 MAGIC *mg = CORO_MAGIC_cv (cv);
570 AV *av; 610 AV *av;
571 611
572 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 612 if (ecb_expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
573 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 613 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
574 else 614 else
575 { 615 {
576#if CORO_PREFER_PERL_FUNCTIONS 616#if CORO_PREFER_PERL_FUNCTIONS
577 /* this is probably cleaner? but also slower! */ 617 /* this is probably cleaner? but also slower! */
… …
584 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 624 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
585#endif 625#endif
586 } 626 }
587} 627}
588 628
589static void 629ecb_inline void
590put_padlist (pTHX_ CV *cv) 630put_padlist (pTHX_ CV *cv)
591{ 631{
592 MAGIC *mg = CORO_MAGIC_cv (cv); 632 MAGIC *mg = CORO_MAGIC_cv (cv);
593 AV *av; 633 AV *av;
594 634
595 if (expect_false (!mg)) 635 if (ecb_expect_false (!mg))
596 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 636 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
597 637
598 av = (AV *)mg->mg_obj; 638 av = (AV *)mg->mg_obj;
599 639
600 if (expect_false (AvFILLp (av) >= AvMAX (av))) 640 if (ecb_expect_false (AvFILLp (av) >= AvMAX (av)))
601 av_extend (av, AvFILLp (av) + 1); 641 av_extend (av, AvFILLp (av) + 1);
602 642
603 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 643 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
604} 644}
605 645
606/** load & save, init *******************************************************/ 646/** load & save, init *******************************************************/
647
648ecb_inline void
649swap_sv (SV *a, SV *b)
650{
651 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
652 SV tmp;
653
654 /* swap sv_any */
655 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
656
657 /* swap sv_flags */
658 SvFLAGS (&tmp) = SvFLAGS (a);
659 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
660 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
661
662#if PERL_VERSION_ATLEAST (5,10,0)
663 /* perl 5.10 and later complicates this _quite_ a bit, but it also
664 * is much faster, so no quarrels here. alternatively, we could
665 * sv_upgrade to avoid this.
666 */
667 {
668 /* swap sv_u */
669 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
670
671 /* if SvANY points to the head, we need to adjust the pointers,
672 * as the pointer for a still points to b, and maybe vice versa.
673 */
674 #define svany_in_head(type) \
675 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
676
677 if (svany_in_head (SvTYPE (a)))
678 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
679
680 if (svany_in_head (SvTYPE (b)))
681 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
682 }
683#endif
684}
685
686/* swap sv heads, at least logically */
687static void
688swap_svs (pTHX_ Coro__State c)
689{
690 int i;
691
692 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
693 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
694}
695
696#define SWAP_SVS(coro) \
697 if (ecb_expect_false ((coro)->swap_sv)) \
698 swap_svs (aTHX_ (coro))
607 699
608static void 700static void
609on_enterleave_call (pTHX_ SV *cb); 701on_enterleave_call (pTHX_ SV *cb);
610 702
611static void 703static void
… …
614 perl_slots *slot = c->slot; 706 perl_slots *slot = c->slot;
615 c->slot = 0; 707 c->slot = 0;
616 708
617 PL_mainstack = c->mainstack; 709 PL_mainstack = c->mainstack;
618 710
619 GvSV (PL_defgv) = slot->defsv; 711#if CORO_JIT
620 GvAV (PL_defgv) = slot->defav; 712 load_perl_slots (slot);
621 GvSV (PL_errgv) = slot->errsv; 713#else
622 GvSV (irsgv) = slot->irsgv;
623 GvHV (PL_hintgv) = slot->hinthv;
624
625 #define VAR(name,type) PL_ ## name = slot->name; 714 #define VARx(name,expr,type) expr = slot->name;
626 # include "state.h" 715 # include "state.h"
627 #undef VAR 716 #undef VARx
717#endif
628 718
629 { 719 {
630 dSP; 720 dSP;
631 721
632 CV *cv; 722 CV *cv;
633 723
634 /* now do the ugly restore mess */ 724 /* now do the ugly restore mess */
635 while (expect_true (cv = (CV *)POPs)) 725 while (ecb_expect_true (cv = (CV *)POPs))
636 { 726 {
637 put_padlist (aTHX_ cv); /* mark this padlist as available */ 727 put_padlist (aTHX_ cv); /* mark this padlist as available */
638 CvDEPTH (cv) = PTR2IV (POPs); 728 CvDEPTH (cv) = PTR2IV (POPs);
639 CvPADLIST (cv) = (AV *)POPs; 729 CvPADLIST (cv) = (AV *)POPs;
640 } 730 }
… …
643 } 733 }
644 734
645 slf_frame = c->slf_frame; 735 slf_frame = c->slf_frame;
646 CORO_THROW = c->except; 736 CORO_THROW = c->except;
647 737
648 if (expect_false (enable_times)) 738 if (ecb_expect_false (enable_times))
649 { 739 {
650 if (expect_false (!times_valid)) 740 if (ecb_expect_false (!times_valid))
651 coro_times_update (); 741 coro_times_update ();
652 742
653 coro_times_sub (c); 743 coro_times_sub (c);
654 } 744 }
655 745
656 if (expect_false (c->on_enter)) 746 if (ecb_expect_false (c->on_enter))
657 { 747 {
658 int i; 748 int i;
659 749
660 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 750 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
661 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 751 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
662 } 752 }
753
754 SWAP_SVS (c);
663} 755}
664 756
665static void 757static void
666save_perl (pTHX_ Coro__State c) 758save_perl (pTHX_ Coro__State c)
667{ 759{
760 SWAP_SVS (c);
761
668 if (expect_false (c->on_leave)) 762 if (ecb_expect_false (c->on_leave))
669 { 763 {
670 int i; 764 int i;
671 765
672 for (i = AvFILLp (c->on_leave); i >= 0; --i) 766 for (i = AvFILLp (c->on_leave); i >= 0; --i)
673 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 767 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
674 } 768 }
675 769
676 times_valid = 0; 770 times_valid = 0;
677 771
678 if (expect_false (enable_times)) 772 if (ecb_expect_false (enable_times))
679 { 773 {
680 coro_times_update (); times_valid = 1; 774 coro_times_update (); times_valid = 1;
681 coro_times_add (c); 775 coro_times_add (c);
682 } 776 }
683 777
… …
697 791
698 XPUSHs (Nullsv); 792 XPUSHs (Nullsv);
699 /* this loop was inspired by pp_caller */ 793 /* this loop was inspired by pp_caller */
700 for (;;) 794 for (;;)
701 { 795 {
702 while (expect_true (cxix >= 0)) 796 while (ecb_expect_true (cxix >= 0))
703 { 797 {
704 PERL_CONTEXT *cx = &ccstk[cxix--]; 798 PERL_CONTEXT *cx = &ccstk[cxix--];
705 799
706 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 800 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
707 { 801 {
708 CV *cv = cx->blk_sub.cv; 802 CV *cv = cx->blk_sub.cv;
709 803
710 if (expect_true (CvDEPTH (cv))) 804 if (ecb_expect_true (CvDEPTH (cv)))
711 { 805 {
712 EXTEND (SP, 3); 806 EXTEND (SP, 3);
713 PUSHs ((SV *)CvPADLIST (cv)); 807 PUSHs ((SV *)CvPADLIST (cv));
714 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 808 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
715 PUSHs ((SV *)cv); 809 PUSHs ((SV *)cv);
… …
718 get_padlist (aTHX_ cv); 812 get_padlist (aTHX_ cv);
719 } 813 }
720 } 814 }
721 } 815 }
722 816
723 if (expect_true (top_si->si_type == PERLSI_MAIN)) 817 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
724 break; 818 break;
725 819
726 top_si = top_si->si_prev; 820 top_si = top_si->si_prev;
727 ccstk = top_si->si_cxstack; 821 ccstk = top_si->si_cxstack;
728 cxix = top_si->si_cxix; 822 cxix = top_si->si_cxix;
… …
730 824
731 PUTBACK; 825 PUTBACK;
732 } 826 }
733 827
734 /* allocate some space on the context stack for our purposes */ 828 /* allocate some space on the context stack for our purposes */
735 /* we manually unroll here, as usually 2 slots is enough */ 829 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
736 if (SLOT_COUNT >= 1) CXINC;
737 if (SLOT_COUNT >= 2) CXINC;
738 if (SLOT_COUNT >= 3) CXINC;
739 { 830 {
740 int i; 831 unsigned int i;
832
741 for (i = 3; i < SLOT_COUNT; ++i) 833 for (i = 0; i < SLOT_COUNT; ++i)
742 CXINC; 834 CXINC;
743 } 835
744 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 836 cxstack_ix -= SLOT_COUNT; /* undo allocation */
837 }
745 838
746 c->mainstack = PL_mainstack; 839 c->mainstack = PL_mainstack;
747 840
748 { 841 {
749 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 842 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
750 843
751 slot->defav = GvAV (PL_defgv); 844#if CORO_JIT
752 slot->defsv = DEFSV; 845 save_perl_slots (slot);
753 slot->errsv = ERRSV; 846#else
754 slot->irsgv = GvSV (irsgv);
755 slot->hinthv = GvHV (PL_hintgv);
756
757 #define VAR(name,type) slot->name = PL_ ## name; 847 #define VARx(name,expr,type) slot->name = expr;
758 # include "state.h" 848 # include "state.h"
759 #undef VAR 849 #undef VARx
850#endif
760 } 851 }
761} 852}
762 853
763/* 854/*
764 * allocate various perl stacks. This is almost an exact copy 855 * allocate various perl stacks. This is almost an exact copy
… …
770# define coro_init_stacks(thx) init_stacks () 861# define coro_init_stacks(thx) init_stacks ()
771#else 862#else
772static void 863static void
773coro_init_stacks (pTHX) 864coro_init_stacks (pTHX)
774{ 865{
775 PL_curstackinfo = new_stackinfo(32, 8); 866 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
776 PL_curstackinfo->si_type = PERLSI_MAIN; 867 PL_curstackinfo->si_type = PERLSI_MAIN;
777 PL_curstack = PL_curstackinfo->si_stack; 868 PL_curstack = PL_curstackinfo->si_stack;
778 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 869 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
779 870
780 PL_stack_base = AvARRAY(PL_curstack); 871 PL_stack_base = AvARRAY(PL_curstack);
… …
795#endif 886#endif
796 887
797 New(54,PL_scopestack,8,I32); 888 New(54,PL_scopestack,8,I32);
798 PL_scopestack_ix = 0; 889 PL_scopestack_ix = 0;
799 PL_scopestack_max = 8; 890 PL_scopestack_max = 8;
891#if HAS_SCOPESTACK_NAME
892 New(54,PL_scopestack_name,8,const char*);
893#endif
800 894
801 New(54,PL_savestack,24,ANY); 895 New(54,PL_savestack,24,ANY);
802 PL_savestack_ix = 0; 896 PL_savestack_ix = 0;
803 PL_savestack_max = 24; 897 PL_savestack_max = 24;
804 898
… …
832 } 926 }
833 927
834 Safefree (PL_tmps_stack); 928 Safefree (PL_tmps_stack);
835 Safefree (PL_markstack); 929 Safefree (PL_markstack);
836 Safefree (PL_scopestack); 930 Safefree (PL_scopestack);
931#if HAS_SCOPESTACK_NAME
932 Safefree (PL_scopestack_name);
933#endif
837 Safefree (PL_savestack); 934 Safefree (PL_savestack);
838#if !PERL_VERSION_ATLEAST (5,10,0) 935#if !PERL_VERSION_ATLEAST (5,10,0)
839 Safefree (PL_retstack); 936 Safefree (PL_retstack);
840#endif 937#endif
841} 938}
… …
887#endif 984#endif
888 985
889/* 986/*
890 * This overrides the default magic get method of %SIG elements. 987 * This overrides the default magic get method of %SIG elements.
891 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 988 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
892 * and instead of trying to save and restore the hash elements, we just provide 989 * and instead of trying to save and restore the hash elements (extremely slow),
893 * readback here. 990 * we just provide our own readback here.
894 */ 991 */
895static int 992static int ecb_cold
896coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 993coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
897{ 994{
898 const char *s = MgPV_nolen_const (mg); 995 const char *s = MgPV_nolen_const (mg);
899 996
900 if (*s == '_') 997 if (*s == '_')
… …
904 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1001 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
905 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1002 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
906 1003
907 if (svp) 1004 if (svp)
908 { 1005 {
909 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1006 SV *ssv;
1007
1008 if (!*svp)
1009 ssv = &PL_sv_undef;
1010 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1011 ssv = sv_2mortal (newRV_inc (*svp));
1012 else
1013 ssv = *svp;
1014
1015 sv_setsv (sv, ssv);
910 return 0; 1016 return 0;
911 } 1017 }
912 } 1018 }
913 1019
914 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1020 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
915} 1021}
916 1022
917static int 1023static int ecb_cold
918coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1024coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
919{ 1025{
920 const char *s = MgPV_nolen_const (mg); 1026 const char *s = MgPV_nolen_const (mg);
921 1027
922 if (*s == '_') 1028 if (*s == '_')
… …
936 } 1042 }
937 1043
938 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1044 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
939} 1045}
940 1046
941static int 1047static int ecb_cold
942coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1048coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
943{ 1049{
944 const char *s = MgPV_nolen_const (mg); 1050 const char *s = MgPV_nolen_const (mg);
945 1051
946 if (*s == '_') 1052 if (*s == '_')
… …
979slf_check_repeat (pTHX_ struct CoroSLF *frame) 1085slf_check_repeat (pTHX_ struct CoroSLF *frame)
980{ 1086{
981 return 1; 1087 return 1;
982} 1088}
983 1089
984static UNOP coro_setup_op; 1090static UNOP init_perl_op;
985 1091
986static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1092ecb_noinline static void /* noinline to keep it out of the transfer fast path */
987coro_setup (pTHX_ struct coro *coro) 1093init_perl (pTHX_ struct coro *coro)
988{ 1094{
989 /* 1095 /*
990 * emulate part of the perl startup here. 1096 * emulate part of the perl startup here.
991 */ 1097 */
992 coro_init_stacks (aTHX); 1098 coro_init_stacks (aTHX);
… …
999 PL_comppad_name_fill = 0; 1105 PL_comppad_name_fill = 0;
1000 PL_comppad_name_floor = 0; 1106 PL_comppad_name_floor = 0;
1001 PL_curpm = 0; 1107 PL_curpm = 0;
1002 PL_curpad = 0; 1108 PL_curpad = 0;
1003 PL_localizing = 0; 1109 PL_localizing = 0;
1004 PL_dirty = 0;
1005 PL_restartop = 0; 1110 PL_restartop = 0;
1006#if PERL_VERSION_ATLEAST (5,10,0) 1111#if PERL_VERSION_ATLEAST (5,10,0)
1007 PL_parser = 0; 1112 PL_parser = 0;
1008#endif 1113#endif
1009 PL_hints = 0; 1114 PL_hints = 0;
1010 1115
1011 /* recreate the die/warn hooks */ 1116 /* recreate the die/warn hooks */
1012 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1117 PL_diehook = SvREFCNT_inc (rv_diehook);
1013 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1118 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1014 1119
1015 GvSV (PL_defgv) = newSV (0); 1120 GvSV (PL_defgv) = newSV (0);
1016 GvAV (PL_defgv) = coro->args; coro->args = 0; 1121 GvAV (PL_defgv) = coro->args; coro->args = 0;
1017 GvSV (PL_errgv) = newSV (0); 1122 GvSV (PL_errgv) = newSV (0);
1018 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1123 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
1039 /* this newly created coroutine might be run on an existing cctx which most 1144 /* this newly created coroutine might be run on an existing cctx which most
1040 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1145 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1041 */ 1146 */
1042 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1147 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1043 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1148 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1149 slf_frame.destroy = 0;
1044 1150
1045 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1151 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1046 coro_setup_op.op_next = PL_op; 1152 init_perl_op.op_next = PL_op;
1047 coro_setup_op.op_type = OP_ENTERSUB; 1153 init_perl_op.op_type = OP_ENTERSUB;
1048 coro_setup_op.op_ppaddr = pp_slf; 1154 init_perl_op.op_ppaddr = pp_slf;
1049 /* no flags etc. required, as an init function won't be called */ 1155 /* no flags etc. required, as an init function won't be called */
1050 1156
1051 PL_op = (OP *)&coro_setup_op; 1157 PL_op = (OP *)&init_perl_op;
1052 1158
1053 /* copy throw, in case it was set before coro_setup */ 1159 /* copy throw, in case it was set before init_perl */
1054 CORO_THROW = coro->except; 1160 CORO_THROW = coro->except;
1055 1161
1162 SWAP_SVS (coro);
1163
1056 if (expect_false (enable_times)) 1164 if (ecb_expect_false (enable_times))
1057 { 1165 {
1058 coro_times_update (); 1166 coro_times_update ();
1059 coro_times_sub (coro); 1167 coro_times_sub (coro);
1060 } 1168 }
1061} 1169}
… …
1080 dounwind (-1); 1188 dounwind (-1);
1081 } 1189 }
1082} 1190}
1083 1191
1084static void 1192static void
1085coro_destruct_perl (pTHX_ struct coro *coro) 1193destroy_perl (pTHX_ struct coro *coro)
1086{ 1194{
1087 SV *svf [9]; 1195 SV *svf [9];
1088 1196
1089 { 1197 {
1198 SV *old_current = SvRV (coro_current);
1090 struct coro *current = SvSTATE_current; 1199 struct coro *current = SvSTATE (old_current);
1091 1200
1092 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1201 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1093 1202
1094 save_perl (aTHX_ current); 1203 save_perl (aTHX_ current);
1204
1205 /* this will cause transfer_check to croak on block*/
1206 SvRV_set (coro_current, (SV *)coro->hv);
1207
1095 load_perl (aTHX_ coro); 1208 load_perl (aTHX_ coro);
1096 1209
1097 coro_unwind_stacks (aTHX); 1210 coro_unwind_stacks (aTHX);
1211
1212 /* restore swapped sv's */
1213 SWAP_SVS (coro);
1214
1098 coro_destruct_stacks (aTHX); 1215 coro_destruct_stacks (aTHX);
1099 1216
1100 // now save some sv's to be free'd later 1217 /* now save some sv's to be free'd later */
1101 svf [0] = GvSV (PL_defgv); 1218 svf [0] = GvSV (PL_defgv);
1102 svf [1] = (SV *)GvAV (PL_defgv); 1219 svf [1] = (SV *)GvAV (PL_defgv);
1103 svf [2] = GvSV (PL_errgv); 1220 svf [2] = GvSV (PL_errgv);
1104 svf [3] = (SV *)PL_defoutgv; 1221 svf [3] = (SV *)PL_defoutgv;
1105 svf [4] = PL_rs; 1222 svf [4] = PL_rs;
… …
1107 svf [6] = (SV *)GvHV (PL_hintgv); 1224 svf [6] = (SV *)GvHV (PL_hintgv);
1108 svf [7] = PL_diehook; 1225 svf [7] = PL_diehook;
1109 svf [8] = PL_warnhook; 1226 svf [8] = PL_warnhook;
1110 assert (9 == sizeof (svf) / sizeof (*svf)); 1227 assert (9 == sizeof (svf) / sizeof (*svf));
1111 1228
1229 SvRV_set (coro_current, old_current);
1230
1112 load_perl (aTHX_ current); 1231 load_perl (aTHX_ current);
1113 } 1232 }
1114 1233
1115 { 1234 {
1116 int i; 1235 unsigned int i;
1117 1236
1118 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i) 1237 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1119 SvREFCNT_dec (svf [i]); 1238 SvREFCNT_dec (svf [i]);
1120 1239
1121 SvREFCNT_dec (coro->saved_deffh); 1240 SvREFCNT_dec (coro->saved_deffh);
… …
1123 SvREFCNT_dec (coro->invoke_cb); 1242 SvREFCNT_dec (coro->invoke_cb);
1124 SvREFCNT_dec (coro->invoke_av); 1243 SvREFCNT_dec (coro->invoke_av);
1125 } 1244 }
1126} 1245}
1127 1246
1128INLINE void 1247ecb_inline void
1129free_coro_mortal (pTHX) 1248free_coro_mortal (pTHX)
1130{ 1249{
1131 if (expect_true (coro_mortal)) 1250 if (ecb_expect_true (coro_mortal))
1132 { 1251 {
1133 SvREFCNT_dec (coro_mortal); 1252 SvREFCNT_dec ((SV *)coro_mortal);
1134 coro_mortal = 0; 1253 coro_mortal = 0;
1135 } 1254 }
1136} 1255}
1137 1256
1138static int 1257static int
… …
1271 1390
1272 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1391 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1273} 1392}
1274 1393
1275/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1394/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1276static void NOINLINE 1395static void ecb_noinline
1277cctx_prepare (pTHX) 1396cctx_prepare (pTHX)
1278{ 1397{
1279 PL_top_env = &PL_start_env; 1398 PL_top_env = &PL_start_env;
1280 1399
1281 if (cctx_current->flags & CC_TRACE) 1400 if (cctx_current->flags & CC_TRACE)
… …
1291 1410
1292 slf_frame.prepare = slf_prepare_set_stacklevel; 1411 slf_frame.prepare = slf_prepare_set_stacklevel;
1293 slf_frame.check = slf_check_set_stacklevel; 1412 slf_frame.check = slf_check_set_stacklevel;
1294} 1413}
1295 1414
1415/* try to exit the same way perl's main function would do */
1416/* we do not bother resetting the environment or other things *7
1417/* that are not, uhm, essential */
1418/* this obviously also doesn't work when perl is embedded */
1419static void ecb_noinline ecb_cold
1420perlish_exit (void)
1421{
1422 int exitstatus = perl_destruct (PL_curinterp);
1423 perl_free (PL_curinterp);
1424 exit (exitstatus);
1425}
1426
1296/* the tail of transfer: execute stuff we can only do after a transfer */ 1427/* the tail of transfer: execute stuff we can only do after a transfer */
1297INLINE void 1428ecb_inline void
1298transfer_tail (pTHX) 1429transfer_tail (pTHX)
1299{ 1430{
1300 free_coro_mortal (aTHX); 1431 free_coro_mortal (aTHX);
1301} 1432}
1302 1433
… …
1327 /* somebody or something will hit me for both perl_run and PL_restartop */ 1458 /* somebody or something will hit me for both perl_run and PL_restartop */
1328 PL_restartop = PL_op; 1459 PL_restartop = PL_op;
1329 perl_run (PL_curinterp); 1460 perl_run (PL_curinterp);
1330 /* 1461 /*
1331 * Unfortunately, there is no way to get at the return values of the 1462 * Unfortunately, there is no way to get at the return values of the
1332 * coro body here, as perl_run destroys these 1463 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1464 * runtime errors here, as this is just a random interpreter, not a thread.
1333 */ 1465 */
1334 1466
1335 /* 1467 /*
1336 * If perl-run returns we assume exit() was being called or the coro 1468 * If perl-run returns we assume exit() was being called or the coro
1337 * fell off the end, which seems to be the only valid (non-bug) 1469 * fell off the end, which seems to be the only valid (non-bug)
1338 * reason for perl_run to return. We try to exit by jumping to the 1470 * reason for perl_run to return. We try to mimic whatever perl is normally
1339 * bootstrap-time "top" top_env, as we cannot restore the "main" 1471 * doing in that case. YMMV.
1340 * coroutine as Coro has no such concept.
1341 * This actually isn't valid with the pthread backend, but OSes requiring
1342 * that backend are too broken to do it in a standards-compliant way.
1343 */ 1472 */
1344 PL_top_env = main_top_env; 1473 perlish_exit ();
1345 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1346 } 1474 }
1347} 1475}
1348 1476
1349static coro_cctx * 1477static coro_cctx *
1350cctx_new () 1478cctx_new (void)
1351{ 1479{
1352 coro_cctx *cctx; 1480 coro_cctx *cctx;
1353 1481
1354 ++cctx_count; 1482 ++cctx_count;
1355 New (0, cctx, 1, coro_cctx); 1483 New (0, cctx, 1, coro_cctx);
… …
1361 return cctx; 1489 return cctx;
1362} 1490}
1363 1491
1364/* create a new cctx only suitable as source */ 1492/* create a new cctx only suitable as source */
1365static coro_cctx * 1493static coro_cctx *
1366cctx_new_empty () 1494cctx_new_empty (void)
1367{ 1495{
1368 coro_cctx *cctx = cctx_new (); 1496 coro_cctx *cctx = cctx_new ();
1369 1497
1370 cctx->sptr = 0; 1498 cctx->sptr = 0;
1371 coro_create (&cctx->cctx, 0, 0, 0, 0); 1499 coro_create (&cctx->cctx, 0, 0, 0, 0);
… …
1373 return cctx; 1501 return cctx;
1374} 1502}
1375 1503
1376/* create a new cctx suitable as destination/running a perl interpreter */ 1504/* create a new cctx suitable as destination/running a perl interpreter */
1377static coro_cctx * 1505static coro_cctx *
1378cctx_new_run () 1506cctx_new_run (void)
1379{ 1507{
1380 coro_cctx *cctx = cctx_new (); 1508 coro_cctx *cctx = cctx_new ();
1381 void *stack_start; 1509 void *stack_start;
1382 size_t stack_size; 1510 size_t stack_size;
1383 1511
1384#if HAVE_MMAP 1512#if HAVE_MMAP
1385 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1513 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1386 /* mmap supposedly does allocate-on-write for us */ 1514 /* mmap supposedly does allocate-on-write for us */
1387 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1515 cctx->sptr = mmap (0, cctx->ssize, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS, 0, 0);
1388 1516
1389 if (cctx->sptr != (void *)-1) 1517 if (cctx->sptr != (void *)-1)
1390 { 1518 {
1391 #if CORO_STACKGUARD 1519 #if CORO_STACKGUARD
1392 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1520 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
… …
1424cctx_destroy (coro_cctx *cctx) 1552cctx_destroy (coro_cctx *cctx)
1425{ 1553{
1426 if (!cctx) 1554 if (!cctx)
1427 return; 1555 return;
1428 1556
1429 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1557 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1430 1558
1431 --cctx_count; 1559 --cctx_count;
1432 coro_destroy (&cctx->cctx); 1560 coro_destroy (&cctx->cctx);
1433 1561
1434 /* coro_transfer creates new, empty cctx's */ 1562 /* coro_transfer creates new, empty cctx's */
… …
1453#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1581#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1454 1582
1455static coro_cctx * 1583static coro_cctx *
1456cctx_get (pTHX) 1584cctx_get (pTHX)
1457{ 1585{
1458 while (expect_true (cctx_first)) 1586 while (ecb_expect_true (cctx_first))
1459 { 1587 {
1460 coro_cctx *cctx = cctx_first; 1588 coro_cctx *cctx = cctx_first;
1461 cctx_first = cctx->next; 1589 cctx_first = cctx->next;
1462 --cctx_idle; 1590 --cctx_idle;
1463 1591
1464 if (expect_true (!CCTX_EXPIRED (cctx))) 1592 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1465 return cctx; 1593 return cctx;
1466 1594
1467 cctx_destroy (cctx); 1595 cctx_destroy (cctx);
1468 } 1596 }
1469 1597
… …
1474cctx_put (coro_cctx *cctx) 1602cctx_put (coro_cctx *cctx)
1475{ 1603{
1476 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1604 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1477 1605
1478 /* free another cctx if overlimit */ 1606 /* free another cctx if overlimit */
1479 if (expect_false (cctx_idle >= cctx_max_idle)) 1607 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1480 { 1608 {
1481 coro_cctx *first = cctx_first; 1609 coro_cctx *first = cctx_first;
1482 cctx_first = first->next; 1610 cctx_first = first->next;
1483 --cctx_idle; 1611 --cctx_idle;
1484 1612
… …
1495static void 1623static void
1496transfer_check (pTHX_ struct coro *prev, struct coro *next) 1624transfer_check (pTHX_ struct coro *prev, struct coro *next)
1497{ 1625{
1498 /* TODO: throwing up here is considered harmful */ 1626 /* TODO: throwing up here is considered harmful */
1499 1627
1500 if (expect_true (prev != next)) 1628 if (ecb_expect_true (prev != next))
1501 { 1629 {
1502 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1630 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1503 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1631 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1504 1632
1505 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1633 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1506 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1634 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1507 1635
1508#if !PERL_VERSION_ATLEAST (5,10,0) 1636#if !PERL_VERSION_ATLEAST (5,10,0)
1509 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1637 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1510 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1638 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1511#endif 1639#endif
1512 } 1640 }
1513} 1641}
1514 1642
1515/* always use the TRANSFER macro */ 1643/* always use the TRANSFER macro */
1516static void NOINLINE /* noinline so we have a fixed stackframe */ 1644static void ecb_noinline /* noinline so we have a fixed stackframe */
1517transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1645transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1518{ 1646{
1519 dSTACKLEVEL; 1647 dSTACKLEVEL;
1520 1648
1521 /* sometimes transfer is only called to set idle_sp */ 1649 /* sometimes transfer is only called to set idle_sp */
1522 if (expect_false (!prev)) 1650 if (ecb_expect_false (!prev))
1523 { 1651 {
1524 cctx_current->idle_sp = STACKLEVEL; 1652 cctx_current->idle_sp = STACKLEVEL;
1525 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1653 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1526 } 1654 }
1527 else if (expect_true (prev != next)) 1655 else if (ecb_expect_true (prev != next))
1528 { 1656 {
1529 coro_cctx *cctx_prev; 1657 coro_cctx *cctx_prev;
1530 1658
1531 if (expect_false (prev->flags & CF_NEW)) 1659 if (ecb_expect_false (prev->flags & CF_NEW))
1532 { 1660 {
1533 /* create a new empty/source context */ 1661 /* create a new empty/source context */
1534 prev->flags &= ~CF_NEW; 1662 prev->flags &= ~CF_NEW;
1535 prev->flags |= CF_RUNNING; 1663 prev->flags |= CF_RUNNING;
1536 } 1664 }
… …
1539 next->flags |= CF_RUNNING; 1667 next->flags |= CF_RUNNING;
1540 1668
1541 /* first get rid of the old state */ 1669 /* first get rid of the old state */
1542 save_perl (aTHX_ prev); 1670 save_perl (aTHX_ prev);
1543 1671
1544 if (expect_false (next->flags & CF_NEW)) 1672 if (ecb_expect_false (next->flags & CF_NEW))
1545 { 1673 {
1546 /* need to start coroutine */ 1674 /* need to start coroutine */
1547 next->flags &= ~CF_NEW; 1675 next->flags &= ~CF_NEW;
1548 /* setup coroutine call */ 1676 /* setup coroutine call */
1549 coro_setup (aTHX_ next); 1677 init_perl (aTHX_ next);
1550 } 1678 }
1551 else 1679 else
1552 load_perl (aTHX_ next); 1680 load_perl (aTHX_ next);
1553 1681
1554 /* possibly untie and reuse the cctx */ 1682 /* possibly untie and reuse the cctx */
1555 if (expect_true ( 1683 if (ecb_expect_true (
1556 cctx_current->idle_sp == STACKLEVEL 1684 cctx_current->idle_sp == STACKLEVEL
1557 && !(cctx_current->flags & CC_TRACE) 1685 && !(cctx_current->flags & CC_TRACE)
1558 && !force_cctx 1686 && !force_cctx
1559 )) 1687 ))
1560 { 1688 {
1561 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1689 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1562 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1690 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1563 1691
1564 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1692 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1565 /* without this the next cctx_get might destroy the running cctx while still in use */ 1693 /* without this the next cctx_get might destroy the running cctx while still in use */
1566 if (expect_false (CCTX_EXPIRED (cctx_current))) 1694 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1567 if (expect_true (!next->cctx)) 1695 if (ecb_expect_true (!next->cctx))
1568 next->cctx = cctx_get (aTHX); 1696 next->cctx = cctx_get (aTHX);
1569 1697
1570 cctx_put (cctx_current); 1698 cctx_put (cctx_current);
1571 } 1699 }
1572 else 1700 else
1573 prev->cctx = cctx_current; 1701 prev->cctx = cctx_current;
1574 1702
1575 ++next->usecount; 1703 ++next->usecount;
1576 1704
1577 cctx_prev = cctx_current; 1705 cctx_prev = cctx_current;
1578 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1706 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1579 1707
1580 next->cctx = 0; 1708 next->cctx = 0;
1581 1709
1582 if (expect_false (cctx_prev != cctx_current)) 1710 if (ecb_expect_false (cctx_prev != cctx_current))
1583 { 1711 {
1584 cctx_prev->top_env = PL_top_env; 1712 cctx_prev->top_env = PL_top_env;
1585 PL_top_env = cctx_current->top_env; 1713 PL_top_env = cctx_current->top_env;
1586 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1714 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1587 } 1715 }
… …
1593#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1721#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1594#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1722#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1595 1723
1596/** high level stuff ********************************************************/ 1724/** high level stuff ********************************************************/
1597 1725
1726/* this function is actually Coro, not Coro::State, but we call it from here */
1727/* because it is convenient - but it hasn't been declared yet for that reason */
1598static int 1728static void
1729coro_call_on_destroy (pTHX_ struct coro *coro);
1730
1731static void
1599coro_state_destroy (pTHX_ struct coro *coro) 1732coro_state_destroy (pTHX_ struct coro *coro)
1600{ 1733{
1601 if (coro->flags & CF_DESTROYED) 1734 if (coro->flags & CF_ZOMBIE)
1602 return 0; 1735 return;
1603 1736
1604 if (coro->on_destroy && !PL_dirty)
1605 coro->on_destroy (aTHX_ coro); 1737 slf_destroy (aTHX_ coro);
1606 1738
1607 coro->flags |= CF_DESTROYED; 1739 coro->flags |= CF_ZOMBIE;
1608 1740
1609 if (coro->flags & CF_READY) 1741 if (coro->flags & CF_READY)
1610 { 1742 {
1611 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1743 /* reduce nready, as destroying a ready coro effectively unreadies it */
1612 /* alternative: look through all ready queues and remove the coro */ 1744 /* alternative: look through all ready queues and remove the coro */
1613 --coro_nready; 1745 --coro_nready;
1614 } 1746 }
1615 else 1747 else
1616 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1748 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1749
1750 if (coro->next) coro->next->prev = coro->prev;
1751 if (coro->prev) coro->prev->next = coro->next;
1752 if (coro == coro_first) coro_first = coro->next;
1617 1753
1618 if (coro->mainstack 1754 if (coro->mainstack
1619 && coro->mainstack != main_mainstack 1755 && coro->mainstack != main_mainstack
1620 && coro->slot 1756 && coro->slot
1621 && !PL_dirty) 1757 && !PL_dirty)
1622 coro_destruct_perl (aTHX_ coro); 1758 destroy_perl (aTHX_ coro);
1623 1759
1624 cctx_destroy (coro->cctx); 1760 cctx_destroy (coro->cctx);
1625 SvREFCNT_dec (coro->startcv); 1761 SvREFCNT_dec (coro->startcv);
1626 SvREFCNT_dec (coro->args); 1762 SvREFCNT_dec (coro->args);
1763 SvREFCNT_dec (coro->swap_sv);
1627 SvREFCNT_dec (CORO_THROW); 1764 SvREFCNT_dec (CORO_THROW);
1628 1765
1629 if (coro->next) coro->next->prev = coro->prev; 1766 coro_call_on_destroy (aTHX_ coro);
1630 if (coro->prev) coro->prev->next = coro->next;
1631 if (coro == coro_first) coro_first = coro->next;
1632 1767
1633 return 1; 1768 /* more destruction mayhem in coro_state_free */
1634} 1769}
1635 1770
1636static int 1771static int
1637coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1772coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1638{ 1773{
1639 struct coro *coro = (struct coro *)mg->mg_ptr; 1774 struct coro *coro = (struct coro *)mg->mg_ptr;
1640 mg->mg_ptr = 0; 1775 mg->mg_ptr = 0;
1641 1776
1642 coro->hv = 0;
1643
1644 if (--coro->refcnt < 0)
1645 {
1646 coro_state_destroy (aTHX_ coro); 1777 coro_state_destroy (aTHX_ coro);
1778 SvREFCNT_dec (coro->on_destroy);
1779 SvREFCNT_dec (coro->status);
1780
1647 Safefree (coro); 1781 Safefree (coro);
1648 }
1649 1782
1650 return 0; 1783 return 0;
1651} 1784}
1652 1785
1653static int 1786static int ecb_cold
1654coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1787coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1655{ 1788{
1656 struct coro *coro = (struct coro *)mg->mg_ptr; 1789 /* called when perl clones the current process the slow way (windows process emulation) */
1657 1790 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1658 ++coro->refcnt; 1791 mg->mg_ptr = 0;
1792 mg->mg_virtual = 0;
1659 1793
1660 return 0; 1794 return 0;
1661} 1795}
1662 1796
1663static MGVTBL coro_state_vtbl = { 1797static MGVTBL coro_state_vtbl = {
… …
1686 1820
1687 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1821 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1688 TRANSFER (ta, 1); 1822 TRANSFER (ta, 1);
1689} 1823}
1690 1824
1691/*****************************************************************************/
1692/* gensub: simple closure generation utility */
1693
1694#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1695
1696/* create a closure from XS, returns a code reference */
1697/* the arg can be accessed via GENSUB_ARG from the callback */
1698/* the callback must use dXSARGS/XSRETURN */
1699static SV *
1700gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1701{
1702 CV *cv = (CV *)newSV (0);
1703
1704 sv_upgrade ((SV *)cv, SVt_PVCV);
1705
1706 CvANON_on (cv);
1707 CvISXSUB_on (cv);
1708 CvXSUB (cv) = xsub;
1709 GENSUB_ARG = arg;
1710
1711 return newRV_noinc ((SV *)cv);
1712}
1713
1714/** Coro ********************************************************************/ 1825/** Coro ********************************************************************/
1715 1826
1716INLINE void 1827ecb_inline void
1717coro_enq (pTHX_ struct coro *coro) 1828coro_enq (pTHX_ struct coro *coro)
1718{ 1829{
1719 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1830 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1720 1831
1721 SvREFCNT_inc_NN (coro->hv); 1832 SvREFCNT_inc_NN (coro->hv);
… …
1723 coro->next_ready = 0; 1834 coro->next_ready = 0;
1724 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1835 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1725 ready [1] = coro; 1836 ready [1] = coro;
1726} 1837}
1727 1838
1728INLINE struct coro * 1839ecb_inline struct coro *
1729coro_deq (pTHX) 1840coro_deq (pTHX)
1730{ 1841{
1731 int prio; 1842 int prio;
1732 1843
1733 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1844 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1743 } 1854 }
1744 1855
1745 return 0; 1856 return 0;
1746} 1857}
1747 1858
1859static void
1860invoke_sv_ready_hook_helper (void)
1861{
1862 dTHX;
1863 dSP;
1864
1865 ENTER;
1866 SAVETMPS;
1867
1868 PUSHMARK (SP);
1869 PUTBACK;
1870 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1871
1872 FREETMPS;
1873 LEAVE;
1874}
1875
1748static int 1876static int
1749api_ready (pTHX_ SV *coro_sv) 1877api_ready (pTHX_ SV *coro_sv)
1750{ 1878{
1751 struct coro *coro;
1752 SV *sv_hook;
1753 void (*xs_hook)(void);
1754
1755 coro = SvSTATE (coro_sv); 1879 struct coro *coro = SvSTATE (coro_sv);
1756 1880
1757 if (coro->flags & CF_READY) 1881 if (coro->flags & CF_READY)
1758 return 0; 1882 return 0;
1759 1883
1760 coro->flags |= CF_READY; 1884 coro->flags |= CF_READY;
1761 1885
1762 sv_hook = coro_nready ? 0 : coro_readyhook;
1763 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1764
1765 coro_enq (aTHX_ coro); 1886 coro_enq (aTHX_ coro);
1766 ++coro_nready;
1767 1887
1768 if (sv_hook) 1888 if (!coro_nready++)
1769 { 1889 if (coroapi.readyhook)
1770 dSP; 1890 coroapi.readyhook ();
1771
1772 ENTER;
1773 SAVETMPS;
1774
1775 PUSHMARK (SP);
1776 PUTBACK;
1777 call_sv (sv_hook, G_VOID | G_DISCARD);
1778
1779 FREETMPS;
1780 LEAVE;
1781 }
1782
1783 if (xs_hook)
1784 xs_hook ();
1785 1891
1786 return 1; 1892 return 1;
1787} 1893}
1788 1894
1789static int 1895static int
… …
1791{ 1897{
1792 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1898 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1793} 1899}
1794 1900
1795/* expects to own a reference to next->hv */ 1901/* expects to own a reference to next->hv */
1796INLINE void 1902ecb_inline void
1797prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1903prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1798{ 1904{
1799 SV *prev_sv = SvRV (coro_current); 1905 SV *prev_sv = SvRV (coro_current);
1800 1906
1801 ta->prev = SvSTATE_hv (prev_sv); 1907 ta->prev = SvSTATE_hv (prev_sv);
… …
1814{ 1920{
1815 for (;;) 1921 for (;;)
1816 { 1922 {
1817 struct coro *next = coro_deq (aTHX); 1923 struct coro *next = coro_deq (aTHX);
1818 1924
1819 if (expect_true (next)) 1925 if (ecb_expect_true (next))
1820 { 1926 {
1821 /* cannot transfer to destroyed coros, skip and look for next */ 1927 /* cannot transfer to destroyed coros, skip and look for next */
1822 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1928 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1823 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1929 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1824 else 1930 else
1825 { 1931 {
1826 next->flags &= ~CF_READY; 1932 next->flags &= ~CF_READY;
1827 --coro_nready; 1933 --coro_nready;
… …
1834 { 1940 {
1835 /* nothing to schedule: call the idle handler */ 1941 /* nothing to schedule: call the idle handler */
1836 if (SvROK (sv_idle) 1942 if (SvROK (sv_idle)
1837 && SvOBJECT (SvRV (sv_idle))) 1943 && SvOBJECT (SvRV (sv_idle)))
1838 { 1944 {
1945 if (SvRV (sv_idle) == SvRV (coro_current))
1946 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1947
1839 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1948 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1840 api_ready (aTHX_ SvRV (sv_idle)); 1949 api_ready (aTHX_ SvRV (sv_idle));
1841 --coro_nready; 1950 --coro_nready;
1842 } 1951 }
1843 else 1952 else
1844 { 1953 {
1954 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1845 dSP; 1955 dSP;
1846 1956
1847 ENTER; 1957 ENTER;
1848 SAVETMPS; 1958 SAVETMPS;
1849 1959
… …
1856 } 1966 }
1857 } 1967 }
1858 } 1968 }
1859} 1969}
1860 1970
1861INLINE void 1971ecb_inline void
1862prepare_cede (pTHX_ struct coro_transfer_args *ta) 1972prepare_cede (pTHX_ struct coro_transfer_args *ta)
1863{ 1973{
1864 api_ready (aTHX_ coro_current); 1974 api_ready (aTHX_ coro_current);
1865 prepare_schedule (aTHX_ ta); 1975 prepare_schedule (aTHX_ ta);
1866} 1976}
1867 1977
1868INLINE void 1978ecb_inline void
1869prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1979prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1870{ 1980{
1871 SV *prev = SvRV (coro_current); 1981 SV *prev = SvRV (coro_current);
1872 1982
1873 if (coro_nready) 1983 if (coro_nready)
… …
1903{ 2013{
1904 struct coro_transfer_args ta; 2014 struct coro_transfer_args ta;
1905 2015
1906 prepare_cede (aTHX_ &ta); 2016 prepare_cede (aTHX_ &ta);
1907 2017
1908 if (expect_true (ta.prev != ta.next)) 2018 if (ecb_expect_true (ta.prev != ta.next))
1909 { 2019 {
1910 TRANSFER (ta, 1); 2020 TRANSFER (ta, 1);
1911 return 1; 2021 return 1;
1912 } 2022 }
1913 else 2023 else
… …
1956 coro->slot->runops = RUNOPS_DEFAULT; 2066 coro->slot->runops = RUNOPS_DEFAULT;
1957 } 2067 }
1958} 2068}
1959 2069
1960static void 2070static void
2071coro_push_av (pTHX_ AV *av, I32 gimme_v)
2072{
2073 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2074 {
2075 dSP;
2076
2077 if (gimme_v == G_SCALAR)
2078 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2079 else
2080 {
2081 int i;
2082 EXTEND (SP, AvFILLp (av) + 1);
2083
2084 for (i = 0; i <= AvFILLp (av); ++i)
2085 PUSHs (AvARRAY (av)[i]);
2086 }
2087
2088 PUTBACK;
2089 }
2090}
2091
2092static void
2093coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2094{
2095 if (!coro->on_destroy)
2096 coro->on_destroy = newAV ();
2097
2098 av_push (coro->on_destroy, cb);
2099}
2100
2101static void
2102slf_destroy_join (pTHX_ struct CoroSLF *frame)
2103{
2104 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2105}
2106
2107static int
2108slf_check_join (pTHX_ struct CoroSLF *frame)
2109{
2110 struct coro *coro = (struct coro *)frame->data;
2111
2112 if (!coro->status)
2113 return 1;
2114
2115 frame->destroy = 0;
2116
2117 coro_push_av (aTHX_ coro->status, GIMME_V);
2118
2119 SvREFCNT_dec ((SV *)coro->hv);
2120
2121 return 0;
2122}
2123
2124static void
2125slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2126{
2127 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2128
2129 if (items > 1)
2130 croak ("join called with too many arguments");
2131
2132 if (coro->status)
2133 frame->prepare = prepare_nop;
2134 else
2135 {
2136 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2137 frame->prepare = prepare_schedule;
2138 }
2139
2140 frame->check = slf_check_join;
2141 frame->destroy = slf_destroy_join;
2142 frame->data = (void *)coro;
2143 SvREFCNT_inc (coro->hv);
2144}
2145
2146static void
1961coro_call_on_destroy (pTHX_ struct coro *coro) 2147coro_call_on_destroy (pTHX_ struct coro *coro)
1962{ 2148{
1963 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2149 AV *od = coro->on_destroy;
1964 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1965 2150
1966 if (on_destroyp) 2151 if (!od)
1967 { 2152 return;
1968 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1969 2153
1970 while (AvFILLp (on_destroy) >= 0) 2154 while (AvFILLp (od) >= 0)
2155 {
2156 SV *cb = sv_2mortal (av_pop (od));
2157
2158 /* coro hv's (and only hv's at the moment) are supported as well */
2159 if (SvSTATEhv_p (aTHX_ cb))
2160 api_ready (aTHX_ cb);
2161 else
1971 { 2162 {
1972 dSP; /* don't disturb outer sp */ 2163 dSP; /* don't disturb outer sp */
1973 SV *cb = av_pop (on_destroy);
1974
1975 PUSHMARK (SP); 2164 PUSHMARK (SP);
1976 2165
1977 if (statusp) 2166 if (coro->status)
1978 { 2167 {
1979 int i; 2168 PUTBACK;
1980 AV *status = (AV *)SvRV (*statusp); 2169 coro_push_av (aTHX_ coro->status, G_ARRAY);
1981 EXTEND (SP, AvFILLp (status) + 1); 2170 SPAGAIN;
1982
1983 for (i = 0; i <= AvFILLp (status); ++i)
1984 PUSHs (AvARRAY (status)[i]);
1985 } 2171 }
1986 2172
1987 PUTBACK; 2173 PUTBACK;
1988 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2174 call_sv (cb, G_VOID | G_DISCARD);
1989 } 2175 }
1990 } 2176 }
1991} 2177}
1992 2178
1993static void 2179static void
1994slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2180coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1995{ 2181{
2182 AV *av;
2183
2184 if (coro->status)
2185 {
2186 av = coro->status;
2187 av_clear (av);
2188 }
2189 else
2190 av = coro->status = newAV ();
2191
2192 /* items are actually not so common, so optimise for this case */
2193 if (items)
2194 {
1996 int i; 2195 int i;
1997 HV *hv = (HV *)SvRV (coro_current);
1998 AV *av = newAV ();
1999 2196
2000 av_extend (av, items - 1); 2197 av_extend (av, items - 1);
2198
2001 for (i = 0; i < items; ++i) 2199 for (i = 0; i < items; ++i)
2002 av_push (av, SvREFCNT_inc_NN (arg [i])); 2200 av_push (av, SvREFCNT_inc_NN (arg [i]));
2201 }
2202}
2003 2203
2004 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2204static void
2005 2205slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2206{
2006 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2207 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2007 api_ready (aTHX_ sv_manager); 2208 api_ready (aTHX_ sv_manager);
2008 2209
2009 frame->prepare = prepare_schedule; 2210 frame->prepare = prepare_schedule;
2010 frame->check = slf_check_repeat; 2211 frame->check = slf_check_repeat;
2011 2212
2012 /* as a minor optimisation, we could unwind all stacks here */ 2213 /* as a minor optimisation, we could unwind all stacks here */
2013 /* but that puts extra pressure on pp_slf, and is not worth much */ 2214 /* but that puts extra pressure on pp_slf, and is not worth much */
2014 /*coro_unwind_stacks (aTHX);*/ 2215 /*coro_unwind_stacks (aTHX);*/
2216}
2217
2218static void
2219slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2220{
2221 HV *coro_hv = (HV *)SvRV (coro_current);
2222
2223 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2224 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2225}
2226
2227static void
2228slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2229{
2230 HV *coro_hv;
2231 struct coro *coro;
2232
2233 if (items <= 0)
2234 croak ("Coro::cancel called without coro object,");
2235
2236 coro = SvSTATE (arg [0]);
2237 coro_hv = coro->hv;
2238
2239 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2240
2241 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2242 {
2243 /* coro currently busy cancelling something, so just notify it */
2244 coro->slf_frame.data = (void *)coro;
2245
2246 frame->prepare = prepare_nop;
2247 frame->check = slf_check_nop;
2248 }
2249 else if (coro_hv == (HV *)SvRV (coro_current))
2250 {
2251 /* cancelling the current coro is allowed, and equals terminate */
2252 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2253 }
2254 else
2255 {
2256 struct coro *self = SvSTATE_current;
2257
2258 /* otherwise we cancel directly, purely for speed reasons
2259 * unfortunately, this requires some magic trickery, as
2260 * somebody else could cancel us, so we have to fight the cancellation.
2261 * this is ugly, and hopefully fully worth the extra speed.
2262 * besides, I can't get the slow-but-safe version working...
2263 */
2264 slf_frame.data = 0;
2265 self->flags |= CF_NOCANCEL;
2266 coro_state_destroy (aTHX_ coro);
2267 self->flags &= ~CF_NOCANCEL;
2268
2269 if (slf_frame.data)
2270 {
2271 /* while we were busy we have been cancelled, so terminate */
2272 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2273 }
2274 else
2275 {
2276 frame->prepare = prepare_nop;
2277 frame->check = slf_check_nop;
2278 }
2279 }
2280}
2281
2282static int
2283slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2284{
2285 frame->prepare = 0;
2286 coro_unwind_stacks (aTHX);
2287
2288 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2289
2290 return 1;
2291}
2292
2293static int
2294safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2295{
2296 if (coro->cctx)
2297 croak ("coro inside C callback, unable to cancel at this time, caught");
2298
2299 if (coro->flags & CF_NEW)
2300 {
2301 coro_set_status (aTHX_ coro, arg, items);
2302 coro_state_destroy (aTHX_ coro);
2303 }
2304 else
2305 {
2306 if (!coro->slf_frame.prepare)
2307 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2308
2309 slf_destroy (aTHX_ coro);
2310
2311 coro_set_status (aTHX_ coro, arg, items);
2312 coro->slf_frame.prepare = prepare_nop;
2313 coro->slf_frame.check = slf_check_safe_cancel;
2314
2315 api_ready (aTHX_ (SV *)coro->hv);
2316 }
2317
2318 return 1;
2015} 2319}
2016 2320
2017/*****************************************************************************/ 2321/*****************************************************************************/
2018/* async pool handler */ 2322/* async pool handler */
2019 2323
… …
2050slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2354slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2051{ 2355{
2052 HV *hv = (HV *)SvRV (coro_current); 2356 HV *hv = (HV *)SvRV (coro_current);
2053 struct coro *coro = SvSTATE_hv ((SV *)hv); 2357 struct coro *coro = SvSTATE_hv ((SV *)hv);
2054 2358
2055 if (expect_true (coro->saved_deffh)) 2359 if (ecb_expect_true (coro->saved_deffh))
2056 { 2360 {
2057 /* subsequent iteration */ 2361 /* subsequent iteration */
2058 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2362 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2059 coro->saved_deffh = 0; 2363 coro->saved_deffh = 0;
2060 2364
2061 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2365 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2062 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2366 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2063 { 2367 {
2064 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2368 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2065 coro->invoke_av = newAV (); 2369 return;
2066
2067 frame->prepare = prepare_nop;
2068 } 2370 }
2069 else 2371 else
2070 { 2372 {
2071 av_clear (GvAV (PL_defgv)); 2373 av_clear (GvAV (PL_defgv));
2072 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2374 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2097 2399
2098static void 2400static void
2099coro_rouse_callback (pTHX_ CV *cv) 2401coro_rouse_callback (pTHX_ CV *cv)
2100{ 2402{
2101 dXSARGS; 2403 dXSARGS;
2102 SV *data = (SV *)GENSUB_ARG; 2404 SV *data = (SV *)S_GENSUB_ARG;
2103 2405
2104 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2406 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2105 { 2407 {
2106 /* first call, set args */ 2408 /* first call, set args */
2107 SV *coro = SvRV (data); 2409 SV *coro = SvRV (data);
… …
2173 || SvTYPE (SvRV (cb)) != SVt_PVCV 2475 || SvTYPE (SvRV (cb)) != SVt_PVCV
2174 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2476 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2175 croak ("Coro::rouse_wait called with illegal callback argument,"); 2477 croak ("Coro::rouse_wait called with illegal callback argument,");
2176 2478
2177 { 2479 {
2178 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2480 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2179 SV *data = (SV *)GENSUB_ARG; 2481 SV *data = (SV *)S_GENSUB_ARG;
2180 2482
2181 frame->data = (void *)data; 2483 frame->data = (void *)data;
2182 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2484 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2183 frame->check = slf_check_rouse_wait; 2485 frame->check = slf_check_rouse_wait;
2184 } 2486 }
… …
2188coro_new_rouse_cb (pTHX) 2490coro_new_rouse_cb (pTHX)
2189{ 2491{
2190 HV *hv = (HV *)SvRV (coro_current); 2492 HV *hv = (HV *)SvRV (coro_current);
2191 struct coro *coro = SvSTATE_hv (hv); 2493 struct coro *coro = SvSTATE_hv (hv);
2192 SV *data = newRV_inc ((SV *)hv); 2494 SV *data = newRV_inc ((SV *)hv);
2193 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2495 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2194 2496
2195 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2497 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2196 SvREFCNT_dec (data); /* magicext increases the refcount */ 2498 SvREFCNT_dec (data); /* magicext increases the refcount */
2197 2499
2198 SvREFCNT_dec (coro->rouse_cb); 2500 SvREFCNT_dec (coro->rouse_cb);
… …
2295static void 2597static void
2296slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2598slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2297{ 2599{
2298 frame->prepare = prepare_cede_notself; 2600 frame->prepare = prepare_cede_notself;
2299 frame->check = slf_check_nop; 2601 frame->check = slf_check_nop;
2602}
2603
2604/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2605static void
2606slf_destroy (pTHX_ struct coro *coro)
2607{
2608 /* this callback is reserved for slf functions needing to do cleanup */
2609 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2610 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2611
2612 /*
2613 * The on_destroy above most likely is from an SLF call.
2614 * Since by definition the SLF call will not finish when we destroy
2615 * the coro, we will have to force-finish it here, otherwise
2616 * cleanup functions cannot call SLF functions.
2617 */
2618 coro->slf_frame.prepare = 0;
2300} 2619}
2301 2620
2302/* 2621/*
2303 * these not obviously related functions are all rolled into one 2622 * these not obviously related functions are all rolled into one
2304 * function to increase chances that they all will call transfer with the same 2623 * function to increase chances that they all will call transfer with the same
… …
2311 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2630 I32 checkmark; /* mark SP to see how many elements check has pushed */
2312 2631
2313 /* set up the slf frame, unless it has already been set-up */ 2632 /* set up the slf frame, unless it has already been set-up */
2314 /* the latter happens when a new coro has been started */ 2633 /* the latter happens when a new coro has been started */
2315 /* or when a new cctx was attached to an existing coroutine */ 2634 /* or when a new cctx was attached to an existing coroutine */
2316 if (expect_true (!slf_frame.prepare)) 2635 if (ecb_expect_true (!slf_frame.prepare))
2317 { 2636 {
2318 /* first iteration */ 2637 /* first iteration */
2319 dSP; 2638 dSP;
2320 SV **arg = PL_stack_base + TOPMARK + 1; 2639 SV **arg = PL_stack_base + TOPMARK + 1;
2321 int items = SP - arg; /* args without function object */ 2640 int items = SP - arg; /* args without function object */
… …
2362 while (slf_frame.check (aTHX_ &slf_frame)); 2681 while (slf_frame.check (aTHX_ &slf_frame));
2363 2682
2364 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2683 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2365 2684
2366 /* exception handling */ 2685 /* exception handling */
2367 if (expect_false (CORO_THROW)) 2686 if (ecb_expect_false (CORO_THROW))
2368 { 2687 {
2369 SV *exception = sv_2mortal (CORO_THROW); 2688 SV *exception = sv_2mortal (CORO_THROW);
2370 2689
2371 CORO_THROW = 0; 2690 CORO_THROW = 0;
2372 sv_setsv (ERRSV, exception); 2691 sv_setsv (ERRSV, exception);
2373 croak (0); 2692 croak (0);
2374 } 2693 }
2375 2694
2376 /* return value handling - mostly like entersub */ 2695 /* return value handling - mostly like entersub */
2377 /* make sure we put something on the stack in scalar context */ 2696 /* make sure we put something on the stack in scalar context */
2378 if (GIMME_V == G_SCALAR) 2697 if (GIMME_V == G_SCALAR
2698 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2379 { 2699 {
2380 dSP; 2700 dSP;
2381 SV **bot = PL_stack_base + checkmark; 2701 SV **bot = PL_stack_base + checkmark;
2382 2702
2383 if (sp == bot) /* too few, push undef */ 2703 if (sp == bot) /* too few, push undef */
2384 bot [1] = &PL_sv_undef; 2704 bot [1] = &PL_sv_undef;
2385 else if (sp != bot + 1) /* too many, take last one */ 2705 else /* too many, take last one */
2386 bot [1] = *sp; 2706 bot [1] = *sp;
2387 2707
2388 SP = bot + 1; 2708 SP = bot + 1;
2389 2709
2390 PUTBACK; 2710 PUTBACK;
… …
2423 if (PL_op->op_flags & OPf_STACKED) 2743 if (PL_op->op_flags & OPf_STACKED)
2424 { 2744 {
2425 if (items > slf_arga) 2745 if (items > slf_arga)
2426 { 2746 {
2427 slf_arga = items; 2747 slf_arga = items;
2428 free (slf_argv); 2748 Safefree (slf_argv);
2429 slf_argv = malloc (slf_arga * sizeof (SV *)); 2749 New (0, slf_argv, slf_arga, SV *);
2430 } 2750 }
2431 2751
2432 slf_argc = items; 2752 slf_argc = items;
2433 2753
2434 for (i = 0; i < items; ++i) 2754 for (i = 0; i < items; ++i)
… …
2497{ 2817{
2498 PerlIOBuf base; 2818 PerlIOBuf base;
2499 NV next, every; 2819 NV next, every;
2500} PerlIOCede; 2820} PerlIOCede;
2501 2821
2502static IV 2822static IV ecb_cold
2503PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2823PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2504{ 2824{
2505 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2825 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2506 2826
2507 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2827 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2508 self->next = nvtime () + self->every; 2828 self->next = nvtime () + self->every;
2509 2829
2510 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2830 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2511} 2831}
2512 2832
2513static SV * 2833static SV * ecb_cold
2514PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2834PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2515{ 2835{
2516 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2836 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2517 2837
2518 return newSVnv (self->every); 2838 return newSVnv (self->every);
… …
2630 SvREFCNT_dec (cb); 2950 SvREFCNT_dec (cb);
2631 } 2951 }
2632} 2952}
2633 2953
2634static void 2954static void
2635coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2955coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2636{ 2956{
2637 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2957 /* call $sem->adjust (0) to possibly wake up some other waiters */
2638 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2958 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2639} 2959}
2640 2960
2641static int 2961static int
2642slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2962slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2643{ 2963{
2644 AV *av = (AV *)frame->data; 2964 AV *av = (AV *)frame->data;
2645 SV *count_sv = AvARRAY (av)[0]; 2965 SV *count_sv = AvARRAY (av)[0];
2966 SV *coro_hv = SvRV (coro_current);
2646 2967
2647 /* if we are about to throw, don't actually acquire the lock, just throw */ 2968 /* if we are about to throw, don't actually acquire the lock, just throw */
2648 if (CORO_THROW) 2969 if (CORO_THROW)
2649 return 0; 2970 return 0;
2650 else if (SvIVX (count_sv) > 0) 2971 else if (SvIVX (count_sv) > 0)
2651 { 2972 {
2652 SvSTATE_current->on_destroy = 0; 2973 frame->destroy = 0;
2653 2974
2654 if (acquire) 2975 if (acquire)
2655 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2976 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2656 else 2977 else
2657 coro_semaphore_adjust (aTHX_ av, 0); 2978 coro_semaphore_adjust (aTHX_ av, 0);
… …
2662 { 2983 {
2663 int i; 2984 int i;
2664 /* if we were woken up but can't down, we look through the whole */ 2985 /* if we were woken up but can't down, we look through the whole */
2665 /* waiters list and only add us if we aren't in there already */ 2986 /* waiters list and only add us if we aren't in there already */
2666 /* this avoids some degenerate memory usage cases */ 2987 /* this avoids some degenerate memory usage cases */
2667 2988 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2668 for (i = 1; i <= AvFILLp (av); ++i)
2669 if (AvARRAY (av)[i] == SvRV (coro_current)) 2989 if (AvARRAY (av)[i] == coro_hv)
2670 return 1; 2990 return 1;
2671 2991
2672 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2992 av_push (av, SvREFCNT_inc (coro_hv));
2673 return 1; 2993 return 1;
2674 } 2994 }
2675} 2995}
2676 2996
2677static int 2997static int
… …
2700 { 3020 {
2701 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3021 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2702 3022
2703 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3023 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2704 frame->prepare = prepare_schedule; 3024 frame->prepare = prepare_schedule;
2705
2706 /* to avoid race conditions when a woken-up coro gets terminated */ 3025 /* to avoid race conditions when a woken-up coro gets terminated */
2707 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3026 /* we arrange for a temporary on_destroy that calls adjust (0) */
2708 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3027 frame->destroy = coro_semaphore_destroy;
2709 } 3028 }
2710} 3029}
2711 3030
2712static void 3031static void
2713slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3032slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2721{ 3040{
2722 if (items >= 2) 3041 if (items >= 2)
2723 { 3042 {
2724 /* callback form */ 3043 /* callback form */
2725 AV *av = (AV *)SvRV (arg [0]); 3044 AV *av = (AV *)SvRV (arg [0]);
2726 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3045 SV *cb_cv = s_get_cv_croak (arg [1]);
2727 3046
2728 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3047 av_push (av, SvREFCNT_inc_NN (cb_cv));
2729 3048
2730 if (SvIVX (AvARRAY (av)[0]) > 0) 3049 if (SvIVX (AvARRAY (av)[0]) > 0)
2731 coro_semaphore_adjust (aTHX_ av, 0); 3050 coro_semaphore_adjust (aTHX_ av, 0);
… …
2791{ 3110{
2792 AV *av = (AV *)SvRV (arg [0]); 3111 AV *av = (AV *)SvRV (arg [0]);
2793 3112
2794 if (items >= 2) 3113 if (items >= 2)
2795 { 3114 {
2796 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3115 SV *cb_cv = s_get_cv_croak (arg [1]);
2797 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3116 av_push (av, SvREFCNT_inc_NN (cb_cv));
2798 3117
2799 if (SvIVX (AvARRAY (av)[0])) 3118 if (SvIVX (AvARRAY (av)[0]))
2800 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3119 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2801 3120
2802 frame->prepare = prepare_nop; 3121 frame->prepare = prepare_nop;
2803 frame->check = slf_check_nop; 3122 frame->check = slf_check_nop;
2804 } 3123 }
2805 else if (SvIVX (AvARRAY (av)[0])) 3124 else if (SvIVX (AvARRAY (av)[0]))
… …
2836 3155
2837static void 3156static void
2838coro_aio_callback (pTHX_ CV *cv) 3157coro_aio_callback (pTHX_ CV *cv)
2839{ 3158{
2840 dXSARGS; 3159 dXSARGS;
2841 AV *state = (AV *)GENSUB_ARG; 3160 AV *state = (AV *)S_GENSUB_ARG;
2842 SV *coro = av_pop (state); 3161 SV *coro = av_pop (state);
2843 SV *data_sv = newSV (sizeof (struct io_state)); 3162 SV *data_sv = newSV (sizeof (struct io_state));
2844 3163
2845 av_extend (state, items - 1); 3164 av_extend (state, items - 1);
2846 3165
… …
2931 dSP; 3250 dSP;
2932 3251
2933 static SV *prio_cv; 3252 static SV *prio_cv;
2934 static SV *prio_sv; 3253 static SV *prio_sv;
2935 3254
2936 if (expect_false (!prio_cv)) 3255 if (ecb_expect_false (!prio_cv))
2937 { 3256 {
2938 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3257 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2939 prio_sv = newSViv (0); 3258 prio_sv = newSViv (0);
2940 } 3259 }
2941 3260
… …
2960 3279
2961 for (i = 0; i < items; ++i) 3280 for (i = 0; i < items; ++i)
2962 PUSHs (arg [i]); 3281 PUSHs (arg [i]);
2963 3282
2964 /* now push the callback closure */ 3283 /* now push the callback closure */
2965 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3284 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2966 3285
2967 /* now call the AIO function - we assume our request is uncancelable */ 3286 /* now call the AIO function - we assume our request is uncancelable */
2968 PUTBACK; 3287 PUTBACK;
2969 call_sv ((SV *)req, G_VOID | G_DISCARD); 3288 call_sv ((SV *)req, G_VOID | G_DISCARD);
2970 } 3289 }
2971 3290
2972 /* now that the requets is going, we loop toll we have a result */ 3291 /* now that the request is going, we loop till we have a result */
2973 frame->data = (void *)state; 3292 frame->data = (void *)state;
2974 frame->prepare = prepare_schedule; 3293 frame->prepare = prepare_schedule;
2975 frame->check = slf_check_aio_req; 3294 frame->check = slf_check_aio_req;
2976} 3295}
2977 3296
… …
2987 3306
2988/*****************************************************************************/ 3307/*****************************************************************************/
2989 3308
2990#if CORO_CLONE 3309#if CORO_CLONE
2991# include "clone.c" 3310# include "clone.c"
3311#endif
3312
3313/*****************************************************************************/
3314
3315static SV *
3316coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3317{
3318 SV *coro_sv;
3319 struct coro *coro;
3320 MAGIC *mg;
3321 HV *hv;
3322 SV *cb;
3323 int i;
3324
3325 if (argc > 0)
3326 {
3327 cb = s_get_cv_croak (argv [0]);
3328
3329 if (!is_coro)
3330 {
3331 if (CvISXSUB (cb))
3332 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3333
3334 if (!CvROOT (cb))
3335 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3336 }
3337 }
3338
3339 Newz (0, coro, 1, struct coro);
3340 coro->args = newAV ();
3341 coro->flags = CF_NEW;
3342
3343 if (coro_first) coro_first->prev = coro;
3344 coro->next = coro_first;
3345 coro_first = coro;
3346
3347 coro->hv = hv = newHV ();
3348 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3349 mg->mg_flags |= MGf_DUP;
3350 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3351
3352 if (argc > 0)
3353 {
3354 av_extend (coro->args, argc + is_coro - 1);
3355
3356 if (is_coro)
3357 {
3358 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3359 cb = (SV *)cv_coro_run;
3360 }
3361
3362 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3363
3364 for (i = 1; i < argc; i++)
3365 av_push (coro->args, newSVsv (argv [i]));
3366 }
3367
3368 return coro_sv;
3369}
3370
3371#ifndef __cplusplus
3372ecb_cold XS(boot_Coro__State);
3373#endif
3374
3375#if CORO_JIT
3376
3377static void ecb_noinline ecb_cold
3378pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3379{
3380 dSP;
3381 AV *av = newAV ();
3382
3383 av_store (av, 3, newSVuv (d));
3384 av_store (av, 2, newSVuv (c));
3385 av_store (av, 1, newSVuv (b));
3386 av_store (av, 0, newSVuv (a));
3387
3388 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3389
3390 PUTBACK;
3391}
3392
3393static void ecb_noinline ecb_cold
3394jit_init (pTHX)
3395{
3396 dSP;
3397 SV *load, *save;
3398 char *map_base;
3399 char *load_ptr, *save_ptr;
3400 STRLEN load_len, save_len, map_len;
3401 int count;
3402
3403 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3404
3405 PUSHMARK (SP);
3406#define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3407# include "state.h"
3408#undef VARx
3409 count = call_pv ("Coro::State::_jit", G_ARRAY);
3410 SPAGAIN;
3411
3412 save = POPs; save_ptr = SvPVbyte (save, save_len);
3413 load = POPs; load_ptr = SvPVbyte (load, load_len);
3414
3415 map_len = load_len + save_len + 16;
3416
3417 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3418
3419 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3420
3421 load_perl_slots = (load_save_perl_slots_type)map_base;
3422 memcpy (map_base, load_ptr, load_len);
3423
3424 map_base += (load_len + 15) & ~15;
3425
3426 save_perl_slots = (load_save_perl_slots_type)map_base;
3427 memcpy (map_base, save_ptr, save_len);
3428
3429 /* we are good citizens and try to make the page read-only, so the evil evil */
3430 /* hackers might have it a bit more difficult */
3431 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3432
3433 PUTBACK;
3434 eval_pv ("undef &Coro::State::_jit", 1);
3435}
3436
2992#endif 3437#endif
2993 3438
2994MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3439MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2995 3440
2996PROTOTYPES: DISABLE 3441PROTOTYPES: DISABLE
… …
3001# if CORO_PTHREAD 3446# if CORO_PTHREAD
3002 coro_thx = PERL_GET_CONTEXT; 3447 coro_thx = PERL_GET_CONTEXT;
3003# endif 3448# endif
3004#endif 3449#endif
3005 BOOT_PAGESIZE; 3450 BOOT_PAGESIZE;
3451
3452 /* perl defines these to check for existance first, but why it doesn't */
3453 /* just create them one at init time is not clear to me, except for */
3454 /* programs trying to delete them, but... */
3455 /* anyway, we declare this as invalid and make sure they are initialised here */
3456 DEFSV;
3457 ERRSV;
3006 3458
3007 cctx_current = cctx_new_empty (); 3459 cctx_current = cctx_new_empty ();
3008 3460
3009 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3461 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3010 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3462 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3050 coroapi.prepare_nop = prepare_nop; 3502 coroapi.prepare_nop = prepare_nop;
3051 coroapi.prepare_schedule = prepare_schedule; 3503 coroapi.prepare_schedule = prepare_schedule;
3052 coroapi.prepare_cede = prepare_cede; 3504 coroapi.prepare_cede = prepare_cede;
3053 coroapi.prepare_cede_notself = prepare_cede_notself; 3505 coroapi.prepare_cede_notself = prepare_cede_notself;
3054 3506
3055 { 3507 time_init (aTHX);
3056 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3057
3058 if (!svp) croak ("Time::HiRes is required");
3059 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3060
3061 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3062
3063 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3064 u2time = INT2PTR (double (*)(), SvIV (*svp));
3065 }
3066 3508
3067 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3509 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3510#if CORO_JIT
3511 PUTBACK;
3512 jit_init (aTHX);
3513 SPAGAIN;
3514#endif
3068} 3515}
3069 3516
3070SV * 3517SV *
3071new (char *klass, ...) 3518new (SV *klass, ...)
3072 ALIAS: 3519 ALIAS:
3073 Coro::new = 1 3520 Coro::new = 1
3074 CODE: 3521 CODE:
3075{ 3522 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
3076 struct coro *coro; 3523 OUTPUT:
3077 MAGIC *mg;
3078 HV *hv;
3079 CV *cb;
3080 int i;
3081
3082 if (items > 1)
3083 {
3084 cb = coro_sv_2cv (aTHX_ ST (1));
3085
3086 if (!ix)
3087 {
3088 if (CvISXSUB (cb))
3089 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3090
3091 if (!CvROOT (cb))
3092 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3093 }
3094 }
3095
3096 Newz (0, coro, 1, struct coro);
3097 coro->args = newAV ();
3098 coro->flags = CF_NEW;
3099
3100 if (coro_first) coro_first->prev = coro;
3101 coro->next = coro_first;
3102 coro_first = coro;
3103
3104 coro->hv = hv = newHV ();
3105 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3106 mg->mg_flags |= MGf_DUP;
3107 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3108
3109 if (items > 1)
3110 {
3111 av_extend (coro->args, items - 1 + ix - 1);
3112
3113 if (ix)
3114 {
3115 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3116 cb = cv_coro_run;
3117 }
3118
3119 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3120
3121 for (i = 2; i < items; i++)
3122 av_push (coro->args, newSVsv (ST (i)));
3123 }
3124}
3125 OUTPUT:
3126 RETVAL 3524 RETVAL
3127 3525
3128void 3526void
3129transfer (...) 3527transfer (...)
3130 PROTOTYPE: $$ 3528 PROTOTYPE: $$
3131 CODE: 3529 CODE:
3132 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3530 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3133
3134bool
3135_destroy (SV *coro_sv)
3136 CODE:
3137 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3138 OUTPUT:
3139 RETVAL
3140 3531
3141void 3532void
3142_exit (int code) 3533_exit (int code)
3143 PROTOTYPE: $ 3534 PROTOTYPE: $
3144 CODE: 3535 CODE:
… …
3220 CODE: 3611 CODE:
3221{ 3612{
3222 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3613 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3223 { 3614 {
3224 struct coro *current = SvSTATE_current; 3615 struct coro *current = SvSTATE_current;
3616 struct CoroSLF slf_save;
3225 3617
3226 if (current != coro) 3618 if (current != coro)
3227 { 3619 {
3228 PUTBACK; 3620 PUTBACK;
3229 save_perl (aTHX_ current); 3621 save_perl (aTHX_ current);
3230 load_perl (aTHX_ coro); 3622 load_perl (aTHX_ coro);
3623 /* the coro is most likely in an active SLF call.
3624 * while not strictly required (the code we execute is
3625 * not allowed to call any SLF functions), it's cleaner
3626 * to reinitialise the slf_frame and restore it later.
3627 * This might one day allow us to actually do SLF calls
3628 * from code executed here.
3629 */
3630 slf_save = slf_frame;
3631 slf_frame.prepare = 0;
3231 SPAGAIN; 3632 SPAGAIN;
3232 } 3633 }
3233 3634
3234 PUSHSTACK; 3635 PUSHSTACK;
3235 3636
… …
3245 SPAGAIN; 3646 SPAGAIN;
3246 3647
3247 if (current != coro) 3648 if (current != coro)
3248 { 3649 {
3249 PUTBACK; 3650 PUTBACK;
3651 slf_frame = slf_save;
3250 save_perl (aTHX_ coro); 3652 save_perl (aTHX_ coro);
3251 load_perl (aTHX_ current); 3653 load_perl (aTHX_ current);
3252 SPAGAIN; 3654 SPAGAIN;
3253 } 3655 }
3254 } 3656 }
… …
3259 PROTOTYPE: $ 3661 PROTOTYPE: $
3260 ALIAS: 3662 ALIAS:
3261 is_ready = CF_READY 3663 is_ready = CF_READY
3262 is_running = CF_RUNNING 3664 is_running = CF_RUNNING
3263 is_new = CF_NEW 3665 is_new = CF_NEW
3264 is_destroyed = CF_DESTROYED 3666 is_destroyed = CF_ZOMBIE
3667 is_zombie = CF_ZOMBIE
3265 is_suspended = CF_SUSPENDED 3668 is_suspended = CF_SUSPENDED
3266 CODE: 3669 CODE:
3267 RETVAL = boolSV (coro->flags & ix); 3670 RETVAL = boolSV (coro->flags & ix);
3268 OUTPUT: 3671 OUTPUT:
3269 RETVAL 3672 RETVAL
3270 3673
3271void 3674void
3272throw (Coro::State self, SV *throw = &PL_sv_undef) 3675throw (Coro::State self, SV *exception = &PL_sv_undef)
3273 PROTOTYPE: $;$ 3676 PROTOTYPE: $;$
3274 CODE: 3677 CODE:
3275{ 3678{
3276 struct coro *current = SvSTATE_current; 3679 struct coro *current = SvSTATE_current;
3277 SV **throwp = self == current ? &CORO_THROW : &self->except; 3680 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3278 SvREFCNT_dec (*throwp); 3681 SvREFCNT_dec (*exceptionp);
3279 SvGETMAGIC (throw); 3682 SvGETMAGIC (exception);
3280 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3683 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3281} 3684}
3282 3685
3283void 3686void
3284api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3687api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3285 PROTOTYPE: $;$ 3688 PROTOTYPE: $;$
… …
3340 3743
3341void 3744void
3342cancel (Coro::State self) 3745cancel (Coro::State self)
3343 CODE: 3746 CODE:
3344 coro_state_destroy (aTHX_ self); 3747 coro_state_destroy (aTHX_ self);
3345 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3346
3347 3748
3348SV * 3749SV *
3349enable_times (int enabled = enable_times) 3750enable_times (int enabled = enable_times)
3350 CODE: 3751 CODE:
3351{ 3752{
… …
3366times (Coro::State self) 3767times (Coro::State self)
3367 PPCODE: 3768 PPCODE:
3368{ 3769{
3369 struct coro *current = SvSTATE (coro_current); 3770 struct coro *current = SvSTATE (coro_current);
3370 3771
3371 if (expect_false (current == self)) 3772 if (ecb_expect_false (current == self))
3372 { 3773 {
3373 coro_times_update (); 3774 coro_times_update ();
3374 coro_times_add (SvSTATE (coro_current)); 3775 coro_times_add (SvSTATE (coro_current));
3375 } 3776 }
3376 3777
3377 EXTEND (SP, 2); 3778 EXTEND (SP, 2);
3378 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3779 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3379 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3780 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3380 3781
3381 if (expect_false (current == self)) 3782 if (ecb_expect_false (current == self))
3382 coro_times_sub (SvSTATE (coro_current)); 3783 coro_times_sub (SvSTATE (coro_current));
3383} 3784}
3785
3786void
3787swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3788 CODE:
3789{
3790 struct coro *current = SvSTATE_current;
3791
3792 if (current == coro)
3793 SWAP_SVS (current);
3794
3795 if (!coro->swap_sv)
3796 coro->swap_sv = newAV ();
3797
3798 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3799 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3800
3801 if (current == coro)
3802 SWAP_SVS (current);
3803}
3804
3384 3805
3385MODULE = Coro::State PACKAGE = Coro 3806MODULE = Coro::State PACKAGE = Coro
3386 3807
3387BOOT: 3808BOOT:
3388{ 3809{
3389 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3810 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3390 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3811 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3391 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3812 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3392 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3393 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3813 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3394 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3814 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3395 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3815 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3396 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3816 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3397 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3817 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3398 3818
3399 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3819 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3400 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3820 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3401 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3821 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3402 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3822 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3403 3823
3404 coro_stash = gv_stashpv ("Coro", TRUE); 3824 coro_stash = gv_stashpv ("Coro", TRUE);
3405 3825
3406 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3826 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3407 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3827 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3408 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3828 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3426 sv_setiv (sv, (IV)&coroapi); 3846 sv_setiv (sv, (IV)&coroapi);
3427 SvREADONLY_on (sv); 3847 SvREADONLY_on (sv);
3428 } 3848 }
3429} 3849}
3430 3850
3851SV *
3852async (...)
3853 PROTOTYPE: &@
3854 CODE:
3855 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3856 api_ready (aTHX_ RETVAL);
3857 OUTPUT:
3858 RETVAL
3859
3860void
3861_destroy (Coro::State coro)
3862 CODE:
3863 /* used by the manager thread */
3864 coro_state_destroy (aTHX_ coro);
3865
3866void
3867on_destroy (Coro::State coro, SV *cb)
3868 CODE:
3869 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3870
3871void
3872join (...)
3873 CODE:
3874 CORO_EXECUTE_SLF_XS (slf_init_join);
3875
3431void 3876void
3432terminate (...) 3877terminate (...)
3433 CODE: 3878 CODE:
3434 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3879 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3880
3881void
3882cancel (...)
3883 CODE:
3884 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3885
3886int
3887safe_cancel (Coro::State self, ...)
3888 C_ARGS: aTHX_ self, &ST (1), items - 1
3435 3889
3436void 3890void
3437schedule (...) 3891schedule (...)
3438 CODE: 3892 CODE:
3439 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3893 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3469_set_readyhook (SV *hook) 3923_set_readyhook (SV *hook)
3470 PROTOTYPE: $ 3924 PROTOTYPE: $
3471 CODE: 3925 CODE:
3472 SvREFCNT_dec (coro_readyhook); 3926 SvREFCNT_dec (coro_readyhook);
3473 SvGETMAGIC (hook); 3927 SvGETMAGIC (hook);
3928 if (SvOK (hook))
3929 {
3474 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3930 coro_readyhook = newSVsv (hook);
3931 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3932 }
3933 else
3934 {
3935 coro_readyhook = 0;
3936 CORO_READYHOOK = 0;
3937 }
3475 3938
3476int 3939int
3477prio (Coro::State coro, int newprio = 0) 3940prio (Coro::State coro, int newprio = 0)
3478 PROTOTYPE: $;$ 3941 PROTOTYPE: $;$
3479 ALIAS: 3942 ALIAS:
… …
3543 for (i = 1; i < items; ++i) 4006 for (i = 1; i < items; ++i)
3544 av_push (av, SvREFCNT_inc_NN (ST (i))); 4007 av_push (av, SvREFCNT_inc_NN (ST (i)));
3545 4008
3546 if ((SV *)hv == &PL_sv_undef) 4009 if ((SV *)hv == &PL_sv_undef)
3547 { 4010 {
3548 PUSHMARK (SP); 4011 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3549 EXTEND (SP, 2);
3550 PUSHs (sv_Coro);
3551 PUSHs ((SV *)cv_pool_handler);
3552 PUTBACK;
3553 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3554 SPAGAIN;
3555
3556 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4012 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4013 SvREFCNT_dec (sv);
3557 } 4014 }
3558 4015
3559 { 4016 {
3560 struct coro *coro = SvSTATE_hv (hv); 4017 struct coro *coro = SvSTATE_hv (hv);
3561 4018
… …
3595 CODE: 4052 CODE:
3596{ 4053{
3597 struct coro *coro = SvSTATE_current; 4054 struct coro *coro = SvSTATE_current;
3598 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4055 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3599 4056
3600 block = (SV *)coro_sv_2cv (aTHX_ block); 4057 block = s_get_cv_croak (block);
3601 4058
3602 if (!*avp) 4059 if (!*avp)
3603 *avp = newAV (); 4060 *avp = newAV ();
3604 4061
3605 av_push (*avp, SvREFCNT_inc (block)); 4062 av_push (*avp, SvREFCNT_inc (block));
… …
3712} 4169}
3713 4170
3714MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4171MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3715 4172
3716void 4173void
3717_may_delete (SV *sem, int count, int extra_refs) 4174_may_delete (SV *sem, int count, unsigned int extra_refs)
3718 PPCODE: 4175 PPCODE:
3719{ 4176{
3720 AV *av = (AV *)SvRV (sem); 4177 AV *av = (AV *)SvRV (sem);
3721 4178
3722 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4179 if (SvREFCNT ((SV *)av) == 1 + extra_refs
… …
3805 4262
3806void 4263void
3807_register (char *target, char *proto, SV *req) 4264_register (char *target, char *proto, SV *req)
3808 CODE: 4265 CODE:
3809{ 4266{
3810 CV *req_cv = coro_sv_2cv (aTHX_ req); 4267 SV *req_cv = s_get_cv_croak (req);
3811 /* newXSproto doesn't return the CV on 5.8 */ 4268 /* newXSproto doesn't return the CV on 5.8 */
3812 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4269 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3813 sv_setpv ((SV *)slf_cv, proto); 4270 sv_setpv ((SV *)slf_cv, proto);
3814 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4271 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3815} 4272}
3816 4273
4274MODULE = Coro::State PACKAGE = Coro::Select
4275
4276void
4277patch_pp_sselect ()
4278 CODE:
4279 if (!coro_old_pp_sselect)
4280 {
4281 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4282 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4283 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4284 }
4285
4286void
4287unpatch_pp_sselect ()
4288 CODE:
4289 if (coro_old_pp_sselect)
4290 {
4291 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4292 coro_old_pp_sselect = 0;
4293 }
4294

Diff Legend

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