ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

Comparing Coro/Coro/State.xs (file contents):
Revision 1.367 by root, Mon Aug 3 09:19:57 2009 UTC vs.
Revision 1.432 by root, Wed May 8 00:44:44 2013 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
… …
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "schmorp.h" 16#include "schmorp.h"
12 17
18#define ECB_NO_THREADS 1
19#include "ecb.h"
20
21#include <stddef.h>
13#include <stdio.h> 22#include <stdio.h>
14#include <errno.h> 23#include <errno.h>
15#include <assert.h> 24#include <assert.h>
16 25
17#ifdef WIN32 26#ifndef SVs_PADSTALE
27# define SVs_PADSTALE 0
28#endif
29
30#ifdef PadARRAY
31# define NEWPADAPI
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 ECB_AMD64 && 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 */
… …
1282 */ 1455 */
1283 1456
1284 /* 1457 /*
1285 * 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
1286 * 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)
1287 * 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
1288 * bootstrap-time "top" top_env, as we cannot restore the "main" 1461 * doing in that case. YMMV.
1289 * coroutine as Coro has no such concept.
1290 * This actually isn't valid with the pthread backend, but OSes requiring
1291 * that backend are too broken to do it in a standards-compliant way.
1292 */ 1462 */
1293 PL_top_env = main_top_env; 1463 perlish_exit (aTHX);
1294 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1295 } 1464 }
1296} 1465}
1297 1466
1298static coro_cctx * 1467static coro_cctx *
1299cctx_new () 1468cctx_new (void)
1300{ 1469{
1301 coro_cctx *cctx; 1470 coro_cctx *cctx;
1302 1471
1303 ++cctx_count; 1472 ++cctx_count;
1304 New (0, cctx, 1, coro_cctx); 1473 New (0, cctx, 1, coro_cctx);
… …
1310 return cctx; 1479 return cctx;
1311} 1480}
1312 1481
1313/* create a new cctx only suitable as source */ 1482/* create a new cctx only suitable as source */
1314static coro_cctx * 1483static coro_cctx *
1315cctx_new_empty () 1484cctx_new_empty (void)
1316{ 1485{
1317 coro_cctx *cctx = cctx_new (); 1486 coro_cctx *cctx = cctx_new ();
1318 1487
1319 cctx->sptr = 0; 1488 cctx->stack.sptr = 0;
1320 coro_create (&cctx->cctx, 0, 0, 0, 0); 1489 coro_create (&cctx->cctx, 0, 0, 0, 0);
1321 1490
1322 return cctx; 1491 return cctx;
1323} 1492}
1324 1493
1325/* create a new cctx suitable as destination/running a perl interpreter */ 1494/* create a new cctx suitable as destination/running a perl interpreter */
1326static coro_cctx * 1495static coro_cctx *
1327cctx_new_run () 1496cctx_new_run (void)
1328{ 1497{
1329 coro_cctx *cctx = cctx_new (); 1498 coro_cctx *cctx = cctx_new ();
1330 void *stack_start;
1331 size_t stack_size;
1332 1499
1333#if HAVE_MMAP 1500 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1334 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1335 /* mmap supposedly does allocate-on-write for us */
1336 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1337
1338 if (cctx->sptr != (void *)-1)
1339 {
1340 #if CORO_STACKGUARD
1341 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1342 #endif
1343 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1344 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1345 cctx->flags |= CC_MAPPED;
1346 } 1501 {
1347 else
1348#endif
1349 {
1350 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1351 New (0, cctx->sptr, cctx_stacksize, long);
1352
1353 if (!cctx->sptr)
1354 {
1355 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1502 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1356 _exit (EXIT_FAILURE); 1503 _exit (EXIT_FAILURE);
1357 }
1358
1359 stack_start = cctx->sptr;
1360 stack_size = cctx->ssize;
1361 } 1504 }
1362 1505
1363 #if CORO_USE_VALGRIND
1364 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1365 #endif
1366
1367 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1506 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1368 1507
1369 return cctx; 1508 return cctx;
1370} 1509}
1371 1510
1372static void 1511static void
1373cctx_destroy (coro_cctx *cctx) 1512cctx_destroy (coro_cctx *cctx)
1374{ 1513{
1375 if (!cctx) 1514 if (!cctx)
1376 return; 1515 return;
1377 1516
1378 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1517 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1379 1518
1380 --cctx_count; 1519 --cctx_count;
1381 coro_destroy (&cctx->cctx); 1520 coro_destroy (&cctx->cctx);
1382 1521
1383 /* coro_transfer creates new, empty cctx's */ 1522 coro_stack_free (&cctx->stack);
1384 if (cctx->sptr)
1385 {
1386 #if CORO_USE_VALGRIND
1387 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1388 #endif
1389
1390#if HAVE_MMAP
1391 if (cctx->flags & CC_MAPPED)
1392 munmap (cctx->sptr, cctx->ssize);
1393 else
1394#endif
1395 Safefree (cctx->sptr);
1396 }
1397 1523
1398 Safefree (cctx); 1524 Safefree (cctx);
1399} 1525}
1400 1526
1401/* wether this cctx should be destructed */ 1527/* wether this cctx should be destructed */
1402#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))
1403 1529
1404static coro_cctx * 1530static coro_cctx *
1405cctx_get (pTHX) 1531cctx_get (pTHX)
1406{ 1532{
1407 while (expect_true (cctx_first)) 1533 while (ecb_expect_true (cctx_first))
1408 { 1534 {
1409 coro_cctx *cctx = cctx_first; 1535 coro_cctx *cctx = cctx_first;
1410 cctx_first = cctx->next; 1536 cctx_first = cctx->next;
1411 --cctx_idle; 1537 --cctx_idle;
1412 1538
1413 if (expect_true (!CCTX_EXPIRED (cctx))) 1539 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1414 return cctx; 1540 return cctx;
1415 1541
1416 cctx_destroy (cctx); 1542 cctx_destroy (cctx);
1417 } 1543 }
1418 1544
… …
1420} 1546}
1421 1547
1422static void 1548static void
1423cctx_put (coro_cctx *cctx) 1549cctx_put (coro_cctx *cctx)
1424{ 1550{
1425 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));
1426 1552
1427 /* free another cctx if overlimit */ 1553 /* free another cctx if overlimit */
1428 if (expect_false (cctx_idle >= cctx_max_idle)) 1554 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1429 { 1555 {
1430 coro_cctx *first = cctx_first; 1556 coro_cctx *first = cctx_first;
1431 cctx_first = first->next; 1557 cctx_first = first->next;
1432 --cctx_idle; 1558 --cctx_idle;
1433 1559
… …
1444static void 1570static void
1445transfer_check (pTHX_ struct coro *prev, struct coro *next) 1571transfer_check (pTHX_ struct coro *prev, struct coro *next)
1446{ 1572{
1447 /* TODO: throwing up here is considered harmful */ 1573 /* TODO: throwing up here is considered harmful */
1448 1574
1449 if (expect_true (prev != next)) 1575 if (ecb_expect_true (prev != next))
1450 { 1576 {
1451 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1577 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1452 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1578 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1453 1579
1454 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1580 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1455 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1581 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1456 1582
1457#if !PERL_VERSION_ATLEAST (5,10,0) 1583#if !PERL_VERSION_ATLEAST (5,10,0)
1458 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1584 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1459 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1585 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1460#endif 1586#endif
1461 } 1587 }
1462} 1588}
1463 1589
1464/* always use the TRANSFER macro */ 1590/* always use the TRANSFER macro */
1465static void NOINLINE /* noinline so we have a fixed stackframe */ 1591static void ecb_noinline /* noinline so we have a fixed stackframe */
1466transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1592transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1467{ 1593{
1468 dSTACKLEVEL; 1594 dSTACKLEVEL;
1469 1595
1470 /* sometimes transfer is only called to set idle_sp */ 1596 /* sometimes transfer is only called to set idle_sp */
1471 if (expect_false (!prev)) 1597 if (ecb_expect_false (!prev))
1472 { 1598 {
1473 cctx_current->idle_sp = STACKLEVEL; 1599 cctx_current->idle_sp = STACKLEVEL;
1474 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 */
1475 } 1601 }
1476 else if (expect_true (prev != next)) 1602 else if (ecb_expect_true (prev != next))
1477 { 1603 {
1478 coro_cctx *cctx_prev; 1604 coro_cctx *cctx_prev;
1479 1605
1480 if (expect_false (prev->flags & CF_NEW)) 1606 if (ecb_expect_false (prev->flags & CF_NEW))
1481 { 1607 {
1482 /* create a new empty/source context */ 1608 /* create a new empty/source context */
1483 prev->flags &= ~CF_NEW; 1609 prev->flags &= ~CF_NEW;
1484 prev->flags |= CF_RUNNING; 1610 prev->flags |= CF_RUNNING;
1485 } 1611 }
… …
1488 next->flags |= CF_RUNNING; 1614 next->flags |= CF_RUNNING;
1489 1615
1490 /* first get rid of the old state */ 1616 /* first get rid of the old state */
1491 save_perl (aTHX_ prev); 1617 save_perl (aTHX_ prev);
1492 1618
1493 if (expect_false (next->flags & CF_NEW)) 1619 if (ecb_expect_false (next->flags & CF_NEW))
1494 { 1620 {
1495 /* need to start coroutine */ 1621 /* need to start coroutine */
1496 next->flags &= ~CF_NEW; 1622 next->flags &= ~CF_NEW;
1497 /* setup coroutine call */ 1623 /* setup coroutine call */
1498 coro_setup (aTHX_ next); 1624 init_perl (aTHX_ next);
1499 } 1625 }
1500 else 1626 else
1501 load_perl (aTHX_ next); 1627 load_perl (aTHX_ next);
1502 1628
1503 /* possibly untie and reuse the cctx */ 1629 /* possibly untie and reuse the cctx */
1504 if (expect_true ( 1630 if (ecb_expect_true (
1505 cctx_current->idle_sp == STACKLEVEL 1631 cctx_current->idle_sp == STACKLEVEL
1506 && !(cctx_current->flags & CC_TRACE) 1632 && !(cctx_current->flags & CC_TRACE)
1507 && !force_cctx 1633 && !force_cctx
1508 )) 1634 ))
1509 { 1635 {
1510 /* 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 */
1511 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));
1512 1638
1513 /* 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. */
1514 /* 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 */
1515 if (expect_false (CCTX_EXPIRED (cctx_current))) 1641 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1516 if (expect_true (!next->cctx)) 1642 if (ecb_expect_true (!next->cctx))
1517 next->cctx = cctx_get (aTHX); 1643 next->cctx = cctx_get (aTHX);
1518 1644
1519 cctx_put (cctx_current); 1645 cctx_put (cctx_current);
1520 } 1646 }
1521 else 1647 else
1522 prev->cctx = cctx_current; 1648 prev->cctx = cctx_current;
1523 1649
1524 ++next->usecount; 1650 ++next->usecount;
1525 1651
1526 cctx_prev = cctx_current; 1652 cctx_prev = cctx_current;
1527 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1653 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1528 1654
1529 next->cctx = 0; 1655 next->cctx = 0;
1530 1656
1531 if (expect_false (cctx_prev != cctx_current)) 1657 if (ecb_expect_false (cctx_prev != cctx_current))
1532 { 1658 {
1533 cctx_prev->top_env = PL_top_env; 1659 cctx_prev->top_env = PL_top_env;
1534 PL_top_env = cctx_current->top_env; 1660 PL_top_env = cctx_current->top_env;
1535 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1661 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1536 } 1662 }
… …
1542#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))
1543#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1669#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1544 1670
1545/** high level stuff ********************************************************/ 1671/** high level stuff ********************************************************/
1546 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 */
1547static int 1675static void
1676coro_call_on_destroy (pTHX_ struct coro *coro);
1677
1678static void
1548coro_state_destroy (pTHX_ struct coro *coro) 1679coro_state_destroy (pTHX_ struct coro *coro)
1549{ 1680{
1550 if (coro->flags & CF_DESTROYED) 1681 if (coro->flags & CF_ZOMBIE)
1551 return 0; 1682 return;
1552 1683
1553 if (coro->on_destroy && !PL_dirty)
1554 coro->on_destroy (aTHX_ coro); 1684 slf_destroy (aTHX_ coro);
1555 1685
1556 coro->flags |= CF_DESTROYED; 1686 coro->flags |= CF_ZOMBIE;
1557 1687
1558 if (coro->flags & CF_READY) 1688 if (coro->flags & CF_READY)
1559 { 1689 {
1560 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1690 /* reduce nready, as destroying a ready coro effectively unreadies it */
1561 /* alternative: look through all ready queues and remove the coro */ 1691 /* alternative: look through all ready queues and remove the coro */
1562 --coro_nready; 1692 --coro_nready;
1563 } 1693 }
1564 else 1694 else
1565 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;
1566 1700
1567 if (coro->mainstack 1701 if (coro->mainstack
1568 && coro->mainstack != main_mainstack 1702 && coro->mainstack != main_mainstack
1569 && coro->slot 1703 && coro->slot
1570 && !PL_dirty) 1704 && !PL_dirty)
1571 coro_destruct_perl (aTHX_ coro); 1705 destroy_perl (aTHX_ coro);
1572 1706
1573 cctx_destroy (coro->cctx); 1707 cctx_destroy (coro->cctx);
1574 SvREFCNT_dec (coro->startcv); 1708 SvREFCNT_dec (coro->startcv);
1575 SvREFCNT_dec (coro->args); 1709 SvREFCNT_dec (coro->args);
1710 SvREFCNT_dec (coro->swap_sv);
1576 SvREFCNT_dec (CORO_THROW); 1711 SvREFCNT_dec (CORO_THROW);
1577 1712
1578 if (coro->next) coro->next->prev = coro->prev; 1713 coro_call_on_destroy (aTHX_ coro);
1579 if (coro->prev) coro->prev->next = coro->next;
1580 if (coro == coro_first) coro_first = coro->next;
1581 1714
1582 return 1; 1715 /* more destruction mayhem in coro_state_free */
1583} 1716}
1584 1717
1585static int 1718static int
1586coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1719coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1587{ 1720{
1588 struct coro *coro = (struct coro *)mg->mg_ptr; 1721 struct coro *coro = (struct coro *)mg->mg_ptr;
1589 mg->mg_ptr = 0; 1722 mg->mg_ptr = 0;
1590 1723
1591 coro->hv = 0;
1592
1593 if (--coro->refcnt < 0)
1594 {
1595 coro_state_destroy (aTHX_ coro); 1724 coro_state_destroy (aTHX_ coro);
1725 SvREFCNT_dec (coro->on_destroy);
1726 SvREFCNT_dec (coro->status);
1727
1596 Safefree (coro); 1728 Safefree (coro);
1597 }
1598 1729
1599 return 0; 1730 return 0;
1600} 1731}
1601 1732
1602static int 1733static int ecb_cold
1603coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1734coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1604{ 1735{
1605 struct coro *coro = (struct coro *)mg->mg_ptr; 1736 /* called when perl clones the current process the slow way (windows process emulation) */
1606 1737 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1607 ++coro->refcnt; 1738 mg->mg_ptr = 0;
1739 mg->mg_virtual = 0;
1608 1740
1609 return 0; 1741 return 0;
1610} 1742}
1611 1743
1612static MGVTBL coro_state_vtbl = { 1744static MGVTBL coro_state_vtbl = {
… …
1637 TRANSFER (ta, 1); 1769 TRANSFER (ta, 1);
1638} 1770}
1639 1771
1640/** Coro ********************************************************************/ 1772/** Coro ********************************************************************/
1641 1773
1642INLINE void 1774ecb_inline void
1643coro_enq (pTHX_ struct coro *coro) 1775coro_enq (pTHX_ struct coro *coro)
1644{ 1776{
1645 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1777 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1646 1778
1647 SvREFCNT_inc_NN (coro->hv); 1779 SvREFCNT_inc_NN (coro->hv);
… …
1649 coro->next_ready = 0; 1781 coro->next_ready = 0;
1650 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1782 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1651 ready [1] = coro; 1783 ready [1] = coro;
1652} 1784}
1653 1785
1654INLINE struct coro * 1786ecb_inline struct coro *
1655coro_deq (pTHX) 1787coro_deq (pTHX)
1656{ 1788{
1657 int prio; 1789 int prio;
1658 1790
1659 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1791 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1712{ 1844{
1713 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1845 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1714} 1846}
1715 1847
1716/* expects to own a reference to next->hv */ 1848/* expects to own a reference to next->hv */
1717INLINE void 1849ecb_inline void
1718prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1850prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1719{ 1851{
1720 SV *prev_sv = SvRV (coro_current); 1852 SV *prev_sv = SvRV (coro_current);
1721 1853
1722 ta->prev = SvSTATE_hv (prev_sv); 1854 ta->prev = SvSTATE_hv (prev_sv);
… …
1735{ 1867{
1736 for (;;) 1868 for (;;)
1737 { 1869 {
1738 struct coro *next = coro_deq (aTHX); 1870 struct coro *next = coro_deq (aTHX);
1739 1871
1740 if (expect_true (next)) 1872 if (ecb_expect_true (next))
1741 { 1873 {
1742 /* cannot transfer to destroyed coros, skip and look for next */ 1874 /* cannot transfer to destroyed coros, skip and look for next */
1743 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1875 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1744 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1876 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1745 else 1877 else
1746 { 1878 {
1747 next->flags &= ~CF_READY; 1879 next->flags &= ~CF_READY;
1748 --coro_nready; 1880 --coro_nready;
… …
1755 { 1887 {
1756 /* nothing to schedule: call the idle handler */ 1888 /* nothing to schedule: call the idle handler */
1757 if (SvROK (sv_idle) 1889 if (SvROK (sv_idle)
1758 && SvOBJECT (SvRV (sv_idle))) 1890 && SvOBJECT (SvRV (sv_idle)))
1759 { 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
1760 ++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 */
1761 api_ready (aTHX_ SvRV (sv_idle)); 1896 api_ready (aTHX_ SvRV (sv_idle));
1762 --coro_nready; 1897 --coro_nready;
1763 } 1898 }
1764 else 1899 else
1765 { 1900 {
1901 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1766 dSP; 1902 dSP;
1767 1903
1768 ENTER; 1904 ENTER;
1769 SAVETMPS; 1905 SAVETMPS;
1770 1906
… …
1777 } 1913 }
1778 } 1914 }
1779 } 1915 }
1780} 1916}
1781 1917
1782INLINE void 1918ecb_inline void
1783prepare_cede (pTHX_ struct coro_transfer_args *ta) 1919prepare_cede (pTHX_ struct coro_transfer_args *ta)
1784{ 1920{
1785 api_ready (aTHX_ coro_current); 1921 api_ready (aTHX_ coro_current);
1786 prepare_schedule (aTHX_ ta); 1922 prepare_schedule (aTHX_ ta);
1787} 1923}
1788 1924
1789INLINE void 1925ecb_inline void
1790prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1926prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1791{ 1927{
1792 SV *prev = SvRV (coro_current); 1928 SV *prev = SvRV (coro_current);
1793 1929
1794 if (coro_nready) 1930 if (coro_nready)
… …
1824{ 1960{
1825 struct coro_transfer_args ta; 1961 struct coro_transfer_args ta;
1826 1962
1827 prepare_cede (aTHX_ &ta); 1963 prepare_cede (aTHX_ &ta);
1828 1964
1829 if (expect_true (ta.prev != ta.next)) 1965 if (ecb_expect_true (ta.prev != ta.next))
1830 { 1966 {
1831 TRANSFER (ta, 1); 1967 TRANSFER (ta, 1);
1832 return 1; 1968 return 1;
1833 } 1969 }
1834 else 1970 else
… …
1877 coro->slot->runops = RUNOPS_DEFAULT; 2013 coro->slot->runops = RUNOPS_DEFAULT;
1878 } 2014 }
1879} 2015}
1880 2016
1881static 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
1882coro_call_on_destroy (pTHX_ struct coro *coro) 2094coro_call_on_destroy (pTHX_ struct coro *coro)
1883{ 2095{
1884 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2096 AV *od = coro->on_destroy;
1885 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1886 2097
1887 if (on_destroyp) 2098 if (!od)
1888 { 2099 return;
1889 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1890 2100
2101 coro->on_destroy = 0;
2102 sv_2mortal ((SV *)od);
2103
1891 while (AvFILLp (on_destroy) >= 0) 2104 while (AvFILLp (od) >= 0)
2105 {
2106 SV *cb = sv_2mortal (av_pop (od));
2107
2108 /* coro hv's (and only hv's at the moment) are supported as well */
2109 if (SvSTATEhv_p (aTHX_ cb))
2110 api_ready (aTHX_ cb);
2111 else
1892 { 2112 {
1893 dSP; /* don't disturb outer sp */ 2113 dSP; /* don't disturb outer sp */
1894 SV *cb = av_pop (on_destroy);
1895
1896 PUSHMARK (SP); 2114 PUSHMARK (SP);
1897 2115
1898 if (statusp) 2116 if (coro->status)
1899 { 2117 {
1900 int i; 2118 PUTBACK;
1901 AV *status = (AV *)SvRV (*statusp); 2119 coro_push_av (aTHX_ coro->status, G_ARRAY);
1902 EXTEND (SP, AvFILLp (status) + 1); 2120 SPAGAIN;
1903
1904 for (i = 0; i <= AvFILLp (status); ++i)
1905 PUSHs (AvARRAY (status)[i]);
1906 } 2121 }
1907 2122
1908 PUTBACK; 2123 PUTBACK;
1909 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2124 call_sv (cb, G_VOID | G_DISCARD);
1910 } 2125 }
1911 } 2126 }
1912} 2127}
1913 2128
1914static void 2129static void
1915slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2130coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1916{ 2131{
2132 AV *av;
2133
2134 if (coro->status)
2135 {
2136 av = coro->status;
2137 av_clear (av);
2138 }
2139 else
2140 av = coro->status = newAV ();
2141
2142 /* items are actually not so common, so optimise for this case */
2143 if (items)
2144 {
1917 int i; 2145 int i;
1918 HV *hv = (HV *)SvRV (coro_current);
1919 AV *av = newAV ();
1920 2146
1921 av_extend (av, items - 1); 2147 av_extend (av, items - 1);
2148
1922 for (i = 0; i < items; ++i) 2149 for (i = 0; i < items; ++i)
1923 av_push (av, SvREFCNT_inc_NN (arg [i])); 2150 av_push (av, SvREFCNT_inc_NN (arg [i]));
2151 }
2152}
1924 2153
1925 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2154static void
1926 2155slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2156{
1927 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2157 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1928 api_ready (aTHX_ sv_manager); 2158 api_ready (aTHX_ sv_manager);
1929 2159
1930 frame->prepare = prepare_schedule; 2160 frame->prepare = prepare_schedule;
1931 frame->check = slf_check_repeat; 2161 frame->check = slf_check_repeat;
1932 2162
1933 /* as a minor optimisation, we could unwind all stacks here */ 2163 /* as a minor optimisation, we could unwind all stacks here */
1934 /* but that puts extra pressure on pp_slf, and is not worth much */ 2164 /* but that puts extra pressure on pp_slf, and is not worth much */
1935 /*coro_unwind_stacks (aTHX);*/ 2165 /*coro_unwind_stacks (aTHX);*/
2166}
2167
2168static void
2169slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2170{
2171 HV *coro_hv = (HV *)SvRV (coro_current);
2172
2173 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2174 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2175}
2176
2177static void
2178slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2179{
2180 HV *coro_hv;
2181 struct coro *coro;
2182
2183 if (items <= 0)
2184 croak ("Coro::cancel called without coro object,");
2185
2186 coro = SvSTATE (arg [0]);
2187 coro_hv = coro->hv;
2188
2189 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2190
2191 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2192 {
2193 /* coro currently busy cancelling something, so just notify it */
2194 coro->slf_frame.data = (void *)coro;
2195
2196 frame->prepare = prepare_nop;
2197 frame->check = slf_check_nop;
2198 }
2199 else if (coro_hv == (HV *)SvRV (coro_current))
2200 {
2201 /* cancelling the current coro is allowed, and equals terminate */
2202 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2203 }
2204 else
2205 {
2206 struct coro *self = SvSTATE_current;
2207
2208 /* otherwise we cancel directly, purely for speed reasons
2209 * unfortunately, this requires some magic trickery, as
2210 * somebody else could cancel us, so we have to fight the cancellation.
2211 * this is ugly, and hopefully fully worth the extra speed.
2212 * besides, I can't get the slow-but-safe version working...
2213 */
2214 slf_frame.data = 0;
2215 self->flags |= CF_NOCANCEL;
2216 coro_state_destroy (aTHX_ coro);
2217 self->flags &= ~CF_NOCANCEL;
2218
2219 if (slf_frame.data)
2220 {
2221 /* while we were busy we have been cancelled, so terminate */
2222 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2223 }
2224 else
2225 {
2226 frame->prepare = prepare_nop;
2227 frame->check = slf_check_nop;
2228 }
2229 }
2230}
2231
2232static int
2233slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2234{
2235 frame->prepare = 0;
2236 coro_unwind_stacks (aTHX);
2237
2238 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2239
2240 return 1;
2241}
2242
2243static int
2244safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2245{
2246 if (coro->cctx)
2247 croak ("coro inside C callback, unable to cancel at this time, caught");
2248
2249 if (coro->flags & CF_NEW)
2250 {
2251 coro_set_status (aTHX_ coro, arg, items);
2252 coro_state_destroy (aTHX_ coro);
2253 }
2254 else
2255 {
2256 if (!coro->slf_frame.prepare)
2257 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2258
2259 slf_destroy (aTHX_ coro);
2260
2261 coro_set_status (aTHX_ coro, arg, items);
2262 coro->slf_frame.prepare = prepare_nop;
2263 coro->slf_frame.check = slf_check_safe_cancel;
2264
2265 api_ready (aTHX_ (SV *)coro->hv);
2266 }
2267
2268 return 1;
1936} 2269}
1937 2270
1938/*****************************************************************************/ 2271/*****************************************************************************/
1939/* async pool handler */ 2272/* async pool handler */
1940 2273
… …
1971slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2304slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1972{ 2305{
1973 HV *hv = (HV *)SvRV (coro_current); 2306 HV *hv = (HV *)SvRV (coro_current);
1974 struct coro *coro = SvSTATE_hv ((SV *)hv); 2307 struct coro *coro = SvSTATE_hv ((SV *)hv);
1975 2308
1976 if (expect_true (coro->saved_deffh)) 2309 if (ecb_expect_true (coro->saved_deffh))
1977 { 2310 {
1978 /* subsequent iteration */ 2311 /* subsequent iteration */
1979 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2312 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1980 coro->saved_deffh = 0; 2313 coro->saved_deffh = 0;
1981 2314
1982 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2315 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1983 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2316 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1984 { 2317 {
1985 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2318 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1986 coro->invoke_av = newAV (); 2319 return;
1987
1988 frame->prepare = prepare_nop;
1989 } 2320 }
1990 else 2321 else
1991 { 2322 {
1992 av_clear (GvAV (PL_defgv)); 2323 av_clear (GvAV (PL_defgv));
1993 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2324 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2043 2374
2044static int 2375static int
2045slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2376slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2046{ 2377{
2047 SV *data = (SV *)frame->data; 2378 SV *data = (SV *)frame->data;
2048 2379
2049 if (CORO_THROW) 2380 if (CORO_THROW)
2050 return 0; 2381 return 0;
2051 2382
2052 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2383 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2053 return 1; 2384 return 1;
… …
2089 cb = sv_2mortal (coro->rouse_cb); 2420 cb = sv_2mortal (coro->rouse_cb);
2090 coro->rouse_cb = 0; 2421 coro->rouse_cb = 0;
2091 } 2422 }
2092 2423
2093 if (!SvROK (cb) 2424 if (!SvROK (cb)
2094 || SvTYPE (SvRV (cb)) != SVt_PVCV 2425 || SvTYPE (SvRV (cb)) != SVt_PVCV
2095 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2426 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2096 croak ("Coro::rouse_wait called with illegal callback argument,"); 2427 croak ("Coro::rouse_wait called with illegal callback argument,");
2097 2428
2098 { 2429 {
2099 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2430 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2216static void 2547static void
2217slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2548slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2218{ 2549{
2219 frame->prepare = prepare_cede_notself; 2550 frame->prepare = prepare_cede_notself;
2220 frame->check = slf_check_nop; 2551 frame->check = slf_check_nop;
2552}
2553
2554/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2555static void
2556slf_destroy (pTHX_ struct coro *coro)
2557{
2558 /* this callback is reserved for slf functions needing to do cleanup */
2559 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2560 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2561
2562 /*
2563 * The on_destroy above most likely is from an SLF call.
2564 * Since by definition the SLF call will not finish when we destroy
2565 * the coro, we will have to force-finish it here, otherwise
2566 * cleanup functions cannot call SLF functions.
2567 */
2568 coro->slf_frame.prepare = 0;
2221} 2569}
2222 2570
2223/* 2571/*
2224 * these not obviously related functions are all rolled into one 2572 * these not obviously related functions are all rolled into one
2225 * function to increase chances that they all will call transfer with the same 2573 * function to increase chances that they all will call transfer with the same
… …
2232 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2580 I32 checkmark; /* mark SP to see how many elements check has pushed */
2233 2581
2234 /* set up the slf frame, unless it has already been set-up */ 2582 /* set up the slf frame, unless it has already been set-up */
2235 /* the latter happens when a new coro has been started */ 2583 /* the latter happens when a new coro has been started */
2236 /* or when a new cctx was attached to an existing coroutine */ 2584 /* or when a new cctx was attached to an existing coroutine */
2237 if (expect_true (!slf_frame.prepare)) 2585 if (ecb_expect_true (!slf_frame.prepare))
2238 { 2586 {
2239 /* first iteration */ 2587 /* first iteration */
2240 dSP; 2588 dSP;
2241 SV **arg = PL_stack_base + TOPMARK + 1; 2589 SV **arg = PL_stack_base + TOPMARK + 1;
2242 int items = SP - arg; /* args without function object */ 2590 int items = SP - arg; /* args without function object */
… …
2283 while (slf_frame.check (aTHX_ &slf_frame)); 2631 while (slf_frame.check (aTHX_ &slf_frame));
2284 2632
2285 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2633 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2286 2634
2287 /* exception handling */ 2635 /* exception handling */
2288 if (expect_false (CORO_THROW)) 2636 if (ecb_expect_false (CORO_THROW))
2289 { 2637 {
2290 SV *exception = sv_2mortal (CORO_THROW); 2638 SV *exception = sv_2mortal (CORO_THROW);
2291 2639
2292 CORO_THROW = 0; 2640 CORO_THROW = 0;
2293 sv_setsv (ERRSV, exception); 2641 sv_setsv (ERRSV, exception);
2294 croak (0); 2642 croak (0);
2295 } 2643 }
2296 2644
2297 /* return value handling - mostly like entersub */ 2645 /* return value handling - mostly like entersub */
2298 /* make sure we put something on the stack in scalar context */ 2646 /* make sure we put something on the stack in scalar context */
2299 if (GIMME_V == G_SCALAR) 2647 if (GIMME_V == G_SCALAR
2648 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2300 { 2649 {
2301 dSP; 2650 dSP;
2302 SV **bot = PL_stack_base + checkmark; 2651 SV **bot = PL_stack_base + checkmark;
2303 2652
2304 if (sp == bot) /* too few, push undef */ 2653 if (sp == bot) /* too few, push undef */
2305 bot [1] = &PL_sv_undef; 2654 bot [1] = &PL_sv_undef;
2306 else if (sp != bot + 1) /* too many, take last one */ 2655 else /* too many, take last one */
2307 bot [1] = *sp; 2656 bot [1] = *sp;
2308 2657
2309 SP = bot + 1; 2658 SP = bot + 1;
2310 2659
2311 PUTBACK; 2660 PUTBACK;
… …
2344 if (PL_op->op_flags & OPf_STACKED) 2693 if (PL_op->op_flags & OPf_STACKED)
2345 { 2694 {
2346 if (items > slf_arga) 2695 if (items > slf_arga)
2347 { 2696 {
2348 slf_arga = items; 2697 slf_arga = items;
2349 free (slf_argv); 2698 Safefree (slf_argv);
2350 slf_argv = malloc (slf_arga * sizeof (SV *)); 2699 New (0, slf_argv, slf_arga, SV *);
2351 } 2700 }
2352 2701
2353 slf_argc = items; 2702 slf_argc = items;
2354 2703
2355 for (i = 0; i < items; ++i) 2704 for (i = 0; i < items; ++i)
… …
2418{ 2767{
2419 PerlIOBuf base; 2768 PerlIOBuf base;
2420 NV next, every; 2769 NV next, every;
2421} PerlIOCede; 2770} PerlIOCede;
2422 2771
2423static IV 2772static IV ecb_cold
2424PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2773PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2425{ 2774{
2426 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2775 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2427 2776
2428 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2777 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2429 self->next = nvtime () + self->every; 2778 self->next = nvtime () + self->every;
2430 2779
2431 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2780 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2432} 2781}
2433 2782
2434static SV * 2783static SV * ecb_cold
2435PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2784PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2436{ 2785{
2437 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2786 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2438 2787
2439 return newSVnv (self->every); 2788 return newSVnv (self->every);
… …
2551 SvREFCNT_dec (cb); 2900 SvREFCNT_dec (cb);
2552 } 2901 }
2553} 2902}
2554 2903
2555static void 2904static void
2556coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2905coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2557{ 2906{
2558 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2907 /* call $sem->adjust (0) to possibly wake up some other waiters */
2559 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2908 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2560} 2909}
2561 2910
2562static int 2911static int
2563slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2912slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2564{ 2913{
2565 AV *av = (AV *)frame->data; 2914 AV *av = (AV *)frame->data;
2566 SV *count_sv = AvARRAY (av)[0]; 2915 SV *count_sv = AvARRAY (av)[0];
2916 SV *coro_hv = SvRV (coro_current);
2567 2917
2568 /* if we are about to throw, don't actually acquire the lock, just throw */ 2918 /* if we are about to throw, don't actually acquire the lock, just throw */
2569 if (CORO_THROW) 2919 if (CORO_THROW)
2570 return 0; 2920 return 0;
2571 else if (SvIVX (count_sv) > 0) 2921 else if (SvIVX (count_sv) > 0)
2572 { 2922 {
2573 SvSTATE_current->on_destroy = 0; 2923 frame->destroy = 0;
2574 2924
2575 if (acquire) 2925 if (acquire)
2576 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2926 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2577 else 2927 else
2578 coro_semaphore_adjust (aTHX_ av, 0); 2928 coro_semaphore_adjust (aTHX_ av, 0);
… …
2583 { 2933 {
2584 int i; 2934 int i;
2585 /* if we were woken up but can't down, we look through the whole */ 2935 /* if we were woken up but can't down, we look through the whole */
2586 /* waiters list and only add us if we aren't in there already */ 2936 /* waiters list and only add us if we aren't in there already */
2587 /* this avoids some degenerate memory usage cases */ 2937 /* this avoids some degenerate memory usage cases */
2588 2938 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2589 for (i = 1; i <= AvFILLp (av); ++i)
2590 if (AvARRAY (av)[i] == SvRV (coro_current)) 2939 if (AvARRAY (av)[i] == coro_hv)
2591 return 1; 2940 return 1;
2592 2941
2593 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2942 av_push (av, SvREFCNT_inc (coro_hv));
2594 return 1; 2943 return 1;
2595 } 2944 }
2596} 2945}
2597 2946
2598static int 2947static int
… …
2621 { 2970 {
2622 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2971 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2623 2972
2624 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2973 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2625 frame->prepare = prepare_schedule; 2974 frame->prepare = prepare_schedule;
2626
2627 /* to avoid race conditions when a woken-up coro gets terminated */ 2975 /* to avoid race conditions when a woken-up coro gets terminated */
2628 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2976 /* we arrange for a temporary on_destroy that calls adjust (0) */
2629 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2977 frame->destroy = coro_semaphore_destroy;
2630 } 2978 }
2631} 2979}
2632 2980
2633static void 2981static void
2634slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2982slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2716 { 3064 {
2717 SV *cb_cv = s_get_cv_croak (arg [1]); 3065 SV *cb_cv = s_get_cv_croak (arg [1]);
2718 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3066 av_push (av, SvREFCNT_inc_NN (cb_cv));
2719 3067
2720 if (SvIVX (AvARRAY (av)[0])) 3068 if (SvIVX (AvARRAY (av)[0]))
2721 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3069 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2722 3070
2723 frame->prepare = prepare_nop; 3071 frame->prepare = prepare_nop;
2724 frame->check = slf_check_nop; 3072 frame->check = slf_check_nop;
2725 } 3073 }
2726 else if (SvIVX (AvARRAY (av)[0])) 3074 else if (SvIVX (AvARRAY (av)[0]))
… …
2852 dSP; 3200 dSP;
2853 3201
2854 static SV *prio_cv; 3202 static SV *prio_cv;
2855 static SV *prio_sv; 3203 static SV *prio_sv;
2856 3204
2857 if (expect_false (!prio_cv)) 3205 if (ecb_expect_false (!prio_cv))
2858 { 3206 {
2859 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3207 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2860 prio_sv = newSViv (0); 3208 prio_sv = newSViv (0);
2861 } 3209 }
2862 3210
… …
2888 /* now call the AIO function - we assume our request is uncancelable */ 3236 /* now call the AIO function - we assume our request is uncancelable */
2889 PUTBACK; 3237 PUTBACK;
2890 call_sv ((SV *)req, G_VOID | G_DISCARD); 3238 call_sv ((SV *)req, G_VOID | G_DISCARD);
2891 } 3239 }
2892 3240
2893 /* now that the requets is going, we loop toll we have a result */ 3241 /* now that the request is going, we loop till we have a result */
2894 frame->data = (void *)state; 3242 frame->data = (void *)state;
2895 frame->prepare = prepare_schedule; 3243 frame->prepare = prepare_schedule;
2896 frame->check = slf_check_aio_req; 3244 frame->check = slf_check_aio_req;
2897} 3245}
2898 3246
… …
2908 3256
2909/*****************************************************************************/ 3257/*****************************************************************************/
2910 3258
2911#if CORO_CLONE 3259#if CORO_CLONE
2912# include "clone.c" 3260# include "clone.c"
3261#endif
3262
3263/*****************************************************************************/
3264
3265static SV *
3266coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3267{
3268 SV *coro_sv;
3269 struct coro *coro;
3270 MAGIC *mg;
3271 HV *hv;
3272 SV *cb;
3273 int i;
3274
3275 if (argc > 0)
3276 {
3277 cb = s_get_cv_croak (argv [0]);
3278
3279 if (!is_coro)
3280 {
3281 if (CvISXSUB (cb))
3282 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3283
3284 if (!CvROOT (cb))
3285 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3286 }
3287 }
3288
3289 Newz (0, coro, 1, struct coro);
3290 coro->args = newAV ();
3291 coro->flags = CF_NEW;
3292
3293 if (coro_first) coro_first->prev = coro;
3294 coro->next = coro_first;
3295 coro_first = coro;
3296
3297 coro->hv = hv = newHV ();
3298 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3299 mg->mg_flags |= MGf_DUP;
3300 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3301
3302 if (argc > 0)
3303 {
3304 av_extend (coro->args, argc + is_coro - 1);
3305
3306 if (is_coro)
3307 {
3308 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3309 cb = (SV *)cv_coro_run;
3310 }
3311
3312 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3313
3314 for (i = 1; i < argc; i++)
3315 av_push (coro->args, newSVsv (argv [i]));
3316 }
3317
3318 return coro_sv;
3319}
3320
3321#ifndef __cplusplus
3322ecb_cold XS(boot_Coro__State);
3323#endif
3324
3325#if CORO_JIT
3326
3327static void ecb_noinline ecb_cold
3328pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3329{
3330 dSP;
3331 AV *av = newAV ();
3332
3333 av_store (av, 3, newSVuv (d));
3334 av_store (av, 2, newSVuv (c));
3335 av_store (av, 1, newSVuv (b));
3336 av_store (av, 0, newSVuv (a));
3337
3338 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3339
3340 PUTBACK;
3341}
3342
3343static void ecb_noinline ecb_cold
3344jit_init (pTHX)
3345{
3346 dSP;
3347 SV *load, *save;
3348 char *map_base;
3349 char *load_ptr, *save_ptr;
3350 STRLEN load_len, save_len, map_len;
3351 int count;
3352
3353 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3354
3355 PUSHMARK (SP);
3356 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3357 #include "state.h"
3358 count = call_pv ("Coro::State::_jit", G_ARRAY);
3359 SPAGAIN;
3360
3361 save = POPs; save_ptr = SvPVbyte (save, save_len);
3362 load = POPs; load_ptr = SvPVbyte (load, load_len);
3363
3364 map_len = load_len + save_len + 16;
3365
3366 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3367
3368 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3369
3370 load_perl_slots = (load_save_perl_slots_type)map_base;
3371 memcpy (map_base, load_ptr, load_len);
3372
3373 map_base += (load_len + 15) & ~15;
3374
3375 save_perl_slots = (load_save_perl_slots_type)map_base;
3376 memcpy (map_base, save_ptr, save_len);
3377
3378 /* we are good citizens and try to make the page read-only, so the evil evil */
3379 /* hackers might have it a bit more difficult */
3380 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3381
3382 PUTBACK;
3383 eval_pv ("undef &Coro::State::_jit", 1);
3384}
3385
2913#endif 3386#endif
2914 3387
2915MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3388MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2916 3389
2917PROTOTYPES: DISABLE 3390PROTOTYPES: DISABLE
… …
2921#ifdef USE_ITHREADS 3394#ifdef USE_ITHREADS
2922# if CORO_PTHREAD 3395# if CORO_PTHREAD
2923 coro_thx = PERL_GET_CONTEXT; 3396 coro_thx = PERL_GET_CONTEXT;
2924# endif 3397# endif
2925#endif 3398#endif
2926 BOOT_PAGESIZE; 3399 /* perl defines these to check for existance first, but why it doesn't */
3400 /* just create them one at init time is not clear to me, except for */
3401 /* programs trying to delete them, but... */
3402 /* anyway, we declare this as invalid and make sure they are initialised here */
3403 DEFSV;
3404 ERRSV;
2927 3405
2928 cctx_current = cctx_new_empty (); 3406 cctx_current = cctx_new_empty ();
2929 3407
2930 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3408 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2931 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3409 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
2971 coroapi.prepare_nop = prepare_nop; 3449 coroapi.prepare_nop = prepare_nop;
2972 coroapi.prepare_schedule = prepare_schedule; 3450 coroapi.prepare_schedule = prepare_schedule;
2973 coroapi.prepare_cede = prepare_cede; 3451 coroapi.prepare_cede = prepare_cede;
2974 coroapi.prepare_cede_notself = prepare_cede_notself; 3452 coroapi.prepare_cede_notself = prepare_cede_notself;
2975 3453
2976 { 3454 time_init (aTHX);
2977 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2978
2979 if (!svp) croak ("Time::HiRes is required");
2980 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2981
2982 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2983
2984 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
2985 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2986 }
2987 3455
2988 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3456 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3457#if CORO_JIT
3458 PUTBACK;
3459 jit_init (aTHX);
3460 SPAGAIN;
3461#endif
2989} 3462}
2990 3463
2991SV * 3464SV *
2992new (char *klass, ...) 3465new (SV *klass, ...)
2993 ALIAS: 3466 ALIAS:
2994 Coro::new = 1 3467 Coro::new = 1
2995 CODE: 3468 CODE:
2996{ 3469 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2997 struct coro *coro; 3470 OUTPUT:
2998 MAGIC *mg;
2999 HV *hv;
3000 SV *cb;
3001 int i;
3002
3003 if (items > 1)
3004 {
3005 cb = s_get_cv_croak (ST (1));
3006
3007 if (!ix)
3008 {
3009 if (CvISXSUB (cb))
3010 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3011
3012 if (!CvROOT (cb))
3013 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3014 }
3015 }
3016
3017 Newz (0, coro, 1, struct coro);
3018 coro->args = newAV ();
3019 coro->flags = CF_NEW;
3020
3021 if (coro_first) coro_first->prev = coro;
3022 coro->next = coro_first;
3023 coro_first = coro;
3024
3025 coro->hv = hv = newHV ();
3026 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3027 mg->mg_flags |= MGf_DUP;
3028 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3029
3030 if (items > 1)
3031 {
3032 av_extend (coro->args, items - 1 + ix - 1);
3033
3034 if (ix)
3035 {
3036 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3037 cb = (SV *)cv_coro_run;
3038 }
3039
3040 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3041
3042 for (i = 2; i < items; i++)
3043 av_push (coro->args, newSVsv (ST (i)));
3044 }
3045}
3046 OUTPUT:
3047 RETVAL 3471 RETVAL
3048 3472
3049void 3473void
3050transfer (...) 3474transfer (...)
3051 PROTOTYPE: $$ 3475 PROTOTYPE: $$
3052 CODE: 3476 CODE:
3053 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3477 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3054
3055bool
3056_destroy (SV *coro_sv)
3057 CODE:
3058 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3059 OUTPUT:
3060 RETVAL
3061
3062void
3063_exit (int code)
3064 PROTOTYPE: $
3065 CODE:
3066 _exit (code);
3067 3478
3068SV * 3479SV *
3069clone (Coro::State coro) 3480clone (Coro::State coro)
3070 CODE: 3481 CODE:
3071{ 3482{
… …
3126void 3537void
3127list () 3538list ()
3128 PROTOTYPE: 3539 PROTOTYPE:
3129 PPCODE: 3540 PPCODE:
3130{ 3541{
3131 struct coro *coro; 3542 struct coro *coro;
3132 for (coro = coro_first; coro; coro = coro->next) 3543 for (coro = coro_first; coro; coro = coro->next)
3133 if (coro->hv) 3544 if (coro->hv)
3134 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3545 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3135} 3546}
3136 3547
… …
3141 CODE: 3552 CODE:
3142{ 3553{
3143 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3554 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3144 { 3555 {
3145 struct coro *current = SvSTATE_current; 3556 struct coro *current = SvSTATE_current;
3557 struct CoroSLF slf_save;
3146 3558
3147 if (current != coro) 3559 if (current != coro)
3148 { 3560 {
3149 PUTBACK; 3561 PUTBACK;
3150 save_perl (aTHX_ current); 3562 save_perl (aTHX_ current);
3151 load_perl (aTHX_ coro); 3563 load_perl (aTHX_ coro);
3564 /* the coro is most likely in an active SLF call.
3565 * while not strictly required (the code we execute is
3566 * not allowed to call any SLF functions), it's cleaner
3567 * to reinitialise the slf_frame and restore it later.
3568 * This might one day allow us to actually do SLF calls
3569 * from code executed here.
3570 */
3571 slf_save = slf_frame;
3572 slf_frame.prepare = 0;
3152 SPAGAIN; 3573 SPAGAIN;
3153 } 3574 }
3154 3575
3155 PUSHSTACK; 3576 PUSHSTACK;
3156 3577
… …
3166 SPAGAIN; 3587 SPAGAIN;
3167 3588
3168 if (current != coro) 3589 if (current != coro)
3169 { 3590 {
3170 PUTBACK; 3591 PUTBACK;
3592 slf_frame = slf_save;
3171 save_perl (aTHX_ coro); 3593 save_perl (aTHX_ coro);
3172 load_perl (aTHX_ current); 3594 load_perl (aTHX_ current);
3173 SPAGAIN; 3595 SPAGAIN;
3174 } 3596 }
3175 } 3597 }
… …
3180 PROTOTYPE: $ 3602 PROTOTYPE: $
3181 ALIAS: 3603 ALIAS:
3182 is_ready = CF_READY 3604 is_ready = CF_READY
3183 is_running = CF_RUNNING 3605 is_running = CF_RUNNING
3184 is_new = CF_NEW 3606 is_new = CF_NEW
3185 is_destroyed = CF_DESTROYED 3607 is_destroyed = CF_ZOMBIE
3608 is_zombie = CF_ZOMBIE
3186 is_suspended = CF_SUSPENDED 3609 is_suspended = CF_SUSPENDED
3187 CODE: 3610 CODE:
3188 RETVAL = boolSV (coro->flags & ix); 3611 RETVAL = boolSV (coro->flags & ix);
3189 OUTPUT: 3612 OUTPUT:
3190 RETVAL 3613 RETVAL
3191 3614
3192void 3615void
3193throw (Coro::State self, SV *throw = &PL_sv_undef) 3616throw (SV *self, SV *exception = &PL_sv_undef)
3194 PROTOTYPE: $;$ 3617 PROTOTYPE: $;$
3195 CODE: 3618 CODE:
3196{ 3619{
3620 struct coro *coro = SvSTATE (self);
3197 struct coro *current = SvSTATE_current; 3621 struct coro *current = SvSTATE_current;
3198 SV **throwp = self == current ? &CORO_THROW : &self->except; 3622 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3199 SvREFCNT_dec (*throwp); 3623 SvREFCNT_dec (*exceptionp);
3200 SvGETMAGIC (throw); 3624 SvGETMAGIC (exception);
3201 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3625 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3626
3627 api_ready (aTHX_ self);
3202} 3628}
3203 3629
3204void 3630void
3205api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3631api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3206 PROTOTYPE: $;$ 3632 PROTOTYPE: $;$
… …
3261 3687
3262void 3688void
3263cancel (Coro::State self) 3689cancel (Coro::State self)
3264 CODE: 3690 CODE:
3265 coro_state_destroy (aTHX_ self); 3691 coro_state_destroy (aTHX_ self);
3266 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3267
3268 3692
3269SV * 3693SV *
3270enable_times (int enabled = enable_times) 3694enable_times (int enabled = enable_times)
3271 CODE: 3695 CODE:
3272{ 3696{
… …
3285 3709
3286void 3710void
3287times (Coro::State self) 3711times (Coro::State self)
3288 PPCODE: 3712 PPCODE:
3289{ 3713{
3290 struct coro *current = SvSTATE (coro_current); 3714 struct coro *current = SvSTATE (coro_current);
3291 3715
3292 if (expect_false (current == self)) 3716 if (ecb_expect_false (current == self))
3293 { 3717 {
3294 coro_times_update (); 3718 coro_times_update ();
3295 coro_times_add (SvSTATE (coro_current)); 3719 coro_times_add (SvSTATE (coro_current));
3296 } 3720 }
3297 3721
3298 EXTEND (SP, 2); 3722 EXTEND (SP, 2);
3299 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3723 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3300 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3724 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3301 3725
3302 if (expect_false (current == self)) 3726 if (ecb_expect_false (current == self))
3303 coro_times_sub (SvSTATE (coro_current)); 3727 coro_times_sub (SvSTATE (coro_current));
3304} 3728}
3729
3730void
3731swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3732 CODE:
3733{
3734 struct coro *current = SvSTATE_current;
3735
3736 if (current == coro)
3737 SWAP_SVS (current);
3738
3739 if (!coro->swap_sv)
3740 coro->swap_sv = newAV ();
3741
3742 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3743 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3744
3745 if (current == coro)
3746 SWAP_SVS (current);
3747}
3748
3305 3749
3306MODULE = Coro::State PACKAGE = Coro 3750MODULE = Coro::State PACKAGE = Coro
3307 3751
3308BOOT: 3752BOOT:
3309{ 3753{
3310 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3754 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3311 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3755 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3312 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3756 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3313 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3314 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3757 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3315 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3758 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3316 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3759 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3317 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3760 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3318 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3761 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3319 3762
3320 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3763 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3321 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3764 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3322 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3765 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3323 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3766 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3324 3767
3325 coro_stash = gv_stashpv ("Coro", TRUE); 3768 coro_stash = gv_stashpv ("Coro", TRUE);
3326 3769
3327 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3770 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3328 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3771 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
… …
3347 sv_setiv (sv, (IV)&coroapi); 3790 sv_setiv (sv, (IV)&coroapi);
3348 SvREADONLY_on (sv); 3791 SvREADONLY_on (sv);
3349 } 3792 }
3350} 3793}
3351 3794
3795SV *
3796async (...)
3797 PROTOTYPE: &@
3798 CODE:
3799 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3800 api_ready (aTHX_ RETVAL);
3801 OUTPUT:
3802 RETVAL
3803
3804void
3805_destroy (Coro::State coro)
3806 CODE:
3807 /* used by the manager thread */
3808 coro_state_destroy (aTHX_ coro);
3809
3810void
3811on_destroy (Coro::State coro, SV *cb)
3812 CODE:
3813 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3814
3815void
3816join (...)
3817 CODE:
3818 CORO_EXECUTE_SLF_XS (slf_init_join);
3819
3352void 3820void
3353terminate (...) 3821terminate (...)
3354 CODE: 3822 CODE:
3355 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3823 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3824
3825void
3826cancel (...)
3827 CODE:
3828 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3829
3830int
3831safe_cancel (Coro::State self, ...)
3832 C_ARGS: aTHX_ self, &ST (1), items - 1
3356 3833
3357void 3834void
3358schedule (...) 3835schedule (...)
3359 CODE: 3836 CODE:
3360 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3837 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3473 for (i = 1; i < items; ++i) 3950 for (i = 1; i < items; ++i)
3474 av_push (av, SvREFCNT_inc_NN (ST (i))); 3951 av_push (av, SvREFCNT_inc_NN (ST (i)));
3475 3952
3476 if ((SV *)hv == &PL_sv_undef) 3953 if ((SV *)hv == &PL_sv_undef)
3477 { 3954 {
3478 PUSHMARK (SP); 3955 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)); 3956 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3957 SvREFCNT_dec (sv);
3487 } 3958 }
3488 3959
3489 { 3960 {
3490 struct coro *coro = SvSTATE_hv (hv); 3961 struct coro *coro = SvSTATE_hv (hv);
3491 3962
… …
3523 on_leave = 1 3994 on_leave = 1
3524 PROTOTYPE: & 3995 PROTOTYPE: &
3525 CODE: 3996 CODE:
3526{ 3997{
3527 struct coro *coro = SvSTATE_current; 3998 struct coro *coro = SvSTATE_current;
3528 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3999 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3529 4000
3530 block = s_get_cv_croak (block); 4001 block = s_get_cv_croak (block);
3531 4002
3532 if (!*avp) 4003 if (!*avp)
3533 *avp = newAV (); 4004 *avp = newAV ();
… …
3553 4024
3554SV * 4025SV *
3555new (SV *klass, SV *count = 0) 4026new (SV *klass, SV *count = 0)
3556 CODE: 4027 CODE:
3557{ 4028{
3558 int semcnt = 1; 4029 int semcnt = 1;
3559 4030
3560 if (count) 4031 if (count)
3561 { 4032 {
3562 SvGETMAGIC (count); 4033 SvGETMAGIC (count);
3563 4034
… …
3623 XSRETURN_NO; 4094 XSRETURN_NO;
3624} 4095}
3625 4096
3626void 4097void
3627waiters (SV *self) 4098waiters (SV *self)
3628 PPCODE: 4099 PPCODE:
3629{ 4100{
3630 AV *av = (AV *)SvRV (self); 4101 AV *av = (AV *)SvRV (self);
3631 int wcount = AvFILLp (av) + 1 - 1; 4102 int wcount = AvFILLp (av) + 1 - 1;
3632 4103
3633 if (GIMME_V == G_SCALAR) 4104 if (GIMME_V == G_SCALAR)
… …
3642} 4113}
3643 4114
3644MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4115MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3645 4116
3646void 4117void
3647_may_delete (SV *sem, int count, int extra_refs) 4118_may_delete (SV *sem, int count, unsigned int extra_refs)
3648 PPCODE: 4119 PPCODE:
3649{ 4120{
3650 AV *av = (AV *)SvRV (sem); 4121 AV *av = (AV *)SvRV (sem);
3651 4122
3652 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4123 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3653 && AvFILLp (av) == 0 /* no waiters, just count */ 4124 && AvFILLp (av) == 0 /* no waiters, just count */
3654 && SvIV (AvARRAY (av)[0]) == count) 4125 && SvIV (AvARRAY (av)[0]) == count)
3655 XSRETURN_YES; 4126 XSRETURN_YES;
… …
3676 4147
3677void 4148void
3678broadcast (SV *self) 4149broadcast (SV *self)
3679 CODE: 4150 CODE:
3680{ 4151{
3681 AV *av = (AV *)SvRV (self); 4152 AV *av = (AV *)SvRV (self);
3682 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4153 coro_signal_wake (aTHX_ av, AvFILLp (av));
3683} 4154}
3684 4155
3685void 4156void
3686send (SV *self) 4157send (SV *self)
… …
3694 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4165 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3695} 4166}
3696 4167
3697IV 4168IV
3698awaited (SV *self) 4169awaited (SV *self)
3699 CODE: 4170 CODE:
3700 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4171 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3701 OUTPUT: 4172 OUTPUT:
3702 RETVAL 4173 RETVAL
3703 4174
3704 4175
… …
3709 4180
3710void 4181void
3711_schedule (...) 4182_schedule (...)
3712 CODE: 4183 CODE:
3713{ 4184{
3714 static int incede; 4185 static int incede;
3715 4186
3716 api_cede_notself (aTHX); 4187 api_cede_notself (aTHX);
3717 4188
3718 ++incede; 4189 ++incede;
3719 while (coro_nready >= incede && api_cede (aTHX)) 4190 while (coro_nready >= incede && api_cede (aTHX))
… …
3763 { 4234 {
3764 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4235 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3765 coro_old_pp_sselect = 0; 4236 coro_old_pp_sselect = 0;
3766 } 4237 }
3767 4238
4239MODULE = Coro::State PACKAGE = Coro::Util
3768 4240
4241void
4242_exit (int code)
4243 CODE:
4244 _exit (code);
4245
4246NV
4247time ()
4248 CODE:
4249 RETVAL = nvtime (aTHX);
4250 OUTPUT:
4251 RETVAL
4252
4253NV
4254gettimeofday ()
4255 PPCODE:
4256{
4257 UV tv [2];
4258 u2time (aTHX_ tv);
4259 EXTEND (SP, 2);
4260 PUSHs (sv_2mortal (newSVuv (tv [0])));
4261 PUSHs (sv_2mortal (newSVuv (tv [1])));
4262}
4263

Diff Legend

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