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.365 by root, Mon Jul 20 16:18:30 2009 UTC vs.
Revision 1.429 by root, Fri Dec 7 14:21:09 2012 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1 /* 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
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#if defined(_WIN32)
48# undef HAS_GETTIMEOFDAY
18# undef setjmp 49# undef setjmp
19# undef longjmp 50# undef longjmp
20# undef _exit 51# undef _exit
21# define setjmp _setjmp /* deep magic */ 52# define setjmp _setjmp /* deep magic */
22#else 53#else
23# include <inttypes.h> /* most portable stdint.h */ 54# include <inttypes.h> /* most portable stdint.h */
24#endif 55#endif
25 56
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 */ 57/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 58static int cctx_max_idle = 4;
55 59
56#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 60#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57# undef CORO_STACKGUARD 61# define HAS_SCOPESTACK_NAME 1
58#endif
59
60#ifndef CORO_STACKGUARD
61# define CORO_STACKGUARD 0
62#endif 62#endif
63 63
64/* prefer perl internal functions over our own? */ 64/* prefer perl internal functions over our own? */
65#ifndef CORO_PREFER_PERL_FUNCTIONS 65#ifndef CORO_PREFER_PERL_FUNCTIONS
66# define CORO_PREFER_PERL_FUNCTIONS 0 66# define CORO_PREFER_PERL_FUNCTIONS 0
… …
76# define STACKLEVEL ((void *)&stacklevel) 76# define STACKLEVEL ((void *)&stacklevel)
77#endif 77#endif
78 78
79#define IN_DESTRUCT PL_dirty 79#define IN_DESTRUCT PL_dirty
80 80
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" 81#include "CoroAPI.h"
97#define GCoroAPI (&coroapi) /* very sneaky */ 82#define GCoroAPI (&coroapi) /* very sneaky */
98 83
99#ifdef USE_ITHREADS 84#ifdef USE_ITHREADS
100# if CORO_PTHREAD 85# if CORO_PTHREAD
… …
116static void (*u2time)(pTHX_ UV ret[2]); 101static void (*u2time)(pTHX_ UV ret[2]);
117 102
118/* we hijack an hopefully unused CV flag for our purposes */ 103/* we hijack an hopefully unused CV flag for our purposes */
119#define CVf_SLF 0x4000 104#define CVf_SLF 0x4000
120static OP *pp_slf (pTHX); 105static OP *pp_slf (pTHX);
106static void slf_destroy (pTHX_ struct coro *coro);
121 107
122static U32 cctx_gen; 108static U32 cctx_gen;
123static size_t cctx_stacksize = CORO_STACKSIZE; 109static size_t cctx_stacksize = CORO_STACKSIZE;
124static struct CoroAPI coroapi; 110static struct CoroAPI coroapi;
125static AV *main_mainstack; /* used to differentiate between $main and others */ 111static AV *main_mainstack; /* used to differentiate between $main and others */
… …
142static SV *sv_pool_size; 128static SV *sv_pool_size;
143static SV *sv_async_pool_idle; /* description string */ 129static SV *sv_async_pool_idle; /* description string */
144static AV *av_async_pool; /* idle pool */ 130static AV *av_async_pool; /* idle pool */
145static SV *sv_Coro; /* class string */ 131static SV *sv_Coro; /* class string */
146static CV *cv_pool_handler; 132static CV *cv_pool_handler;
147static CV *cv_coro_state_new;
148 133
149/* Coro::AnyEvent */ 134/* Coro::AnyEvent */
150static SV *sv_activity; 135static SV *sv_activity;
151 136
152/* enable processtime/realtime profiling */ 137/* enable processtime/realtime profiling */
… …
156static char times_valid; 141static char times_valid;
157 142
158static struct coro_cctx *cctx_first; 143static struct coro_cctx *cctx_first;
159static int cctx_count, cctx_idle; 144static int cctx_count, cctx_idle;
160 145
161enum { 146enum
147{
162 CC_MAPPED = 0x01, 148 CC_MAPPED = 0x01,
163 CC_NOREUSE = 0x02, /* throw this away after tracing */ 149 CC_NOREUSE = 0x02, /* throw this away after tracing */
164 CC_TRACE = 0x04, 150 CC_TRACE = 0x04,
165 CC_TRACE_SUB = 0x08, /* trace sub calls */ 151 CC_TRACE_SUB = 0x08, /* trace sub calls */
166 CC_TRACE_LINE = 0x10, /* trace each statement */ 152 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
171typedef struct coro_cctx 157typedef struct coro_cctx
172{ 158{
173 struct coro_cctx *next; 159 struct coro_cctx *next;
174 160
175 /* the stack */ 161 /* the stack */
176 void *sptr; 162 struct coro_stack stack;
177 size_t ssize;
178 163
179 /* cpu state */ 164 /* cpu state */
180 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 165 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
166#ifndef NDEBUG
181 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 167 JMPENV *idle_te; /* same as idle_sp, but for top_env */
168#endif
182 JMPENV *top_env; 169 JMPENV *top_env;
183 coro_context cctx; 170 coro_context cctx;
184 171
185 U32 gen; 172 U32 gen;
186#if CORO_USE_VALGRIND 173#if CORO_USE_VALGRIND
187 int valgrind_id; 174 int valgrind_id;
188#endif 175#endif
189 unsigned char flags; 176 unsigned char flags;
190} coro_cctx; 177} coro_cctx;
191 178
192coro_cctx *cctx_current; /* the currently running cctx */ 179static coro_cctx *cctx_current; /* the currently running cctx */
193 180
194/*****************************************************************************/ 181/*****************************************************************************/
195 182
183static MGVTBL coro_state_vtbl;
184
196enum { 185enum
186{
197 CF_RUNNING = 0x0001, /* coroutine is running */ 187 CF_RUNNING = 0x0001, /* coroutine is running */
198 CF_READY = 0x0002, /* coroutine is ready */ 188 CF_READY = 0x0002, /* coroutine is ready */
199 CF_NEW = 0x0004, /* has never been switched to */ 189 CF_NEW = 0x0004, /* has never been switched to */
200 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 190 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
201 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 191 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
192 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
202}; 193};
203 194
204/* the structure where most of the perl state is stored, overlaid on the cxstack */ 195/* the structure where most of the perl state is stored, overlaid on the cxstack */
205typedef struct 196typedef struct
206{ 197{
207 SV *defsv;
208 AV *defav;
209 SV *errsv;
210 SV *irsgv;
211 HV *hinthv;
212#define VAR(name,type) type name; 198 #define VARx(name,expr,type) type name;
213# include "state.h" 199 #include "state.h"
214#undef VAR
215} perl_slots; 200} perl_slots;
216 201
202/* 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)) 203#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
218 204
219/* this is a structure representing a perl-level coroutine */ 205/* this is a structure representing a perl-level coroutine */
220struct coro { 206struct coro
207{
221 /* the C coroutine allocated to this perl coroutine, if any */ 208 /* the C coroutine allocated to this perl coroutine, if any */
222 coro_cctx *cctx; 209 coro_cctx *cctx;
223 210
224 /* ready queue */ 211 /* ready queue */
225 struct coro *next_ready; 212 struct coro *next_ready;
… …
227 /* state data */ 214 /* state data */
228 struct CoroSLF slf_frame; /* saved slf frame */ 215 struct CoroSLF slf_frame; /* saved slf frame */
229 AV *mainstack; 216 AV *mainstack;
230 perl_slots *slot; /* basically the saved sp */ 217 perl_slots *slot; /* basically the saved sp */
231 218
232 CV *startcv; /* the CV to execute */ 219 CV *startcv; /* the CV to execute */
233 AV *args; /* data associated with this coroutine (initial args) */ 220 AV *args; /* data associated with this coroutine (initial args) */
234 int refcnt; /* coroutines are refcounted, yes */
235 int flags; /* CF_ flags */ 221 int flags; /* CF_ flags */
236 HV *hv; /* the perl hash associated with this coro, if any */ 222 HV *hv; /* the perl hash associated with this coro, if any */
237 void (*on_destroy)(pTHX_ struct coro *coro);
238 223
239 /* statistics */ 224 /* statistics */
240 int usecount; /* number of transfers to this coro */ 225 int usecount; /* number of transfers to this coro */
241 226
242 /* coro process data */ 227 /* coro process data */
243 int prio; 228 int prio;
244 SV *except; /* exception to be thrown */ 229 SV *except; /* exception to be thrown */
245 SV *rouse_cb; 230 SV *rouse_cb; /* last rouse callback */
231 AV *on_destroy; /* callbacks or coros to notify on destroy */
232 AV *status; /* the exit status list */
246 233
247 /* async_pool */ 234 /* async_pool */
248 SV *saved_deffh; 235 SV *saved_deffh;
249 SV *invoke_cb; 236 SV *invoke_cb;
250 AV *invoke_av; 237 AV *invoke_av;
251 238
252 /* on_enter/on_leave */ 239 /* on_enter/on_leave */
253 AV *on_enter; 240 AV *on_enter;
254 AV *on_leave; 241 AV *on_leave;
255 242
243 /* swap_sv */
244 AV *swap_sv;
245
256 /* times */ 246 /* times */
257 coro_ts t_cpu, t_real; 247 coro_ts t_cpu, t_real;
258 248
259 /* linked list */ 249 /* linked list */
260 struct coro *next, *prev; 250 struct coro *next, *prev;
… …
263typedef struct coro *Coro__State; 253typedef struct coro *Coro__State;
264typedef struct coro *Coro__State_or_hashref; 254typedef struct coro *Coro__State_or_hashref;
265 255
266/* the following variables are effectively part of the perl context */ 256/* the following variables are effectively part of the perl context */
267/* and get copied between struct coro and these variables */ 257/* and get copied between struct coro and these variables */
268/* the mainr easonw e don't support windows process emulation */ 258/* the main reason we don't support windows process emulation */
269static struct CoroSLF slf_frame; /* the current slf frame */ 259static struct CoroSLF slf_frame; /* the current slf frame */
270 260
271/** Coro ********************************************************************/ 261/** Coro ********************************************************************/
272 262
273#define CORO_PRIO_MAX 3 263#define CORO_PRIO_MAX 3
… …
279 269
280/* for Coro.pm */ 270/* for Coro.pm */
281static SV *coro_current; 271static SV *coro_current;
282static SV *coro_readyhook; 272static SV *coro_readyhook;
283static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 273static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
284static CV *cv_coro_run, *cv_coro_terminate; 274static CV *cv_coro_run;
285static struct coro *coro_first; 275static struct coro *coro_first;
286#define coro_nready coroapi.nready 276#define coro_nready coroapi.nready
287 277
278/** JIT *********************************************************************/
279
280#if CORO_JIT
281 /* APPLE doesn't have mmap though */
282 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
283 #ifndef CORO_JIT_TYPE
284 #if __x86_64 && CORO_JIT_UNIXY
285 #define CORO_JIT_TYPE "amd64-unix"
286 #elif __i386 && CORO_JIT_UNIXY
287 #define CORO_JIT_TYPE "x86-unix"
288 #endif
289 #endif
290#endif
291
292#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
293 #undef CORO_JIT
294#endif
295
296#if CORO_JIT
297 typedef void (*load_save_perl_slots_type)(perl_slots *);
298 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
299#endif
300
288/** Coro::Select ************************************************************/ 301/** Coro::Select ************************************************************/
289 302
290static OP *(*coro_old_pp_sselect) (pTHX); 303static OP *(*coro_old_pp_sselect) (pTHX);
291static SV *coro_select_select; 304static SV *coro_select_select;
292 305
293/* horrible hack, but if it works... */ 306/* horrible hack, but if it works... */
294static OP * 307static OP *
295coro_pp_sselect (aTHX) 308coro_pp_sselect (pTHX)
296{ 309{
297 dSP; 310 dSP;
298 PUSHMARK (SP - 4); /* fake argument list */ 311 PUSHMARK (SP - 4); /* fake argument list */
299 XPUSHs (coro_select_select); 312 XPUSHs (coro_select_select);
300 PUTBACK; 313 PUTBACK;
… …
303 PL_op->op_flags |= OPf_STACKED; 316 PL_op->op_flags |= OPf_STACKED;
304 PL_op->op_private = 0; 317 PL_op->op_private = 0;
305 return PL_ppaddr [OP_ENTERSUB](aTHX); 318 return PL_ppaddr [OP_ENTERSUB](aTHX);
306} 319}
307 320
321/** time stuff **************************************************************/
322
323#ifdef HAS_GETTIMEOFDAY
324
325ecb_inline void
326coro_u2time (pTHX_ UV ret[2])
327{
328 struct timeval tv;
329 gettimeofday (&tv, 0);
330
331 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec;
333}
334
335ecb_inline double
336coro_nvtime (void)
337{
338 struct timeval tv;
339 gettimeofday (&tv, 0);
340
341 return tv.tv_sec + tv.tv_usec * 1e-6;
342}
343
344ecb_inline void
345time_init (pTHX)
346{
347 nvtime = coro_nvtime;
348 u2time = coro_u2time;
349}
350
351#else
352
353ecb_inline void
354time_init (pTHX)
355{
356 SV **svp;
357
358 require_pv ("Time/HiRes.pm");
359
360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
361
362 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
364
365 nvtime = INT2PTR (double (*)(), SvIV (*svp));
366
367 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
368 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
369}
370
371#endif
372
308/** lowlevel stuff **********************************************************/ 373/** lowlevel stuff **********************************************************/
309 374
310static SV * 375static SV * ecb_noinline
311coro_get_sv (pTHX_ const char *name, int create) 376coro_get_sv (pTHX_ const char *name, int create)
312{ 377{
313#if PERL_VERSION_ATLEAST (5,10,0) 378#if PERL_VERSION_ATLEAST (5,10,0)
314 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 379 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
315 get_sv (name, create); 380 get_sv (name, create);
316#endif 381#endif
317 return get_sv (name, create); 382 return get_sv (name, create);
318} 383}
319 384
320static AV * 385static AV * ecb_noinline
321coro_get_av (pTHX_ const char *name, int create) 386coro_get_av (pTHX_ const char *name, int create)
322{ 387{
323#if PERL_VERSION_ATLEAST (5,10,0) 388#if PERL_VERSION_ATLEAST (5,10,0)
324 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 389 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
325 get_av (name, create); 390 get_av (name, create);
326#endif 391#endif
327 return get_av (name, create); 392 return get_av (name, create);
328} 393}
329 394
330static HV * 395static HV * ecb_noinline
331coro_get_hv (pTHX_ const char *name, int create) 396coro_get_hv (pTHX_ const char *name, int create)
332{ 397{
333#if PERL_VERSION_ATLEAST (5,10,0) 398#if PERL_VERSION_ATLEAST (5,10,0)
334 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 399 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
335 get_hv (name, create); 400 get_hv (name, create);
336#endif 401#endif
337 return get_hv (name, create); 402 return get_hv (name, create);
338} 403}
339 404
340INLINE void 405ecb_inline void
341coro_times_update () 406coro_times_update (void)
342{ 407{
343#ifdef coro_clock_gettime 408#ifdef coro_clock_gettime
344 struct timespec ts; 409 struct timespec ts;
345 410
346 ts.tv_sec = ts.tv_nsec = 0; 411 ts.tv_sec = ts.tv_nsec = 0;
… …
358 time_real [0] = tv [0]; 423 time_real [0] = tv [0];
359 time_real [1] = tv [1] * 1000; 424 time_real [1] = tv [1] * 1000;
360#endif 425#endif
361} 426}
362 427
363INLINE void 428ecb_inline void
364coro_times_add (struct coro *c) 429coro_times_add (struct coro *c)
365{ 430{
366 c->t_real [1] += time_real [1]; 431 c->t_real [1] += time_real [1];
367 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 432 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
368 c->t_real [0] += time_real [0]; 433 c->t_real [0] += time_real [0];
… …
370 c->t_cpu [1] += time_cpu [1]; 435 c->t_cpu [1] += time_cpu [1];
371 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 436 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
372 c->t_cpu [0] += time_cpu [0]; 437 c->t_cpu [0] += time_cpu [0];
373} 438}
374 439
375INLINE void 440ecb_inline void
376coro_times_sub (struct coro *c) 441coro_times_sub (struct coro *c)
377{ 442{
378 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 443 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]; 444 c->t_real [1] -= time_real [1];
380 c->t_real [0] -= time_real [0]; 445 c->t_real [0] -= time_real [0];
… …
388/* magic glue */ 453/* magic glue */
389 454
390#define CORO_MAGIC_type_cv 26 455#define CORO_MAGIC_type_cv 26
391#define CORO_MAGIC_type_state PERL_MAGIC_ext 456#define CORO_MAGIC_type_state PERL_MAGIC_ext
392 457
393#define CORO_MAGIC_NN(sv, type) \ 458#define CORO_MAGIC_NN(sv, type) \
394 (expect_true (SvMAGIC (sv)->mg_type == type) \ 459 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
395 ? SvMAGIC (sv) \ 460 ? SvMAGIC (sv) \
396 : mg_find (sv, type)) 461 : mg_find (sv, type))
397 462
398#define CORO_MAGIC(sv, type) \ 463#define CORO_MAGIC(sv, type) \
399 (expect_true (SvMAGIC (sv)) \ 464 (ecb_expect_true (SvMAGIC (sv)) \
400 ? CORO_MAGIC_NN (sv, type) \ 465 ? CORO_MAGIC_NN (sv, type) \
401 : 0) 466 : 0)
402 467
403#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 468#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) 469#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
405 470
406INLINE struct coro * 471ecb_inline MAGIC *
472SvSTATEhv_p (pTHX_ SV *coro)
473{
474 MAGIC *mg;
475
476 if (ecb_expect_true (
477 SvTYPE (coro) == SVt_PVHV
478 && (mg = CORO_MAGIC_state (coro))
479 && mg->mg_virtual == &coro_state_vtbl
480 ))
481 return mg;
482
483 return 0;
484}
485
486ecb_inline struct coro *
407SvSTATE_ (pTHX_ SV *coro) 487SvSTATE_ (pTHX_ SV *coro)
408{ 488{
409 HV *stash;
410 MAGIC *mg; 489 MAGIC *mg;
411 490
412 if (SvROK (coro)) 491 if (SvROK (coro))
413 coro = SvRV (coro); 492 coro = SvRV (coro);
414 493
415 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 494 mg = SvSTATEhv_p (aTHX_ coro);
495 if (!mg)
416 croak ("Coro::State object required"); 496 croak ("Coro::State object required");
417 497
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; 498 return (struct coro *)mg->mg_ptr;
428} 499}
429 500
430#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 501#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
431 502
… …
434#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 505#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
435 506
436/*****************************************************************************/ 507/*****************************************************************************/
437/* padlist management and caching */ 508/* padlist management and caching */
438 509
439static AV * 510ecb_inline PADLIST *
440coro_derive_padlist (pTHX_ CV *cv) 511coro_derive_padlist (pTHX_ CV *cv)
441{ 512{
442 AV *padlist = CvPADLIST (cv); 513 PADLIST *padlist = CvPADLIST (cv);
443 AV *newpadlist, *newpad; 514 PADLIST *newpadlist;
515 PAD *newpad;
516 PADOFFSET const off = PadlistMAX (padlist) + 1;
444 517
445 newpadlist = newAV (); 518 newPADLIST(newpadlist);
519#if !PERL_VERSION_ATLEAST(5,15,3)
520 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
446 AvREAL_off (newpadlist); 521 AvREAL_off (newpadlist);
522#endif
447#if PERL_VERSION_ATLEAST (5,10,0) 523#if PERL_VERSION_ATLEAST (5,10,0)
448 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 524 Perl_pad_push (aTHX_ padlist, off);
449#else 525#else
450 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 526 Perl_pad_push (aTHX_ padlist, off, 1);
451#endif 527#endif
452 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 528 newpad = PadlistARRAY (padlist)[off];
453 --AvFILLp (padlist); 529 PadlistMAX (padlist) = off - 1;
454 530
455 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 531 /* Already extended to 2 elements by newPADLIST. */
456 av_store (newpadlist, 1, (SV *)newpad); 532 PadlistMAX (newpadlist) = 1;
533 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
534 PadlistARRAY (newpadlist)[1] = newpad;
457 535
458 return newpadlist; 536 return newpadlist;
459} 537}
460 538
461static void 539ecb_inline void
462free_padlist (pTHX_ AV *padlist) 540free_padlist (pTHX_ PADLIST *padlist)
463{ 541{
464 /* may be during global destruction */ 542 /* may be during global destruction */
465 if (!IN_DESTRUCT) 543 if (!IN_DESTRUCT)
466 { 544 {
467 I32 i = AvFILLp (padlist); 545 I32 i = PadlistMAX (padlist);
468 546
469 while (i > 0) /* special-case index 0 */ 547 while (i > 0) /* special-case index 0 */
470 { 548 {
471 /* we try to be extra-careful here */ 549 /* we try to be extra-careful here */
472 AV *av = (AV *)AvARRAY (padlist)[i--]; 550 PAD *pad = PadlistARRAY (padlist)[i--];
473 I32 j = AvFILLp (av); 551 I32 j = PadMAX (pad);
474 552
475 while (j >= 0) 553 while (j >= 0)
476 SvREFCNT_dec (AvARRAY (av)[j--]); 554 SvREFCNT_dec (PadARRAY (pad)[j--]);
477 555
478 AvFILLp (av) = -1; 556 PadMAX (pad) = -1;
479 SvREFCNT_dec (av); 557 SvREFCNT_dec (pad);
480 } 558 }
481 559
482 SvREFCNT_dec (AvARRAY (padlist)[0]); 560 SvREFCNT_dec (PadlistNAMES (padlist));
483 561
562#ifdef NEWPADAPI
563 Safefree (PadlistARRAY (padlist));
564 Safefree (padlist);
565#else
484 AvFILLp (padlist) = -1; 566 AvFILLp (padlist) = -1;
567 AvREAL_off (padlist);
485 SvREFCNT_dec ((SV*)padlist); 568 SvREFCNT_dec ((SV*)padlist);
569#endif
486 } 570 }
487} 571}
488 572
489static int 573static int
490coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 574coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
491{ 575{
492 AV *padlist; 576 PADLIST *padlist;
493 AV *av = (AV *)mg->mg_obj; 577 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
578 size_t len = *(size_t *)mg->mg_ptr;
494 579
495 /* perl manages to free our internal AV and _then_ call us */ 580 /* perl manages to free our internal AV and _then_ call us */
496 if (IN_DESTRUCT) 581 if (IN_DESTRUCT)
497 return 0; 582 return 0;
498 583
499 /* casting is fun. */ 584 while (len--)
500 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
501 free_padlist (aTHX_ padlist); 585 free_padlist (aTHX_ padlists[len]);
502
503 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
504 586
505 return 0; 587 return 0;
506} 588}
507 589
508static MGVTBL coro_cv_vtbl = { 590static MGVTBL coro_cv_vtbl = {
509 0, 0, 0, 0, 591 0, 0, 0, 0,
510 coro_cv_free 592 coro_cv_free
511}; 593};
512 594
513/* the next two functions merely cache the padlists */ 595/* the next two functions merely cache the padlists */
514static void 596ecb_inline void
515get_padlist (pTHX_ CV *cv) 597get_padlist (pTHX_ CV *cv)
516{ 598{
517 MAGIC *mg = CORO_MAGIC_cv (cv); 599 MAGIC *mg = CORO_MAGIC_cv (cv);
518 AV *av; 600 size_t *lenp;
519 601
520 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 602 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
521 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 603 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
522 else 604 else
523 { 605 {
524#if CORO_PREFER_PERL_FUNCTIONS 606#if CORO_PREFER_PERL_FUNCTIONS
525 /* this is probably cleaner? but also slower! */ 607 /* this is probably cleaner? but also slower! */
526 /* in practise, it seems to be less stable */ 608 /* in practise, it seems to be less stable */
… …
532 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 614 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
533#endif 615#endif
534 } 616 }
535} 617}
536 618
537static void 619ecb_inline void
538put_padlist (pTHX_ CV *cv) 620put_padlist (pTHX_ CV *cv)
539{ 621{
540 MAGIC *mg = CORO_MAGIC_cv (cv); 622 MAGIC *mg = CORO_MAGIC_cv (cv);
541 AV *av;
542 623
543 if (expect_false (!mg)) 624 if (ecb_expect_false (!mg))
625 {
544 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 626 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
627 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
628 mg->mg_len = 1; /* so mg_free frees mg_ptr */
629 }
630 else
631 Renew (mg->mg_ptr,
632 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
633 char);
545 634
546 av = (AV *)mg->mg_obj; 635 ((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} 636}
553 637
554/** load & save, init *******************************************************/ 638/** load & save, init *******************************************************/
639
640ecb_inline void
641swap_sv (SV *a, SV *b)
642{
643 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
644 SV tmp;
645
646 /* swap sv_any */
647 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
648
649 /* swap sv_flags */
650 SvFLAGS (&tmp) = SvFLAGS (a);
651 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
652 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
653
654#if PERL_VERSION_ATLEAST (5,10,0)
655 /* perl 5.10 and later complicates this _quite_ a bit, but it also
656 * is much faster, so no quarrels here. alternatively, we could
657 * sv_upgrade to avoid this.
658 */
659 {
660 /* swap sv_u */
661 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
662
663 /* if SvANY points to the head, we need to adjust the pointers,
664 * as the pointer for a still points to b, and maybe vice versa.
665 */
666 #define svany_in_head(type) \
667 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
668
669 if (svany_in_head (SvTYPE (a)))
670 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
671
672 if (svany_in_head (SvTYPE (b)))
673 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
674 }
675#endif
676}
677
678/* swap sv heads, at least logically */
679static void
680swap_svs (pTHX_ Coro__State c)
681{
682 int i;
683
684 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
685 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
686}
687
688#define SWAP_SVS(coro) \
689 if (ecb_expect_false ((coro)->swap_sv)) \
690 swap_svs (aTHX_ (coro))
555 691
556static void 692static void
557on_enterleave_call (pTHX_ SV *cb); 693on_enterleave_call (pTHX_ SV *cb);
558 694
559static void 695static void
… …
562 perl_slots *slot = c->slot; 698 perl_slots *slot = c->slot;
563 c->slot = 0; 699 c->slot = 0;
564 700
565 PL_mainstack = c->mainstack; 701 PL_mainstack = c->mainstack;
566 702
567 GvSV (PL_defgv) = slot->defsv; 703#if CORO_JIT
568 GvAV (PL_defgv) = slot->defav; 704 load_perl_slots (slot);
569 GvSV (PL_errgv) = slot->errsv; 705#else
570 GvSV (irsgv) = slot->irsgv;
571 GvHV (PL_hintgv) = slot->hinthv;
572
573 #define VAR(name,type) PL_ ## name = slot->name; 706 #define VARx(name,expr,type) expr = slot->name;
574 # include "state.h" 707 #include "state.h"
575 #undef VAR 708#endif
576 709
577 { 710 {
578 dSP; 711 dSP;
579 712
580 CV *cv; 713 CV *cv;
581 714
582 /* now do the ugly restore mess */ 715 /* now do the ugly restore mess */
583 while (expect_true (cv = (CV *)POPs)) 716 while (ecb_expect_true (cv = (CV *)POPs))
584 { 717 {
585 put_padlist (aTHX_ cv); /* mark this padlist as available */ 718 put_padlist (aTHX_ cv); /* mark this padlist as available */
586 CvDEPTH (cv) = PTR2IV (POPs); 719 CvDEPTH (cv) = PTR2IV (POPs);
587 CvPADLIST (cv) = (AV *)POPs; 720 CvPADLIST (cv) = (PADLIST *)POPs;
588 } 721 }
589 722
590 PUTBACK; 723 PUTBACK;
591 } 724 }
592 725
593 slf_frame = c->slf_frame; 726 slf_frame = c->slf_frame;
594 CORO_THROW = c->except; 727 CORO_THROW = c->except;
595 728
596 if (expect_false (enable_times)) 729 if (ecb_expect_false (enable_times))
597 { 730 {
598 if (expect_false (!times_valid)) 731 if (ecb_expect_false (!times_valid))
599 coro_times_update (); 732 coro_times_update ();
600 733
601 coro_times_sub (c); 734 coro_times_sub (c);
602 } 735 }
603 736
604 if (expect_false (c->on_enter)) 737 if (ecb_expect_false (c->on_enter))
605 { 738 {
606 int i; 739 int i;
607 740
608 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 741 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 742 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
610 } 743 }
744
745 SWAP_SVS (c);
611} 746}
612 747
613static void 748static void
614save_perl (pTHX_ Coro__State c) 749save_perl (pTHX_ Coro__State c)
615{ 750{
751 SWAP_SVS (c);
752
616 if (expect_false (c->on_leave)) 753 if (ecb_expect_false (c->on_leave))
617 { 754 {
618 int i; 755 int i;
619 756
620 for (i = AvFILLp (c->on_leave); i >= 0; --i) 757 for (i = AvFILLp (c->on_leave); i >= 0; --i)
621 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 758 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
622 } 759 }
623 760
624 times_valid = 0; 761 times_valid = 0;
625 762
626 if (expect_false (enable_times)) 763 if (ecb_expect_false (enable_times))
627 { 764 {
628 coro_times_update (); times_valid = 1; 765 coro_times_update (); times_valid = 1;
629 coro_times_add (c); 766 coro_times_add (c);
630 } 767 }
631 768
… …
645 782
646 XPUSHs (Nullsv); 783 XPUSHs (Nullsv);
647 /* this loop was inspired by pp_caller */ 784 /* this loop was inspired by pp_caller */
648 for (;;) 785 for (;;)
649 { 786 {
650 while (expect_true (cxix >= 0)) 787 while (ecb_expect_true (cxix >= 0))
651 { 788 {
652 PERL_CONTEXT *cx = &ccstk[cxix--]; 789 PERL_CONTEXT *cx = &ccstk[cxix--];
653 790
654 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 791 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
655 { 792 {
656 CV *cv = cx->blk_sub.cv; 793 CV *cv = cx->blk_sub.cv;
657 794
658 if (expect_true (CvDEPTH (cv))) 795 if (ecb_expect_true (CvDEPTH (cv)))
659 { 796 {
660 EXTEND (SP, 3); 797 EXTEND (SP, 3);
661 PUSHs ((SV *)CvPADLIST (cv)); 798 PUSHs ((SV *)CvPADLIST (cv));
662 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 799 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
663 PUSHs ((SV *)cv); 800 PUSHs ((SV *)cv);
… …
666 get_padlist (aTHX_ cv); 803 get_padlist (aTHX_ cv);
667 } 804 }
668 } 805 }
669 } 806 }
670 807
671 if (expect_true (top_si->si_type == PERLSI_MAIN)) 808 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
672 break; 809 break;
673 810
674 top_si = top_si->si_prev; 811 top_si = top_si->si_prev;
675 ccstk = top_si->si_cxstack; 812 ccstk = top_si->si_cxstack;
676 cxix = top_si->si_cxix; 813 cxix = top_si->si_cxix;
… …
678 815
679 PUTBACK; 816 PUTBACK;
680 } 817 }
681 818
682 /* allocate some space on the context stack for our purposes */ 819 /* allocate some space on the context stack for our purposes */
683 /* we manually unroll here, as usually 2 slots is enough */ 820 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 { 821 {
688 unsigned int i; 822 unsigned int i;
823
689 for (i = 3; i < SLOT_COUNT; ++i) 824 for (i = 0; i < SLOT_COUNT; ++i)
690 CXINC; 825 CXINC;
691 } 826
692 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 827 cxstack_ix -= SLOT_COUNT; /* undo allocation */
828 }
693 829
694 c->mainstack = PL_mainstack; 830 c->mainstack = PL_mainstack;
695 831
696 { 832 {
697 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 833 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
698 834
699 slot->defav = GvAV (PL_defgv); 835#if CORO_JIT
700 slot->defsv = DEFSV; 836 save_perl_slots (slot);
701 slot->errsv = ERRSV; 837#else
702 slot->irsgv = GvSV (irsgv);
703 slot->hinthv = GvHV (PL_hintgv);
704
705 #define VAR(name,type) slot->name = PL_ ## name; 838 #define VARx(name,expr,type) slot->name = expr;
706 # include "state.h" 839 #include "state.h"
707 #undef VAR 840#endif
708 } 841 }
709} 842}
710 843
711/* 844/*
712 * allocate various perl stacks. This is almost an exact copy 845 * allocate various perl stacks. This is almost an exact copy
… …
718# define coro_init_stacks(thx) init_stacks () 851# define coro_init_stacks(thx) init_stacks ()
719#else 852#else
720static void 853static void
721coro_init_stacks (pTHX) 854coro_init_stacks (pTHX)
722{ 855{
723 PL_curstackinfo = new_stackinfo(32, 8); 856 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; 857 PL_curstackinfo->si_type = PERLSI_MAIN;
725 PL_curstack = PL_curstackinfo->si_stack; 858 PL_curstack = PL_curstackinfo->si_stack;
726 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 859 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
727 860
728 PL_stack_base = AvARRAY(PL_curstack); 861 PL_stack_base = AvARRAY(PL_curstack);
… …
743#endif 876#endif
744 877
745 New(54,PL_scopestack,8,I32); 878 New(54,PL_scopestack,8,I32);
746 PL_scopestack_ix = 0; 879 PL_scopestack_ix = 0;
747 PL_scopestack_max = 8; 880 PL_scopestack_max = 8;
881#if HAS_SCOPESTACK_NAME
882 New(54,PL_scopestack_name,8,const char*);
883#endif
748 884
749 New(54,PL_savestack,24,ANY); 885 New(54,PL_savestack,24,ANY);
750 PL_savestack_ix = 0; 886 PL_savestack_ix = 0;
751 PL_savestack_max = 24; 887 PL_savestack_max = 24;
752 888
… …
780 } 916 }
781 917
782 Safefree (PL_tmps_stack); 918 Safefree (PL_tmps_stack);
783 Safefree (PL_markstack); 919 Safefree (PL_markstack);
784 Safefree (PL_scopestack); 920 Safefree (PL_scopestack);
921#if HAS_SCOPESTACK_NAME
922 Safefree (PL_scopestack_name);
923#endif
785 Safefree (PL_savestack); 924 Safefree (PL_savestack);
786#if !PERL_VERSION_ATLEAST (5,10,0) 925#if !PERL_VERSION_ATLEAST (5,10,0)
787 Safefree (PL_retstack); 926 Safefree (PL_retstack);
788#endif 927#endif
789} 928}
… …
835#endif 974#endif
836 975
837/* 976/*
838 * This overrides the default magic get method of %SIG elements. 977 * 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 978 * 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 979 * and instead of trying to save and restore the hash elements (extremely slow),
841 * readback here. 980 * we just provide our own readback here.
842 */ 981 */
843static int 982static int ecb_cold
844coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 983coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
845{ 984{
846 const char *s = MgPV_nolen_const (mg); 985 const char *s = MgPV_nolen_const (mg);
847 986
848 if (*s == '_') 987 if (*s == '_')
849 { 988 {
850 SV **svp = 0; 989 SV **svp = 0;
851 990
852 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 991 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
853 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 992 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
854 993
855 if (svp) 994 if (svp)
856 { 995 {
857 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 996 SV *ssv;
997
998 if (!*svp)
999 ssv = &PL_sv_undef;
1000 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1001 ssv = sv_2mortal (newRV_inc (*svp));
1002 else
1003 ssv = *svp;
1004
1005 sv_setsv (sv, ssv);
858 return 0; 1006 return 0;
859 } 1007 }
860 } 1008 }
861 1009
862 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1010 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
863} 1011}
864 1012
865static int 1013static int ecb_cold
866coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1014coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
867{ 1015{
868 const char *s = MgPV_nolen_const (mg); 1016 const char *s = MgPV_nolen_const (mg);
869 1017
870 if (*s == '_') 1018 if (*s == '_')
… …
884 } 1032 }
885 1033
886 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1034 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
887} 1035}
888 1036
889static int 1037static int ecb_cold
890coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1038coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
891{ 1039{
892 const char *s = MgPV_nolen_const (mg); 1040 const char *s = MgPV_nolen_const (mg);
893 1041
894 if (*s == '_') 1042 if (*s == '_')
… …
927slf_check_repeat (pTHX_ struct CoroSLF *frame) 1075slf_check_repeat (pTHX_ struct CoroSLF *frame)
928{ 1076{
929 return 1; 1077 return 1;
930} 1078}
931 1079
932static UNOP coro_setup_op; 1080static UNOP init_perl_op;
933 1081
934static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1082ecb_noinline static void /* noinline to keep it out of the transfer fast path */
935coro_setup (pTHX_ struct coro *coro) 1083init_perl (pTHX_ struct coro *coro)
936{ 1084{
937 /* 1085 /*
938 * emulate part of the perl startup here. 1086 * emulate part of the perl startup here.
939 */ 1087 */
940 coro_init_stacks (aTHX); 1088 coro_init_stacks (aTHX);
… …
947 PL_comppad_name_fill = 0; 1095 PL_comppad_name_fill = 0;
948 PL_comppad_name_floor = 0; 1096 PL_comppad_name_floor = 0;
949 PL_curpm = 0; 1097 PL_curpm = 0;
950 PL_curpad = 0; 1098 PL_curpad = 0;
951 PL_localizing = 0; 1099 PL_localizing = 0;
952 PL_dirty = 0;
953 PL_restartop = 0; 1100 PL_restartop = 0;
954#if PERL_VERSION_ATLEAST (5,10,0) 1101#if PERL_VERSION_ATLEAST (5,10,0)
955 PL_parser = 0; 1102 PL_parser = 0;
956#endif 1103#endif
957 PL_hints = 0; 1104 PL_hints = 0;
958 1105
959 /* recreate the die/warn hooks */ 1106 /* recreate the die/warn hooks */
960 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1107 PL_diehook = SvREFCNT_inc (rv_diehook);
961 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1108 PL_warnhook = SvREFCNT_inc (rv_warnhook);
962 1109
963 GvSV (PL_defgv) = newSV (0); 1110 GvSV (PL_defgv) = newSV (0);
964 GvAV (PL_defgv) = coro->args; coro->args = 0; 1111 GvAV (PL_defgv) = coro->args; coro->args = 0;
965 GvSV (PL_errgv) = newSV (0); 1112 GvSV (PL_errgv) = newSV (0);
966 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1113 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
967 GvHV (PL_hintgv) = 0; 1114 GvHV (PL_hintgv) = 0;
… …
987 /* this newly created coroutine might be run on an existing cctx which most 1134 /* 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. 1135 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
989 */ 1136 */
990 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1137 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 */ 1138 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1139 slf_frame.destroy = 0;
992 1140
993 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1141 /* 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; 1142 init_perl_op.op_next = PL_op;
995 coro_setup_op.op_type = OP_ENTERSUB; 1143 init_perl_op.op_type = OP_ENTERSUB;
996 coro_setup_op.op_ppaddr = pp_slf; 1144 init_perl_op.op_ppaddr = pp_slf;
997 /* no flags etc. required, as an init function won't be called */ 1145 /* no flags etc. required, as an init function won't be called */
998 1146
999 PL_op = (OP *)&coro_setup_op; 1147 PL_op = (OP *)&init_perl_op;
1000 1148
1001 /* copy throw, in case it was set before coro_setup */ 1149 /* copy throw, in case it was set before init_perl */
1002 CORO_THROW = coro->except; 1150 CORO_THROW = coro->except;
1003 1151
1152 SWAP_SVS (coro);
1153
1004 if (expect_false (enable_times)) 1154 if (ecb_expect_false (enable_times))
1005 { 1155 {
1006 coro_times_update (); 1156 coro_times_update ();
1007 coro_times_sub (coro); 1157 coro_times_sub (coro);
1008 } 1158 }
1009} 1159}
… …
1028 dounwind (-1); 1178 dounwind (-1);
1029 } 1179 }
1030} 1180}
1031 1181
1032static void 1182static void
1033coro_destruct_perl (pTHX_ struct coro *coro) 1183destroy_perl (pTHX_ struct coro *coro)
1034{ 1184{
1035 SV *svf [9]; 1185 SV *svf [9];
1036 1186
1037 { 1187 {
1188 SV *old_current = SvRV (coro_current);
1038 struct coro *current = SvSTATE_current; 1189 struct coro *current = SvSTATE (old_current);
1039 1190
1040 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1191 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1041 1192
1042 save_perl (aTHX_ current); 1193 save_perl (aTHX_ current);
1194
1195 /* this will cause transfer_check to croak on block*/
1196 SvRV_set (coro_current, (SV *)coro->hv);
1197
1043 load_perl (aTHX_ coro); 1198 load_perl (aTHX_ coro);
1044 1199
1045 coro_unwind_stacks (aTHX); 1200 coro_unwind_stacks (aTHX);
1201
1202 /* restore swapped sv's */
1203 SWAP_SVS (coro);
1204
1046 coro_destruct_stacks (aTHX); 1205 coro_destruct_stacks (aTHX);
1047 1206
1048 // now save some sv's to be free'd later 1207 /* now save some sv's to be free'd later */
1049 svf [0] = GvSV (PL_defgv); 1208 svf [0] = GvSV (PL_defgv);
1050 svf [1] = (SV *)GvAV (PL_defgv); 1209 svf [1] = (SV *)GvAV (PL_defgv);
1051 svf [2] = GvSV (PL_errgv); 1210 svf [2] = GvSV (PL_errgv);
1052 svf [3] = (SV *)PL_defoutgv; 1211 svf [3] = (SV *)PL_defoutgv;
1053 svf [4] = PL_rs; 1212 svf [4] = PL_rs;
… …
1055 svf [6] = (SV *)GvHV (PL_hintgv); 1214 svf [6] = (SV *)GvHV (PL_hintgv);
1056 svf [7] = PL_diehook; 1215 svf [7] = PL_diehook;
1057 svf [8] = PL_warnhook; 1216 svf [8] = PL_warnhook;
1058 assert (9 == sizeof (svf) / sizeof (*svf)); 1217 assert (9 == sizeof (svf) / sizeof (*svf));
1059 1218
1219 SvRV_set (coro_current, old_current);
1220
1060 load_perl (aTHX_ current); 1221 load_perl (aTHX_ current);
1061 } 1222 }
1062 1223
1063 { 1224 {
1064 unsigned int i; 1225 unsigned int i;
… …
1071 SvREFCNT_dec (coro->invoke_cb); 1232 SvREFCNT_dec (coro->invoke_cb);
1072 SvREFCNT_dec (coro->invoke_av); 1233 SvREFCNT_dec (coro->invoke_av);
1073 } 1234 }
1074} 1235}
1075 1236
1076INLINE void 1237ecb_inline void
1077free_coro_mortal (pTHX) 1238free_coro_mortal (pTHX)
1078{ 1239{
1079 if (expect_true (coro_mortal)) 1240 if (ecb_expect_true (coro_mortal))
1080 { 1241 {
1081 SvREFCNT_dec (coro_mortal); 1242 SvREFCNT_dec ((SV *)coro_mortal);
1082 coro_mortal = 0; 1243 coro_mortal = 0;
1083 } 1244 }
1084} 1245}
1085 1246
1086static int 1247static int
… …
1219 1380
1220 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1381 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1221} 1382}
1222 1383
1223/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1384/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1224static void NOINLINE 1385static void ecb_noinline
1225cctx_prepare (pTHX) 1386cctx_prepare (pTHX)
1226{ 1387{
1227 PL_top_env = &PL_start_env; 1388 PL_top_env = &PL_start_env;
1228 1389
1229 if (cctx_current->flags & CC_TRACE) 1390 if (cctx_current->flags & CC_TRACE)
… …
1240 slf_frame.prepare = slf_prepare_set_stacklevel; 1401 slf_frame.prepare = slf_prepare_set_stacklevel;
1241 slf_frame.check = slf_check_set_stacklevel; 1402 slf_frame.check = slf_check_set_stacklevel;
1242} 1403}
1243 1404
1244/* the tail of transfer: execute stuff we can only do after a transfer */ 1405/* the tail of transfer: execute stuff we can only do after a transfer */
1245INLINE void 1406ecb_inline void
1246transfer_tail (pTHX) 1407transfer_tail (pTHX)
1247{ 1408{
1248 free_coro_mortal (aTHX); 1409 free_coro_mortal (aTHX);
1410}
1411
1412/* try to exit the same way perl's main function would do */
1413/* we do not bother resetting the environment or other things *7
1414/* that are not, uhm, essential */
1415/* this obviously also doesn't work when perl is embedded */
1416static void ecb_noinline ecb_cold
1417perlish_exit (pTHX)
1418{
1419 int exitstatus = perl_destruct (PL_curinterp);
1420 perl_free (PL_curinterp);
1421 exit (exitstatus);
1249} 1422}
1250 1423
1251/* 1424/*
1252 * this is a _very_ stripped down perl interpreter ;) 1425 * this is a _very_ stripped down perl interpreter ;)
1253 */ 1426 */
… …
1275 /* somebody or something will hit me for both perl_run and PL_restartop */ 1448 /* somebody or something will hit me for both perl_run and PL_restartop */
1276 PL_restartop = PL_op; 1449 PL_restartop = PL_op;
1277 perl_run (PL_curinterp); 1450 perl_run (PL_curinterp);
1278 /* 1451 /*
1279 * Unfortunately, there is no way to get at the return values of the 1452 * Unfortunately, there is no way to get at the return values of the
1280 * coro body here, as perl_run destroys these 1453 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1454 * runtime errors here, as this is just a random interpreter, not a thread.
1281 */ 1455 */
1282 1456
1283 /* 1457 /*
1284 * If perl-run returns we assume exit() was being called or the coro 1458 * If perl-run returns we assume exit() was being called or the coro
1285 * fell off the end, which seems to be the only valid (non-bug) 1459 * fell off the end, which seems to be the only valid (non-bug)
1286 * reason for perl_run to return. We try to exit by jumping to the 1460 * reason for perl_run to return. We try to mimic whatever perl is normally
1287 * bootstrap-time "top" top_env, as we cannot restore the "main" 1461 * doing in that case. YMMV.
1288 * coroutine as Coro has no such concept.
1289 * This actually isn't valid with the pthread backend, but OSes requiring
1290 * that backend are too broken to do it in a standards-compliant way.
1291 */ 1462 */
1292 PL_top_env = main_top_env; 1463 perlish_exit (aTHX);
1293 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1294 } 1464 }
1295} 1465}
1296 1466
1297static coro_cctx * 1467static coro_cctx *
1298cctx_new () 1468cctx_new (void)
1299{ 1469{
1300 coro_cctx *cctx; 1470 coro_cctx *cctx;
1301 1471
1302 ++cctx_count; 1472 ++cctx_count;
1303 New (0, cctx, 1, coro_cctx); 1473 New (0, cctx, 1, coro_cctx);
… …
1309 return cctx; 1479 return cctx;
1310} 1480}
1311 1481
1312/* create a new cctx only suitable as source */ 1482/* create a new cctx only suitable as source */
1313static coro_cctx * 1483static coro_cctx *
1314cctx_new_empty () 1484cctx_new_empty (void)
1315{ 1485{
1316 coro_cctx *cctx = cctx_new (); 1486 coro_cctx *cctx = cctx_new ();
1317 1487
1318 cctx->sptr = 0; 1488 cctx->stack.sptr = 0;
1319 coro_create (&cctx->cctx, 0, 0, 0, 0); 1489 coro_create (&cctx->cctx, 0, 0, 0, 0);
1320 1490
1321 return cctx; 1491 return cctx;
1322} 1492}
1323 1493
1324/* create a new cctx suitable as destination/running a perl interpreter */ 1494/* create a new cctx suitable as destination/running a perl interpreter */
1325static coro_cctx * 1495static coro_cctx *
1326cctx_new_run () 1496cctx_new_run (void)
1327{ 1497{
1328 coro_cctx *cctx = cctx_new (); 1498 coro_cctx *cctx = cctx_new ();
1329 void *stack_start;
1330 size_t stack_size;
1331 1499
1332#if HAVE_MMAP 1500 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1333 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1334 /* mmap supposedly does allocate-on-write for us */
1335 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1336
1337 if (cctx->sptr != (void *)-1)
1338 {
1339 #if CORO_STACKGUARD
1340 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1341 #endif
1342 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1343 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1344 cctx->flags |= CC_MAPPED;
1345 } 1501 {
1346 else
1347#endif
1348 {
1349 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1350 New (0, cctx->sptr, cctx_stacksize, long);
1351
1352 if (!cctx->sptr)
1353 {
1354 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1502 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1355 _exit (EXIT_FAILURE); 1503 _exit (EXIT_FAILURE);
1356 }
1357
1358 stack_start = cctx->sptr;
1359 stack_size = cctx->ssize;
1360 } 1504 }
1361 1505
1362 #if CORO_USE_VALGRIND
1363 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1364 #endif
1365
1366 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1506 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1367 1507
1368 return cctx; 1508 return cctx;
1369} 1509}
1370 1510
1371static void 1511static void
1372cctx_destroy (coro_cctx *cctx) 1512cctx_destroy (coro_cctx *cctx)
1373{ 1513{
1374 if (!cctx) 1514 if (!cctx)
1375 return; 1515 return;
1376 1516
1377 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1517 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1378 1518
1379 --cctx_count; 1519 --cctx_count;
1380 coro_destroy (&cctx->cctx); 1520 coro_destroy (&cctx->cctx);
1381 1521
1382 /* coro_transfer creates new, empty cctx's */ 1522 coro_stack_free (&cctx->stack);
1383 if (cctx->sptr)
1384 {
1385 #if CORO_USE_VALGRIND
1386 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1387 #endif
1388
1389#if HAVE_MMAP
1390 if (cctx->flags & CC_MAPPED)
1391 munmap (cctx->sptr, cctx->ssize);
1392 else
1393#endif
1394 Safefree (cctx->sptr);
1395 }
1396 1523
1397 Safefree (cctx); 1524 Safefree (cctx);
1398} 1525}
1399 1526
1400/* wether this cctx should be destructed */ 1527/* wether this cctx should be destructed */
1401#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1528#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1402 1529
1403static coro_cctx * 1530static coro_cctx *
1404cctx_get (pTHX) 1531cctx_get (pTHX)
1405{ 1532{
1406 while (expect_true (cctx_first)) 1533 while (ecb_expect_true (cctx_first))
1407 { 1534 {
1408 coro_cctx *cctx = cctx_first; 1535 coro_cctx *cctx = cctx_first;
1409 cctx_first = cctx->next; 1536 cctx_first = cctx->next;
1410 --cctx_idle; 1537 --cctx_idle;
1411 1538
1412 if (expect_true (!CCTX_EXPIRED (cctx))) 1539 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1413 return cctx; 1540 return cctx;
1414 1541
1415 cctx_destroy (cctx); 1542 cctx_destroy (cctx);
1416 } 1543 }
1417 1544
… …
1419} 1546}
1420 1547
1421static void 1548static void
1422cctx_put (coro_cctx *cctx) 1549cctx_put (coro_cctx *cctx)
1423{ 1550{
1424 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1551 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1425 1552
1426 /* free another cctx if overlimit */ 1553 /* free another cctx if overlimit */
1427 if (expect_false (cctx_idle >= cctx_max_idle)) 1554 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1428 { 1555 {
1429 coro_cctx *first = cctx_first; 1556 coro_cctx *first = cctx_first;
1430 cctx_first = first->next; 1557 cctx_first = first->next;
1431 --cctx_idle; 1558 --cctx_idle;
1432 1559
… …
1443static void 1570static void
1444transfer_check (pTHX_ struct coro *prev, struct coro *next) 1571transfer_check (pTHX_ struct coro *prev, struct coro *next)
1445{ 1572{
1446 /* TODO: throwing up here is considered harmful */ 1573 /* TODO: throwing up here is considered harmful */
1447 1574
1448 if (expect_true (prev != next)) 1575 if (ecb_expect_true (prev != next))
1449 { 1576 {
1450 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1577 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1451 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1578 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1452 1579
1453 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1580 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1454 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1581 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1455 1582
1456#if !PERL_VERSION_ATLEAST (5,10,0) 1583#if !PERL_VERSION_ATLEAST (5,10,0)
1457 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1584 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1458 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1585 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1459#endif 1586#endif
1460 } 1587 }
1461} 1588}
1462 1589
1463/* always use the TRANSFER macro */ 1590/* always use the TRANSFER macro */
1464static void NOINLINE /* noinline so we have a fixed stackframe */ 1591static void ecb_noinline /* noinline so we have a fixed stackframe */
1465transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1592transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1466{ 1593{
1467 dSTACKLEVEL; 1594 dSTACKLEVEL;
1468 1595
1469 /* sometimes transfer is only called to set idle_sp */ 1596 /* sometimes transfer is only called to set idle_sp */
1470 if (expect_false (!prev)) 1597 if (ecb_expect_false (!prev))
1471 { 1598 {
1472 cctx_current->idle_sp = STACKLEVEL; 1599 cctx_current->idle_sp = STACKLEVEL;
1473 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1600 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1474 } 1601 }
1475 else if (expect_true (prev != next)) 1602 else if (ecb_expect_true (prev != next))
1476 { 1603 {
1477 coro_cctx *cctx_prev; 1604 coro_cctx *cctx_prev;
1478 1605
1479 if (expect_false (prev->flags & CF_NEW)) 1606 if (ecb_expect_false (prev->flags & CF_NEW))
1480 { 1607 {
1481 /* create a new empty/source context */ 1608 /* create a new empty/source context */
1482 prev->flags &= ~CF_NEW; 1609 prev->flags &= ~CF_NEW;
1483 prev->flags |= CF_RUNNING; 1610 prev->flags |= CF_RUNNING;
1484 } 1611 }
… …
1487 next->flags |= CF_RUNNING; 1614 next->flags |= CF_RUNNING;
1488 1615
1489 /* first get rid of the old state */ 1616 /* first get rid of the old state */
1490 save_perl (aTHX_ prev); 1617 save_perl (aTHX_ prev);
1491 1618
1492 if (expect_false (next->flags & CF_NEW)) 1619 if (ecb_expect_false (next->flags & CF_NEW))
1493 { 1620 {
1494 /* need to start coroutine */ 1621 /* need to start coroutine */
1495 next->flags &= ~CF_NEW; 1622 next->flags &= ~CF_NEW;
1496 /* setup coroutine call */ 1623 /* setup coroutine call */
1497 coro_setup (aTHX_ next); 1624 init_perl (aTHX_ next);
1498 } 1625 }
1499 else 1626 else
1500 load_perl (aTHX_ next); 1627 load_perl (aTHX_ next);
1501 1628
1502 /* possibly untie and reuse the cctx */ 1629 /* possibly untie and reuse the cctx */
1503 if (expect_true ( 1630 if (ecb_expect_true (
1504 cctx_current->idle_sp == STACKLEVEL 1631 cctx_current->idle_sp == STACKLEVEL
1505 && !(cctx_current->flags & CC_TRACE) 1632 && !(cctx_current->flags & CC_TRACE)
1506 && !force_cctx 1633 && !force_cctx
1507 )) 1634 ))
1508 { 1635 {
1509 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1636 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1510 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1637 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1511 1638
1512 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1639 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1513 /* without this the next cctx_get might destroy the running cctx while still in use */ 1640 /* without this the next cctx_get might destroy the running cctx while still in use */
1514 if (expect_false (CCTX_EXPIRED (cctx_current))) 1641 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1515 if (expect_true (!next->cctx)) 1642 if (ecb_expect_true (!next->cctx))
1516 next->cctx = cctx_get (aTHX); 1643 next->cctx = cctx_get (aTHX);
1517 1644
1518 cctx_put (cctx_current); 1645 cctx_put (cctx_current);
1519 } 1646 }
1520 else 1647 else
1521 prev->cctx = cctx_current; 1648 prev->cctx = cctx_current;
1522 1649
1523 ++next->usecount; 1650 ++next->usecount;
1524 1651
1525 cctx_prev = cctx_current; 1652 cctx_prev = cctx_current;
1526 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1653 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1527 1654
1528 next->cctx = 0; 1655 next->cctx = 0;
1529 1656
1530 if (expect_false (cctx_prev != cctx_current)) 1657 if (ecb_expect_false (cctx_prev != cctx_current))
1531 { 1658 {
1532 cctx_prev->top_env = PL_top_env; 1659 cctx_prev->top_env = PL_top_env;
1533 PL_top_env = cctx_current->top_env; 1660 PL_top_env = cctx_current->top_env;
1534 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1661 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1535 } 1662 }
… …
1541#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1668#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1542#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1669#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1543 1670
1544/** high level stuff ********************************************************/ 1671/** high level stuff ********************************************************/
1545 1672
1673/* this function is actually Coro, not Coro::State, but we call it from here */
1674/* because it is convenient - but it hasn't been declared yet for that reason */
1546static int 1675static void
1676coro_call_on_destroy (pTHX_ struct coro *coro);
1677
1678static void
1547coro_state_destroy (pTHX_ struct coro *coro) 1679coro_state_destroy (pTHX_ struct coro *coro)
1548{ 1680{
1549 if (coro->flags & CF_DESTROYED) 1681 if (coro->flags & CF_ZOMBIE)
1550 return 0; 1682 return;
1551 1683
1552 if (coro->on_destroy && !PL_dirty)
1553 coro->on_destroy (aTHX_ coro); 1684 slf_destroy (aTHX_ coro);
1554 1685
1555 coro->flags |= CF_DESTROYED; 1686 coro->flags |= CF_ZOMBIE;
1556 1687
1557 if (coro->flags & CF_READY) 1688 if (coro->flags & CF_READY)
1558 { 1689 {
1559 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1690 /* reduce nready, as destroying a ready coro effectively unreadies it */
1560 /* alternative: look through all ready queues and remove the coro */ 1691 /* alternative: look through all ready queues and remove the coro */
1561 --coro_nready; 1692 --coro_nready;
1562 } 1693 }
1563 else 1694 else
1564 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1695 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1696
1697 if (coro->next) coro->next->prev = coro->prev;
1698 if (coro->prev) coro->prev->next = coro->next;
1699 if (coro == coro_first) coro_first = coro->next;
1565 1700
1566 if (coro->mainstack 1701 if (coro->mainstack
1567 && coro->mainstack != main_mainstack 1702 && coro->mainstack != main_mainstack
1568 && coro->slot 1703 && coro->slot
1569 && !PL_dirty) 1704 && !PL_dirty)
1570 coro_destruct_perl (aTHX_ coro); 1705 destroy_perl (aTHX_ coro);
1571 1706
1572 cctx_destroy (coro->cctx); 1707 cctx_destroy (coro->cctx);
1573 SvREFCNT_dec (coro->startcv); 1708 SvREFCNT_dec (coro->startcv);
1574 SvREFCNT_dec (coro->args); 1709 SvREFCNT_dec (coro->args);
1710 SvREFCNT_dec (coro->swap_sv);
1575 SvREFCNT_dec (CORO_THROW); 1711 SvREFCNT_dec (CORO_THROW);
1576 1712
1577 if (coro->next) coro->next->prev = coro->prev; 1713 coro_call_on_destroy (aTHX_ coro);
1578 if (coro->prev) coro->prev->next = coro->next;
1579 if (coro == coro_first) coro_first = coro->next;
1580 1714
1581 return 1; 1715 /* more destruction mayhem in coro_state_free */
1582} 1716}
1583 1717
1584static int 1718static int
1585coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1719coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1586{ 1720{
1587 struct coro *coro = (struct coro *)mg->mg_ptr; 1721 struct coro *coro = (struct coro *)mg->mg_ptr;
1588 mg->mg_ptr = 0; 1722 mg->mg_ptr = 0;
1589 1723
1590 coro->hv = 0;
1591
1592 if (--coro->refcnt < 0)
1593 {
1594 coro_state_destroy (aTHX_ coro); 1724 coro_state_destroy (aTHX_ coro);
1725 SvREFCNT_dec (coro->on_destroy);
1726 SvREFCNT_dec (coro->status);
1727
1595 Safefree (coro); 1728 Safefree (coro);
1596 }
1597 1729
1598 return 0; 1730 return 0;
1599} 1731}
1600 1732
1601static int 1733static int ecb_cold
1602coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1734coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1603{ 1735{
1604 struct coro *coro = (struct coro *)mg->mg_ptr; 1736 /* called when perl clones the current process the slow way (windows process emulation) */
1605 1737 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1606 ++coro->refcnt; 1738 mg->mg_ptr = 0;
1739 mg->mg_virtual = 0;
1607 1740
1608 return 0; 1741 return 0;
1609} 1742}
1610 1743
1611static MGVTBL coro_state_vtbl = { 1744static MGVTBL coro_state_vtbl = {
… …
1636 TRANSFER (ta, 1); 1769 TRANSFER (ta, 1);
1637} 1770}
1638 1771
1639/** Coro ********************************************************************/ 1772/** Coro ********************************************************************/
1640 1773
1641INLINE void 1774ecb_inline void
1642coro_enq (pTHX_ struct coro *coro) 1775coro_enq (pTHX_ struct coro *coro)
1643{ 1776{
1644 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1777 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1645 1778
1646 SvREFCNT_inc_NN (coro->hv); 1779 SvREFCNT_inc_NN (coro->hv);
… …
1648 coro->next_ready = 0; 1781 coro->next_ready = 0;
1649 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1782 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1650 ready [1] = coro; 1783 ready [1] = coro;
1651} 1784}
1652 1785
1653INLINE struct coro * 1786ecb_inline struct coro *
1654coro_deq (pTHX) 1787coro_deq (pTHX)
1655{ 1788{
1656 int prio; 1789 int prio;
1657 1790
1658 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1791 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1711{ 1844{
1712 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1845 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1713} 1846}
1714 1847
1715/* expects to own a reference to next->hv */ 1848/* expects to own a reference to next->hv */
1716INLINE void 1849ecb_inline void
1717prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1850prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1718{ 1851{
1719 SV *prev_sv = SvRV (coro_current); 1852 SV *prev_sv = SvRV (coro_current);
1720 1853
1721 ta->prev = SvSTATE_hv (prev_sv); 1854 ta->prev = SvSTATE_hv (prev_sv);
… …
1734{ 1867{
1735 for (;;) 1868 for (;;)
1736 { 1869 {
1737 struct coro *next = coro_deq (aTHX); 1870 struct coro *next = coro_deq (aTHX);
1738 1871
1739 if (expect_true (next)) 1872 if (ecb_expect_true (next))
1740 { 1873 {
1741 /* cannot transfer to destroyed coros, skip and look for next */ 1874 /* cannot transfer to destroyed coros, skip and look for next */
1742 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1875 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1743 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1876 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1744 else 1877 else
1745 { 1878 {
1746 next->flags &= ~CF_READY; 1879 next->flags &= ~CF_READY;
1747 --coro_nready; 1880 --coro_nready;
… …
1754 { 1887 {
1755 /* nothing to schedule: call the idle handler */ 1888 /* nothing to schedule: call the idle handler */
1756 if (SvROK (sv_idle) 1889 if (SvROK (sv_idle)
1757 && SvOBJECT (SvRV (sv_idle))) 1890 && SvOBJECT (SvRV (sv_idle)))
1758 { 1891 {
1892 if (SvRV (sv_idle) == SvRV (coro_current))
1893 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1894
1759 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1895 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1760 api_ready (aTHX_ SvRV (sv_idle)); 1896 api_ready (aTHX_ SvRV (sv_idle));
1761 --coro_nready; 1897 --coro_nready;
1762 } 1898 }
1763 else 1899 else
1764 { 1900 {
1901 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1765 dSP; 1902 dSP;
1766 1903
1767 ENTER; 1904 ENTER;
1768 SAVETMPS; 1905 SAVETMPS;
1769 1906
… …
1776 } 1913 }
1777 } 1914 }
1778 } 1915 }
1779} 1916}
1780 1917
1781INLINE void 1918ecb_inline void
1782prepare_cede (pTHX_ struct coro_transfer_args *ta) 1919prepare_cede (pTHX_ struct coro_transfer_args *ta)
1783{ 1920{
1784 api_ready (aTHX_ coro_current); 1921 api_ready (aTHX_ coro_current);
1785 prepare_schedule (aTHX_ ta); 1922 prepare_schedule (aTHX_ ta);
1786} 1923}
1787 1924
1788INLINE void 1925ecb_inline void
1789prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1926prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1790{ 1927{
1791 SV *prev = SvRV (coro_current); 1928 SV *prev = SvRV (coro_current);
1792 1929
1793 if (coro_nready) 1930 if (coro_nready)
… …
1823{ 1960{
1824 struct coro_transfer_args ta; 1961 struct coro_transfer_args ta;
1825 1962
1826 prepare_cede (aTHX_ &ta); 1963 prepare_cede (aTHX_ &ta);
1827 1964
1828 if (expect_true (ta.prev != ta.next)) 1965 if (ecb_expect_true (ta.prev != ta.next))
1829 { 1966 {
1830 TRANSFER (ta, 1); 1967 TRANSFER (ta, 1);
1831 return 1; 1968 return 1;
1832 } 1969 }
1833 else 1970 else
… …
1876 coro->slot->runops = RUNOPS_DEFAULT; 2013 coro->slot->runops = RUNOPS_DEFAULT;
1877 } 2014 }
1878} 2015}
1879 2016
1880static void 2017static void
2018coro_push_av (pTHX_ AV *av, I32 gimme_v)
2019{
2020 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2021 {
2022 dSP;
2023
2024 if (gimme_v == G_SCALAR)
2025 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2026 else
2027 {
2028 int i;
2029 EXTEND (SP, AvFILLp (av) + 1);
2030
2031 for (i = 0; i <= AvFILLp (av); ++i)
2032 PUSHs (AvARRAY (av)[i]);
2033 }
2034
2035 PUTBACK;
2036 }
2037}
2038
2039static void
2040coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2041{
2042 if (!coro->on_destroy)
2043 coro->on_destroy = newAV ();
2044
2045 av_push (coro->on_destroy, cb);
2046}
2047
2048static void
2049slf_destroy_join (pTHX_ struct CoroSLF *frame)
2050{
2051 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2052}
2053
2054static int
2055slf_check_join (pTHX_ struct CoroSLF *frame)
2056{
2057 struct coro *coro = (struct coro *)frame->data;
2058
2059 if (!coro->status)
2060 return 1;
2061
2062 frame->destroy = 0;
2063
2064 coro_push_av (aTHX_ coro->status, GIMME_V);
2065
2066 SvREFCNT_dec ((SV *)coro->hv);
2067
2068 return 0;
2069}
2070
2071static void
2072slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2073{
2074 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2075
2076 if (items > 1)
2077 croak ("join called with too many arguments");
2078
2079 if (coro->status)
2080 frame->prepare = prepare_nop;
2081 else
2082 {
2083 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2084 frame->prepare = prepare_schedule;
2085 }
2086
2087 frame->check = slf_check_join;
2088 frame->destroy = slf_destroy_join;
2089 frame->data = (void *)coro;
2090 SvREFCNT_inc (coro->hv);
2091}
2092
2093static void
1881coro_call_on_destroy (pTHX_ struct coro *coro) 2094coro_call_on_destroy (pTHX_ struct coro *coro)
1882{ 2095{
1883 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2096 AV *od = coro->on_destroy;
1884 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1885 2097
1886 if (on_destroyp) 2098 if (!od)
1887 { 2099 return;
1888 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1889 2100
1890 while (AvFILLp (on_destroy) >= 0) 2101 while (AvFILLp (od) >= 0)
2102 {
2103 SV *cb = sv_2mortal (av_pop (od));
2104
2105 /* coro hv's (and only hv's at the moment) are supported as well */
2106 if (SvSTATEhv_p (aTHX_ cb))
2107 api_ready (aTHX_ cb);
2108 else
1891 { 2109 {
1892 dSP; /* don't disturb outer sp */ 2110 dSP; /* don't disturb outer sp */
1893 SV *cb = av_pop (on_destroy);
1894
1895 PUSHMARK (SP); 2111 PUSHMARK (SP);
1896 2112
1897 if (statusp) 2113 if (coro->status)
1898 { 2114 {
1899 int i; 2115 PUTBACK;
1900 AV *status = (AV *)SvRV (*statusp); 2116 coro_push_av (aTHX_ coro->status, G_ARRAY);
1901 EXTEND (SP, AvFILLp (status) + 1); 2117 SPAGAIN;
1902
1903 for (i = 0; i <= AvFILLp (status); ++i)
1904 PUSHs (AvARRAY (status)[i]);
1905 } 2118 }
1906 2119
1907 PUTBACK; 2120 PUTBACK;
1908 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2121 call_sv (cb, G_VOID | G_DISCARD);
1909 } 2122 }
1910 } 2123 }
1911} 2124}
1912 2125
1913static void 2126static void
1914slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2127coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1915{ 2128{
2129 AV *av;
2130
2131 if (coro->status)
2132 {
2133 av = coro->status;
2134 av_clear (av);
2135 }
2136 else
2137 av = coro->status = newAV ();
2138
2139 /* items are actually not so common, so optimise for this case */
2140 if (items)
2141 {
1916 int i; 2142 int i;
1917 HV *hv = (HV *)SvRV (coro_current);
1918 AV *av = newAV ();
1919 2143
1920 av_extend (av, items - 1); 2144 av_extend (av, items - 1);
2145
1921 for (i = 0; i < items; ++i) 2146 for (i = 0; i < items; ++i)
1922 av_push (av, SvREFCNT_inc_NN (arg [i])); 2147 av_push (av, SvREFCNT_inc_NN (arg [i]));
2148 }
2149}
1923 2150
1924 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2151static void
1925 2152slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2153{
1926 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2154 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1927 api_ready (aTHX_ sv_manager); 2155 api_ready (aTHX_ sv_manager);
1928 2156
1929 frame->prepare = prepare_schedule; 2157 frame->prepare = prepare_schedule;
1930 frame->check = slf_check_repeat; 2158 frame->check = slf_check_repeat;
1931 2159
1932 /* as a minor optimisation, we could unwind all stacks here */ 2160 /* as a minor optimisation, we could unwind all stacks here */
1933 /* but that puts extra pressure on pp_slf, and is not worth much */ 2161 /* but that puts extra pressure on pp_slf, and is not worth much */
1934 /*coro_unwind_stacks (aTHX);*/ 2162 /*coro_unwind_stacks (aTHX);*/
2163}
2164
2165static void
2166slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2167{
2168 HV *coro_hv = (HV *)SvRV (coro_current);
2169
2170 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2171 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2172}
2173
2174static void
2175slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2176{
2177 HV *coro_hv;
2178 struct coro *coro;
2179
2180 if (items <= 0)
2181 croak ("Coro::cancel called without coro object,");
2182
2183 coro = SvSTATE (arg [0]);
2184 coro_hv = coro->hv;
2185
2186 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2187
2188 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2189 {
2190 /* coro currently busy cancelling something, so just notify it */
2191 coro->slf_frame.data = (void *)coro;
2192
2193 frame->prepare = prepare_nop;
2194 frame->check = slf_check_nop;
2195 }
2196 else if (coro_hv == (HV *)SvRV (coro_current))
2197 {
2198 /* cancelling the current coro is allowed, and equals terminate */
2199 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2200 }
2201 else
2202 {
2203 struct coro *self = SvSTATE_current;
2204
2205 /* otherwise we cancel directly, purely for speed reasons
2206 * unfortunately, this requires some magic trickery, as
2207 * somebody else could cancel us, so we have to fight the cancellation.
2208 * this is ugly, and hopefully fully worth the extra speed.
2209 * besides, I can't get the slow-but-safe version working...
2210 */
2211 slf_frame.data = 0;
2212 self->flags |= CF_NOCANCEL;
2213 coro_state_destroy (aTHX_ coro);
2214 self->flags &= ~CF_NOCANCEL;
2215
2216 if (slf_frame.data)
2217 {
2218 /* while we were busy we have been cancelled, so terminate */
2219 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2220 }
2221 else
2222 {
2223 frame->prepare = prepare_nop;
2224 frame->check = slf_check_nop;
2225 }
2226 }
2227}
2228
2229static int
2230slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2231{
2232 frame->prepare = 0;
2233 coro_unwind_stacks (aTHX);
2234
2235 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2236
2237 return 1;
2238}
2239
2240static int
2241safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2242{
2243 if (coro->cctx)
2244 croak ("coro inside C callback, unable to cancel at this time, caught");
2245
2246 if (coro->flags & CF_NEW)
2247 {
2248 coro_set_status (aTHX_ coro, arg, items);
2249 coro_state_destroy (aTHX_ coro);
2250 }
2251 else
2252 {
2253 if (!coro->slf_frame.prepare)
2254 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2255
2256 slf_destroy (aTHX_ coro);
2257
2258 coro_set_status (aTHX_ coro, arg, items);
2259 coro->slf_frame.prepare = prepare_nop;
2260 coro->slf_frame.check = slf_check_safe_cancel;
2261
2262 api_ready (aTHX_ (SV *)coro->hv);
2263 }
2264
2265 return 1;
1935} 2266}
1936 2267
1937/*****************************************************************************/ 2268/*****************************************************************************/
1938/* async pool handler */ 2269/* async pool handler */
1939 2270
… …
1970slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2301slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1971{ 2302{
1972 HV *hv = (HV *)SvRV (coro_current); 2303 HV *hv = (HV *)SvRV (coro_current);
1973 struct coro *coro = SvSTATE_hv ((SV *)hv); 2304 struct coro *coro = SvSTATE_hv ((SV *)hv);
1974 2305
1975 if (expect_true (coro->saved_deffh)) 2306 if (ecb_expect_true (coro->saved_deffh))
1976 { 2307 {
1977 /* subsequent iteration */ 2308 /* subsequent iteration */
1978 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2309 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1979 coro->saved_deffh = 0; 2310 coro->saved_deffh = 0;
1980 2311
1981 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2312 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1982 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2313 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1983 { 2314 {
1984 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2315 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1985 coro->invoke_av = newAV (); 2316 return;
1986
1987 frame->prepare = prepare_nop;
1988 } 2317 }
1989 else 2318 else
1990 { 2319 {
1991 av_clear (GvAV (PL_defgv)); 2320 av_clear (GvAV (PL_defgv));
1992 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2321 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2042 2371
2043static int 2372static int
2044slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2373slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2045{ 2374{
2046 SV *data = (SV *)frame->data; 2375 SV *data = (SV *)frame->data;
2047 2376
2048 if (CORO_THROW) 2377 if (CORO_THROW)
2049 return 0; 2378 return 0;
2050 2379
2051 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2380 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2052 return 1; 2381 return 1;
… …
2088 cb = sv_2mortal (coro->rouse_cb); 2417 cb = sv_2mortal (coro->rouse_cb);
2089 coro->rouse_cb = 0; 2418 coro->rouse_cb = 0;
2090 } 2419 }
2091 2420
2092 if (!SvROK (cb) 2421 if (!SvROK (cb)
2093 || SvTYPE (SvRV (cb)) != SVt_PVCV 2422 || SvTYPE (SvRV (cb)) != SVt_PVCV
2094 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2423 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2095 croak ("Coro::rouse_wait called with illegal callback argument,"); 2424 croak ("Coro::rouse_wait called with illegal callback argument,");
2096 2425
2097 { 2426 {
2098 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2427 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2215static void 2544static void
2216slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2545slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2217{ 2546{
2218 frame->prepare = prepare_cede_notself; 2547 frame->prepare = prepare_cede_notself;
2219 frame->check = slf_check_nop; 2548 frame->check = slf_check_nop;
2549}
2550
2551/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2552static void
2553slf_destroy (pTHX_ struct coro *coro)
2554{
2555 /* this callback is reserved for slf functions needing to do cleanup */
2556 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2557 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2558
2559 /*
2560 * The on_destroy above most likely is from an SLF call.
2561 * Since by definition the SLF call will not finish when we destroy
2562 * the coro, we will have to force-finish it here, otherwise
2563 * cleanup functions cannot call SLF functions.
2564 */
2565 coro->slf_frame.prepare = 0;
2220} 2566}
2221 2567
2222/* 2568/*
2223 * these not obviously related functions are all rolled into one 2569 * these not obviously related functions are all rolled into one
2224 * function to increase chances that they all will call transfer with the same 2570 * function to increase chances that they all will call transfer with the same
… …
2231 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2577 I32 checkmark; /* mark SP to see how many elements check has pushed */
2232 2578
2233 /* set up the slf frame, unless it has already been set-up */ 2579 /* set up the slf frame, unless it has already been set-up */
2234 /* the latter happens when a new coro has been started */ 2580 /* the latter happens when a new coro has been started */
2235 /* or when a new cctx was attached to an existing coroutine */ 2581 /* or when a new cctx was attached to an existing coroutine */
2236 if (expect_true (!slf_frame.prepare)) 2582 if (ecb_expect_true (!slf_frame.prepare))
2237 { 2583 {
2238 /* first iteration */ 2584 /* first iteration */
2239 dSP; 2585 dSP;
2240 SV **arg = PL_stack_base + TOPMARK + 1; 2586 SV **arg = PL_stack_base + TOPMARK + 1;
2241 int items = SP - arg; /* args without function object */ 2587 int items = SP - arg; /* args without function object */
… …
2282 while (slf_frame.check (aTHX_ &slf_frame)); 2628 while (slf_frame.check (aTHX_ &slf_frame));
2283 2629
2284 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2630 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2285 2631
2286 /* exception handling */ 2632 /* exception handling */
2287 if (expect_false (CORO_THROW)) 2633 if (ecb_expect_false (CORO_THROW))
2288 { 2634 {
2289 SV *exception = sv_2mortal (CORO_THROW); 2635 SV *exception = sv_2mortal (CORO_THROW);
2290 2636
2291 CORO_THROW = 0; 2637 CORO_THROW = 0;
2292 sv_setsv (ERRSV, exception); 2638 sv_setsv (ERRSV, exception);
2293 croak (0); 2639 croak (0);
2294 } 2640 }
2295 2641
2296 /* return value handling - mostly like entersub */ 2642 /* return value handling - mostly like entersub */
2297 /* make sure we put something on the stack in scalar context */ 2643 /* make sure we put something on the stack in scalar context */
2298 if (GIMME_V == G_SCALAR) 2644 if (GIMME_V == G_SCALAR
2645 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2299 { 2646 {
2300 dSP; 2647 dSP;
2301 SV **bot = PL_stack_base + checkmark; 2648 SV **bot = PL_stack_base + checkmark;
2302 2649
2303 if (sp == bot) /* too few, push undef */ 2650 if (sp == bot) /* too few, push undef */
2304 bot [1] = &PL_sv_undef; 2651 bot [1] = &PL_sv_undef;
2305 else if (sp != bot + 1) /* too many, take last one */ 2652 else /* too many, take last one */
2306 bot [1] = *sp; 2653 bot [1] = *sp;
2307 2654
2308 SP = bot + 1; 2655 SP = bot + 1;
2309 2656
2310 PUTBACK; 2657 PUTBACK;
… …
2343 if (PL_op->op_flags & OPf_STACKED) 2690 if (PL_op->op_flags & OPf_STACKED)
2344 { 2691 {
2345 if (items > slf_arga) 2692 if (items > slf_arga)
2346 { 2693 {
2347 slf_arga = items; 2694 slf_arga = items;
2348 free (slf_argv); 2695 Safefree (slf_argv);
2349 slf_argv = malloc (slf_arga * sizeof (SV *)); 2696 New (0, slf_argv, slf_arga, SV *);
2350 } 2697 }
2351 2698
2352 slf_argc = items; 2699 slf_argc = items;
2353 2700
2354 for (i = 0; i < items; ++i) 2701 for (i = 0; i < items; ++i)
… …
2417{ 2764{
2418 PerlIOBuf base; 2765 PerlIOBuf base;
2419 NV next, every; 2766 NV next, every;
2420} PerlIOCede; 2767} PerlIOCede;
2421 2768
2422static IV 2769static IV ecb_cold
2423PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2770PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2424{ 2771{
2425 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2772 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2426 2773
2427 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2774 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2428 self->next = nvtime () + self->every; 2775 self->next = nvtime () + self->every;
2429 2776
2430 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2777 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2431} 2778}
2432 2779
2433static SV * 2780static SV * ecb_cold
2434PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2781PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2435{ 2782{
2436 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2783 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2437 2784
2438 return newSVnv (self->every); 2785 return newSVnv (self->every);
… …
2550 SvREFCNT_dec (cb); 2897 SvREFCNT_dec (cb);
2551 } 2898 }
2552} 2899}
2553 2900
2554static void 2901static void
2555coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2902coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2556{ 2903{
2557 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2904 /* call $sem->adjust (0) to possibly wake up some other waiters */
2558 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2905 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2559} 2906}
2560 2907
2561static int 2908static int
2562slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2909slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2563{ 2910{
2564 AV *av = (AV *)frame->data; 2911 AV *av = (AV *)frame->data;
2565 SV *count_sv = AvARRAY (av)[0]; 2912 SV *count_sv = AvARRAY (av)[0];
2913 SV *coro_hv = SvRV (coro_current);
2566 2914
2567 /* if we are about to throw, don't actually acquire the lock, just throw */ 2915 /* if we are about to throw, don't actually acquire the lock, just throw */
2568 if (CORO_THROW) 2916 if (CORO_THROW)
2569 return 0; 2917 return 0;
2570 else if (SvIVX (count_sv) > 0) 2918 else if (SvIVX (count_sv) > 0)
2571 { 2919 {
2572 SvSTATE_current->on_destroy = 0; 2920 frame->destroy = 0;
2573 2921
2574 if (acquire) 2922 if (acquire)
2575 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2923 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2576 else 2924 else
2577 coro_semaphore_adjust (aTHX_ av, 0); 2925 coro_semaphore_adjust (aTHX_ av, 0);
… …
2582 { 2930 {
2583 int i; 2931 int i;
2584 /* if we were woken up but can't down, we look through the whole */ 2932 /* if we were woken up but can't down, we look through the whole */
2585 /* waiters list and only add us if we aren't in there already */ 2933 /* waiters list and only add us if we aren't in there already */
2586 /* this avoids some degenerate memory usage cases */ 2934 /* this avoids some degenerate memory usage cases */
2587 2935 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2588 for (i = 1; i <= AvFILLp (av); ++i)
2589 if (AvARRAY (av)[i] == SvRV (coro_current)) 2936 if (AvARRAY (av)[i] == coro_hv)
2590 return 1; 2937 return 1;
2591 2938
2592 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2939 av_push (av, SvREFCNT_inc (coro_hv));
2593 return 1; 2940 return 1;
2594 } 2941 }
2595} 2942}
2596 2943
2597static int 2944static int
… …
2620 { 2967 {
2621 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2968 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2622 2969
2623 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2970 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2624 frame->prepare = prepare_schedule; 2971 frame->prepare = prepare_schedule;
2625
2626 /* to avoid race conditions when a woken-up coro gets terminated */ 2972 /* to avoid race conditions when a woken-up coro gets terminated */
2627 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2973 /* we arrange for a temporary on_destroy that calls adjust (0) */
2628 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2974 frame->destroy = coro_semaphore_destroy;
2629 } 2975 }
2630} 2976}
2631 2977
2632static void 2978static void
2633slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2979slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2715 { 3061 {
2716 SV *cb_cv = s_get_cv_croak (arg [1]); 3062 SV *cb_cv = s_get_cv_croak (arg [1]);
2717 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3063 av_push (av, SvREFCNT_inc_NN (cb_cv));
2718 3064
2719 if (SvIVX (AvARRAY (av)[0])) 3065 if (SvIVX (AvARRAY (av)[0]))
2720 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3066 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2721 3067
2722 frame->prepare = prepare_nop; 3068 frame->prepare = prepare_nop;
2723 frame->check = slf_check_nop; 3069 frame->check = slf_check_nop;
2724 } 3070 }
2725 else if (SvIVX (AvARRAY (av)[0])) 3071 else if (SvIVX (AvARRAY (av)[0]))
… …
2851 dSP; 3197 dSP;
2852 3198
2853 static SV *prio_cv; 3199 static SV *prio_cv;
2854 static SV *prio_sv; 3200 static SV *prio_sv;
2855 3201
2856 if (expect_false (!prio_cv)) 3202 if (ecb_expect_false (!prio_cv))
2857 { 3203 {
2858 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3204 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2859 prio_sv = newSViv (0); 3205 prio_sv = newSViv (0);
2860 } 3206 }
2861 3207
… …
2887 /* now call the AIO function - we assume our request is uncancelable */ 3233 /* now call the AIO function - we assume our request is uncancelable */
2888 PUTBACK; 3234 PUTBACK;
2889 call_sv ((SV *)req, G_VOID | G_DISCARD); 3235 call_sv ((SV *)req, G_VOID | G_DISCARD);
2890 } 3236 }
2891 3237
2892 /* now that the requets is going, we loop toll we have a result */ 3238 /* now that the request is going, we loop till we have a result */
2893 frame->data = (void *)state; 3239 frame->data = (void *)state;
2894 frame->prepare = prepare_schedule; 3240 frame->prepare = prepare_schedule;
2895 frame->check = slf_check_aio_req; 3241 frame->check = slf_check_aio_req;
2896} 3242}
2897 3243
… …
2907 3253
2908/*****************************************************************************/ 3254/*****************************************************************************/
2909 3255
2910#if CORO_CLONE 3256#if CORO_CLONE
2911# include "clone.c" 3257# include "clone.c"
3258#endif
3259
3260/*****************************************************************************/
3261
3262static SV *
3263coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3264{
3265 SV *coro_sv;
3266 struct coro *coro;
3267 MAGIC *mg;
3268 HV *hv;
3269 SV *cb;
3270 int i;
3271
3272 if (argc > 0)
3273 {
3274 cb = s_get_cv_croak (argv [0]);
3275
3276 if (!is_coro)
3277 {
3278 if (CvISXSUB (cb))
3279 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3280
3281 if (!CvROOT (cb))
3282 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3283 }
3284 }
3285
3286 Newz (0, coro, 1, struct coro);
3287 coro->args = newAV ();
3288 coro->flags = CF_NEW;
3289
3290 if (coro_first) coro_first->prev = coro;
3291 coro->next = coro_first;
3292 coro_first = coro;
3293
3294 coro->hv = hv = newHV ();
3295 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3296 mg->mg_flags |= MGf_DUP;
3297 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3298
3299 if (argc > 0)
3300 {
3301 av_extend (coro->args, argc + is_coro - 1);
3302
3303 if (is_coro)
3304 {
3305 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3306 cb = (SV *)cv_coro_run;
3307 }
3308
3309 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3310
3311 for (i = 1; i < argc; i++)
3312 av_push (coro->args, newSVsv (argv [i]));
3313 }
3314
3315 return coro_sv;
3316}
3317
3318#ifndef __cplusplus
3319ecb_cold XS(boot_Coro__State);
3320#endif
3321
3322#if CORO_JIT
3323
3324static void ecb_noinline ecb_cold
3325pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3326{
3327 dSP;
3328 AV *av = newAV ();
3329
3330 av_store (av, 3, newSVuv (d));
3331 av_store (av, 2, newSVuv (c));
3332 av_store (av, 1, newSVuv (b));
3333 av_store (av, 0, newSVuv (a));
3334
3335 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3336
3337 PUTBACK;
3338}
3339
3340static void ecb_noinline ecb_cold
3341jit_init (pTHX)
3342{
3343 dSP;
3344 SV *load, *save;
3345 char *map_base;
3346 char *load_ptr, *save_ptr;
3347 STRLEN load_len, save_len, map_len;
3348 int count;
3349
3350 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3351
3352 PUSHMARK (SP);
3353 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3354 #include "state.h"
3355 count = call_pv ("Coro::State::_jit", G_ARRAY);
3356 SPAGAIN;
3357
3358 save = POPs; save_ptr = SvPVbyte (save, save_len);
3359 load = POPs; load_ptr = SvPVbyte (load, load_len);
3360
3361 map_len = load_len + save_len + 16;
3362
3363 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3364
3365 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3366
3367 load_perl_slots = (load_save_perl_slots_type)map_base;
3368 memcpy (map_base, load_ptr, load_len);
3369
3370 map_base += (load_len + 15) & ~15;
3371
3372 save_perl_slots = (load_save_perl_slots_type)map_base;
3373 memcpy (map_base, save_ptr, save_len);
3374
3375 /* we are good citizens and try to make the page read-only, so the evil evil */
3376 /* hackers might have it a bit more difficult */
3377 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3378
3379 PUTBACK;
3380 eval_pv ("undef &Coro::State::_jit", 1);
3381}
3382
2912#endif 3383#endif
2913 3384
2914MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3385MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2915 3386
2916PROTOTYPES: DISABLE 3387PROTOTYPES: DISABLE
… …
2920#ifdef USE_ITHREADS 3391#ifdef USE_ITHREADS
2921# if CORO_PTHREAD 3392# if CORO_PTHREAD
2922 coro_thx = PERL_GET_CONTEXT; 3393 coro_thx = PERL_GET_CONTEXT;
2923# endif 3394# endif
2924#endif 3395#endif
2925 BOOT_PAGESIZE; 3396 /* perl defines these to check for existance first, but why it doesn't */
3397 /* just create them one at init time is not clear to me, except for */
3398 /* programs trying to delete them, but... */
3399 /* anyway, we declare this as invalid and make sure they are initialised here */
3400 DEFSV;
3401 ERRSV;
2926 3402
2927 cctx_current = cctx_new_empty (); 3403 cctx_current = cctx_new_empty ();
2928 3404
2929 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3405 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2930 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3406 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
2970 coroapi.prepare_nop = prepare_nop; 3446 coroapi.prepare_nop = prepare_nop;
2971 coroapi.prepare_schedule = prepare_schedule; 3447 coroapi.prepare_schedule = prepare_schedule;
2972 coroapi.prepare_cede = prepare_cede; 3448 coroapi.prepare_cede = prepare_cede;
2973 coroapi.prepare_cede_notself = prepare_cede_notself; 3449 coroapi.prepare_cede_notself = prepare_cede_notself;
2974 3450
2975 { 3451 time_init (aTHX);
2976 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2977
2978 if (!svp) croak ("Time::HiRes is required");
2979 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2980
2981 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2982
2983 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
2984 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2985 }
2986 3452
2987 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3453 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3454#if CORO_JIT
3455 PUTBACK;
3456 jit_init (aTHX);
3457 SPAGAIN;
3458#endif
2988} 3459}
2989 3460
2990SV * 3461SV *
2991new (char *klass, ...) 3462new (SV *klass, ...)
2992 ALIAS: 3463 ALIAS:
2993 Coro::new = 1 3464 Coro::new = 1
2994 CODE: 3465 CODE:
2995{ 3466 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2996 struct coro *coro; 3467 OUTPUT:
2997 MAGIC *mg;
2998 HV *hv;
2999 SV *cb;
3000 int i;
3001
3002 if (items > 1)
3003 {
3004 cb = s_get_cv_croak (ST (1));
3005
3006 if (!ix)
3007 {
3008 if (CvISXSUB (cb))
3009 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3010
3011 if (!CvROOT (cb))
3012 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3013 }
3014 }
3015
3016 Newz (0, coro, 1, struct coro);
3017 coro->args = newAV ();
3018 coro->flags = CF_NEW;
3019
3020 if (coro_first) coro_first->prev = coro;
3021 coro->next = coro_first;
3022 coro_first = coro;
3023
3024 coro->hv = hv = newHV ();
3025 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3026 mg->mg_flags |= MGf_DUP;
3027 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3028
3029 if (items > 1)
3030 {
3031 av_extend (coro->args, items - 1 + ix - 1);
3032
3033 if (ix)
3034 {
3035 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3036 cb = (SV *)cv_coro_run;
3037 }
3038
3039 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3040
3041 for (i = 2; i < items; i++)
3042 av_push (coro->args, newSVsv (ST (i)));
3043 }
3044}
3045 OUTPUT:
3046 RETVAL 3468 RETVAL
3047 3469
3048void 3470void
3049transfer (...) 3471transfer (...)
3050 PROTOTYPE: $$ 3472 PROTOTYPE: $$
3051 CODE: 3473 CODE:
3052 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3474 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3053
3054bool
3055_destroy (SV *coro_sv)
3056 CODE:
3057 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3058 OUTPUT:
3059 RETVAL
3060 3475
3061void 3476void
3062_exit (int code) 3477_exit (int code)
3063 PROTOTYPE: $ 3478 PROTOTYPE: $
3064 CODE: 3479 CODE:
… …
3125void 3540void
3126list () 3541list ()
3127 PROTOTYPE: 3542 PROTOTYPE:
3128 PPCODE: 3543 PPCODE:
3129{ 3544{
3130 struct coro *coro; 3545 struct coro *coro;
3131 for (coro = coro_first; coro; coro = coro->next) 3546 for (coro = coro_first; coro; coro = coro->next)
3132 if (coro->hv) 3547 if (coro->hv)
3133 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3548 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3134} 3549}
3135 3550
… …
3140 CODE: 3555 CODE:
3141{ 3556{
3142 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3557 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3143 { 3558 {
3144 struct coro *current = SvSTATE_current; 3559 struct coro *current = SvSTATE_current;
3560 struct CoroSLF slf_save;
3145 3561
3146 if (current != coro) 3562 if (current != coro)
3147 { 3563 {
3148 PUTBACK; 3564 PUTBACK;
3149 save_perl (aTHX_ current); 3565 save_perl (aTHX_ current);
3150 load_perl (aTHX_ coro); 3566 load_perl (aTHX_ coro);
3567 /* the coro is most likely in an active SLF call.
3568 * while not strictly required (the code we execute is
3569 * not allowed to call any SLF functions), it's cleaner
3570 * to reinitialise the slf_frame and restore it later.
3571 * This might one day allow us to actually do SLF calls
3572 * from code executed here.
3573 */
3574 slf_save = slf_frame;
3575 slf_frame.prepare = 0;
3151 SPAGAIN; 3576 SPAGAIN;
3152 } 3577 }
3153 3578
3154 PUSHSTACK; 3579 PUSHSTACK;
3155 3580
… …
3165 SPAGAIN; 3590 SPAGAIN;
3166 3591
3167 if (current != coro) 3592 if (current != coro)
3168 { 3593 {
3169 PUTBACK; 3594 PUTBACK;
3595 slf_frame = slf_save;
3170 save_perl (aTHX_ coro); 3596 save_perl (aTHX_ coro);
3171 load_perl (aTHX_ current); 3597 load_perl (aTHX_ current);
3172 SPAGAIN; 3598 SPAGAIN;
3173 } 3599 }
3174 } 3600 }
… …
3179 PROTOTYPE: $ 3605 PROTOTYPE: $
3180 ALIAS: 3606 ALIAS:
3181 is_ready = CF_READY 3607 is_ready = CF_READY
3182 is_running = CF_RUNNING 3608 is_running = CF_RUNNING
3183 is_new = CF_NEW 3609 is_new = CF_NEW
3184 is_destroyed = CF_DESTROYED 3610 is_destroyed = CF_ZOMBIE
3611 is_zombie = CF_ZOMBIE
3185 is_suspended = CF_SUSPENDED 3612 is_suspended = CF_SUSPENDED
3186 CODE: 3613 CODE:
3187 RETVAL = boolSV (coro->flags & ix); 3614 RETVAL = boolSV (coro->flags & ix);
3188 OUTPUT: 3615 OUTPUT:
3189 RETVAL 3616 RETVAL
3190 3617
3191void 3618void
3192throw (Coro::State self, SV *throw = &PL_sv_undef) 3619throw (SV *self, SV *exception = &PL_sv_undef)
3193 PROTOTYPE: $;$ 3620 PROTOTYPE: $;$
3194 CODE: 3621 CODE:
3195{ 3622{
3623 struct coro *coro = SvSTATE (self);
3196 struct coro *current = SvSTATE_current; 3624 struct coro *current = SvSTATE_current;
3197 SV **throwp = self == current ? &CORO_THROW : &self->except; 3625 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3198 SvREFCNT_dec (*throwp); 3626 SvREFCNT_dec (*exceptionp);
3199 SvGETMAGIC (throw); 3627 SvGETMAGIC (exception);
3200 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3628 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3629
3630 api_ready (aTHX_ self);
3201} 3631}
3202 3632
3203void 3633void
3204api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3634api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3205 PROTOTYPE: $;$ 3635 PROTOTYPE: $;$
… …
3260 3690
3261void 3691void
3262cancel (Coro::State self) 3692cancel (Coro::State self)
3263 CODE: 3693 CODE:
3264 coro_state_destroy (aTHX_ self); 3694 coro_state_destroy (aTHX_ self);
3265 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3266
3267 3695
3268SV * 3696SV *
3269enable_times (int enabled = enable_times) 3697enable_times (int enabled = enable_times)
3270 CODE: 3698 CODE:
3271{ 3699{
… …
3284 3712
3285void 3713void
3286times (Coro::State self) 3714times (Coro::State self)
3287 PPCODE: 3715 PPCODE:
3288{ 3716{
3289 struct coro *current = SvSTATE (coro_current); 3717 struct coro *current = SvSTATE (coro_current);
3290 3718
3291 if (expect_false (current == self)) 3719 if (ecb_expect_false (current == self))
3292 { 3720 {
3293 coro_times_update (); 3721 coro_times_update ();
3294 coro_times_add (SvSTATE (coro_current)); 3722 coro_times_add (SvSTATE (coro_current));
3295 } 3723 }
3296 3724
3297 EXTEND (SP, 2); 3725 EXTEND (SP, 2);
3298 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3726 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3299 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3727 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3300 3728
3301 if (expect_false (current == self)) 3729 if (ecb_expect_false (current == self))
3302 coro_times_sub (SvSTATE (coro_current)); 3730 coro_times_sub (SvSTATE (coro_current));
3303} 3731}
3732
3733void
3734swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3735 CODE:
3736{
3737 struct coro *current = SvSTATE_current;
3738
3739 if (current == coro)
3740 SWAP_SVS (current);
3741
3742 if (!coro->swap_sv)
3743 coro->swap_sv = newAV ();
3744
3745 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3746 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3747
3748 if (current == coro)
3749 SWAP_SVS (current);
3750}
3751
3304 3752
3305MODULE = Coro::State PACKAGE = Coro 3753MODULE = Coro::State PACKAGE = Coro
3306 3754
3307BOOT: 3755BOOT:
3308{ 3756{
3309 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3757 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3310 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3758 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3311 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3759 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3312 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3313 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3760 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3314 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3761 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3315 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3762 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3316 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3763 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3317 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3764 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3318 3765
3319 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3766 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3320 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3767 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3321 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3768 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3322 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3769 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3323 3770
3324 coro_stash = gv_stashpv ("Coro", TRUE); 3771 coro_stash = gv_stashpv ("Coro", TRUE);
3325 3772
3326 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3773 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3327 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3774 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
… …
3346 sv_setiv (sv, (IV)&coroapi); 3793 sv_setiv (sv, (IV)&coroapi);
3347 SvREADONLY_on (sv); 3794 SvREADONLY_on (sv);
3348 } 3795 }
3349} 3796}
3350 3797
3798SV *
3799async (...)
3800 PROTOTYPE: &@
3801 CODE:
3802 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3803 api_ready (aTHX_ RETVAL);
3804 OUTPUT:
3805 RETVAL
3806
3807void
3808_destroy (Coro::State coro)
3809 CODE:
3810 /* used by the manager thread */
3811 coro_state_destroy (aTHX_ coro);
3812
3813void
3814on_destroy (Coro::State coro, SV *cb)
3815 CODE:
3816 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3817
3818void
3819join (...)
3820 CODE:
3821 CORO_EXECUTE_SLF_XS (slf_init_join);
3822
3351void 3823void
3352terminate (...) 3824terminate (...)
3353 CODE: 3825 CODE:
3354 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3826 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3827
3828void
3829cancel (...)
3830 CODE:
3831 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3832
3833int
3834safe_cancel (Coro::State self, ...)
3835 C_ARGS: aTHX_ self, &ST (1), items - 1
3355 3836
3356void 3837void
3357schedule (...) 3838schedule (...)
3358 CODE: 3839 CODE:
3359 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3840 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3393 SvGETMAGIC (hook); 3874 SvGETMAGIC (hook);
3394 if (SvOK (hook)) 3875 if (SvOK (hook))
3395 { 3876 {
3396 coro_readyhook = newSVsv (hook); 3877 coro_readyhook = newSVsv (hook);
3397 CORO_READYHOOK = invoke_sv_ready_hook_helper; 3878 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3398 CORO_READYHOOK ();
3399 } 3879 }
3400 else 3880 else
3401 { 3881 {
3402 coro_readyhook = 0; 3882 coro_readyhook = 0;
3403 CORO_READYHOOK = 0; 3883 CORO_READYHOOK = 0;
… …
3473 for (i = 1; i < items; ++i) 3953 for (i = 1; i < items; ++i)
3474 av_push (av, SvREFCNT_inc_NN (ST (i))); 3954 av_push (av, SvREFCNT_inc_NN (ST (i)));
3475 3955
3476 if ((SV *)hv == &PL_sv_undef) 3956 if ((SV *)hv == &PL_sv_undef)
3477 { 3957 {
3478 PUSHMARK (SP); 3958 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)); 3959 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3960 SvREFCNT_dec (sv);
3487 } 3961 }
3488 3962
3489 { 3963 {
3490 struct coro *coro = SvSTATE_hv (hv); 3964 struct coro *coro = SvSTATE_hv (hv);
3491 3965
… …
3523 on_leave = 1 3997 on_leave = 1
3524 PROTOTYPE: & 3998 PROTOTYPE: &
3525 CODE: 3999 CODE:
3526{ 4000{
3527 struct coro *coro = SvSTATE_current; 4001 struct coro *coro = SvSTATE_current;
3528 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4002 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3529 4003
3530 block = s_get_cv_croak (block); 4004 block = s_get_cv_croak (block);
3531 4005
3532 if (!*avp) 4006 if (!*avp)
3533 *avp = newAV (); 4007 *avp = newAV ();
… …
3553 4027
3554SV * 4028SV *
3555new (SV *klass, SV *count = 0) 4029new (SV *klass, SV *count = 0)
3556 CODE: 4030 CODE:
3557{ 4031{
3558 int semcnt = 1; 4032 int semcnt = 1;
3559 4033
3560 if (count) 4034 if (count)
3561 { 4035 {
3562 SvGETMAGIC (count); 4036 SvGETMAGIC (count);
3563 4037
… …
3623 XSRETURN_NO; 4097 XSRETURN_NO;
3624} 4098}
3625 4099
3626void 4100void
3627waiters (SV *self) 4101waiters (SV *self)
3628 PPCODE: 4102 PPCODE:
3629{ 4103{
3630 AV *av = (AV *)SvRV (self); 4104 AV *av = (AV *)SvRV (self);
3631 int wcount = AvFILLp (av) + 1 - 1; 4105 int wcount = AvFILLp (av) + 1 - 1;
3632 4106
3633 if (GIMME_V == G_SCALAR) 4107 if (GIMME_V == G_SCALAR)
… …
3642} 4116}
3643 4117
3644MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4118MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3645 4119
3646void 4120void
3647_may_delete (SV *sem, int count, int extra_refs) 4121_may_delete (SV *sem, int count, unsigned int extra_refs)
3648 PPCODE: 4122 PPCODE:
3649{ 4123{
3650 AV *av = (AV *)SvRV (sem); 4124 AV *av = (AV *)SvRV (sem);
3651 4125
3652 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4126 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3653 && AvFILLp (av) == 0 /* no waiters, just count */ 4127 && AvFILLp (av) == 0 /* no waiters, just count */
3654 && SvIV (AvARRAY (av)[0]) == count) 4128 && SvIV (AvARRAY (av)[0]) == count)
3655 XSRETURN_YES; 4129 XSRETURN_YES;
… …
3676 4150
3677void 4151void
3678broadcast (SV *self) 4152broadcast (SV *self)
3679 CODE: 4153 CODE:
3680{ 4154{
3681 AV *av = (AV *)SvRV (self); 4155 AV *av = (AV *)SvRV (self);
3682 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4156 coro_signal_wake (aTHX_ av, AvFILLp (av));
3683} 4157}
3684 4158
3685void 4159void
3686send (SV *self) 4160send (SV *self)
… …
3694 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4168 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3695} 4169}
3696 4170
3697IV 4171IV
3698awaited (SV *self) 4172awaited (SV *self)
3699 CODE: 4173 CODE:
3700 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4174 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3701 OUTPUT: 4175 OUTPUT:
3702 RETVAL 4176 RETVAL
3703 4177
3704 4178
… …
3709 4183
3710void 4184void
3711_schedule (...) 4185_schedule (...)
3712 CODE: 4186 CODE:
3713{ 4187{
3714 static int incede; 4188 static int incede;
3715 4189
3716 api_cede_notself (aTHX); 4190 api_cede_notself (aTHX);
3717 4191
3718 ++incede; 4192 ++incede;
3719 while (coro_nready >= incede && api_cede (aTHX)) 4193 while (coro_nready >= incede && api_cede (aTHX))
… …
3763 { 4237 {
3764 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4238 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3765 coro_old_pp_sselect = 0; 4239 coro_old_pp_sselect = 0;
3766 } 4240 }
3767 4241
3768

Diff Legend

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