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.367 by root, Mon Aug 3 09:19:57 2009 UTC vs.
Revision 1.438 by root, Mon Nov 18 10:27:53 2013 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 /* perl usually disables NDEBUG later */
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
… …
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "schmorp.h" 16#include "schmorp.h"
12 17
18#define ECB_NO_THREADS 1
19#include "ecb.h"
20
21#include <stddef.h>
13#include <stdio.h> 22#include <stdio.h>
14#include <errno.h> 23#include <errno.h>
15#include <assert.h> 24#include <assert.h>
16 25
17#ifdef WIN32 26#ifndef SVs_PADSTALE
27# define SVs_PADSTALE 0
28#endif
29
30#ifdef PadARRAY
31# define NEWPADAPI 1
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else
34typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST;
37typedef AV PAD;
38# endif
39# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
40# define PadlistMAX(pl) AvFILLp (pl)
41# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY
43# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45#endif
46
47/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
48/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
49#if PERL_VERSION_ATLEAST(5,19,0)
50# define SVt_BIND SVt_IV
51#endif
52
53#if defined(_WIN32)
54# undef HAS_GETTIMEOFDAY
18# undef setjmp 55# undef setjmp
19# undef longjmp 56# undef longjmp
20# undef _exit 57# undef _exit
21# define setjmp _setjmp /* deep magic */ 58# define setjmp _setjmp /* deep magic */
22#else 59#else
23# include <inttypes.h> /* most portable stdint.h */ 60# include <inttypes.h> /* most portable stdint.h */
24#endif 61#endif
25 62
26#ifdef HAVE_MMAP
27# include <unistd.h>
28# include <sys/mman.h>
29# ifndef MAP_ANONYMOUS
30# ifdef MAP_ANON
31# define MAP_ANONYMOUS MAP_ANON
32# else
33# undef HAVE_MMAP
34# endif
35# endif
36# include <limits.h>
37# ifndef PAGESIZE
38# define PAGESIZE pagesize
39# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
40static long pagesize;
41# else
42# define BOOT_PAGESIZE (void)0
43# endif
44#else
45# define PAGESIZE 0
46# define BOOT_PAGESIZE (void)0
47#endif
48
49#if CORO_USE_VALGRIND
50# include <valgrind/valgrind.h>
51#endif
52
53/* the maximum number of idle cctx that will be pooled */ 63/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 64static int cctx_max_idle = 4;
55 65
56#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 66#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57# undef CORO_STACKGUARD 67# define HAS_SCOPESTACK_NAME 1
58#endif
59
60#ifndef CORO_STACKGUARD
61# define CORO_STACKGUARD 0
62#endif 68#endif
63 69
64/* prefer perl internal functions over our own? */ 70/* prefer perl internal functions over our own? */
65#ifndef CORO_PREFER_PERL_FUNCTIONS 71#ifndef CORO_PREFER_PERL_FUNCTIONS
66# define CORO_PREFER_PERL_FUNCTIONS 0 72# define CORO_PREFER_PERL_FUNCTIONS 0
… …
76# define STACKLEVEL ((void *)&stacklevel) 82# define STACKLEVEL ((void *)&stacklevel)
77#endif 83#endif
78 84
79#define IN_DESTRUCT PL_dirty 85#define IN_DESTRUCT PL_dirty
80 86
81#if __GNUC__ >= 3
82# define attribute(x) __attribute__(x)
83# define expect(expr,value) __builtin_expect ((expr), (value))
84# define INLINE static inline
85#else
86# define attribute(x)
87# define expect(expr,value) (expr)
88# define INLINE static
89#endif
90
91#define expect_false(expr) expect ((expr) != 0, 0)
92#define expect_true(expr) expect ((expr) != 0, 1)
93
94#define NOINLINE attribute ((noinline))
95
96#include "CoroAPI.h" 87#include "CoroAPI.h"
97#define GCoroAPI (&coroapi) /* very sneaky */ 88#define GCoroAPI (&coroapi) /* very sneaky */
98 89
99#ifdef USE_ITHREADS 90#ifdef USE_ITHREADS
100# if CORO_PTHREAD 91# if CORO_PTHREAD
… …
116static void (*u2time)(pTHX_ UV ret[2]); 107static void (*u2time)(pTHX_ UV ret[2]);
117 108
118/* we hijack an hopefully unused CV flag for our purposes */ 109/* we hijack an hopefully unused CV flag for our purposes */
119#define CVf_SLF 0x4000 110#define CVf_SLF 0x4000
120static OP *pp_slf (pTHX); 111static OP *pp_slf (pTHX);
112static void slf_destroy (pTHX_ struct coro *coro);
121 113
122static U32 cctx_gen; 114static U32 cctx_gen;
123static size_t cctx_stacksize = CORO_STACKSIZE; 115static size_t cctx_stacksize = CORO_STACKSIZE;
124static struct CoroAPI coroapi; 116static struct CoroAPI coroapi;
125static AV *main_mainstack; /* used to differentiate between $main and others */ 117static AV *main_mainstack; /* used to differentiate between $main and others */
… …
142static SV *sv_pool_size; 134static SV *sv_pool_size;
143static SV *sv_async_pool_idle; /* description string */ 135static SV *sv_async_pool_idle; /* description string */
144static AV *av_async_pool; /* idle pool */ 136static AV *av_async_pool; /* idle pool */
145static SV *sv_Coro; /* class string */ 137static SV *sv_Coro; /* class string */
146static CV *cv_pool_handler; 138static CV *cv_pool_handler;
147static CV *cv_coro_state_new;
148 139
149/* Coro::AnyEvent */ 140/* Coro::AnyEvent */
150static SV *sv_activity; 141static SV *sv_activity;
151 142
152/* enable processtime/realtime profiling */ 143/* enable processtime/realtime profiling */
… …
156static char times_valid; 147static char times_valid;
157 148
158static struct coro_cctx *cctx_first; 149static struct coro_cctx *cctx_first;
159static int cctx_count, cctx_idle; 150static int cctx_count, cctx_idle;
160 151
161enum { 152enum
153{
162 CC_MAPPED = 0x01, 154 CC_MAPPED = 0x01,
163 CC_NOREUSE = 0x02, /* throw this away after tracing */ 155 CC_NOREUSE = 0x02, /* throw this away after tracing */
164 CC_TRACE = 0x04, 156 CC_TRACE = 0x04,
165 CC_TRACE_SUB = 0x08, /* trace sub calls */ 157 CC_TRACE_SUB = 0x08, /* trace sub calls */
166 CC_TRACE_LINE = 0x10, /* trace each statement */ 158 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
171typedef struct coro_cctx 163typedef struct coro_cctx
172{ 164{
173 struct coro_cctx *next; 165 struct coro_cctx *next;
174 166
175 /* the stack */ 167 /* the stack */
176 void *sptr; 168 struct coro_stack stack;
177 size_t ssize;
178 169
179 /* cpu state */ 170 /* cpu state */
180 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 171 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
172#ifndef NDEBUG
181 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 173 JMPENV *idle_te; /* same as idle_sp, but for top_env */
174#endif
182 JMPENV *top_env; 175 JMPENV *top_env;
183 coro_context cctx; 176 coro_context cctx;
184 177
185 U32 gen; 178 U32 gen;
186#if CORO_USE_VALGRIND 179#if CORO_USE_VALGRIND
187 int valgrind_id; 180 int valgrind_id;
188#endif 181#endif
189 unsigned char flags; 182 unsigned char flags;
190} coro_cctx; 183} coro_cctx;
191 184
192coro_cctx *cctx_current; /* the currently running cctx */ 185static coro_cctx *cctx_current; /* the currently running cctx */
193 186
194/*****************************************************************************/ 187/*****************************************************************************/
195 188
189static MGVTBL coro_state_vtbl;
190
196enum { 191enum
192{
197 CF_RUNNING = 0x0001, /* coroutine is running */ 193 CF_RUNNING = 0x0001, /* coroutine is running */
198 CF_READY = 0x0002, /* coroutine is ready */ 194 CF_READY = 0x0002, /* coroutine is ready */
199 CF_NEW = 0x0004, /* has never been switched to */ 195 CF_NEW = 0x0004, /* has never been switched to */
200 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 196 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
201 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 197 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
198 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
202}; 199};
203 200
204/* the structure where most of the perl state is stored, overlaid on the cxstack */ 201/* the structure where most of the perl state is stored, overlaid on the cxstack */
205typedef struct 202typedef struct
206{ 203{
207 SV *defsv;
208 AV *defav;
209 SV *errsv;
210 SV *irsgv;
211 HV *hinthv;
212#define VAR(name,type) type name; 204 #define VARx(name,expr,type) type name;
213# include "state.h" 205 #include "state.h"
214#undef VAR
215} perl_slots; 206} perl_slots;
216 207
208/* how many context stack entries do we need for perl_slots */
217#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 209#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
218 210
219/* this is a structure representing a perl-level coroutine */ 211/* this is a structure representing a perl-level coroutine */
220struct coro { 212struct coro
213{
221 /* the C coroutine allocated to this perl coroutine, if any */ 214 /* the C coroutine allocated to this perl coroutine, if any */
222 coro_cctx *cctx; 215 coro_cctx *cctx;
223 216
224 /* ready queue */ 217 /* ready queue */
225 struct coro *next_ready; 218 struct coro *next_ready;
… …
227 /* state data */ 220 /* state data */
228 struct CoroSLF slf_frame; /* saved slf frame */ 221 struct CoroSLF slf_frame; /* saved slf frame */
229 AV *mainstack; 222 AV *mainstack;
230 perl_slots *slot; /* basically the saved sp */ 223 perl_slots *slot; /* basically the saved sp */
231 224
232 CV *startcv; /* the CV to execute */ 225 CV *startcv; /* the CV to execute */
233 AV *args; /* data associated with this coroutine (initial args) */ 226 AV *args; /* data associated with this coroutine (initial args) */
234 int refcnt; /* coroutines are refcounted, yes */
235 int flags; /* CF_ flags */ 227 int flags; /* CF_ flags */
236 HV *hv; /* the perl hash associated with this coro, if any */ 228 HV *hv; /* the perl hash associated with this coro, if any */
237 void (*on_destroy)(pTHX_ struct coro *coro);
238 229
239 /* statistics */ 230 /* statistics */
240 int usecount; /* number of transfers to this coro */ 231 int usecount; /* number of transfers to this coro */
241 232
242 /* coro process data */ 233 /* coro process data */
243 int prio; 234 int prio;
244 SV *except; /* exception to be thrown */ 235 SV *except; /* exception to be thrown */
245 SV *rouse_cb; 236 SV *rouse_cb; /* last rouse callback */
237 AV *on_destroy; /* callbacks or coros to notify on destroy */
238 AV *status; /* the exit status list */
246 239
247 /* async_pool */ 240 /* async_pool */
248 SV *saved_deffh; 241 SV *saved_deffh;
249 SV *invoke_cb; 242 SV *invoke_cb;
250 AV *invoke_av; 243 AV *invoke_av;
251 244
252 /* on_enter/on_leave */ 245 /* on_enter/on_leave */
253 AV *on_enter; 246 AV *on_enter;
254 AV *on_leave; 247 AV *on_leave;
255 248
249 /* swap_sv */
250 AV *swap_sv;
251
256 /* times */ 252 /* times */
257 coro_ts t_cpu, t_real; 253 coro_ts t_cpu, t_real;
258 254
259 /* linked list */ 255 /* linked list */
260 struct coro *next, *prev; 256 struct coro *next, *prev;
… …
263typedef struct coro *Coro__State; 259typedef struct coro *Coro__State;
264typedef struct coro *Coro__State_or_hashref; 260typedef struct coro *Coro__State_or_hashref;
265 261
266/* the following variables are effectively part of the perl context */ 262/* the following variables are effectively part of the perl context */
267/* and get copied between struct coro and these variables */ 263/* and get copied between struct coro and these variables */
268/* the mainr easonw e don't support windows process emulation */ 264/* the main reason we don't support windows process emulation */
269static struct CoroSLF slf_frame; /* the current slf frame */ 265static struct CoroSLF slf_frame; /* the current slf frame */
270 266
271/** Coro ********************************************************************/ 267/** Coro ********************************************************************/
272 268
273#define CORO_PRIO_MAX 3 269#define CORO_PRIO_MAX 3
… …
279 275
280/* for Coro.pm */ 276/* for Coro.pm */
281static SV *coro_current; 277static SV *coro_current;
282static SV *coro_readyhook; 278static SV *coro_readyhook;
283static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 279static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
284static CV *cv_coro_run, *cv_coro_terminate; 280static CV *cv_coro_run;
285static struct coro *coro_first; 281static struct coro *coro_first;
286#define coro_nready coroapi.nready 282#define coro_nready coroapi.nready
287 283
284/** JIT *********************************************************************/
285
286#if CORO_JIT
287 /* APPLE doesn't have mmap though */
288 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
289 #ifndef CORO_JIT_TYPE
290 #if ECB_AMD64 && CORO_JIT_UNIXY
291 #define CORO_JIT_TYPE "amd64-unix"
292 #elif __i386 && CORO_JIT_UNIXY
293 #define CORO_JIT_TYPE "x86-unix"
294 #endif
295 #endif
296#endif
297
298#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
299 #undef CORO_JIT
300#endif
301
302#if CORO_JIT
303 typedef void (*load_save_perl_slots_type)(perl_slots *);
304 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
305#endif
306
288/** Coro::Select ************************************************************/ 307/** Coro::Select ************************************************************/
289 308
290static OP *(*coro_old_pp_sselect) (pTHX); 309static OP *(*coro_old_pp_sselect) (pTHX);
291static SV *coro_select_select; 310static SV *coro_select_select;
292 311
293/* horrible hack, but if it works... */ 312/* horrible hack, but if it works... */
294static OP * 313static OP *
295coro_pp_sselect (aTHX) 314coro_pp_sselect (pTHX)
296{ 315{
297 dSP; 316 dSP;
298 PUSHMARK (SP - 4); /* fake argument list */ 317 PUSHMARK (SP - 4); /* fake argument list */
299 XPUSHs (coro_select_select); 318 XPUSHs (coro_select_select);
300 PUTBACK; 319 PUTBACK;
… …
303 PL_op->op_flags |= OPf_STACKED; 322 PL_op->op_flags |= OPf_STACKED;
304 PL_op->op_private = 0; 323 PL_op->op_private = 0;
305 return PL_ppaddr [OP_ENTERSUB](aTHX); 324 return PL_ppaddr [OP_ENTERSUB](aTHX);
306} 325}
307 326
327/** time stuff **************************************************************/
328
329#ifdef HAS_GETTIMEOFDAY
330
331ecb_inline void
332coro_u2time (pTHX_ UV ret[2])
333{
334 struct timeval tv;
335 gettimeofday (&tv, 0);
336
337 ret [0] = tv.tv_sec;
338 ret [1] = tv.tv_usec;
339}
340
341ecb_inline double
342coro_nvtime (void)
343{
344 struct timeval tv;
345 gettimeofday (&tv, 0);
346
347 return tv.tv_sec + tv.tv_usec * 1e-6;
348}
349
350ecb_inline void
351time_init (pTHX)
352{
353 nvtime = coro_nvtime;
354 u2time = coro_u2time;
355}
356
357#else
358
359ecb_inline void
360time_init (pTHX)
361{
362 SV **svp;
363
364 require_pv ("Time/HiRes.pm");
365
366 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
367
368 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
369 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
370
371 nvtime = INT2PTR (double (*)(), SvIV (*svp));
372
373 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
374 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
375}
376
377#endif
378
308/** lowlevel stuff **********************************************************/ 379/** lowlevel stuff **********************************************************/
309 380
310static SV * 381static SV * ecb_noinline
311coro_get_sv (pTHX_ const char *name, int create) 382coro_get_sv (pTHX_ const char *name, int create)
312{ 383{
313#if PERL_VERSION_ATLEAST (5,10,0) 384#if PERL_VERSION_ATLEAST (5,10,0)
314 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 385 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
315 get_sv (name, create); 386 get_sv (name, create);
316#endif 387#endif
317 return get_sv (name, create); 388 return get_sv (name, create);
318} 389}
319 390
320static AV * 391static AV * ecb_noinline
321coro_get_av (pTHX_ const char *name, int create) 392coro_get_av (pTHX_ const char *name, int create)
322{ 393{
323#if PERL_VERSION_ATLEAST (5,10,0) 394#if PERL_VERSION_ATLEAST (5,10,0)
324 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 395 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
325 get_av (name, create); 396 get_av (name, create);
326#endif 397#endif
327 return get_av (name, create); 398 return get_av (name, create);
328} 399}
329 400
330static HV * 401static HV * ecb_noinline
331coro_get_hv (pTHX_ const char *name, int create) 402coro_get_hv (pTHX_ const char *name, int create)
332{ 403{
333#if PERL_VERSION_ATLEAST (5,10,0) 404#if PERL_VERSION_ATLEAST (5,10,0)
334 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 405 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
335 get_hv (name, create); 406 get_hv (name, create);
336#endif 407#endif
337 return get_hv (name, create); 408 return get_hv (name, create);
338} 409}
339 410
340INLINE void 411ecb_inline void
341coro_times_update () 412coro_times_update (void)
342{ 413{
343#ifdef coro_clock_gettime 414#ifdef coro_clock_gettime
344 struct timespec ts; 415 struct timespec ts;
345 416
346 ts.tv_sec = ts.tv_nsec = 0; 417 ts.tv_sec = ts.tv_nsec = 0;
… …
358 time_real [0] = tv [0]; 429 time_real [0] = tv [0];
359 time_real [1] = tv [1] * 1000; 430 time_real [1] = tv [1] * 1000;
360#endif 431#endif
361} 432}
362 433
363INLINE void 434ecb_inline void
364coro_times_add (struct coro *c) 435coro_times_add (struct coro *c)
365{ 436{
366 c->t_real [1] += time_real [1]; 437 c->t_real [1] += time_real [1];
367 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 438 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
368 c->t_real [0] += time_real [0]; 439 c->t_real [0] += time_real [0];
… …
370 c->t_cpu [1] += time_cpu [1]; 441 c->t_cpu [1] += time_cpu [1];
371 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 442 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
372 c->t_cpu [0] += time_cpu [0]; 443 c->t_cpu [0] += time_cpu [0];
373} 444}
374 445
375INLINE void 446ecb_inline void
376coro_times_sub (struct coro *c) 447coro_times_sub (struct coro *c)
377{ 448{
378 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 449 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
379 c->t_real [1] -= time_real [1]; 450 c->t_real [1] -= time_real [1];
380 c->t_real [0] -= time_real [0]; 451 c->t_real [0] -= time_real [0];
… …
388/* magic glue */ 459/* magic glue */
389 460
390#define CORO_MAGIC_type_cv 26 461#define CORO_MAGIC_type_cv 26
391#define CORO_MAGIC_type_state PERL_MAGIC_ext 462#define CORO_MAGIC_type_state PERL_MAGIC_ext
392 463
393#define CORO_MAGIC_NN(sv, type) \ 464#define CORO_MAGIC_NN(sv, type) \
394 (expect_true (SvMAGIC (sv)->mg_type == type) \ 465 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
395 ? SvMAGIC (sv) \ 466 ? SvMAGIC (sv) \
396 : mg_find (sv, type)) 467 : mg_find (sv, type))
397 468
398#define CORO_MAGIC(sv, type) \ 469#define CORO_MAGIC(sv, type) \
399 (expect_true (SvMAGIC (sv)) \ 470 (ecb_expect_true (SvMAGIC (sv)) \
400 ? CORO_MAGIC_NN (sv, type) \ 471 ? CORO_MAGIC_NN (sv, type) \
401 : 0) 472 : 0)
402 473
403#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 474#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
404#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 475#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
405 476
406INLINE struct coro * 477ecb_inline MAGIC *
478SvSTATEhv_p (pTHX_ SV *coro)
479{
480 MAGIC *mg;
481
482 if (ecb_expect_true (
483 SvTYPE (coro) == SVt_PVHV
484 && (mg = CORO_MAGIC_state (coro))
485 && mg->mg_virtual == &coro_state_vtbl
486 ))
487 return mg;
488
489 return 0;
490}
491
492ecb_inline struct coro *
407SvSTATE_ (pTHX_ SV *coro) 493SvSTATE_ (pTHX_ SV *coro)
408{ 494{
409 HV *stash;
410 MAGIC *mg; 495 MAGIC *mg;
411 496
412 if (SvROK (coro)) 497 if (SvROK (coro))
413 coro = SvRV (coro); 498 coro = SvRV (coro);
414 499
415 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 500 mg = SvSTATEhv_p (aTHX_ coro);
501 if (!mg)
416 croak ("Coro::State object required"); 502 croak ("Coro::State object required");
417 503
418 stash = SvSTASH (coro);
419 if (expect_false (stash != coro_stash && stash != coro_state_stash))
420 {
421 /* very slow, but rare, check */
422 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
423 croak ("Coro::State object required");
424 }
425
426 mg = CORO_MAGIC_state (coro);
427 return (struct coro *)mg->mg_ptr; 504 return (struct coro *)mg->mg_ptr;
428} 505}
429 506
430#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 507#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
431 508
… …
434#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 511#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
435 512
436/*****************************************************************************/ 513/*****************************************************************************/
437/* padlist management and caching */ 514/* padlist management and caching */
438 515
439static AV * 516ecb_inline PADLIST *
440coro_derive_padlist (pTHX_ CV *cv) 517coro_derive_padlist (pTHX_ CV *cv)
441{ 518{
442 AV *padlist = CvPADLIST (cv); 519 PADLIST *padlist = CvPADLIST (cv);
443 AV *newpadlist, *newpad; 520 PADLIST *newpadlist;
521 PAD *newpad;
522 PADOFFSET off = PadlistMAX (padlist) + 1;
444 523
445 newpadlist = newAV (); 524#if NEWPADAPI
525
526 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
527 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
528 while (!PadlistARRAY (padlist)[off - 1])
529 --off;
530
531 Perl_pad_push (aTHX_ padlist, off);
532
533 newpad = PadlistARRAY (padlist)[off];
534 PadlistARRAY (padlist)[off] = 0;
535
536#else
537
538#if PERL_VERSION_ATLEAST (5,10,0)
539 Perl_pad_push (aTHX_ padlist, off);
540#else
541 Perl_pad_push (aTHX_ padlist, off, 1);
542#endif
543
544 newpad = PadlistARRAY (padlist)[off];
545 PadlistMAX (padlist) = off - 1;
546
547#endif
548
549 newPADLIST (newpadlist);
550#if !PERL_VERSION_ATLEAST(5,15,3)
551 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
446 AvREAL_off (newpadlist); 552 AvREAL_off (newpadlist);
447#if PERL_VERSION_ATLEAST (5,10,0)
448 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
449#else
450 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
451#endif 553#endif
452 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
453 --AvFILLp (padlist);
454 554
455 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 555 /* Already extended to 2 elements by newPADLIST. */
456 av_store (newpadlist, 1, (SV *)newpad); 556 PadlistMAX (newpadlist) = 1;
557 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
558 PadlistARRAY (newpadlist)[1] = newpad;
457 559
458 return newpadlist; 560 return newpadlist;
459} 561}
460 562
461static void 563ecb_inline void
462free_padlist (pTHX_ AV *padlist) 564free_padlist (pTHX_ PADLIST *padlist)
463{ 565{
464 /* may be during global destruction */ 566 /* may be during global destruction */
465 if (!IN_DESTRUCT) 567 if (!IN_DESTRUCT)
466 { 568 {
467 I32 i = AvFILLp (padlist); 569 I32 i = PadlistMAX (padlist);
468 570
469 while (i > 0) /* special-case index 0 */ 571 while (i > 0) /* special-case index 0 */
470 { 572 {
471 /* we try to be extra-careful here */ 573 /* we try to be extra-careful here */
472 AV *av = (AV *)AvARRAY (padlist)[i--]; 574 PAD *pad = PadlistARRAY (padlist)[i--];
473 I32 j = AvFILLp (av);
474 575
576 if (pad)
577 {
578 I32 j = PadMAX (pad);
579
475 while (j >= 0) 580 while (j >= 0)
476 SvREFCNT_dec (AvARRAY (av)[j--]); 581 SvREFCNT_dec (PadARRAY (pad)[j--]);
477 582
478 AvFILLp (av) = -1; 583 PadMAX (pad) = -1;
479 SvREFCNT_dec (av); 584 SvREFCNT_dec (pad);
585 }
480 } 586 }
481 587
482 SvREFCNT_dec (AvARRAY (padlist)[0]); 588 SvREFCNT_dec (PadlistNAMES (padlist));
483 589
590#if NEWPADAPI
591 Safefree (PadlistARRAY (padlist));
592 Safefree (padlist);
593#else
484 AvFILLp (padlist) = -1; 594 AvFILLp (padlist) = -1;
595 AvREAL_off (padlist);
485 SvREFCNT_dec ((SV*)padlist); 596 SvREFCNT_dec ((SV*)padlist);
597#endif
486 } 598 }
487} 599}
488 600
489static int 601static int
490coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 602coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
491{ 603{
492 AV *padlist; 604 PADLIST *padlist;
493 AV *av = (AV *)mg->mg_obj; 605 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
606 size_t len = *(size_t *)mg->mg_ptr;
494 607
495 /* perl manages to free our internal AV and _then_ call us */ 608 /* perl manages to free our internal AV and _then_ call us */
496 if (IN_DESTRUCT) 609 if (IN_DESTRUCT)
497 return 0; 610 return 0;
498 611
499 /* casting is fun. */ 612 while (len--)
500 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
501 free_padlist (aTHX_ padlist); 613 free_padlist (aTHX_ padlists[len]);
502
503 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
504 614
505 return 0; 615 return 0;
506} 616}
507 617
508static MGVTBL coro_cv_vtbl = { 618static MGVTBL coro_cv_vtbl = {
509 0, 0, 0, 0, 619 0, 0, 0, 0,
510 coro_cv_free 620 coro_cv_free
511}; 621};
512 622
513/* the next two functions merely cache the padlists */ 623/* the next two functions merely cache the padlists */
514static void 624ecb_inline void
515get_padlist (pTHX_ CV *cv) 625get_padlist (pTHX_ CV *cv)
516{ 626{
517 MAGIC *mg = CORO_MAGIC_cv (cv); 627 MAGIC *mg = CORO_MAGIC_cv (cv);
518 AV *av; 628 size_t *lenp;
519 629
520 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 630 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
521 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 631 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
522 else 632 else
523 { 633 {
524#if CORO_PREFER_PERL_FUNCTIONS 634#if CORO_PREFER_PERL_FUNCTIONS
525 /* this is probably cleaner? but also slower! */ 635 /* this is probably cleaner? but also slower! */
526 /* in practise, it seems to be less stable */ 636 /* in practise, it seems to be less stable */
… …
532 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 642 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
533#endif 643#endif
534 } 644 }
535} 645}
536 646
537static void 647ecb_inline void
538put_padlist (pTHX_ CV *cv) 648put_padlist (pTHX_ CV *cv)
539{ 649{
540 MAGIC *mg = CORO_MAGIC_cv (cv); 650 MAGIC *mg = CORO_MAGIC_cv (cv);
541 AV *av;
542 651
543 if (expect_false (!mg)) 652 if (ecb_expect_false (!mg))
653 {
544 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 654 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
655 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
656 mg->mg_len = 1; /* so mg_free frees mg_ptr */
657 }
658 else
659 Renew (mg->mg_ptr,
660 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
661 char);
545 662
546 av = (AV *)mg->mg_obj; 663 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
547
548 if (expect_false (AvFILLp (av) >= AvMAX (av)))
549 av_extend (av, AvFILLp (av) + 1);
550
551 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
552} 664}
553 665
554/** load & save, init *******************************************************/ 666/** load & save, init *******************************************************/
667
668ecb_inline void
669swap_sv (SV *a, SV *b)
670{
671 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
672 SV tmp;
673
674 /* swap sv_any */
675 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
676
677 /* swap sv_flags */
678 SvFLAGS (&tmp) = SvFLAGS (a);
679 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
680 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
681
682#if PERL_VERSION_ATLEAST (5,10,0)
683 /* perl 5.10 and later complicates this _quite_ a bit, but it also
684 * is much faster, so no quarrels here. alternatively, we could
685 * sv_upgrade to avoid this.
686 */
687 {
688 /* swap sv_u */
689 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
690
691 /* if SvANY points to the head, we need to adjust the pointers,
692 * as the pointer for a still points to b, and maybe vice versa.
693 */
694 #define svany_in_head(type) \
695 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
696
697 if (svany_in_head (SvTYPE (a)))
698 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
699
700 if (svany_in_head (SvTYPE (b)))
701 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
702 }
703#endif
704}
705
706/* swap sv heads, at least logically */
707static void
708swap_svs (pTHX_ Coro__State c)
709{
710 int i;
711
712 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
713 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
714}
715
716#define SWAP_SVS(coro) \
717 if (ecb_expect_false ((coro)->swap_sv)) \
718 swap_svs (aTHX_ (coro))
555 719
556static void 720static void
557on_enterleave_call (pTHX_ SV *cb); 721on_enterleave_call (pTHX_ SV *cb);
558 722
559static void 723static void
… …
562 perl_slots *slot = c->slot; 726 perl_slots *slot = c->slot;
563 c->slot = 0; 727 c->slot = 0;
564 728
565 PL_mainstack = c->mainstack; 729 PL_mainstack = c->mainstack;
566 730
567 GvSV (PL_defgv) = slot->defsv; 731#if CORO_JIT
568 GvAV (PL_defgv) = slot->defav; 732 load_perl_slots (slot);
569 GvSV (PL_errgv) = slot->errsv; 733#else
570 GvSV (irsgv) = slot->irsgv;
571 GvHV (PL_hintgv) = slot->hinthv;
572
573 #define VAR(name,type) PL_ ## name = slot->name; 734 #define VARx(name,expr,type) expr = slot->name;
574 # include "state.h" 735 #include "state.h"
575 #undef VAR 736#endif
576 737
577 { 738 {
578 dSP; 739 dSP;
579 740
580 CV *cv; 741 CV *cv;
581 742
582 /* now do the ugly restore mess */ 743 /* now do the ugly restore mess */
583 while (expect_true (cv = (CV *)POPs)) 744 while (ecb_expect_true (cv = (CV *)POPs))
584 { 745 {
585 put_padlist (aTHX_ cv); /* mark this padlist as available */ 746 put_padlist (aTHX_ cv); /* mark this padlist as available */
586 CvDEPTH (cv) = PTR2IV (POPs); 747 CvDEPTH (cv) = PTR2IV (POPs);
587 CvPADLIST (cv) = (AV *)POPs; 748 CvPADLIST (cv) = (PADLIST *)POPs;
588 } 749 }
589 750
590 PUTBACK; 751 PUTBACK;
591 } 752 }
592 753
593 slf_frame = c->slf_frame; 754 slf_frame = c->slf_frame;
594 CORO_THROW = c->except; 755 CORO_THROW = c->except;
595 756
596 if (expect_false (enable_times)) 757 if (ecb_expect_false (enable_times))
597 { 758 {
598 if (expect_false (!times_valid)) 759 if (ecb_expect_false (!times_valid))
599 coro_times_update (); 760 coro_times_update ();
600 761
601 coro_times_sub (c); 762 coro_times_sub (c);
602 } 763 }
603 764
604 if (expect_false (c->on_enter)) 765 if (ecb_expect_false (c->on_enter))
605 { 766 {
606 int i; 767 int i;
607 768
608 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 769 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 770 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
610 } 771 }
772
773 SWAP_SVS (c);
611} 774}
612 775
613static void 776static void
614save_perl (pTHX_ Coro__State c) 777save_perl (pTHX_ Coro__State c)
615{ 778{
779 SWAP_SVS (c);
780
616 if (expect_false (c->on_leave)) 781 if (ecb_expect_false (c->on_leave))
617 { 782 {
618 int i; 783 int i;
619 784
620 for (i = AvFILLp (c->on_leave); i >= 0; --i) 785 for (i = AvFILLp (c->on_leave); i >= 0; --i)
621 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 786 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
622 } 787 }
623 788
624 times_valid = 0; 789 times_valid = 0;
625 790
626 if (expect_false (enable_times)) 791 if (ecb_expect_false (enable_times))
627 { 792 {
628 coro_times_update (); times_valid = 1; 793 coro_times_update (); times_valid = 1;
629 coro_times_add (c); 794 coro_times_add (c);
630 } 795 }
631 796
… …
645 810
646 XPUSHs (Nullsv); 811 XPUSHs (Nullsv);
647 /* this loop was inspired by pp_caller */ 812 /* this loop was inspired by pp_caller */
648 for (;;) 813 for (;;)
649 { 814 {
650 while (expect_true (cxix >= 0)) 815 while (ecb_expect_true (cxix >= 0))
651 { 816 {
652 PERL_CONTEXT *cx = &ccstk[cxix--]; 817 PERL_CONTEXT *cx = &ccstk[cxix--];
653 818
654 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 819 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
655 { 820 {
656 CV *cv = cx->blk_sub.cv; 821 CV *cv = cx->blk_sub.cv;
657 822
658 if (expect_true (CvDEPTH (cv))) 823 if (ecb_expect_true (CvDEPTH (cv)))
659 { 824 {
660 EXTEND (SP, 3); 825 EXTEND (SP, 3);
661 PUSHs ((SV *)CvPADLIST (cv)); 826 PUSHs ((SV *)CvPADLIST (cv));
662 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 827 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
663 PUSHs ((SV *)cv); 828 PUSHs ((SV *)cv);
… …
666 get_padlist (aTHX_ cv); 831 get_padlist (aTHX_ cv);
667 } 832 }
668 } 833 }
669 } 834 }
670 835
671 if (expect_true (top_si->si_type == PERLSI_MAIN)) 836 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
672 break; 837 break;
673 838
674 top_si = top_si->si_prev; 839 top_si = top_si->si_prev;
675 ccstk = top_si->si_cxstack; 840 ccstk = top_si->si_cxstack;
676 cxix = top_si->si_cxix; 841 cxix = top_si->si_cxix;
… …
678 843
679 PUTBACK; 844 PUTBACK;
680 } 845 }
681 846
682 /* allocate some space on the context stack for our purposes */ 847 /* allocate some space on the context stack for our purposes */
683 /* we manually unroll here, as usually 2 slots is enough */ 848 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
684 if (SLOT_COUNT >= 1) CXINC;
685 if (SLOT_COUNT >= 2) CXINC;
686 if (SLOT_COUNT >= 3) CXINC;
687 { 849 {
688 unsigned int i; 850 unsigned int i;
851
689 for (i = 3; i < SLOT_COUNT; ++i) 852 for (i = 0; i < SLOT_COUNT; ++i)
690 CXINC; 853 CXINC;
691 } 854
692 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 855 cxstack_ix -= SLOT_COUNT; /* undo allocation */
856 }
693 857
694 c->mainstack = PL_mainstack; 858 c->mainstack = PL_mainstack;
695 859
696 { 860 {
697 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 861 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
698 862
699 slot->defav = GvAV (PL_defgv); 863#if CORO_JIT
700 slot->defsv = DEFSV; 864 save_perl_slots (slot);
701 slot->errsv = ERRSV; 865#else
702 slot->irsgv = GvSV (irsgv);
703 slot->hinthv = GvHV (PL_hintgv);
704
705 #define VAR(name,type) slot->name = PL_ ## name; 866 #define VARx(name,expr,type) slot->name = expr;
706 # include "state.h" 867 #include "state.h"
707 #undef VAR 868#endif
708 } 869 }
709} 870}
710 871
711/* 872/*
712 * allocate various perl stacks. This is almost an exact copy 873 * allocate various perl stacks. This is almost an exact copy
… …
718# define coro_init_stacks(thx) init_stacks () 879# define coro_init_stacks(thx) init_stacks ()
719#else 880#else
720static void 881static void
721coro_init_stacks (pTHX) 882coro_init_stacks (pTHX)
722{ 883{
723 PL_curstackinfo = new_stackinfo(32, 8); 884 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
724 PL_curstackinfo->si_type = PERLSI_MAIN; 885 PL_curstackinfo->si_type = PERLSI_MAIN;
725 PL_curstack = PL_curstackinfo->si_stack; 886 PL_curstack = PL_curstackinfo->si_stack;
726 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 887 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
727 888
728 PL_stack_base = AvARRAY(PL_curstack); 889 PL_stack_base = AvARRAY(PL_curstack);
… …
743#endif 904#endif
744 905
745 New(54,PL_scopestack,8,I32); 906 New(54,PL_scopestack,8,I32);
746 PL_scopestack_ix = 0; 907 PL_scopestack_ix = 0;
747 PL_scopestack_max = 8; 908 PL_scopestack_max = 8;
909#if HAS_SCOPESTACK_NAME
910 New(54,PL_scopestack_name,8,const char*);
911#endif
748 912
749 New(54,PL_savestack,24,ANY); 913 New(54,PL_savestack,24,ANY);
750 PL_savestack_ix = 0; 914 PL_savestack_ix = 0;
751 PL_savestack_max = 24; 915 PL_savestack_max = 24;
752 916
… …
780 } 944 }
781 945
782 Safefree (PL_tmps_stack); 946 Safefree (PL_tmps_stack);
783 Safefree (PL_markstack); 947 Safefree (PL_markstack);
784 Safefree (PL_scopestack); 948 Safefree (PL_scopestack);
949#if HAS_SCOPESTACK_NAME
950 Safefree (PL_scopestack_name);
951#endif
785 Safefree (PL_savestack); 952 Safefree (PL_savestack);
786#if !PERL_VERSION_ATLEAST (5,10,0) 953#if !PERL_VERSION_ATLEAST (5,10,0)
787 Safefree (PL_retstack); 954 Safefree (PL_retstack);
788#endif 955#endif
789} 956}
… …
835#endif 1002#endif
836 1003
837/* 1004/*
838 * This overrides the default magic get method of %SIG elements. 1005 * This overrides the default magic get method of %SIG elements.
839 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1006 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
840 * and instead of trying to save and restore the hash elements, we just provide 1007 * and instead of trying to save and restore the hash elements (extremely slow),
841 * readback here. 1008 * we just provide our own readback here.
842 */ 1009 */
843static int 1010static int ecb_cold
844coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1011coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
845{ 1012{
846 const char *s = MgPV_nolen_const (mg); 1013 const char *s = MgPV_nolen_const (mg);
847 1014
848 if (*s == '_') 1015 if (*s == '_')
849 { 1016 {
850 SV **svp = 0; 1017 SV **svp = 0;
851 1018
852 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1019 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
853 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1020 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
854 1021
855 if (svp) 1022 if (svp)
856 { 1023 {
857 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1024 SV *ssv;
1025
1026 if (!*svp)
1027 ssv = &PL_sv_undef;
1028 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1029 ssv = sv_2mortal (newRV_inc (*svp));
1030 else
1031 ssv = *svp;
1032
1033 sv_setsv (sv, ssv);
858 return 0; 1034 return 0;
859 } 1035 }
860 } 1036 }
861 1037
862 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1038 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
863} 1039}
864 1040
865static int 1041static int ecb_cold
866coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1042coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
867{ 1043{
868 const char *s = MgPV_nolen_const (mg); 1044 const char *s = MgPV_nolen_const (mg);
869 1045
870 if (*s == '_') 1046 if (*s == '_')
… …
884 } 1060 }
885 1061
886 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1062 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
887} 1063}
888 1064
889static int 1065static int ecb_cold
890coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1066coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
891{ 1067{
892 const char *s = MgPV_nolen_const (mg); 1068 const char *s = MgPV_nolen_const (mg);
893 1069
894 if (*s == '_') 1070 if (*s == '_')
… …
927slf_check_repeat (pTHX_ struct CoroSLF *frame) 1103slf_check_repeat (pTHX_ struct CoroSLF *frame)
928{ 1104{
929 return 1; 1105 return 1;
930} 1106}
931 1107
932static UNOP coro_setup_op; 1108static UNOP init_perl_op;
933 1109
934static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1110ecb_noinline static void /* noinline to keep it out of the transfer fast path */
935coro_setup (pTHX_ struct coro *coro) 1111init_perl (pTHX_ struct coro *coro)
936{ 1112{
937 /* 1113 /*
938 * emulate part of the perl startup here. 1114 * emulate part of the perl startup here.
939 */ 1115 */
940 coro_init_stacks (aTHX); 1116 coro_init_stacks (aTHX);
… …
947 PL_comppad_name_fill = 0; 1123 PL_comppad_name_fill = 0;
948 PL_comppad_name_floor = 0; 1124 PL_comppad_name_floor = 0;
949 PL_curpm = 0; 1125 PL_curpm = 0;
950 PL_curpad = 0; 1126 PL_curpad = 0;
951 PL_localizing = 0; 1127 PL_localizing = 0;
952 PL_dirty = 0;
953 PL_restartop = 0; 1128 PL_restartop = 0;
954#if PERL_VERSION_ATLEAST (5,10,0) 1129#if PERL_VERSION_ATLEAST (5,10,0)
955 PL_parser = 0; 1130 PL_parser = 0;
956#endif 1131#endif
957 PL_hints = 0; 1132 PL_hints = 0;
958 1133
959 /* recreate the die/warn hooks */ 1134 /* recreate the die/warn hooks */
960 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1135 PL_diehook = SvREFCNT_inc (rv_diehook);
961 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1136 PL_warnhook = SvREFCNT_inc (rv_warnhook);
962 1137
963 GvSV (PL_defgv) = newSV (0); 1138 GvSV (PL_defgv) = newSV (0);
964 GvAV (PL_defgv) = coro->args; coro->args = 0; 1139 GvAV (PL_defgv) = coro->args; coro->args = 0;
965 GvSV (PL_errgv) = newSV (0); 1140 GvSV (PL_errgv) = newSV (0);
966 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1141 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
967 GvHV (PL_hintgv) = 0; 1142 GvHV (PL_hintgv) = 0;
… …
987 /* this newly created coroutine might be run on an existing cctx which most 1162 /* this newly created coroutine might be run on an existing cctx which most
988 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1163 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
989 */ 1164 */
990 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1165 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
991 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1166 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1167 slf_frame.destroy = 0;
992 1168
993 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1169 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
994 coro_setup_op.op_next = PL_op; 1170 init_perl_op.op_next = PL_op;
995 coro_setup_op.op_type = OP_ENTERSUB; 1171 init_perl_op.op_type = OP_ENTERSUB;
996 coro_setup_op.op_ppaddr = pp_slf; 1172 init_perl_op.op_ppaddr = pp_slf;
997 /* no flags etc. required, as an init function won't be called */ 1173 /* no flags etc. required, as an init function won't be called */
998 1174
999 PL_op = (OP *)&coro_setup_op; 1175 PL_op = (OP *)&init_perl_op;
1000 1176
1001 /* copy throw, in case it was set before coro_setup */ 1177 /* copy throw, in case it was set before init_perl */
1002 CORO_THROW = coro->except; 1178 CORO_THROW = coro->except;
1003 1179
1180 SWAP_SVS (coro);
1181
1004 if (expect_false (enable_times)) 1182 if (ecb_expect_false (enable_times))
1005 { 1183 {
1006 coro_times_update (); 1184 coro_times_update ();
1007 coro_times_sub (coro); 1185 coro_times_sub (coro);
1008 } 1186 }
1009} 1187}
… …
1028 dounwind (-1); 1206 dounwind (-1);
1029 } 1207 }
1030} 1208}
1031 1209
1032static void 1210static void
1033coro_destruct_perl (pTHX_ struct coro *coro) 1211destroy_perl (pTHX_ struct coro *coro)
1034{ 1212{
1035 SV *svf [9]; 1213 SV *svf [9];
1036 1214
1037 { 1215 {
1216 SV *old_current = SvRV (coro_current);
1038 struct coro *current = SvSTATE_current; 1217 struct coro *current = SvSTATE (old_current);
1039 1218
1040 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1219 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1041 1220
1042 save_perl (aTHX_ current); 1221 save_perl (aTHX_ current);
1222
1223 /* this will cause transfer_check to croak on block*/
1224 SvRV_set (coro_current, (SV *)coro->hv);
1225
1043 load_perl (aTHX_ coro); 1226 load_perl (aTHX_ coro);
1044 1227
1045 coro_unwind_stacks (aTHX); 1228 coro_unwind_stacks (aTHX);
1229
1230 /* restore swapped sv's */
1231 SWAP_SVS (coro);
1232
1046 coro_destruct_stacks (aTHX); 1233 coro_destruct_stacks (aTHX);
1047 1234
1048 // now save some sv's to be free'd later 1235 /* now save some sv's to be free'd later */
1049 svf [0] = GvSV (PL_defgv); 1236 svf [0] = GvSV (PL_defgv);
1050 svf [1] = (SV *)GvAV (PL_defgv); 1237 svf [1] = (SV *)GvAV (PL_defgv);
1051 svf [2] = GvSV (PL_errgv); 1238 svf [2] = GvSV (PL_errgv);
1052 svf [3] = (SV *)PL_defoutgv; 1239 svf [3] = (SV *)PL_defoutgv;
1053 svf [4] = PL_rs; 1240 svf [4] = PL_rs;
… …
1055 svf [6] = (SV *)GvHV (PL_hintgv); 1242 svf [6] = (SV *)GvHV (PL_hintgv);
1056 svf [7] = PL_diehook; 1243 svf [7] = PL_diehook;
1057 svf [8] = PL_warnhook; 1244 svf [8] = PL_warnhook;
1058 assert (9 == sizeof (svf) / sizeof (*svf)); 1245 assert (9 == sizeof (svf) / sizeof (*svf));
1059 1246
1247 SvRV_set (coro_current, old_current);
1248
1060 load_perl (aTHX_ current); 1249 load_perl (aTHX_ current);
1061 } 1250 }
1062 1251
1063 { 1252 {
1064 unsigned int i; 1253 unsigned int i;
… …
1071 SvREFCNT_dec (coro->invoke_cb); 1260 SvREFCNT_dec (coro->invoke_cb);
1072 SvREFCNT_dec (coro->invoke_av); 1261 SvREFCNT_dec (coro->invoke_av);
1073 } 1262 }
1074} 1263}
1075 1264
1076INLINE void 1265ecb_inline void
1077free_coro_mortal (pTHX) 1266free_coro_mortal (pTHX)
1078{ 1267{
1079 if (expect_true (coro_mortal)) 1268 if (ecb_expect_true (coro_mortal))
1080 { 1269 {
1081 SvREFCNT_dec (coro_mortal); 1270 SvREFCNT_dec ((SV *)coro_mortal);
1082 coro_mortal = 0; 1271 coro_mortal = 0;
1083 } 1272 }
1084} 1273}
1085 1274
1086static int 1275static int
… …
1219 1408
1220 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1409 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1221} 1410}
1222 1411
1223/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1412/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1224static void NOINLINE 1413static void ecb_noinline
1225cctx_prepare (pTHX) 1414cctx_prepare (pTHX)
1226{ 1415{
1227 PL_top_env = &PL_start_env; 1416 PL_top_env = &PL_start_env;
1228 1417
1229 if (cctx_current->flags & CC_TRACE) 1418 if (cctx_current->flags & CC_TRACE)
… …
1240 slf_frame.prepare = slf_prepare_set_stacklevel; 1429 slf_frame.prepare = slf_prepare_set_stacklevel;
1241 slf_frame.check = slf_check_set_stacklevel; 1430 slf_frame.check = slf_check_set_stacklevel;
1242} 1431}
1243 1432
1244/* the tail of transfer: execute stuff we can only do after a transfer */ 1433/* the tail of transfer: execute stuff we can only do after a transfer */
1245INLINE void 1434ecb_inline void
1246transfer_tail (pTHX) 1435transfer_tail (pTHX)
1247{ 1436{
1248 free_coro_mortal (aTHX); 1437 free_coro_mortal (aTHX);
1438}
1439
1440/* try to exit the same way perl's main function would do */
1441/* we do not bother resetting the environment or other things *7
1442/* that are not, uhm, essential */
1443/* this obviously also doesn't work when perl is embedded */
1444static void ecb_noinline ecb_cold
1445perlish_exit (pTHX)
1446{
1447 int exitstatus = perl_destruct (PL_curinterp);
1448 perl_free (PL_curinterp);
1449 exit (exitstatus);
1249} 1450}
1250 1451
1251/* 1452/*
1252 * this is a _very_ stripped down perl interpreter ;) 1453 * this is a _very_ stripped down perl interpreter ;)
1253 */ 1454 */
… …
1282 */ 1483 */
1283 1484
1284 /* 1485 /*
1285 * If perl-run returns we assume exit() was being called or the coro 1486 * If perl-run returns we assume exit() was being called or the coro
1286 * fell off the end, which seems to be the only valid (non-bug) 1487 * fell off the end, which seems to be the only valid (non-bug)
1287 * reason for perl_run to return. We try to exit by jumping to the 1488 * reason for perl_run to return. We try to mimic whatever perl is normally
1288 * bootstrap-time "top" top_env, as we cannot restore the "main" 1489 * doing in that case. YMMV.
1289 * coroutine as Coro has no such concept.
1290 * This actually isn't valid with the pthread backend, but OSes requiring
1291 * that backend are too broken to do it in a standards-compliant way.
1292 */ 1490 */
1293 PL_top_env = main_top_env; 1491 perlish_exit (aTHX);
1294 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1295 } 1492 }
1296} 1493}
1297 1494
1298static coro_cctx * 1495static coro_cctx *
1299cctx_new () 1496cctx_new (void)
1300{ 1497{
1301 coro_cctx *cctx; 1498 coro_cctx *cctx;
1302 1499
1303 ++cctx_count; 1500 ++cctx_count;
1304 New (0, cctx, 1, coro_cctx); 1501 New (0, cctx, 1, coro_cctx);
… …
1310 return cctx; 1507 return cctx;
1311} 1508}
1312 1509
1313/* create a new cctx only suitable as source */ 1510/* create a new cctx only suitable as source */
1314static coro_cctx * 1511static coro_cctx *
1315cctx_new_empty () 1512cctx_new_empty (void)
1316{ 1513{
1317 coro_cctx *cctx = cctx_new (); 1514 coro_cctx *cctx = cctx_new ();
1318 1515
1319 cctx->sptr = 0; 1516 cctx->stack.sptr = 0;
1320 coro_create (&cctx->cctx, 0, 0, 0, 0); 1517 coro_create (&cctx->cctx, 0, 0, 0, 0);
1321 1518
1322 return cctx; 1519 return cctx;
1323} 1520}
1324 1521
1325/* create a new cctx suitable as destination/running a perl interpreter */ 1522/* create a new cctx suitable as destination/running a perl interpreter */
1326static coro_cctx * 1523static coro_cctx *
1327cctx_new_run () 1524cctx_new_run (void)
1328{ 1525{
1329 coro_cctx *cctx = cctx_new (); 1526 coro_cctx *cctx = cctx_new ();
1330 void *stack_start;
1331 size_t stack_size;
1332 1527
1333#if HAVE_MMAP 1528 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1334 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1335 /* mmap supposedly does allocate-on-write for us */
1336 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1337
1338 if (cctx->sptr != (void *)-1)
1339 {
1340 #if CORO_STACKGUARD
1341 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1342 #endif
1343 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1344 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1345 cctx->flags |= CC_MAPPED;
1346 } 1529 {
1347 else
1348#endif
1349 {
1350 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1351 New (0, cctx->sptr, cctx_stacksize, long);
1352
1353 if (!cctx->sptr)
1354 {
1355 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1530 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1356 _exit (EXIT_FAILURE); 1531 _exit (EXIT_FAILURE);
1357 }
1358
1359 stack_start = cctx->sptr;
1360 stack_size = cctx->ssize;
1361 } 1532 }
1362 1533
1363 #if CORO_USE_VALGRIND
1364 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1365 #endif
1366
1367 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1534 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1368 1535
1369 return cctx; 1536 return cctx;
1370} 1537}
1371 1538
1372static void 1539static void
1373cctx_destroy (coro_cctx *cctx) 1540cctx_destroy (coro_cctx *cctx)
1374{ 1541{
1375 if (!cctx) 1542 if (!cctx)
1376 return; 1543 return;
1377 1544
1378 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1545 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1379 1546
1380 --cctx_count; 1547 --cctx_count;
1381 coro_destroy (&cctx->cctx); 1548 coro_destroy (&cctx->cctx);
1382 1549
1383 /* coro_transfer creates new, empty cctx's */ 1550 coro_stack_free (&cctx->stack);
1384 if (cctx->sptr)
1385 {
1386 #if CORO_USE_VALGRIND
1387 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1388 #endif
1389
1390#if HAVE_MMAP
1391 if (cctx->flags & CC_MAPPED)
1392 munmap (cctx->sptr, cctx->ssize);
1393 else
1394#endif
1395 Safefree (cctx->sptr);
1396 }
1397 1551
1398 Safefree (cctx); 1552 Safefree (cctx);
1399} 1553}
1400 1554
1401/* wether this cctx should be destructed */ 1555/* wether this cctx should be destructed */
1402#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1556#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1403 1557
1404static coro_cctx * 1558static coro_cctx *
1405cctx_get (pTHX) 1559cctx_get (pTHX)
1406{ 1560{
1407 while (expect_true (cctx_first)) 1561 while (ecb_expect_true (cctx_first))
1408 { 1562 {
1409 coro_cctx *cctx = cctx_first; 1563 coro_cctx *cctx = cctx_first;
1410 cctx_first = cctx->next; 1564 cctx_first = cctx->next;
1411 --cctx_idle; 1565 --cctx_idle;
1412 1566
1413 if (expect_true (!CCTX_EXPIRED (cctx))) 1567 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1414 return cctx; 1568 return cctx;
1415 1569
1416 cctx_destroy (cctx); 1570 cctx_destroy (cctx);
1417 } 1571 }
1418 1572
… …
1420} 1574}
1421 1575
1422static void 1576static void
1423cctx_put (coro_cctx *cctx) 1577cctx_put (coro_cctx *cctx)
1424{ 1578{
1425 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1579 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1426 1580
1427 /* free another cctx if overlimit */ 1581 /* free another cctx if overlimit */
1428 if (expect_false (cctx_idle >= cctx_max_idle)) 1582 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1429 { 1583 {
1430 coro_cctx *first = cctx_first; 1584 coro_cctx *first = cctx_first;
1431 cctx_first = first->next; 1585 cctx_first = first->next;
1432 --cctx_idle; 1586 --cctx_idle;
1433 1587
… …
1444static void 1598static void
1445transfer_check (pTHX_ struct coro *prev, struct coro *next) 1599transfer_check (pTHX_ struct coro *prev, struct coro *next)
1446{ 1600{
1447 /* TODO: throwing up here is considered harmful */ 1601 /* TODO: throwing up here is considered harmful */
1448 1602
1449 if (expect_true (prev != next)) 1603 if (ecb_expect_true (prev != next))
1450 { 1604 {
1451 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1605 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1452 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1606 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1453 1607
1454 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1608 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1455 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1609 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1456 1610
1457#if !PERL_VERSION_ATLEAST (5,10,0) 1611#if !PERL_VERSION_ATLEAST (5,10,0)
1458 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1612 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1459 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1613 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1460#endif 1614#endif
1461 } 1615 }
1462} 1616}
1463 1617
1464/* always use the TRANSFER macro */ 1618/* always use the TRANSFER macro */
1465static void NOINLINE /* noinline so we have a fixed stackframe */ 1619static void ecb_noinline /* noinline so we have a fixed stackframe */
1466transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1620transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1467{ 1621{
1468 dSTACKLEVEL; 1622 dSTACKLEVEL;
1469 1623
1470 /* sometimes transfer is only called to set idle_sp */ 1624 /* sometimes transfer is only called to set idle_sp */
1471 if (expect_false (!prev)) 1625 if (ecb_expect_false (!prev))
1472 { 1626 {
1473 cctx_current->idle_sp = STACKLEVEL; 1627 cctx_current->idle_sp = STACKLEVEL;
1474 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1628 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1475 } 1629 }
1476 else if (expect_true (prev != next)) 1630 else if (ecb_expect_true (prev != next))
1477 { 1631 {
1478 coro_cctx *cctx_prev; 1632 coro_cctx *cctx_prev;
1479 1633
1480 if (expect_false (prev->flags & CF_NEW)) 1634 if (ecb_expect_false (prev->flags & CF_NEW))
1481 { 1635 {
1482 /* create a new empty/source context */ 1636 /* create a new empty/source context */
1483 prev->flags &= ~CF_NEW; 1637 prev->flags &= ~CF_NEW;
1484 prev->flags |= CF_RUNNING; 1638 prev->flags |= CF_RUNNING;
1485 } 1639 }
… …
1488 next->flags |= CF_RUNNING; 1642 next->flags |= CF_RUNNING;
1489 1643
1490 /* first get rid of the old state */ 1644 /* first get rid of the old state */
1491 save_perl (aTHX_ prev); 1645 save_perl (aTHX_ prev);
1492 1646
1493 if (expect_false (next->flags & CF_NEW)) 1647 if (ecb_expect_false (next->flags & CF_NEW))
1494 { 1648 {
1495 /* need to start coroutine */ 1649 /* need to start coroutine */
1496 next->flags &= ~CF_NEW; 1650 next->flags &= ~CF_NEW;
1497 /* setup coroutine call */ 1651 /* setup coroutine call */
1498 coro_setup (aTHX_ next); 1652 init_perl (aTHX_ next);
1499 } 1653 }
1500 else 1654 else
1501 load_perl (aTHX_ next); 1655 load_perl (aTHX_ next);
1502 1656
1503 /* possibly untie and reuse the cctx */ 1657 /* possibly untie and reuse the cctx */
1504 if (expect_true ( 1658 if (ecb_expect_true (
1505 cctx_current->idle_sp == STACKLEVEL 1659 cctx_current->idle_sp == STACKLEVEL
1506 && !(cctx_current->flags & CC_TRACE) 1660 && !(cctx_current->flags & CC_TRACE)
1507 && !force_cctx 1661 && !force_cctx
1508 )) 1662 ))
1509 { 1663 {
1510 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1664 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1511 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1665 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1512 1666
1513 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1667 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1514 /* without this the next cctx_get might destroy the running cctx while still in use */ 1668 /* without this the next cctx_get might destroy the running cctx while still in use */
1515 if (expect_false (CCTX_EXPIRED (cctx_current))) 1669 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1516 if (expect_true (!next->cctx)) 1670 if (ecb_expect_true (!next->cctx))
1517 next->cctx = cctx_get (aTHX); 1671 next->cctx = cctx_get (aTHX);
1518 1672
1519 cctx_put (cctx_current); 1673 cctx_put (cctx_current);
1520 } 1674 }
1521 else 1675 else
1522 prev->cctx = cctx_current; 1676 prev->cctx = cctx_current;
1523 1677
1524 ++next->usecount; 1678 ++next->usecount;
1525 1679
1526 cctx_prev = cctx_current; 1680 cctx_prev = cctx_current;
1527 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1681 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1528 1682
1529 next->cctx = 0; 1683 next->cctx = 0;
1530 1684
1531 if (expect_false (cctx_prev != cctx_current)) 1685 if (ecb_expect_false (cctx_prev != cctx_current))
1532 { 1686 {
1533 cctx_prev->top_env = PL_top_env; 1687 cctx_prev->top_env = PL_top_env;
1534 PL_top_env = cctx_current->top_env; 1688 PL_top_env = cctx_current->top_env;
1535 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1689 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1536 } 1690 }
… …
1542#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1696#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1543#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1697#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1544 1698
1545/** high level stuff ********************************************************/ 1699/** high level stuff ********************************************************/
1546 1700
1701/* this function is actually Coro, not Coro::State, but we call it from here */
1702/* because it is convenient - but it hasn't been declared yet for that reason */
1547static int 1703static void
1704coro_call_on_destroy (pTHX_ struct coro *coro);
1705
1706static void
1548coro_state_destroy (pTHX_ struct coro *coro) 1707coro_state_destroy (pTHX_ struct coro *coro)
1549{ 1708{
1550 if (coro->flags & CF_DESTROYED) 1709 if (coro->flags & CF_ZOMBIE)
1551 return 0; 1710 return;
1552 1711
1553 if (coro->on_destroy && !PL_dirty)
1554 coro->on_destroy (aTHX_ coro); 1712 slf_destroy (aTHX_ coro);
1555 1713
1556 coro->flags |= CF_DESTROYED; 1714 coro->flags |= CF_ZOMBIE;
1557 1715
1558 if (coro->flags & CF_READY) 1716 if (coro->flags & CF_READY)
1559 { 1717 {
1560 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1718 /* reduce nready, as destroying a ready coro effectively unreadies it */
1561 /* alternative: look through all ready queues and remove the coro */ 1719 /* alternative: look through all ready queues and remove the coro */
1562 --coro_nready; 1720 --coro_nready;
1563 } 1721 }
1564 else 1722 else
1565 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1723 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1724
1725 if (coro->next) coro->next->prev = coro->prev;
1726 if (coro->prev) coro->prev->next = coro->next;
1727 if (coro == coro_first) coro_first = coro->next;
1566 1728
1567 if (coro->mainstack 1729 if (coro->mainstack
1568 && coro->mainstack != main_mainstack 1730 && coro->mainstack != main_mainstack
1569 && coro->slot 1731 && coro->slot
1570 && !PL_dirty) 1732 && !PL_dirty)
1571 coro_destruct_perl (aTHX_ coro); 1733 destroy_perl (aTHX_ coro);
1572 1734
1573 cctx_destroy (coro->cctx); 1735 cctx_destroy (coro->cctx);
1574 SvREFCNT_dec (coro->startcv); 1736 SvREFCNT_dec (coro->startcv);
1575 SvREFCNT_dec (coro->args); 1737 SvREFCNT_dec (coro->args);
1738 SvREFCNT_dec (coro->swap_sv);
1576 SvREFCNT_dec (CORO_THROW); 1739 SvREFCNT_dec (CORO_THROW);
1577 1740
1578 if (coro->next) coro->next->prev = coro->prev; 1741 coro_call_on_destroy (aTHX_ coro);
1579 if (coro->prev) coro->prev->next = coro->next;
1580 if (coro == coro_first) coro_first = coro->next;
1581 1742
1582 return 1; 1743 /* more destruction mayhem in coro_state_free */
1583} 1744}
1584 1745
1585static int 1746static int
1586coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1747coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1587{ 1748{
1588 struct coro *coro = (struct coro *)mg->mg_ptr; 1749 struct coro *coro = (struct coro *)mg->mg_ptr;
1589 mg->mg_ptr = 0; 1750 mg->mg_ptr = 0;
1590 1751
1591 coro->hv = 0;
1592
1593 if (--coro->refcnt < 0)
1594 {
1595 coro_state_destroy (aTHX_ coro); 1752 coro_state_destroy (aTHX_ coro);
1753 SvREFCNT_dec (coro->on_destroy);
1754 SvREFCNT_dec (coro->status);
1755
1596 Safefree (coro); 1756 Safefree (coro);
1597 }
1598 1757
1599 return 0; 1758 return 0;
1600} 1759}
1601 1760
1602static int 1761static int ecb_cold
1603coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1762coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1604{ 1763{
1605 struct coro *coro = (struct coro *)mg->mg_ptr; 1764 /* called when perl clones the current process the slow way (windows process emulation) */
1606 1765 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1607 ++coro->refcnt; 1766 mg->mg_ptr = 0;
1767 mg->mg_virtual = 0;
1608 1768
1609 return 0; 1769 return 0;
1610} 1770}
1611 1771
1612static MGVTBL coro_state_vtbl = { 1772static MGVTBL coro_state_vtbl = {
… …
1637 TRANSFER (ta, 1); 1797 TRANSFER (ta, 1);
1638} 1798}
1639 1799
1640/** Coro ********************************************************************/ 1800/** Coro ********************************************************************/
1641 1801
1642INLINE void 1802ecb_inline void
1643coro_enq (pTHX_ struct coro *coro) 1803coro_enq (pTHX_ struct coro *coro)
1644{ 1804{
1645 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1805 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1646 1806
1647 SvREFCNT_inc_NN (coro->hv); 1807 SvREFCNT_inc_NN (coro->hv);
… …
1649 coro->next_ready = 0; 1809 coro->next_ready = 0;
1650 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1810 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1651 ready [1] = coro; 1811 ready [1] = coro;
1652} 1812}
1653 1813
1654INLINE struct coro * 1814ecb_inline struct coro *
1655coro_deq (pTHX) 1815coro_deq (pTHX)
1656{ 1816{
1657 int prio; 1817 int prio;
1658 1818
1659 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1819 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1712{ 1872{
1713 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1873 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1714} 1874}
1715 1875
1716/* expects to own a reference to next->hv */ 1876/* expects to own a reference to next->hv */
1717INLINE void 1877ecb_inline void
1718prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1878prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1719{ 1879{
1720 SV *prev_sv = SvRV (coro_current); 1880 SV *prev_sv = SvRV (coro_current);
1721 1881
1722 ta->prev = SvSTATE_hv (prev_sv); 1882 ta->prev = SvSTATE_hv (prev_sv);
… …
1735{ 1895{
1736 for (;;) 1896 for (;;)
1737 { 1897 {
1738 struct coro *next = coro_deq (aTHX); 1898 struct coro *next = coro_deq (aTHX);
1739 1899
1740 if (expect_true (next)) 1900 if (ecb_expect_true (next))
1741 { 1901 {
1742 /* cannot transfer to destroyed coros, skip and look for next */ 1902 /* cannot transfer to destroyed coros, skip and look for next */
1743 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1903 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1744 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1904 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1745 else 1905 else
1746 { 1906 {
1747 next->flags &= ~CF_READY; 1907 next->flags &= ~CF_READY;
1748 --coro_nready; 1908 --coro_nready;
… …
1755 { 1915 {
1756 /* nothing to schedule: call the idle handler */ 1916 /* nothing to schedule: call the idle handler */
1757 if (SvROK (sv_idle) 1917 if (SvROK (sv_idle)
1758 && SvOBJECT (SvRV (sv_idle))) 1918 && SvOBJECT (SvRV (sv_idle)))
1759 { 1919 {
1920 if (SvRV (sv_idle) == SvRV (coro_current))
1921 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1922
1760 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1923 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1761 api_ready (aTHX_ SvRV (sv_idle)); 1924 api_ready (aTHX_ SvRV (sv_idle));
1762 --coro_nready; 1925 --coro_nready;
1763 } 1926 }
1764 else 1927 else
1765 { 1928 {
1929 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1766 dSP; 1930 dSP;
1767 1931
1768 ENTER; 1932 ENTER;
1769 SAVETMPS; 1933 SAVETMPS;
1770 1934
… …
1777 } 1941 }
1778 } 1942 }
1779 } 1943 }
1780} 1944}
1781 1945
1782INLINE void 1946ecb_inline void
1783prepare_cede (pTHX_ struct coro_transfer_args *ta) 1947prepare_cede (pTHX_ struct coro_transfer_args *ta)
1784{ 1948{
1785 api_ready (aTHX_ coro_current); 1949 api_ready (aTHX_ coro_current);
1786 prepare_schedule (aTHX_ ta); 1950 prepare_schedule (aTHX_ ta);
1787} 1951}
1788 1952
1789INLINE void 1953ecb_inline void
1790prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1954prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1791{ 1955{
1792 SV *prev = SvRV (coro_current); 1956 SV *prev = SvRV (coro_current);
1793 1957
1794 if (coro_nready) 1958 if (coro_nready)
… …
1824{ 1988{
1825 struct coro_transfer_args ta; 1989 struct coro_transfer_args ta;
1826 1990
1827 prepare_cede (aTHX_ &ta); 1991 prepare_cede (aTHX_ &ta);
1828 1992
1829 if (expect_true (ta.prev != ta.next)) 1993 if (ecb_expect_true (ta.prev != ta.next))
1830 { 1994 {
1831 TRANSFER (ta, 1); 1995 TRANSFER (ta, 1);
1832 return 1; 1996 return 1;
1833 } 1997 }
1834 else 1998 else
… …
1877 coro->slot->runops = RUNOPS_DEFAULT; 2041 coro->slot->runops = RUNOPS_DEFAULT;
1878 } 2042 }
1879} 2043}
1880 2044
1881static void 2045static void
2046coro_push_av (pTHX_ AV *av, I32 gimme_v)
2047{
2048 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2049 {
2050 dSP;
2051
2052 if (gimme_v == G_SCALAR)
2053 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2054 else
2055 {
2056 int i;
2057 EXTEND (SP, AvFILLp (av) + 1);
2058
2059 for (i = 0; i <= AvFILLp (av); ++i)
2060 PUSHs (AvARRAY (av)[i]);
2061 }
2062
2063 PUTBACK;
2064 }
2065}
2066
2067static void
2068coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2069{
2070 if (!coro->on_destroy)
2071 coro->on_destroy = newAV ();
2072
2073 av_push (coro->on_destroy, cb);
2074}
2075
2076static void
2077slf_destroy_join (pTHX_ struct CoroSLF *frame)
2078{
2079 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2080}
2081
2082static int
2083slf_check_join (pTHX_ struct CoroSLF *frame)
2084{
2085 struct coro *coro = (struct coro *)frame->data;
2086
2087 if (!coro->status)
2088 return 1;
2089
2090 frame->destroy = 0;
2091
2092 coro_push_av (aTHX_ coro->status, GIMME_V);
2093
2094 SvREFCNT_dec ((SV *)coro->hv);
2095
2096 return 0;
2097}
2098
2099static void
2100slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2101{
2102 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2103
2104 if (items > 1)
2105 croak ("join called with too many arguments");
2106
2107 if (coro->status)
2108 frame->prepare = prepare_nop;
2109 else
2110 {
2111 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2112 frame->prepare = prepare_schedule;
2113 }
2114
2115 frame->check = slf_check_join;
2116 frame->destroy = slf_destroy_join;
2117 frame->data = (void *)coro;
2118 SvREFCNT_inc (coro->hv);
2119}
2120
2121static void
1882coro_call_on_destroy (pTHX_ struct coro *coro) 2122coro_call_on_destroy (pTHX_ struct coro *coro)
1883{ 2123{
1884 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2124 AV *od = coro->on_destroy;
1885 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1886 2125
1887 if (on_destroyp) 2126 if (!od)
1888 { 2127 return;
1889 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1890 2128
2129 coro->on_destroy = 0;
2130 sv_2mortal ((SV *)od);
2131
1891 while (AvFILLp (on_destroy) >= 0) 2132 while (AvFILLp (od) >= 0)
2133 {
2134 SV *cb = sv_2mortal (av_pop (od));
2135
2136 /* coro hv's (and only hv's at the moment) are supported as well */
2137 if (SvSTATEhv_p (aTHX_ cb))
2138 api_ready (aTHX_ cb);
2139 else
1892 { 2140 {
1893 dSP; /* don't disturb outer sp */ 2141 dSP; /* don't disturb outer sp */
1894 SV *cb = av_pop (on_destroy);
1895
1896 PUSHMARK (SP); 2142 PUSHMARK (SP);
1897 2143
1898 if (statusp) 2144 if (coro->status)
1899 { 2145 {
1900 int i; 2146 PUTBACK;
1901 AV *status = (AV *)SvRV (*statusp); 2147 coro_push_av (aTHX_ coro->status, G_ARRAY);
1902 EXTEND (SP, AvFILLp (status) + 1); 2148 SPAGAIN;
1903
1904 for (i = 0; i <= AvFILLp (status); ++i)
1905 PUSHs (AvARRAY (status)[i]);
1906 } 2149 }
1907 2150
1908 PUTBACK; 2151 PUTBACK;
1909 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2152 call_sv (cb, G_VOID | G_DISCARD);
1910 } 2153 }
1911 } 2154 }
1912} 2155}
1913 2156
1914static void 2157static void
1915slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2158coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1916{ 2159{
2160 AV *av;
2161
2162 if (coro->status)
2163 {
2164 av = coro->status;
2165 av_clear (av);
2166 }
2167 else
2168 av = coro->status = newAV ();
2169
2170 /* items are actually not so common, so optimise for this case */
2171 if (items)
2172 {
1917 int i; 2173 int i;
1918 HV *hv = (HV *)SvRV (coro_current);
1919 AV *av = newAV ();
1920 2174
1921 av_extend (av, items - 1); 2175 av_extend (av, items - 1);
2176
1922 for (i = 0; i < items; ++i) 2177 for (i = 0; i < items; ++i)
1923 av_push (av, SvREFCNT_inc_NN (arg [i])); 2178 av_push (av, SvREFCNT_inc_NN (arg [i]));
2179 }
2180}
1924 2181
1925 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2182static void
1926 2183slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2184{
1927 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2185 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1928 api_ready (aTHX_ sv_manager); 2186 api_ready (aTHX_ sv_manager);
1929 2187
1930 frame->prepare = prepare_schedule; 2188 frame->prepare = prepare_schedule;
1931 frame->check = slf_check_repeat; 2189 frame->check = slf_check_repeat;
1932 2190
1933 /* as a minor optimisation, we could unwind all stacks here */ 2191 /* as a minor optimisation, we could unwind all stacks here */
1934 /* but that puts extra pressure on pp_slf, and is not worth much */ 2192 /* but that puts extra pressure on pp_slf, and is not worth much */
1935 /*coro_unwind_stacks (aTHX);*/ 2193 /*coro_unwind_stacks (aTHX);*/
2194}
2195
2196static void
2197slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2198{
2199 HV *coro_hv = (HV *)SvRV (coro_current);
2200
2201 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2202 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2203}
2204
2205static void
2206slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2207{
2208 HV *coro_hv;
2209 struct coro *coro;
2210
2211 if (items <= 0)
2212 croak ("Coro::cancel called without coro object,");
2213
2214 coro = SvSTATE (arg [0]);
2215 coro_hv = coro->hv;
2216
2217 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2218
2219 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2220 {
2221 /* coro currently busy cancelling something, so just notify it */
2222 coro->slf_frame.data = (void *)coro;
2223
2224 frame->prepare = prepare_nop;
2225 frame->check = slf_check_nop;
2226 }
2227 else if (coro_hv == (HV *)SvRV (coro_current))
2228 {
2229 /* cancelling the current coro is allowed, and equals terminate */
2230 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2231 }
2232 else
2233 {
2234 struct coro *self = SvSTATE_current;
2235
2236 /* otherwise we cancel directly, purely for speed reasons
2237 * unfortunately, this requires some magic trickery, as
2238 * somebody else could cancel us, so we have to fight the cancellation.
2239 * this is ugly, and hopefully fully worth the extra speed.
2240 * besides, I can't get the slow-but-safe version working...
2241 */
2242 slf_frame.data = 0;
2243 self->flags |= CF_NOCANCEL;
2244 coro_state_destroy (aTHX_ coro);
2245 self->flags &= ~CF_NOCANCEL;
2246
2247 if (slf_frame.data)
2248 {
2249 /* while we were busy we have been cancelled, so terminate */
2250 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2251 }
2252 else
2253 {
2254 frame->prepare = prepare_nop;
2255 frame->check = slf_check_nop;
2256 }
2257 }
2258}
2259
2260static int
2261slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2262{
2263 frame->prepare = 0;
2264 coro_unwind_stacks (aTHX);
2265
2266 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2267
2268 return 1;
2269}
2270
2271static int
2272safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2273{
2274 if (coro->cctx)
2275 croak ("coro inside C callback, unable to cancel at this time, caught");
2276
2277 if (coro->flags & CF_NEW)
2278 {
2279 coro_set_status (aTHX_ coro, arg, items);
2280 coro_state_destroy (aTHX_ coro);
2281 }
2282 else
2283 {
2284 if (!coro->slf_frame.prepare)
2285 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2286
2287 slf_destroy (aTHX_ coro);
2288
2289 coro_set_status (aTHX_ coro, arg, items);
2290 coro->slf_frame.prepare = prepare_nop;
2291 coro->slf_frame.check = slf_check_safe_cancel;
2292
2293 api_ready (aTHX_ (SV *)coro->hv);
2294 }
2295
2296 return 1;
1936} 2297}
1937 2298
1938/*****************************************************************************/ 2299/*****************************************************************************/
1939/* async pool handler */ 2300/* async pool handler */
1940 2301
… …
1971slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2332slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1972{ 2333{
1973 HV *hv = (HV *)SvRV (coro_current); 2334 HV *hv = (HV *)SvRV (coro_current);
1974 struct coro *coro = SvSTATE_hv ((SV *)hv); 2335 struct coro *coro = SvSTATE_hv ((SV *)hv);
1975 2336
1976 if (expect_true (coro->saved_deffh)) 2337 if (ecb_expect_true (coro->saved_deffh))
1977 { 2338 {
1978 /* subsequent iteration */ 2339 /* subsequent iteration */
1979 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2340 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1980 coro->saved_deffh = 0; 2341 coro->saved_deffh = 0;
1981 2342
1982 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2343 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1983 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2344 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1984 { 2345 {
1985 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2346 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1986 coro->invoke_av = newAV (); 2347 return;
1987
1988 frame->prepare = prepare_nop;
1989 } 2348 }
1990 else 2349 else
1991 { 2350 {
1992 av_clear (GvAV (PL_defgv)); 2351 av_clear (GvAV (PL_defgv));
1993 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2352 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2043 2402
2044static int 2403static int
2045slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2404slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2046{ 2405{
2047 SV *data = (SV *)frame->data; 2406 SV *data = (SV *)frame->data;
2048 2407
2049 if (CORO_THROW) 2408 if (CORO_THROW)
2050 return 0; 2409 return 0;
2051 2410
2052 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2411 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2053 return 1; 2412 return 1;
… …
2089 cb = sv_2mortal (coro->rouse_cb); 2448 cb = sv_2mortal (coro->rouse_cb);
2090 coro->rouse_cb = 0; 2449 coro->rouse_cb = 0;
2091 } 2450 }
2092 2451
2093 if (!SvROK (cb) 2452 if (!SvROK (cb)
2094 || SvTYPE (SvRV (cb)) != SVt_PVCV 2453 || SvTYPE (SvRV (cb)) != SVt_PVCV
2095 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2454 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2096 croak ("Coro::rouse_wait called with illegal callback argument,"); 2455 croak ("Coro::rouse_wait called with illegal callback argument,");
2097 2456
2098 { 2457 {
2099 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2458 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2216static void 2575static void
2217slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2576slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2218{ 2577{
2219 frame->prepare = prepare_cede_notself; 2578 frame->prepare = prepare_cede_notself;
2220 frame->check = slf_check_nop; 2579 frame->check = slf_check_nop;
2580}
2581
2582/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2583static void
2584slf_destroy (pTHX_ struct coro *coro)
2585{
2586 /* this callback is reserved for slf functions needing to do cleanup */
2587 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2588 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2589
2590 /*
2591 * The on_destroy above most likely is from an SLF call.
2592 * Since by definition the SLF call will not finish when we destroy
2593 * the coro, we will have to force-finish it here, otherwise
2594 * cleanup functions cannot call SLF functions.
2595 */
2596 coro->slf_frame.prepare = 0;
2221} 2597}
2222 2598
2223/* 2599/*
2224 * these not obviously related functions are all rolled into one 2600 * these not obviously related functions are all rolled into one
2225 * function to increase chances that they all will call transfer with the same 2601 * function to increase chances that they all will call transfer with the same
… …
2232 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2608 I32 checkmark; /* mark SP to see how many elements check has pushed */
2233 2609
2234 /* set up the slf frame, unless it has already been set-up */ 2610 /* set up the slf frame, unless it has already been set-up */
2235 /* the latter happens when a new coro has been started */ 2611 /* the latter happens when a new coro has been started */
2236 /* or when a new cctx was attached to an existing coroutine */ 2612 /* or when a new cctx was attached to an existing coroutine */
2237 if (expect_true (!slf_frame.prepare)) 2613 if (ecb_expect_true (!slf_frame.prepare))
2238 { 2614 {
2239 /* first iteration */ 2615 /* first iteration */
2240 dSP; 2616 dSP;
2241 SV **arg = PL_stack_base + TOPMARK + 1; 2617 SV **arg = PL_stack_base + TOPMARK + 1;
2242 int items = SP - arg; /* args without function object */ 2618 int items = SP - arg; /* args without function object */
… …
2283 while (slf_frame.check (aTHX_ &slf_frame)); 2659 while (slf_frame.check (aTHX_ &slf_frame));
2284 2660
2285 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2661 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2286 2662
2287 /* exception handling */ 2663 /* exception handling */
2288 if (expect_false (CORO_THROW)) 2664 if (ecb_expect_false (CORO_THROW))
2289 { 2665 {
2290 SV *exception = sv_2mortal (CORO_THROW); 2666 SV *exception = sv_2mortal (CORO_THROW);
2291 2667
2292 CORO_THROW = 0; 2668 CORO_THROW = 0;
2293 sv_setsv (ERRSV, exception); 2669 sv_setsv (ERRSV, exception);
2294 croak (0); 2670 croak (0);
2295 } 2671 }
2296 2672
2297 /* return value handling - mostly like entersub */ 2673 /* return value handling - mostly like entersub */
2298 /* make sure we put something on the stack in scalar context */ 2674 /* make sure we put something on the stack in scalar context */
2299 if (GIMME_V == G_SCALAR) 2675 if (GIMME_V == G_SCALAR
2676 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2300 { 2677 {
2301 dSP; 2678 dSP;
2302 SV **bot = PL_stack_base + checkmark; 2679 SV **bot = PL_stack_base + checkmark;
2303 2680
2304 if (sp == bot) /* too few, push undef */ 2681 if (sp == bot) /* too few, push undef */
2305 bot [1] = &PL_sv_undef; 2682 bot [1] = &PL_sv_undef;
2306 else if (sp != bot + 1) /* too many, take last one */ 2683 else /* too many, take last one */
2307 bot [1] = *sp; 2684 bot [1] = *sp;
2308 2685
2309 SP = bot + 1; 2686 SP = bot + 1;
2310 2687
2311 PUTBACK; 2688 PUTBACK;
… …
2344 if (PL_op->op_flags & OPf_STACKED) 2721 if (PL_op->op_flags & OPf_STACKED)
2345 { 2722 {
2346 if (items > slf_arga) 2723 if (items > slf_arga)
2347 { 2724 {
2348 slf_arga = items; 2725 slf_arga = items;
2349 free (slf_argv); 2726 Safefree (slf_argv);
2350 slf_argv = malloc (slf_arga * sizeof (SV *)); 2727 New (0, slf_argv, slf_arga, SV *);
2351 } 2728 }
2352 2729
2353 slf_argc = items; 2730 slf_argc = items;
2354 2731
2355 for (i = 0; i < items; ++i) 2732 for (i = 0; i < items; ++i)
… …
2418{ 2795{
2419 PerlIOBuf base; 2796 PerlIOBuf base;
2420 NV next, every; 2797 NV next, every;
2421} PerlIOCede; 2798} PerlIOCede;
2422 2799
2423static IV 2800static IV ecb_cold
2424PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2801PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2425{ 2802{
2426 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2803 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2427 2804
2428 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2805 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2429 self->next = nvtime () + self->every; 2806 self->next = nvtime () + self->every;
2430 2807
2431 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2808 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2432} 2809}
2433 2810
2434static SV * 2811static SV * ecb_cold
2435PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2812PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2436{ 2813{
2437 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2814 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2438 2815
2439 return newSVnv (self->every); 2816 return newSVnv (self->every);
… …
2551 SvREFCNT_dec (cb); 2928 SvREFCNT_dec (cb);
2552 } 2929 }
2553} 2930}
2554 2931
2555static void 2932static void
2556coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2933coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2557{ 2934{
2558 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2935 /* call $sem->adjust (0) to possibly wake up some other waiters */
2559 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2936 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2560} 2937}
2561 2938
2562static int 2939static int
2563slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2940slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2564{ 2941{
2565 AV *av = (AV *)frame->data; 2942 AV *av = (AV *)frame->data;
2566 SV *count_sv = AvARRAY (av)[0]; 2943 SV *count_sv = AvARRAY (av)[0];
2944 SV *coro_hv = SvRV (coro_current);
2567 2945
2568 /* if we are about to throw, don't actually acquire the lock, just throw */ 2946 /* if we are about to throw, don't actually acquire the lock, just throw */
2569 if (CORO_THROW) 2947 if (CORO_THROW)
2570 return 0; 2948 return 0;
2571 else if (SvIVX (count_sv) > 0) 2949 else if (SvIVX (count_sv) > 0)
2572 { 2950 {
2573 SvSTATE_current->on_destroy = 0; 2951 frame->destroy = 0;
2574 2952
2575 if (acquire) 2953 if (acquire)
2576 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2954 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2577 else 2955 else
2578 coro_semaphore_adjust (aTHX_ av, 0); 2956 coro_semaphore_adjust (aTHX_ av, 0);
… …
2583 { 2961 {
2584 int i; 2962 int i;
2585 /* if we were woken up but can't down, we look through the whole */ 2963 /* if we were woken up but can't down, we look through the whole */
2586 /* waiters list and only add us if we aren't in there already */ 2964 /* waiters list and only add us if we aren't in there already */
2587 /* this avoids some degenerate memory usage cases */ 2965 /* this avoids some degenerate memory usage cases */
2588 2966 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2589 for (i = 1; i <= AvFILLp (av); ++i)
2590 if (AvARRAY (av)[i] == SvRV (coro_current)) 2967 if (AvARRAY (av)[i] == coro_hv)
2591 return 1; 2968 return 1;
2592 2969
2593 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2970 av_push (av, SvREFCNT_inc (coro_hv));
2594 return 1; 2971 return 1;
2595 } 2972 }
2596} 2973}
2597 2974
2598static int 2975static int
… …
2621 { 2998 {
2622 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2999 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2623 3000
2624 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3001 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2625 frame->prepare = prepare_schedule; 3002 frame->prepare = prepare_schedule;
2626
2627 /* to avoid race conditions when a woken-up coro gets terminated */ 3003 /* to avoid race conditions when a woken-up coro gets terminated */
2628 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3004 /* we arrange for a temporary on_destroy that calls adjust (0) */
2629 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3005 frame->destroy = coro_semaphore_destroy;
2630 } 3006 }
2631} 3007}
2632 3008
2633static void 3009static void
2634slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3010slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2716 { 3092 {
2717 SV *cb_cv = s_get_cv_croak (arg [1]); 3093 SV *cb_cv = s_get_cv_croak (arg [1]);
2718 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3094 av_push (av, SvREFCNT_inc_NN (cb_cv));
2719 3095
2720 if (SvIVX (AvARRAY (av)[0])) 3096 if (SvIVX (AvARRAY (av)[0]))
2721 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3097 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2722 3098
2723 frame->prepare = prepare_nop; 3099 frame->prepare = prepare_nop;
2724 frame->check = slf_check_nop; 3100 frame->check = slf_check_nop;
2725 } 3101 }
2726 else if (SvIVX (AvARRAY (av)[0])) 3102 else if (SvIVX (AvARRAY (av)[0]))
… …
2803 /* it quickly returns */ 3179 /* it quickly returns */
2804 if (CORO_THROW) 3180 if (CORO_THROW)
2805 return 0; 3181 return 0;
2806 3182
2807 /* one element that is an RV? repeat! */ 3183 /* one element that is an RV? repeat! */
2808 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3184 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2809 return 1; 3185 return 1;
2810 3186
2811 /* restore status */ 3187 /* restore status */
2812 { 3188 {
2813 SV *data_sv = av_pop (state); 3189 SV *data_sv = av_pop (state);
… …
2852 dSP; 3228 dSP;
2853 3229
2854 static SV *prio_cv; 3230 static SV *prio_cv;
2855 static SV *prio_sv; 3231 static SV *prio_sv;
2856 3232
2857 if (expect_false (!prio_cv)) 3233 if (ecb_expect_false (!prio_cv))
2858 { 3234 {
2859 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3235 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2860 prio_sv = newSViv (0); 3236 prio_sv = newSViv (0);
2861 } 3237 }
2862 3238
… …
2888 /* now call the AIO function - we assume our request is uncancelable */ 3264 /* now call the AIO function - we assume our request is uncancelable */
2889 PUTBACK; 3265 PUTBACK;
2890 call_sv ((SV *)req, G_VOID | G_DISCARD); 3266 call_sv ((SV *)req, G_VOID | G_DISCARD);
2891 } 3267 }
2892 3268
2893 /* now that the requets is going, we loop toll we have a result */ 3269 /* now that the request is going, we loop till we have a result */
2894 frame->data = (void *)state; 3270 frame->data = (void *)state;
2895 frame->prepare = prepare_schedule; 3271 frame->prepare = prepare_schedule;
2896 frame->check = slf_check_aio_req; 3272 frame->check = slf_check_aio_req;
2897} 3273}
2898 3274
… …
2908 3284
2909/*****************************************************************************/ 3285/*****************************************************************************/
2910 3286
2911#if CORO_CLONE 3287#if CORO_CLONE
2912# include "clone.c" 3288# include "clone.c"
3289#endif
3290
3291/*****************************************************************************/
3292
3293static SV *
3294coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3295{
3296 SV *coro_sv;
3297 struct coro *coro;
3298 MAGIC *mg;
3299 HV *hv;
3300 SV *cb;
3301 int i;
3302
3303 if (argc > 0)
3304 {
3305 cb = s_get_cv_croak (argv [0]);
3306
3307 if (!is_coro)
3308 {
3309 if (CvISXSUB (cb))
3310 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3311
3312 if (!CvROOT (cb))
3313 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3314 }
3315 }
3316
3317 Newz (0, coro, 1, struct coro);
3318 coro->args = newAV ();
3319 coro->flags = CF_NEW;
3320
3321 if (coro_first) coro_first->prev = coro;
3322 coro->next = coro_first;
3323 coro_first = coro;
3324
3325 coro->hv = hv = newHV ();
3326 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3327 mg->mg_flags |= MGf_DUP;
3328 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3329
3330 if (argc > 0)
3331 {
3332 av_extend (coro->args, argc + is_coro - 1);
3333
3334 if (is_coro)
3335 {
3336 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3337 cb = (SV *)cv_coro_run;
3338 }
3339
3340 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3341
3342 for (i = 1; i < argc; i++)
3343 av_push (coro->args, newSVsv (argv [i]));
3344 }
3345
3346 return coro_sv;
3347}
3348
3349#ifndef __cplusplus
3350ecb_cold XS(boot_Coro__State);
3351#endif
3352
3353#if CORO_JIT
3354
3355static void ecb_noinline ecb_cold
3356pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3357{
3358 dSP;
3359 AV *av = newAV ();
3360
3361 av_store (av, 3, newSVuv (d));
3362 av_store (av, 2, newSVuv (c));
3363 av_store (av, 1, newSVuv (b));
3364 av_store (av, 0, newSVuv (a));
3365
3366 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3367
3368 PUTBACK;
3369}
3370
3371static void ecb_noinline ecb_cold
3372jit_init (pTHX)
3373{
3374 dSP;
3375 SV *load, *save;
3376 char *map_base;
3377 char *load_ptr, *save_ptr;
3378 STRLEN load_len, save_len, map_len;
3379 int count;
3380
3381 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3382
3383 PUSHMARK (SP);
3384 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3385 #include "state.h"
3386 count = call_pv ("Coro::State::_jit", G_ARRAY);
3387 SPAGAIN;
3388
3389 save = POPs; save_ptr = SvPVbyte (save, save_len);
3390 load = POPs; load_ptr = SvPVbyte (load, load_len);
3391
3392 map_len = load_len + save_len + 16;
3393
3394 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3395
3396 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3397
3398 load_perl_slots = (load_save_perl_slots_type)map_base;
3399 memcpy (map_base, load_ptr, load_len);
3400
3401 map_base += (load_len + 15) & ~15;
3402
3403 save_perl_slots = (load_save_perl_slots_type)map_base;
3404 memcpy (map_base, save_ptr, save_len);
3405
3406 /* we are good citizens and try to make the page read-only, so the evil evil */
3407 /* hackers might have it a bit more difficult */
3408 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3409
3410 PUTBACK;
3411 eval_pv ("undef &Coro::State::_jit", 1);
3412}
3413
2913#endif 3414#endif
2914 3415
2915MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3416MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2916 3417
2917PROTOTYPES: DISABLE 3418PROTOTYPES: DISABLE
… …
2921#ifdef USE_ITHREADS 3422#ifdef USE_ITHREADS
2922# if CORO_PTHREAD 3423# if CORO_PTHREAD
2923 coro_thx = PERL_GET_CONTEXT; 3424 coro_thx = PERL_GET_CONTEXT;
2924# endif 3425# endif
2925#endif 3426#endif
2926 BOOT_PAGESIZE; 3427 /* perl defines these to check for existance first, but why it doesn't */
3428 /* just create them one at init time is not clear to me, except for */
3429 /* programs trying to delete them, but... */
3430 /* anyway, we declare this as invalid and make sure they are initialised here */
3431 DEFSV;
3432 ERRSV;
2927 3433
2928 cctx_current = cctx_new_empty (); 3434 cctx_current = cctx_new_empty ();
2929 3435
2930 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3436 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2931 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3437 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
2971 coroapi.prepare_nop = prepare_nop; 3477 coroapi.prepare_nop = prepare_nop;
2972 coroapi.prepare_schedule = prepare_schedule; 3478 coroapi.prepare_schedule = prepare_schedule;
2973 coroapi.prepare_cede = prepare_cede; 3479 coroapi.prepare_cede = prepare_cede;
2974 coroapi.prepare_cede_notself = prepare_cede_notself; 3480 coroapi.prepare_cede_notself = prepare_cede_notself;
2975 3481
2976 { 3482 time_init (aTHX);
2977 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2978
2979 if (!svp) croak ("Time::HiRes is required");
2980 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2981
2982 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2983
2984 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
2985 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2986 }
2987 3483
2988 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3484 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3485#if CORO_JIT
3486 PUTBACK;
3487 jit_init (aTHX);
3488 SPAGAIN;
3489#endif
2989} 3490}
2990 3491
2991SV * 3492SV *
2992new (char *klass, ...) 3493new (SV *klass, ...)
2993 ALIAS: 3494 ALIAS:
2994 Coro::new = 1 3495 Coro::new = 1
2995 CODE: 3496 CODE:
2996{ 3497 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2997 struct coro *coro; 3498 OUTPUT:
2998 MAGIC *mg;
2999 HV *hv;
3000 SV *cb;
3001 int i;
3002
3003 if (items > 1)
3004 {
3005 cb = s_get_cv_croak (ST (1));
3006
3007 if (!ix)
3008 {
3009 if (CvISXSUB (cb))
3010 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3011
3012 if (!CvROOT (cb))
3013 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3014 }
3015 }
3016
3017 Newz (0, coro, 1, struct coro);
3018 coro->args = newAV ();
3019 coro->flags = CF_NEW;
3020
3021 if (coro_first) coro_first->prev = coro;
3022 coro->next = coro_first;
3023 coro_first = coro;
3024
3025 coro->hv = hv = newHV ();
3026 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3027 mg->mg_flags |= MGf_DUP;
3028 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3029
3030 if (items > 1)
3031 {
3032 av_extend (coro->args, items - 1 + ix - 1);
3033
3034 if (ix)
3035 {
3036 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3037 cb = (SV *)cv_coro_run;
3038 }
3039
3040 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3041
3042 for (i = 2; i < items; i++)
3043 av_push (coro->args, newSVsv (ST (i)));
3044 }
3045}
3046 OUTPUT:
3047 RETVAL 3499 RETVAL
3048 3500
3049void 3501void
3050transfer (...) 3502transfer (...)
3051 PROTOTYPE: $$ 3503 PROTOTYPE: $$
3052 CODE: 3504 CODE:
3053 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3505 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3054
3055bool
3056_destroy (SV *coro_sv)
3057 CODE:
3058 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3059 OUTPUT:
3060 RETVAL
3061
3062void
3063_exit (int code)
3064 PROTOTYPE: $
3065 CODE:
3066 _exit (code);
3067 3506
3068SV * 3507SV *
3069clone (Coro::State coro) 3508clone (Coro::State coro)
3070 CODE: 3509 CODE:
3071{ 3510{
… …
3126void 3565void
3127list () 3566list ()
3128 PROTOTYPE: 3567 PROTOTYPE:
3129 PPCODE: 3568 PPCODE:
3130{ 3569{
3131 struct coro *coro; 3570 struct coro *coro;
3132 for (coro = coro_first; coro; coro = coro->next) 3571 for (coro = coro_first; coro; coro = coro->next)
3133 if (coro->hv) 3572 if (coro->hv)
3134 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3573 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3135} 3574}
3136 3575
… …
3141 CODE: 3580 CODE:
3142{ 3581{
3143 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3582 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3144 { 3583 {
3145 struct coro *current = SvSTATE_current; 3584 struct coro *current = SvSTATE_current;
3585 struct CoroSLF slf_save;
3146 3586
3147 if (current != coro) 3587 if (current != coro)
3148 { 3588 {
3149 PUTBACK; 3589 PUTBACK;
3150 save_perl (aTHX_ current); 3590 save_perl (aTHX_ current);
3151 load_perl (aTHX_ coro); 3591 load_perl (aTHX_ coro);
3592 /* the coro is most likely in an active SLF call.
3593 * while not strictly required (the code we execute is
3594 * not allowed to call any SLF functions), it's cleaner
3595 * to reinitialise the slf_frame and restore it later.
3596 * This might one day allow us to actually do SLF calls
3597 * from code executed here.
3598 */
3599 slf_save = slf_frame;
3600 slf_frame.prepare = 0;
3152 SPAGAIN; 3601 SPAGAIN;
3153 } 3602 }
3154 3603
3155 PUSHSTACK; 3604 PUSHSTACK;
3156 3605
… …
3166 SPAGAIN; 3615 SPAGAIN;
3167 3616
3168 if (current != coro) 3617 if (current != coro)
3169 { 3618 {
3170 PUTBACK; 3619 PUTBACK;
3620 slf_frame = slf_save;
3171 save_perl (aTHX_ coro); 3621 save_perl (aTHX_ coro);
3172 load_perl (aTHX_ current); 3622 load_perl (aTHX_ current);
3173 SPAGAIN; 3623 SPAGAIN;
3174 } 3624 }
3175 } 3625 }
… …
3180 PROTOTYPE: $ 3630 PROTOTYPE: $
3181 ALIAS: 3631 ALIAS:
3182 is_ready = CF_READY 3632 is_ready = CF_READY
3183 is_running = CF_RUNNING 3633 is_running = CF_RUNNING
3184 is_new = CF_NEW 3634 is_new = CF_NEW
3185 is_destroyed = CF_DESTROYED 3635 is_destroyed = CF_ZOMBIE
3636 is_zombie = CF_ZOMBIE
3186 is_suspended = CF_SUSPENDED 3637 is_suspended = CF_SUSPENDED
3187 CODE: 3638 CODE:
3188 RETVAL = boolSV (coro->flags & ix); 3639 RETVAL = boolSV (coro->flags & ix);
3189 OUTPUT: 3640 OUTPUT:
3190 RETVAL 3641 RETVAL
3191 3642
3192void 3643void
3193throw (Coro::State self, SV *throw = &PL_sv_undef) 3644throw (SV *self, SV *exception = &PL_sv_undef)
3194 PROTOTYPE: $;$ 3645 PROTOTYPE: $;$
3195 CODE: 3646 CODE:
3196{ 3647{
3648 struct coro *coro = SvSTATE (self);
3197 struct coro *current = SvSTATE_current; 3649 struct coro *current = SvSTATE_current;
3198 SV **throwp = self == current ? &CORO_THROW : &self->except; 3650 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3199 SvREFCNT_dec (*throwp); 3651 SvREFCNT_dec (*exceptionp);
3200 SvGETMAGIC (throw); 3652 SvGETMAGIC (exception);
3201 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3653 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3654
3655 api_ready (aTHX_ self);
3202} 3656}
3203 3657
3204void 3658void
3205api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3659api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3206 PROTOTYPE: $;$ 3660 PROTOTYPE: $;$
… …
3261 3715
3262void 3716void
3263cancel (Coro::State self) 3717cancel (Coro::State self)
3264 CODE: 3718 CODE:
3265 coro_state_destroy (aTHX_ self); 3719 coro_state_destroy (aTHX_ self);
3266 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3267
3268 3720
3269SV * 3721SV *
3270enable_times (int enabled = enable_times) 3722enable_times (int enabled = enable_times)
3271 CODE: 3723 CODE:
3272{ 3724{
… …
3285 3737
3286void 3738void
3287times (Coro::State self) 3739times (Coro::State self)
3288 PPCODE: 3740 PPCODE:
3289{ 3741{
3290 struct coro *current = SvSTATE (coro_current); 3742 struct coro *current = SvSTATE (coro_current);
3291 3743
3292 if (expect_false (current == self)) 3744 if (ecb_expect_false (current == self))
3293 { 3745 {
3294 coro_times_update (); 3746 coro_times_update ();
3295 coro_times_add (SvSTATE (coro_current)); 3747 coro_times_add (SvSTATE (coro_current));
3296 } 3748 }
3297 3749
3298 EXTEND (SP, 2); 3750 EXTEND (SP, 2);
3299 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3751 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3300 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3752 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3301 3753
3302 if (expect_false (current == self)) 3754 if (ecb_expect_false (current == self))
3303 coro_times_sub (SvSTATE (coro_current)); 3755 coro_times_sub (SvSTATE (coro_current));
3304} 3756}
3757
3758void
3759swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3760 CODE:
3761{
3762 struct coro *current = SvSTATE_current;
3763
3764 if (current == coro)
3765 SWAP_SVS (current);
3766
3767 if (!coro->swap_sv)
3768 coro->swap_sv = newAV ();
3769
3770 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3771 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3772
3773 if (current == coro)
3774 SWAP_SVS (current);
3775}
3776
3305 3777
3306MODULE = Coro::State PACKAGE = Coro 3778MODULE = Coro::State PACKAGE = Coro
3307 3779
3308BOOT: 3780BOOT:
3309{ 3781{
3310 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3782 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3311 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3783 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3312 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3784 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3313 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3314 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3785 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3315 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3786 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3316 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3787 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3317 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3788 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3318 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3789 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3319 3790
3320 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3791 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3321 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3792 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3322 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3793 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3323 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3794 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3324 3795
3325 coro_stash = gv_stashpv ("Coro", TRUE); 3796 coro_stash = gv_stashpv ("Coro", TRUE);
3326 3797
3327 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3798 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3328 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3799 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
… …
3347 sv_setiv (sv, (IV)&coroapi); 3818 sv_setiv (sv, (IV)&coroapi);
3348 SvREADONLY_on (sv); 3819 SvREADONLY_on (sv);
3349 } 3820 }
3350} 3821}
3351 3822
3823SV *
3824async (...)
3825 PROTOTYPE: &@
3826 CODE:
3827 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3828 api_ready (aTHX_ RETVAL);
3829 OUTPUT:
3830 RETVAL
3831
3832void
3833_destroy (Coro::State coro)
3834 CODE:
3835 /* used by the manager thread */
3836 coro_state_destroy (aTHX_ coro);
3837
3838void
3839on_destroy (Coro::State coro, SV *cb)
3840 CODE:
3841 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3842
3843void
3844join (...)
3845 CODE:
3846 CORO_EXECUTE_SLF_XS (slf_init_join);
3847
3352void 3848void
3353terminate (...) 3849terminate (...)
3354 CODE: 3850 CODE:
3355 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3851 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3852
3853void
3854cancel (...)
3855 CODE:
3856 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3857
3858int
3859safe_cancel (Coro::State self, ...)
3860 C_ARGS: aTHX_ self, &ST (1), items - 1
3356 3861
3357void 3862void
3358schedule (...) 3863schedule (...)
3359 CODE: 3864 CODE:
3360 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3865 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3473 for (i = 1; i < items; ++i) 3978 for (i = 1; i < items; ++i)
3474 av_push (av, SvREFCNT_inc_NN (ST (i))); 3979 av_push (av, SvREFCNT_inc_NN (ST (i)));
3475 3980
3476 if ((SV *)hv == &PL_sv_undef) 3981 if ((SV *)hv == &PL_sv_undef)
3477 { 3982 {
3478 PUSHMARK (SP); 3983 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3479 EXTEND (SP, 2);
3480 PUSHs (sv_Coro);
3481 PUSHs ((SV *)cv_pool_handler);
3482 PUTBACK;
3483 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3484 SPAGAIN;
3485
3486 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3984 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3985 SvREFCNT_dec (sv);
3487 } 3986 }
3488 3987
3489 { 3988 {
3490 struct coro *coro = SvSTATE_hv (hv); 3989 struct coro *coro = SvSTATE_hv (hv);
3491 3990
… …
3523 on_leave = 1 4022 on_leave = 1
3524 PROTOTYPE: & 4023 PROTOTYPE: &
3525 CODE: 4024 CODE:
3526{ 4025{
3527 struct coro *coro = SvSTATE_current; 4026 struct coro *coro = SvSTATE_current;
3528 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4027 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3529 4028
3530 block = s_get_cv_croak (block); 4029 block = s_get_cv_croak (block);
3531 4030
3532 if (!*avp) 4031 if (!*avp)
3533 *avp = newAV (); 4032 *avp = newAV ();
… …
3553 4052
3554SV * 4053SV *
3555new (SV *klass, SV *count = 0) 4054new (SV *klass, SV *count = 0)
3556 CODE: 4055 CODE:
3557{ 4056{
3558 int semcnt = 1; 4057 int semcnt = 1;
3559 4058
3560 if (count) 4059 if (count)
3561 { 4060 {
3562 SvGETMAGIC (count); 4061 SvGETMAGIC (count);
3563 4062
… …
3623 XSRETURN_NO; 4122 XSRETURN_NO;
3624} 4123}
3625 4124
3626void 4125void
3627waiters (SV *self) 4126waiters (SV *self)
3628 PPCODE: 4127 PPCODE:
3629{ 4128{
3630 AV *av = (AV *)SvRV (self); 4129 AV *av = (AV *)SvRV (self);
3631 int wcount = AvFILLp (av) + 1 - 1; 4130 int wcount = AvFILLp (av) + 1 - 1;
3632 4131
3633 if (GIMME_V == G_SCALAR) 4132 if (GIMME_V == G_SCALAR)
… …
3642} 4141}
3643 4142
3644MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4143MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3645 4144
3646void 4145void
3647_may_delete (SV *sem, int count, int extra_refs) 4146_may_delete (SV *sem, int count, unsigned int extra_refs)
3648 PPCODE: 4147 PPCODE:
3649{ 4148{
3650 AV *av = (AV *)SvRV (sem); 4149 AV *av = (AV *)SvRV (sem);
3651 4150
3652 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4151 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3653 && AvFILLp (av) == 0 /* no waiters, just count */ 4152 && AvFILLp (av) == 0 /* no waiters, just count */
3654 && SvIV (AvARRAY (av)[0]) == count) 4153 && SvIV (AvARRAY (av)[0]) == count)
3655 XSRETURN_YES; 4154 XSRETURN_YES;
… …
3676 4175
3677void 4176void
3678broadcast (SV *self) 4177broadcast (SV *self)
3679 CODE: 4178 CODE:
3680{ 4179{
3681 AV *av = (AV *)SvRV (self); 4180 AV *av = (AV *)SvRV (self);
3682 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4181 coro_signal_wake (aTHX_ av, AvFILLp (av));
3683} 4182}
3684 4183
3685void 4184void
3686send (SV *self) 4185send (SV *self)
… …
3694 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4193 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3695} 4194}
3696 4195
3697IV 4196IV
3698awaited (SV *self) 4197awaited (SV *self)
3699 CODE: 4198 CODE:
3700 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4199 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3701 OUTPUT: 4200 OUTPUT:
3702 RETVAL 4201 RETVAL
3703 4202
3704 4203
… …
3709 4208
3710void 4209void
3711_schedule (...) 4210_schedule (...)
3712 CODE: 4211 CODE:
3713{ 4212{
3714 static int incede; 4213 static int incede;
3715 4214
3716 api_cede_notself (aTHX); 4215 api_cede_notself (aTHX);
3717 4216
3718 ++incede; 4217 ++incede;
3719 while (coro_nready >= incede && api_cede (aTHX)) 4218 while (coro_nready >= incede && api_cede (aTHX))
… …
3763 { 4262 {
3764 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4263 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3765 coro_old_pp_sselect = 0; 4264 coro_old_pp_sselect = 0;
3766 } 4265 }
3767 4266
4267MODULE = Coro::State PACKAGE = Coro::Util
3768 4268
4269void
4270_exit (int code)
4271 CODE:
4272 _exit (code);
4273
4274NV
4275time ()
4276 CODE:
4277 RETVAL = nvtime (aTHX);
4278 OUTPUT:
4279 RETVAL
4280
4281NV
4282gettimeofday ()
4283 PPCODE:
4284{
4285 UV tv [2];
4286 u2time (aTHX_ tv);
4287 EXTEND (SP, 2);
4288 PUSHs (sv_2mortal (newSVuv (tv [0])));
4289 PUSHs (sv_2mortal (newSVuv (tv [1])));
4290}
4291

Diff Legend

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