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.434 by root, Sat Nov 2 19:48:50 2013 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
… …
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "schmorp.h" 16#include "schmorp.h"
12 17
18#define ECB_NO_THREADS 1
19#include "ecb.h"
20
21#include <stddef.h>
13#include <stdio.h> 22#include <stdio.h>
14#include <errno.h> 23#include <errno.h>
15#include <assert.h> 24#include <assert.h>
16 25
17#ifdef WIN32 26#ifndef SVs_PADSTALE
27# define SVs_PADSTALE 0
28#endif
29
30#ifdef PadARRAY
31# define NEWPADAPI 1
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else
34typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST;
37typedef AV PAD;
38# endif
39# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
40# define PadlistMAX(pl) AvFILLp (pl)
41# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY
43# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45#endif
46
47#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 off = PadlistMAX (padlist) + 1;
444 517
445 newpadlist = newAV (); 518#if NEWPADAPI
519
520 while (!PadlistARRAY (padlist)[off - 1])
521 --off;
522
523 Perl_pad_push (aTHX_ padlist, off);
524 newpad = PadlistARRAY (padlist)[off];
525 PadlistARRAY (padlist)[off] = 0;
526
527#else
528
529#if PERL_VERSION_ATLEAST (5,10,0)
530 Perl_pad_push (aTHX_ padlist, off);
531#else
532 Perl_pad_push (aTHX_ padlist, off, 1);
533#endif
534
535 newpad = PadlistARRAY (padlist)[off];
536 PadlistMAX (padlist) = off - 1;
537
538#endif
539
540 newPADLIST (newpadlist);
541#if !PERL_VERSION_ATLEAST(5,15,3)
542 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
446 AvREAL_off (newpadlist); 543 AvREAL_off (newpadlist);
447#if PERL_VERSION_ATLEAST (5,10,0)
448 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
449#else
450 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
451#endif 544#endif
452 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
453 --AvFILLp (padlist);
454 545
455 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 546 /* Already extended to 2 elements by newPADLIST. */
456 av_store (newpadlist, 1, (SV *)newpad); 547 PadlistMAX (newpadlist) = 1;
548 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
549 PadlistARRAY (newpadlist)[1] = newpad;
457 550
458 return newpadlist; 551 return newpadlist;
459} 552}
460 553
461static void 554ecb_inline void
462free_padlist (pTHX_ AV *padlist) 555free_padlist (pTHX_ PADLIST *padlist)
463{ 556{
464 /* may be during global destruction */ 557 /* may be during global destruction */
465 if (!IN_DESTRUCT) 558 if (!IN_DESTRUCT)
466 { 559 {
467 I32 i = AvFILLp (padlist); 560 I32 i = PadlistMAX (padlist);
468 561
469 while (i > 0) /* special-case index 0 */ 562 while (i > 0) /* special-case index 0 */
470 { 563 {
471 /* we try to be extra-careful here */ 564 /* we try to be extra-careful here */
472 AV *av = (AV *)AvARRAY (padlist)[i--]; 565 PAD *pad = PadlistARRAY (padlist)[i--];
473 I32 j = AvFILLp (av); 566 I32 j = PadMAX (pad);
474 567
475 while (j >= 0) 568 while (j >= 0)
476 SvREFCNT_dec (AvARRAY (av)[j--]); 569 SvREFCNT_dec (PadARRAY (pad)[j--]);
477 570
478 AvFILLp (av) = -1; 571 PadMAX (pad) = -1;
479 SvREFCNT_dec (av); 572 SvREFCNT_dec (pad);
480 } 573 }
481 574
482 SvREFCNT_dec (AvARRAY (padlist)[0]); 575 SvREFCNT_dec (PadlistNAMES (padlist));
483 576
577#if NEWPADAPI
578 Safefree (PadlistARRAY (padlist));
579 Safefree (padlist);
580#else
484 AvFILLp (padlist) = -1; 581 AvFILLp (padlist) = -1;
582 AvREAL_off (padlist);
485 SvREFCNT_dec ((SV*)padlist); 583 SvREFCNT_dec ((SV*)padlist);
584#endif
486 } 585 }
487} 586}
488 587
489static int 588static int
490coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 589coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
491{ 590{
492 AV *padlist; 591 PADLIST *padlist;
493 AV *av = (AV *)mg->mg_obj; 592 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
593 size_t len = *(size_t *)mg->mg_ptr;
494 594
495 /* perl manages to free our internal AV and _then_ call us */ 595 /* perl manages to free our internal AV and _then_ call us */
496 if (IN_DESTRUCT) 596 if (IN_DESTRUCT)
497 return 0; 597 return 0;
498 598
499 /* casting is fun. */ 599 while (len--)
500 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
501 free_padlist (aTHX_ padlist); 600 free_padlist (aTHX_ padlists[len]);
502
503 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
504 601
505 return 0; 602 return 0;
506} 603}
507 604
508static MGVTBL coro_cv_vtbl = { 605static MGVTBL coro_cv_vtbl = {
509 0, 0, 0, 0, 606 0, 0, 0, 0,
510 coro_cv_free 607 coro_cv_free
511}; 608};
512 609
513/* the next two functions merely cache the padlists */ 610/* the next two functions merely cache the padlists */
514static void 611ecb_inline void
515get_padlist (pTHX_ CV *cv) 612get_padlist (pTHX_ CV *cv)
516{ 613{
517 MAGIC *mg = CORO_MAGIC_cv (cv); 614 MAGIC *mg = CORO_MAGIC_cv (cv);
518 AV *av; 615 size_t *lenp;
519 616
520 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 617 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
521 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 618 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
522 else 619 else
523 { 620 {
524#if CORO_PREFER_PERL_FUNCTIONS 621#if CORO_PREFER_PERL_FUNCTIONS
525 /* this is probably cleaner? but also slower! */ 622 /* this is probably cleaner? but also slower! */
526 /* in practise, it seems to be less stable */ 623 /* in practise, it seems to be less stable */
… …
532 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 629 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
533#endif 630#endif
534 } 631 }
535} 632}
536 633
537static void 634ecb_inline void
538put_padlist (pTHX_ CV *cv) 635put_padlist (pTHX_ CV *cv)
539{ 636{
540 MAGIC *mg = CORO_MAGIC_cv (cv); 637 MAGIC *mg = CORO_MAGIC_cv (cv);
541 AV *av;
542 638
543 if (expect_false (!mg)) 639 if (ecb_expect_false (!mg))
640 {
544 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 641 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
642 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
643 mg->mg_len = 1; /* so mg_free frees mg_ptr */
644 }
645 else
646 Renew (mg->mg_ptr,
647 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
648 char);
545 649
546 av = (AV *)mg->mg_obj; 650 ((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} 651}
553 652
554/** load & save, init *******************************************************/ 653/** load & save, init *******************************************************/
654
655ecb_inline void
656swap_sv (SV *a, SV *b)
657{
658 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
659 SV tmp;
660
661 /* swap sv_any */
662 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
663
664 /* swap sv_flags */
665 SvFLAGS (&tmp) = SvFLAGS (a);
666 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
667 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
668
669#if PERL_VERSION_ATLEAST (5,10,0)
670 /* perl 5.10 and later complicates this _quite_ a bit, but it also
671 * is much faster, so no quarrels here. alternatively, we could
672 * sv_upgrade to avoid this.
673 */
674 {
675 /* swap sv_u */
676 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
677
678 /* if SvANY points to the head, we need to adjust the pointers,
679 * as the pointer for a still points to b, and maybe vice versa.
680 */
681 #define svany_in_head(type) \
682 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
683
684 if (svany_in_head (SvTYPE (a)))
685 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
686
687 if (svany_in_head (SvTYPE (b)))
688 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
689 }
690#endif
691}
692
693/* swap sv heads, at least logically */
694static void
695swap_svs (pTHX_ Coro__State c)
696{
697 int i;
698
699 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
700 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
701}
702
703#define SWAP_SVS(coro) \
704 if (ecb_expect_false ((coro)->swap_sv)) \
705 swap_svs (aTHX_ (coro))
555 706
556static void 707static void
557on_enterleave_call (pTHX_ SV *cb); 708on_enterleave_call (pTHX_ SV *cb);
558 709
559static void 710static void
… …
562 perl_slots *slot = c->slot; 713 perl_slots *slot = c->slot;
563 c->slot = 0; 714 c->slot = 0;
564 715
565 PL_mainstack = c->mainstack; 716 PL_mainstack = c->mainstack;
566 717
567 GvSV (PL_defgv) = slot->defsv; 718#if CORO_JIT
568 GvAV (PL_defgv) = slot->defav; 719 load_perl_slots (slot);
569 GvSV (PL_errgv) = slot->errsv; 720#else
570 GvSV (irsgv) = slot->irsgv;
571 GvHV (PL_hintgv) = slot->hinthv;
572
573 #define VAR(name,type) PL_ ## name = slot->name; 721 #define VARx(name,expr,type) expr = slot->name;
574 # include "state.h" 722 #include "state.h"
575 #undef VAR 723#endif
576 724
577 { 725 {
578 dSP; 726 dSP;
579 727
580 CV *cv; 728 CV *cv;
581 729
582 /* now do the ugly restore mess */ 730 /* now do the ugly restore mess */
583 while (expect_true (cv = (CV *)POPs)) 731 while (ecb_expect_true (cv = (CV *)POPs))
584 { 732 {
585 put_padlist (aTHX_ cv); /* mark this padlist as available */ 733 put_padlist (aTHX_ cv); /* mark this padlist as available */
586 CvDEPTH (cv) = PTR2IV (POPs); 734 CvDEPTH (cv) = PTR2IV (POPs);
587 CvPADLIST (cv) = (AV *)POPs; 735 CvPADLIST (cv) = (PADLIST *)POPs;
588 } 736 }
589 737
590 PUTBACK; 738 PUTBACK;
591 } 739 }
592 740
593 slf_frame = c->slf_frame; 741 slf_frame = c->slf_frame;
594 CORO_THROW = c->except; 742 CORO_THROW = c->except;
595 743
596 if (expect_false (enable_times)) 744 if (ecb_expect_false (enable_times))
597 { 745 {
598 if (expect_false (!times_valid)) 746 if (ecb_expect_false (!times_valid))
599 coro_times_update (); 747 coro_times_update ();
600 748
601 coro_times_sub (c); 749 coro_times_sub (c);
602 } 750 }
603 751
604 if (expect_false (c->on_enter)) 752 if (ecb_expect_false (c->on_enter))
605 { 753 {
606 int i; 754 int i;
607 755
608 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 756 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 757 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
610 } 758 }
759
760 SWAP_SVS (c);
611} 761}
612 762
613static void 763static void
614save_perl (pTHX_ Coro__State c) 764save_perl (pTHX_ Coro__State c)
615{ 765{
766 SWAP_SVS (c);
767
616 if (expect_false (c->on_leave)) 768 if (ecb_expect_false (c->on_leave))
617 { 769 {
618 int i; 770 int i;
619 771
620 for (i = AvFILLp (c->on_leave); i >= 0; --i) 772 for (i = AvFILLp (c->on_leave); i >= 0; --i)
621 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 773 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
622 } 774 }
623 775
624 times_valid = 0; 776 times_valid = 0;
625 777
626 if (expect_false (enable_times)) 778 if (ecb_expect_false (enable_times))
627 { 779 {
628 coro_times_update (); times_valid = 1; 780 coro_times_update (); times_valid = 1;
629 coro_times_add (c); 781 coro_times_add (c);
630 } 782 }
631 783
… …
645 797
646 XPUSHs (Nullsv); 798 XPUSHs (Nullsv);
647 /* this loop was inspired by pp_caller */ 799 /* this loop was inspired by pp_caller */
648 for (;;) 800 for (;;)
649 { 801 {
650 while (expect_true (cxix >= 0)) 802 while (ecb_expect_true (cxix >= 0))
651 { 803 {
652 PERL_CONTEXT *cx = &ccstk[cxix--]; 804 PERL_CONTEXT *cx = &ccstk[cxix--];
653 805
654 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 806 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
655 { 807 {
656 CV *cv = cx->blk_sub.cv; 808 CV *cv = cx->blk_sub.cv;
657 809
658 if (expect_true (CvDEPTH (cv))) 810 if (ecb_expect_true (CvDEPTH (cv)))
659 { 811 {
660 EXTEND (SP, 3); 812 EXTEND (SP, 3);
661 PUSHs ((SV *)CvPADLIST (cv)); 813 PUSHs ((SV *)CvPADLIST (cv));
662 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 814 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
663 PUSHs ((SV *)cv); 815 PUSHs ((SV *)cv);
… …
666 get_padlist (aTHX_ cv); 818 get_padlist (aTHX_ cv);
667 } 819 }
668 } 820 }
669 } 821 }
670 822
671 if (expect_true (top_si->si_type == PERLSI_MAIN)) 823 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
672 break; 824 break;
673 825
674 top_si = top_si->si_prev; 826 top_si = top_si->si_prev;
675 ccstk = top_si->si_cxstack; 827 ccstk = top_si->si_cxstack;
676 cxix = top_si->si_cxix; 828 cxix = top_si->si_cxix;
… …
678 830
679 PUTBACK; 831 PUTBACK;
680 } 832 }
681 833
682 /* allocate some space on the context stack for our purposes */ 834 /* allocate some space on the context stack for our purposes */
683 /* we manually unroll here, as usually 2 slots is enough */ 835 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 { 836 {
688 unsigned int i; 837 unsigned int i;
838
689 for (i = 3; i < SLOT_COUNT; ++i) 839 for (i = 0; i < SLOT_COUNT; ++i)
690 CXINC; 840 CXINC;
691 } 841
692 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 842 cxstack_ix -= SLOT_COUNT; /* undo allocation */
843 }
693 844
694 c->mainstack = PL_mainstack; 845 c->mainstack = PL_mainstack;
695 846
696 { 847 {
697 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 848 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
698 849
699 slot->defav = GvAV (PL_defgv); 850#if CORO_JIT
700 slot->defsv = DEFSV; 851 save_perl_slots (slot);
701 slot->errsv = ERRSV; 852#else
702 slot->irsgv = GvSV (irsgv);
703 slot->hinthv = GvHV (PL_hintgv);
704
705 #define VAR(name,type) slot->name = PL_ ## name; 853 #define VARx(name,expr,type) slot->name = expr;
706 # include "state.h" 854 #include "state.h"
707 #undef VAR 855#endif
708 } 856 }
709} 857}
710 858
711/* 859/*
712 * allocate various perl stacks. This is almost an exact copy 860 * allocate various perl stacks. This is almost an exact copy
… …
718# define coro_init_stacks(thx) init_stacks () 866# define coro_init_stacks(thx) init_stacks ()
719#else 867#else
720static void 868static void
721coro_init_stacks (pTHX) 869coro_init_stacks (pTHX)
722{ 870{
723 PL_curstackinfo = new_stackinfo(32, 8); 871 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; 872 PL_curstackinfo->si_type = PERLSI_MAIN;
725 PL_curstack = PL_curstackinfo->si_stack; 873 PL_curstack = PL_curstackinfo->si_stack;
726 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 874 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
727 875
728 PL_stack_base = AvARRAY(PL_curstack); 876 PL_stack_base = AvARRAY(PL_curstack);
… …
743#endif 891#endif
744 892
745 New(54,PL_scopestack,8,I32); 893 New(54,PL_scopestack,8,I32);
746 PL_scopestack_ix = 0; 894 PL_scopestack_ix = 0;
747 PL_scopestack_max = 8; 895 PL_scopestack_max = 8;
896#if HAS_SCOPESTACK_NAME
897 New(54,PL_scopestack_name,8,const char*);
898#endif
748 899
749 New(54,PL_savestack,24,ANY); 900 New(54,PL_savestack,24,ANY);
750 PL_savestack_ix = 0; 901 PL_savestack_ix = 0;
751 PL_savestack_max = 24; 902 PL_savestack_max = 24;
752 903
… …
780 } 931 }
781 932
782 Safefree (PL_tmps_stack); 933 Safefree (PL_tmps_stack);
783 Safefree (PL_markstack); 934 Safefree (PL_markstack);
784 Safefree (PL_scopestack); 935 Safefree (PL_scopestack);
936#if HAS_SCOPESTACK_NAME
937 Safefree (PL_scopestack_name);
938#endif
785 Safefree (PL_savestack); 939 Safefree (PL_savestack);
786#if !PERL_VERSION_ATLEAST (5,10,0) 940#if !PERL_VERSION_ATLEAST (5,10,0)
787 Safefree (PL_retstack); 941 Safefree (PL_retstack);
788#endif 942#endif
789} 943}
… …
835#endif 989#endif
836 990
837/* 991/*
838 * This overrides the default magic get method of %SIG elements. 992 * 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 993 * 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 994 * and instead of trying to save and restore the hash elements (extremely slow),
841 * readback here. 995 * we just provide our own readback here.
842 */ 996 */
843static int 997static int ecb_cold
844coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 998coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
845{ 999{
846 const char *s = MgPV_nolen_const (mg); 1000 const char *s = MgPV_nolen_const (mg);
847 1001
848 if (*s == '_') 1002 if (*s == '_')
849 { 1003 {
850 SV **svp = 0; 1004 SV **svp = 0;
851 1005
852 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1006 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
853 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1007 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
854 1008
855 if (svp) 1009 if (svp)
856 { 1010 {
857 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1011 SV *ssv;
1012
1013 if (!*svp)
1014 ssv = &PL_sv_undef;
1015 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1016 ssv = sv_2mortal (newRV_inc (*svp));
1017 else
1018 ssv = *svp;
1019
1020 sv_setsv (sv, ssv);
858 return 0; 1021 return 0;
859 } 1022 }
860 } 1023 }
861 1024
862 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1025 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
863} 1026}
864 1027
865static int 1028static int ecb_cold
866coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1029coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
867{ 1030{
868 const char *s = MgPV_nolen_const (mg); 1031 const char *s = MgPV_nolen_const (mg);
869 1032
870 if (*s == '_') 1033 if (*s == '_')
… …
884 } 1047 }
885 1048
886 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1049 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
887} 1050}
888 1051
889static int 1052static int ecb_cold
890coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1053coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
891{ 1054{
892 const char *s = MgPV_nolen_const (mg); 1055 const char *s = MgPV_nolen_const (mg);
893 1056
894 if (*s == '_') 1057 if (*s == '_')
… …
927slf_check_repeat (pTHX_ struct CoroSLF *frame) 1090slf_check_repeat (pTHX_ struct CoroSLF *frame)
928{ 1091{
929 return 1; 1092 return 1;
930} 1093}
931 1094
932static UNOP coro_setup_op; 1095static UNOP init_perl_op;
933 1096
934static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1097ecb_noinline static void /* noinline to keep it out of the transfer fast path */
935coro_setup (pTHX_ struct coro *coro) 1098init_perl (pTHX_ struct coro *coro)
936{ 1099{
937 /* 1100 /*
938 * emulate part of the perl startup here. 1101 * emulate part of the perl startup here.
939 */ 1102 */
940 coro_init_stacks (aTHX); 1103 coro_init_stacks (aTHX);
… …
947 PL_comppad_name_fill = 0; 1110 PL_comppad_name_fill = 0;
948 PL_comppad_name_floor = 0; 1111 PL_comppad_name_floor = 0;
949 PL_curpm = 0; 1112 PL_curpm = 0;
950 PL_curpad = 0; 1113 PL_curpad = 0;
951 PL_localizing = 0; 1114 PL_localizing = 0;
952 PL_dirty = 0;
953 PL_restartop = 0; 1115 PL_restartop = 0;
954#if PERL_VERSION_ATLEAST (5,10,0) 1116#if PERL_VERSION_ATLEAST (5,10,0)
955 PL_parser = 0; 1117 PL_parser = 0;
956#endif 1118#endif
957 PL_hints = 0; 1119 PL_hints = 0;
958 1120
959 /* recreate the die/warn hooks */ 1121 /* recreate the die/warn hooks */
960 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1122 PL_diehook = SvREFCNT_inc (rv_diehook);
961 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1123 PL_warnhook = SvREFCNT_inc (rv_warnhook);
962 1124
963 GvSV (PL_defgv) = newSV (0); 1125 GvSV (PL_defgv) = newSV (0);
964 GvAV (PL_defgv) = coro->args; coro->args = 0; 1126 GvAV (PL_defgv) = coro->args; coro->args = 0;
965 GvSV (PL_errgv) = newSV (0); 1127 GvSV (PL_errgv) = newSV (0);
966 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1128 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
967 GvHV (PL_hintgv) = 0; 1129 GvHV (PL_hintgv) = 0;
… …
987 /* this newly created coroutine might be run on an existing cctx which most 1149 /* 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. 1150 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
989 */ 1151 */
990 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1152 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 */ 1153 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1154 slf_frame.destroy = 0;
992 1155
993 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1156 /* 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; 1157 init_perl_op.op_next = PL_op;
995 coro_setup_op.op_type = OP_ENTERSUB; 1158 init_perl_op.op_type = OP_ENTERSUB;
996 coro_setup_op.op_ppaddr = pp_slf; 1159 init_perl_op.op_ppaddr = pp_slf;
997 /* no flags etc. required, as an init function won't be called */ 1160 /* no flags etc. required, as an init function won't be called */
998 1161
999 PL_op = (OP *)&coro_setup_op; 1162 PL_op = (OP *)&init_perl_op;
1000 1163
1001 /* copy throw, in case it was set before coro_setup */ 1164 /* copy throw, in case it was set before init_perl */
1002 CORO_THROW = coro->except; 1165 CORO_THROW = coro->except;
1003 1166
1167 SWAP_SVS (coro);
1168
1004 if (expect_false (enable_times)) 1169 if (ecb_expect_false (enable_times))
1005 { 1170 {
1006 coro_times_update (); 1171 coro_times_update ();
1007 coro_times_sub (coro); 1172 coro_times_sub (coro);
1008 } 1173 }
1009} 1174}
… …
1028 dounwind (-1); 1193 dounwind (-1);
1029 } 1194 }
1030} 1195}
1031 1196
1032static void 1197static void
1033coro_destruct_perl (pTHX_ struct coro *coro) 1198destroy_perl (pTHX_ struct coro *coro)
1034{ 1199{
1035 SV *svf [9]; 1200 SV *svf [9];
1036 1201
1037 { 1202 {
1203 SV *old_current = SvRV (coro_current);
1038 struct coro *current = SvSTATE_current; 1204 struct coro *current = SvSTATE (old_current);
1039 1205
1040 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1206 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1041 1207
1042 save_perl (aTHX_ current); 1208 save_perl (aTHX_ current);
1209
1210 /* this will cause transfer_check to croak on block*/
1211 SvRV_set (coro_current, (SV *)coro->hv);
1212
1043 load_perl (aTHX_ coro); 1213 load_perl (aTHX_ coro);
1044 1214
1045 coro_unwind_stacks (aTHX); 1215 coro_unwind_stacks (aTHX);
1216
1217 /* restore swapped sv's */
1218 SWAP_SVS (coro);
1219
1046 coro_destruct_stacks (aTHX); 1220 coro_destruct_stacks (aTHX);
1047 1221
1048 // now save some sv's to be free'd later 1222 /* now save some sv's to be free'd later */
1049 svf [0] = GvSV (PL_defgv); 1223 svf [0] = GvSV (PL_defgv);
1050 svf [1] = (SV *)GvAV (PL_defgv); 1224 svf [1] = (SV *)GvAV (PL_defgv);
1051 svf [2] = GvSV (PL_errgv); 1225 svf [2] = GvSV (PL_errgv);
1052 svf [3] = (SV *)PL_defoutgv; 1226 svf [3] = (SV *)PL_defoutgv;
1053 svf [4] = PL_rs; 1227 svf [4] = PL_rs;
… …
1055 svf [6] = (SV *)GvHV (PL_hintgv); 1229 svf [6] = (SV *)GvHV (PL_hintgv);
1056 svf [7] = PL_diehook; 1230 svf [7] = PL_diehook;
1057 svf [8] = PL_warnhook; 1231 svf [8] = PL_warnhook;
1058 assert (9 == sizeof (svf) / sizeof (*svf)); 1232 assert (9 == sizeof (svf) / sizeof (*svf));
1059 1233
1234 SvRV_set (coro_current, old_current);
1235
1060 load_perl (aTHX_ current); 1236 load_perl (aTHX_ current);
1061 } 1237 }
1062 1238
1063 { 1239 {
1064 unsigned int i; 1240 unsigned int i;
… …
1071 SvREFCNT_dec (coro->invoke_cb); 1247 SvREFCNT_dec (coro->invoke_cb);
1072 SvREFCNT_dec (coro->invoke_av); 1248 SvREFCNT_dec (coro->invoke_av);
1073 } 1249 }
1074} 1250}
1075 1251
1076INLINE void 1252ecb_inline void
1077free_coro_mortal (pTHX) 1253free_coro_mortal (pTHX)
1078{ 1254{
1079 if (expect_true (coro_mortal)) 1255 if (ecb_expect_true (coro_mortal))
1080 { 1256 {
1081 SvREFCNT_dec (coro_mortal); 1257 SvREFCNT_dec ((SV *)coro_mortal);
1082 coro_mortal = 0; 1258 coro_mortal = 0;
1083 } 1259 }
1084} 1260}
1085 1261
1086static int 1262static int
… …
1219 1395
1220 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1396 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1221} 1397}
1222 1398
1223/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1399/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1224static void NOINLINE 1400static void ecb_noinline
1225cctx_prepare (pTHX) 1401cctx_prepare (pTHX)
1226{ 1402{
1227 PL_top_env = &PL_start_env; 1403 PL_top_env = &PL_start_env;
1228 1404
1229 if (cctx_current->flags & CC_TRACE) 1405 if (cctx_current->flags & CC_TRACE)
… …
1240 slf_frame.prepare = slf_prepare_set_stacklevel; 1416 slf_frame.prepare = slf_prepare_set_stacklevel;
1241 slf_frame.check = slf_check_set_stacklevel; 1417 slf_frame.check = slf_check_set_stacklevel;
1242} 1418}
1243 1419
1244/* the tail of transfer: execute stuff we can only do after a transfer */ 1420/* the tail of transfer: execute stuff we can only do after a transfer */
1245INLINE void 1421ecb_inline void
1246transfer_tail (pTHX) 1422transfer_tail (pTHX)
1247{ 1423{
1248 free_coro_mortal (aTHX); 1424 free_coro_mortal (aTHX);
1425}
1426
1427/* try to exit the same way perl's main function would do */
1428/* we do not bother resetting the environment or other things *7
1429/* that are not, uhm, essential */
1430/* this obviously also doesn't work when perl is embedded */
1431static void ecb_noinline ecb_cold
1432perlish_exit (pTHX)
1433{
1434 int exitstatus = perl_destruct (PL_curinterp);
1435 perl_free (PL_curinterp);
1436 exit (exitstatus);
1249} 1437}
1250 1438
1251/* 1439/*
1252 * this is a _very_ stripped down perl interpreter ;) 1440 * this is a _very_ stripped down perl interpreter ;)
1253 */ 1441 */
… …
1282 */ 1470 */
1283 1471
1284 /* 1472 /*
1285 * If perl-run returns we assume exit() was being called or the coro 1473 * 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) 1474 * 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 1475 * 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" 1476 * 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 */ 1477 */
1293 PL_top_env = main_top_env; 1478 perlish_exit (aTHX);
1294 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1295 } 1479 }
1296} 1480}
1297 1481
1298static coro_cctx * 1482static coro_cctx *
1299cctx_new () 1483cctx_new (void)
1300{ 1484{
1301 coro_cctx *cctx; 1485 coro_cctx *cctx;
1302 1486
1303 ++cctx_count; 1487 ++cctx_count;
1304 New (0, cctx, 1, coro_cctx); 1488 New (0, cctx, 1, coro_cctx);
… …
1310 return cctx; 1494 return cctx;
1311} 1495}
1312 1496
1313/* create a new cctx only suitable as source */ 1497/* create a new cctx only suitable as source */
1314static coro_cctx * 1498static coro_cctx *
1315cctx_new_empty () 1499cctx_new_empty (void)
1316{ 1500{
1317 coro_cctx *cctx = cctx_new (); 1501 coro_cctx *cctx = cctx_new ();
1318 1502
1319 cctx->sptr = 0; 1503 cctx->stack.sptr = 0;
1320 coro_create (&cctx->cctx, 0, 0, 0, 0); 1504 coro_create (&cctx->cctx, 0, 0, 0, 0);
1321 1505
1322 return cctx; 1506 return cctx;
1323} 1507}
1324 1508
1325/* create a new cctx suitable as destination/running a perl interpreter */ 1509/* create a new cctx suitable as destination/running a perl interpreter */
1326static coro_cctx * 1510static coro_cctx *
1327cctx_new_run () 1511cctx_new_run (void)
1328{ 1512{
1329 coro_cctx *cctx = cctx_new (); 1513 coro_cctx *cctx = cctx_new ();
1330 void *stack_start;
1331 size_t stack_size;
1332 1514
1333#if HAVE_MMAP 1515 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 } 1516 {
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."); 1517 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1356 _exit (EXIT_FAILURE); 1518 _exit (EXIT_FAILURE);
1357 }
1358
1359 stack_start = cctx->sptr;
1360 stack_size = cctx->ssize;
1361 } 1519 }
1362 1520
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); 1521 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1368 1522
1369 return cctx; 1523 return cctx;
1370} 1524}
1371 1525
1372static void 1526static void
1373cctx_destroy (coro_cctx *cctx) 1527cctx_destroy (coro_cctx *cctx)
1374{ 1528{
1375 if (!cctx) 1529 if (!cctx)
1376 return; 1530 return;
1377 1531
1378 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1532 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1379 1533
1380 --cctx_count; 1534 --cctx_count;
1381 coro_destroy (&cctx->cctx); 1535 coro_destroy (&cctx->cctx);
1382 1536
1383 /* coro_transfer creates new, empty cctx's */ 1537 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 1538
1398 Safefree (cctx); 1539 Safefree (cctx);
1399} 1540}
1400 1541
1401/* wether this cctx should be destructed */ 1542/* wether this cctx should be destructed */
1402#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1543#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1403 1544
1404static coro_cctx * 1545static coro_cctx *
1405cctx_get (pTHX) 1546cctx_get (pTHX)
1406{ 1547{
1407 while (expect_true (cctx_first)) 1548 while (ecb_expect_true (cctx_first))
1408 { 1549 {
1409 coro_cctx *cctx = cctx_first; 1550 coro_cctx *cctx = cctx_first;
1410 cctx_first = cctx->next; 1551 cctx_first = cctx->next;
1411 --cctx_idle; 1552 --cctx_idle;
1412 1553
1413 if (expect_true (!CCTX_EXPIRED (cctx))) 1554 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1414 return cctx; 1555 return cctx;
1415 1556
1416 cctx_destroy (cctx); 1557 cctx_destroy (cctx);
1417 } 1558 }
1418 1559
… …
1420} 1561}
1421 1562
1422static void 1563static void
1423cctx_put (coro_cctx *cctx) 1564cctx_put (coro_cctx *cctx)
1424{ 1565{
1425 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1566 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1426 1567
1427 /* free another cctx if overlimit */ 1568 /* free another cctx if overlimit */
1428 if (expect_false (cctx_idle >= cctx_max_idle)) 1569 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1429 { 1570 {
1430 coro_cctx *first = cctx_first; 1571 coro_cctx *first = cctx_first;
1431 cctx_first = first->next; 1572 cctx_first = first->next;
1432 --cctx_idle; 1573 --cctx_idle;
1433 1574
… …
1444static void 1585static void
1445transfer_check (pTHX_ struct coro *prev, struct coro *next) 1586transfer_check (pTHX_ struct coro *prev, struct coro *next)
1446{ 1587{
1447 /* TODO: throwing up here is considered harmful */ 1588 /* TODO: throwing up here is considered harmful */
1448 1589
1449 if (expect_true (prev != next)) 1590 if (ecb_expect_true (prev != next))
1450 { 1591 {
1451 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1592 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,"); 1593 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1453 1594
1454 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1595 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,"); 1596 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1456 1597
1457#if !PERL_VERSION_ATLEAST (5,10,0) 1598#if !PERL_VERSION_ATLEAST (5,10,0)
1458 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1599 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,"); 1600 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1460#endif 1601#endif
1461 } 1602 }
1462} 1603}
1463 1604
1464/* always use the TRANSFER macro */ 1605/* always use the TRANSFER macro */
1465static void NOINLINE /* noinline so we have a fixed stackframe */ 1606static void ecb_noinline /* noinline so we have a fixed stackframe */
1466transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1607transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1467{ 1608{
1468 dSTACKLEVEL; 1609 dSTACKLEVEL;
1469 1610
1470 /* sometimes transfer is only called to set idle_sp */ 1611 /* sometimes transfer is only called to set idle_sp */
1471 if (expect_false (!prev)) 1612 if (ecb_expect_false (!prev))
1472 { 1613 {
1473 cctx_current->idle_sp = STACKLEVEL; 1614 cctx_current->idle_sp = STACKLEVEL;
1474 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1615 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1475 } 1616 }
1476 else if (expect_true (prev != next)) 1617 else if (ecb_expect_true (prev != next))
1477 { 1618 {
1478 coro_cctx *cctx_prev; 1619 coro_cctx *cctx_prev;
1479 1620
1480 if (expect_false (prev->flags & CF_NEW)) 1621 if (ecb_expect_false (prev->flags & CF_NEW))
1481 { 1622 {
1482 /* create a new empty/source context */ 1623 /* create a new empty/source context */
1483 prev->flags &= ~CF_NEW; 1624 prev->flags &= ~CF_NEW;
1484 prev->flags |= CF_RUNNING; 1625 prev->flags |= CF_RUNNING;
1485 } 1626 }
… …
1488 next->flags |= CF_RUNNING; 1629 next->flags |= CF_RUNNING;
1489 1630
1490 /* first get rid of the old state */ 1631 /* first get rid of the old state */
1491 save_perl (aTHX_ prev); 1632 save_perl (aTHX_ prev);
1492 1633
1493 if (expect_false (next->flags & CF_NEW)) 1634 if (ecb_expect_false (next->flags & CF_NEW))
1494 { 1635 {
1495 /* need to start coroutine */ 1636 /* need to start coroutine */
1496 next->flags &= ~CF_NEW; 1637 next->flags &= ~CF_NEW;
1497 /* setup coroutine call */ 1638 /* setup coroutine call */
1498 coro_setup (aTHX_ next); 1639 init_perl (aTHX_ next);
1499 } 1640 }
1500 else 1641 else
1501 load_perl (aTHX_ next); 1642 load_perl (aTHX_ next);
1502 1643
1503 /* possibly untie and reuse the cctx */ 1644 /* possibly untie and reuse the cctx */
1504 if (expect_true ( 1645 if (ecb_expect_true (
1505 cctx_current->idle_sp == STACKLEVEL 1646 cctx_current->idle_sp == STACKLEVEL
1506 && !(cctx_current->flags & CC_TRACE) 1647 && !(cctx_current->flags & CC_TRACE)
1507 && !force_cctx 1648 && !force_cctx
1508 )) 1649 ))
1509 { 1650 {
1510 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1651 /* 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)); 1652 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1512 1653
1513 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1654 /* 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 */ 1655 /* without this the next cctx_get might destroy the running cctx while still in use */
1515 if (expect_false (CCTX_EXPIRED (cctx_current))) 1656 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1516 if (expect_true (!next->cctx)) 1657 if (ecb_expect_true (!next->cctx))
1517 next->cctx = cctx_get (aTHX); 1658 next->cctx = cctx_get (aTHX);
1518 1659
1519 cctx_put (cctx_current); 1660 cctx_put (cctx_current);
1520 } 1661 }
1521 else 1662 else
1522 prev->cctx = cctx_current; 1663 prev->cctx = cctx_current;
1523 1664
1524 ++next->usecount; 1665 ++next->usecount;
1525 1666
1526 cctx_prev = cctx_current; 1667 cctx_prev = cctx_current;
1527 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1668 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1528 1669
1529 next->cctx = 0; 1670 next->cctx = 0;
1530 1671
1531 if (expect_false (cctx_prev != cctx_current)) 1672 if (ecb_expect_false (cctx_prev != cctx_current))
1532 { 1673 {
1533 cctx_prev->top_env = PL_top_env; 1674 cctx_prev->top_env = PL_top_env;
1534 PL_top_env = cctx_current->top_env; 1675 PL_top_env = cctx_current->top_env;
1535 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1676 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1536 } 1677 }
… …
1542#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1683#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) 1684#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1544 1685
1545/** high level stuff ********************************************************/ 1686/** high level stuff ********************************************************/
1546 1687
1688/* this function is actually Coro, not Coro::State, but we call it from here */
1689/* because it is convenient - but it hasn't been declared yet for that reason */
1547static int 1690static void
1691coro_call_on_destroy (pTHX_ struct coro *coro);
1692
1693static void
1548coro_state_destroy (pTHX_ struct coro *coro) 1694coro_state_destroy (pTHX_ struct coro *coro)
1549{ 1695{
1550 if (coro->flags & CF_DESTROYED) 1696 if (coro->flags & CF_ZOMBIE)
1551 return 0; 1697 return;
1552 1698
1553 if (coro->on_destroy && !PL_dirty)
1554 coro->on_destroy (aTHX_ coro); 1699 slf_destroy (aTHX_ coro);
1555 1700
1556 coro->flags |= CF_DESTROYED; 1701 coro->flags |= CF_ZOMBIE;
1557 1702
1558 if (coro->flags & CF_READY) 1703 if (coro->flags & CF_READY)
1559 { 1704 {
1560 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1705 /* reduce nready, as destroying a ready coro effectively unreadies it */
1561 /* alternative: look through all ready queues and remove the coro */ 1706 /* alternative: look through all ready queues and remove the coro */
1562 --coro_nready; 1707 --coro_nready;
1563 } 1708 }
1564 else 1709 else
1565 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1710 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1711
1712 if (coro->next) coro->next->prev = coro->prev;
1713 if (coro->prev) coro->prev->next = coro->next;
1714 if (coro == coro_first) coro_first = coro->next;
1566 1715
1567 if (coro->mainstack 1716 if (coro->mainstack
1568 && coro->mainstack != main_mainstack 1717 && coro->mainstack != main_mainstack
1569 && coro->slot 1718 && coro->slot
1570 && !PL_dirty) 1719 && !PL_dirty)
1571 coro_destruct_perl (aTHX_ coro); 1720 destroy_perl (aTHX_ coro);
1572 1721
1573 cctx_destroy (coro->cctx); 1722 cctx_destroy (coro->cctx);
1574 SvREFCNT_dec (coro->startcv); 1723 SvREFCNT_dec (coro->startcv);
1575 SvREFCNT_dec (coro->args); 1724 SvREFCNT_dec (coro->args);
1725 SvREFCNT_dec (coro->swap_sv);
1576 SvREFCNT_dec (CORO_THROW); 1726 SvREFCNT_dec (CORO_THROW);
1577 1727
1578 if (coro->next) coro->next->prev = coro->prev; 1728 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 1729
1582 return 1; 1730 /* more destruction mayhem in coro_state_free */
1583} 1731}
1584 1732
1585static int 1733static int
1586coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1734coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1587{ 1735{
1588 struct coro *coro = (struct coro *)mg->mg_ptr; 1736 struct coro *coro = (struct coro *)mg->mg_ptr;
1589 mg->mg_ptr = 0; 1737 mg->mg_ptr = 0;
1590 1738
1591 coro->hv = 0;
1592
1593 if (--coro->refcnt < 0)
1594 {
1595 coro_state_destroy (aTHX_ coro); 1739 coro_state_destroy (aTHX_ coro);
1740 SvREFCNT_dec (coro->on_destroy);
1741 SvREFCNT_dec (coro->status);
1742
1596 Safefree (coro); 1743 Safefree (coro);
1597 }
1598 1744
1599 return 0; 1745 return 0;
1600} 1746}
1601 1747
1602static int 1748static int ecb_cold
1603coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1749coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1604{ 1750{
1605 struct coro *coro = (struct coro *)mg->mg_ptr; 1751 /* called when perl clones the current process the slow way (windows process emulation) */
1606 1752 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1607 ++coro->refcnt; 1753 mg->mg_ptr = 0;
1754 mg->mg_virtual = 0;
1608 1755
1609 return 0; 1756 return 0;
1610} 1757}
1611 1758
1612static MGVTBL coro_state_vtbl = { 1759static MGVTBL coro_state_vtbl = {
… …
1637 TRANSFER (ta, 1); 1784 TRANSFER (ta, 1);
1638} 1785}
1639 1786
1640/** Coro ********************************************************************/ 1787/** Coro ********************************************************************/
1641 1788
1642INLINE void 1789ecb_inline void
1643coro_enq (pTHX_ struct coro *coro) 1790coro_enq (pTHX_ struct coro *coro)
1644{ 1791{
1645 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1792 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1646 1793
1647 SvREFCNT_inc_NN (coro->hv); 1794 SvREFCNT_inc_NN (coro->hv);
… …
1649 coro->next_ready = 0; 1796 coro->next_ready = 0;
1650 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1797 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1651 ready [1] = coro; 1798 ready [1] = coro;
1652} 1799}
1653 1800
1654INLINE struct coro * 1801ecb_inline struct coro *
1655coro_deq (pTHX) 1802coro_deq (pTHX)
1656{ 1803{
1657 int prio; 1804 int prio;
1658 1805
1659 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1806 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1712{ 1859{
1713 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1860 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1714} 1861}
1715 1862
1716/* expects to own a reference to next->hv */ 1863/* expects to own a reference to next->hv */
1717INLINE void 1864ecb_inline void
1718prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1865prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1719{ 1866{
1720 SV *prev_sv = SvRV (coro_current); 1867 SV *prev_sv = SvRV (coro_current);
1721 1868
1722 ta->prev = SvSTATE_hv (prev_sv); 1869 ta->prev = SvSTATE_hv (prev_sv);
… …
1735{ 1882{
1736 for (;;) 1883 for (;;)
1737 { 1884 {
1738 struct coro *next = coro_deq (aTHX); 1885 struct coro *next = coro_deq (aTHX);
1739 1886
1740 if (expect_true (next)) 1887 if (ecb_expect_true (next))
1741 { 1888 {
1742 /* cannot transfer to destroyed coros, skip and look for next */ 1889 /* cannot transfer to destroyed coros, skip and look for next */
1743 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1890 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 */ 1891 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1745 else 1892 else
1746 { 1893 {
1747 next->flags &= ~CF_READY; 1894 next->flags &= ~CF_READY;
1748 --coro_nready; 1895 --coro_nready;
… …
1755 { 1902 {
1756 /* nothing to schedule: call the idle handler */ 1903 /* nothing to schedule: call the idle handler */
1757 if (SvROK (sv_idle) 1904 if (SvROK (sv_idle)
1758 && SvOBJECT (SvRV (sv_idle))) 1905 && SvOBJECT (SvRV (sv_idle)))
1759 { 1906 {
1907 if (SvRV (sv_idle) == SvRV (coro_current))
1908 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1909
1760 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1910 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1761 api_ready (aTHX_ SvRV (sv_idle)); 1911 api_ready (aTHX_ SvRV (sv_idle));
1762 --coro_nready; 1912 --coro_nready;
1763 } 1913 }
1764 else 1914 else
1765 { 1915 {
1916 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1766 dSP; 1917 dSP;
1767 1918
1768 ENTER; 1919 ENTER;
1769 SAVETMPS; 1920 SAVETMPS;
1770 1921
… …
1777 } 1928 }
1778 } 1929 }
1779 } 1930 }
1780} 1931}
1781 1932
1782INLINE void 1933ecb_inline void
1783prepare_cede (pTHX_ struct coro_transfer_args *ta) 1934prepare_cede (pTHX_ struct coro_transfer_args *ta)
1784{ 1935{
1785 api_ready (aTHX_ coro_current); 1936 api_ready (aTHX_ coro_current);
1786 prepare_schedule (aTHX_ ta); 1937 prepare_schedule (aTHX_ ta);
1787} 1938}
1788 1939
1789INLINE void 1940ecb_inline void
1790prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1941prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1791{ 1942{
1792 SV *prev = SvRV (coro_current); 1943 SV *prev = SvRV (coro_current);
1793 1944
1794 if (coro_nready) 1945 if (coro_nready)
… …
1824{ 1975{
1825 struct coro_transfer_args ta; 1976 struct coro_transfer_args ta;
1826 1977
1827 prepare_cede (aTHX_ &ta); 1978 prepare_cede (aTHX_ &ta);
1828 1979
1829 if (expect_true (ta.prev != ta.next)) 1980 if (ecb_expect_true (ta.prev != ta.next))
1830 { 1981 {
1831 TRANSFER (ta, 1); 1982 TRANSFER (ta, 1);
1832 return 1; 1983 return 1;
1833 } 1984 }
1834 else 1985 else
… …
1877 coro->slot->runops = RUNOPS_DEFAULT; 2028 coro->slot->runops = RUNOPS_DEFAULT;
1878 } 2029 }
1879} 2030}
1880 2031
1881static void 2032static void
2033coro_push_av (pTHX_ AV *av, I32 gimme_v)
2034{
2035 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2036 {
2037 dSP;
2038
2039 if (gimme_v == G_SCALAR)
2040 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2041 else
2042 {
2043 int i;
2044 EXTEND (SP, AvFILLp (av) + 1);
2045
2046 for (i = 0; i <= AvFILLp (av); ++i)
2047 PUSHs (AvARRAY (av)[i]);
2048 }
2049
2050 PUTBACK;
2051 }
2052}
2053
2054static void
2055coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2056{
2057 if (!coro->on_destroy)
2058 coro->on_destroy = newAV ();
2059
2060 av_push (coro->on_destroy, cb);
2061}
2062
2063static void
2064slf_destroy_join (pTHX_ struct CoroSLF *frame)
2065{
2066 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2067}
2068
2069static int
2070slf_check_join (pTHX_ struct CoroSLF *frame)
2071{
2072 struct coro *coro = (struct coro *)frame->data;
2073
2074 if (!coro->status)
2075 return 1;
2076
2077 frame->destroy = 0;
2078
2079 coro_push_av (aTHX_ coro->status, GIMME_V);
2080
2081 SvREFCNT_dec ((SV *)coro->hv);
2082
2083 return 0;
2084}
2085
2086static void
2087slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2088{
2089 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2090
2091 if (items > 1)
2092 croak ("join called with too many arguments");
2093
2094 if (coro->status)
2095 frame->prepare = prepare_nop;
2096 else
2097 {
2098 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2099 frame->prepare = prepare_schedule;
2100 }
2101
2102 frame->check = slf_check_join;
2103 frame->destroy = slf_destroy_join;
2104 frame->data = (void *)coro;
2105 SvREFCNT_inc (coro->hv);
2106}
2107
2108static void
1882coro_call_on_destroy (pTHX_ struct coro *coro) 2109coro_call_on_destroy (pTHX_ struct coro *coro)
1883{ 2110{
1884 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2111 AV *od = coro->on_destroy;
1885 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1886 2112
1887 if (on_destroyp) 2113 if (!od)
1888 { 2114 return;
1889 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1890 2115
2116 coro->on_destroy = 0;
2117 sv_2mortal ((SV *)od);
2118
1891 while (AvFILLp (on_destroy) >= 0) 2119 while (AvFILLp (od) >= 0)
2120 {
2121 SV *cb = sv_2mortal (av_pop (od));
2122
2123 /* coro hv's (and only hv's at the moment) are supported as well */
2124 if (SvSTATEhv_p (aTHX_ cb))
2125 api_ready (aTHX_ cb);
2126 else
1892 { 2127 {
1893 dSP; /* don't disturb outer sp */ 2128 dSP; /* don't disturb outer sp */
1894 SV *cb = av_pop (on_destroy);
1895
1896 PUSHMARK (SP); 2129 PUSHMARK (SP);
1897 2130
1898 if (statusp) 2131 if (coro->status)
1899 { 2132 {
1900 int i; 2133 PUTBACK;
1901 AV *status = (AV *)SvRV (*statusp); 2134 coro_push_av (aTHX_ coro->status, G_ARRAY);
1902 EXTEND (SP, AvFILLp (status) + 1); 2135 SPAGAIN;
1903
1904 for (i = 0; i <= AvFILLp (status); ++i)
1905 PUSHs (AvARRAY (status)[i]);
1906 } 2136 }
1907 2137
1908 PUTBACK; 2138 PUTBACK;
1909 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2139 call_sv (cb, G_VOID | G_DISCARD);
1910 } 2140 }
1911 } 2141 }
1912} 2142}
1913 2143
1914static void 2144static void
1915slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2145coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1916{ 2146{
2147 AV *av;
2148
2149 if (coro->status)
2150 {
2151 av = coro->status;
2152 av_clear (av);
2153 }
2154 else
2155 av = coro->status = newAV ();
2156
2157 /* items are actually not so common, so optimise for this case */
2158 if (items)
2159 {
1917 int i; 2160 int i;
1918 HV *hv = (HV *)SvRV (coro_current);
1919 AV *av = newAV ();
1920 2161
1921 av_extend (av, items - 1); 2162 av_extend (av, items - 1);
2163
1922 for (i = 0; i < items; ++i) 2164 for (i = 0; i < items; ++i)
1923 av_push (av, SvREFCNT_inc_NN (arg [i])); 2165 av_push (av, SvREFCNT_inc_NN (arg [i]));
2166 }
2167}
1924 2168
1925 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2169static void
1926 2170slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2171{
1927 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2172 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1928 api_ready (aTHX_ sv_manager); 2173 api_ready (aTHX_ sv_manager);
1929 2174
1930 frame->prepare = prepare_schedule; 2175 frame->prepare = prepare_schedule;
1931 frame->check = slf_check_repeat; 2176 frame->check = slf_check_repeat;
1932 2177
1933 /* as a minor optimisation, we could unwind all stacks here */ 2178 /* as a minor optimisation, we could unwind all stacks here */
1934 /* but that puts extra pressure on pp_slf, and is not worth much */ 2179 /* but that puts extra pressure on pp_slf, and is not worth much */
1935 /*coro_unwind_stacks (aTHX);*/ 2180 /*coro_unwind_stacks (aTHX);*/
2181}
2182
2183static void
2184slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2185{
2186 HV *coro_hv = (HV *)SvRV (coro_current);
2187
2188 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2189 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2190}
2191
2192static void
2193slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2194{
2195 HV *coro_hv;
2196 struct coro *coro;
2197
2198 if (items <= 0)
2199 croak ("Coro::cancel called without coro object,");
2200
2201 coro = SvSTATE (arg [0]);
2202 coro_hv = coro->hv;
2203
2204 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2205
2206 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2207 {
2208 /* coro currently busy cancelling something, so just notify it */
2209 coro->slf_frame.data = (void *)coro;
2210
2211 frame->prepare = prepare_nop;
2212 frame->check = slf_check_nop;
2213 }
2214 else if (coro_hv == (HV *)SvRV (coro_current))
2215 {
2216 /* cancelling the current coro is allowed, and equals terminate */
2217 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2218 }
2219 else
2220 {
2221 struct coro *self = SvSTATE_current;
2222
2223 /* otherwise we cancel directly, purely for speed reasons
2224 * unfortunately, this requires some magic trickery, as
2225 * somebody else could cancel us, so we have to fight the cancellation.
2226 * this is ugly, and hopefully fully worth the extra speed.
2227 * besides, I can't get the slow-but-safe version working...
2228 */
2229 slf_frame.data = 0;
2230 self->flags |= CF_NOCANCEL;
2231 coro_state_destroy (aTHX_ coro);
2232 self->flags &= ~CF_NOCANCEL;
2233
2234 if (slf_frame.data)
2235 {
2236 /* while we were busy we have been cancelled, so terminate */
2237 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2238 }
2239 else
2240 {
2241 frame->prepare = prepare_nop;
2242 frame->check = slf_check_nop;
2243 }
2244 }
2245}
2246
2247static int
2248slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2249{
2250 frame->prepare = 0;
2251 coro_unwind_stacks (aTHX);
2252
2253 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2254
2255 return 1;
2256}
2257
2258static int
2259safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2260{
2261 if (coro->cctx)
2262 croak ("coro inside C callback, unable to cancel at this time, caught");
2263
2264 if (coro->flags & CF_NEW)
2265 {
2266 coro_set_status (aTHX_ coro, arg, items);
2267 coro_state_destroy (aTHX_ coro);
2268 }
2269 else
2270 {
2271 if (!coro->slf_frame.prepare)
2272 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2273
2274 slf_destroy (aTHX_ coro);
2275
2276 coro_set_status (aTHX_ coro, arg, items);
2277 coro->slf_frame.prepare = prepare_nop;
2278 coro->slf_frame.check = slf_check_safe_cancel;
2279
2280 api_ready (aTHX_ (SV *)coro->hv);
2281 }
2282
2283 return 1;
1936} 2284}
1937 2285
1938/*****************************************************************************/ 2286/*****************************************************************************/
1939/* async pool handler */ 2287/* async pool handler */
1940 2288
… …
1971slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2319slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1972{ 2320{
1973 HV *hv = (HV *)SvRV (coro_current); 2321 HV *hv = (HV *)SvRV (coro_current);
1974 struct coro *coro = SvSTATE_hv ((SV *)hv); 2322 struct coro *coro = SvSTATE_hv ((SV *)hv);
1975 2323
1976 if (expect_true (coro->saved_deffh)) 2324 if (ecb_expect_true (coro->saved_deffh))
1977 { 2325 {
1978 /* subsequent iteration */ 2326 /* subsequent iteration */
1979 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2327 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1980 coro->saved_deffh = 0; 2328 coro->saved_deffh = 0;
1981 2329
1982 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2330 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1983 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2331 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1984 { 2332 {
1985 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2333 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1986 coro->invoke_av = newAV (); 2334 return;
1987
1988 frame->prepare = prepare_nop;
1989 } 2335 }
1990 else 2336 else
1991 { 2337 {
1992 av_clear (GvAV (PL_defgv)); 2338 av_clear (GvAV (PL_defgv));
1993 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2339 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2043 2389
2044static int 2390static int
2045slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2391slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2046{ 2392{
2047 SV *data = (SV *)frame->data; 2393 SV *data = (SV *)frame->data;
2048 2394
2049 if (CORO_THROW) 2395 if (CORO_THROW)
2050 return 0; 2396 return 0;
2051 2397
2052 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2398 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2053 return 1; 2399 return 1;
… …
2089 cb = sv_2mortal (coro->rouse_cb); 2435 cb = sv_2mortal (coro->rouse_cb);
2090 coro->rouse_cb = 0; 2436 coro->rouse_cb = 0;
2091 } 2437 }
2092 2438
2093 if (!SvROK (cb) 2439 if (!SvROK (cb)
2094 || SvTYPE (SvRV (cb)) != SVt_PVCV 2440 || SvTYPE (SvRV (cb)) != SVt_PVCV
2095 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2441 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2096 croak ("Coro::rouse_wait called with illegal callback argument,"); 2442 croak ("Coro::rouse_wait called with illegal callback argument,");
2097 2443
2098 { 2444 {
2099 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2445 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2216static void 2562static void
2217slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2563slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2218{ 2564{
2219 frame->prepare = prepare_cede_notself; 2565 frame->prepare = prepare_cede_notself;
2220 frame->check = slf_check_nop; 2566 frame->check = slf_check_nop;
2567}
2568
2569/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2570static void
2571slf_destroy (pTHX_ struct coro *coro)
2572{
2573 /* this callback is reserved for slf functions needing to do cleanup */
2574 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2575 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2576
2577 /*
2578 * The on_destroy above most likely is from an SLF call.
2579 * Since by definition the SLF call will not finish when we destroy
2580 * the coro, we will have to force-finish it here, otherwise
2581 * cleanup functions cannot call SLF functions.
2582 */
2583 coro->slf_frame.prepare = 0;
2221} 2584}
2222 2585
2223/* 2586/*
2224 * these not obviously related functions are all rolled into one 2587 * these not obviously related functions are all rolled into one
2225 * function to increase chances that they all will call transfer with the same 2588 * 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 */ 2595 I32 checkmark; /* mark SP to see how many elements check has pushed */
2233 2596
2234 /* set up the slf frame, unless it has already been set-up */ 2597 /* set up the slf frame, unless it has already been set-up */
2235 /* the latter happens when a new coro has been started */ 2598 /* the latter happens when a new coro has been started */
2236 /* or when a new cctx was attached to an existing coroutine */ 2599 /* or when a new cctx was attached to an existing coroutine */
2237 if (expect_true (!slf_frame.prepare)) 2600 if (ecb_expect_true (!slf_frame.prepare))
2238 { 2601 {
2239 /* first iteration */ 2602 /* first iteration */
2240 dSP; 2603 dSP;
2241 SV **arg = PL_stack_base + TOPMARK + 1; 2604 SV **arg = PL_stack_base + TOPMARK + 1;
2242 int items = SP - arg; /* args without function object */ 2605 int items = SP - arg; /* args without function object */
… …
2283 while (slf_frame.check (aTHX_ &slf_frame)); 2646 while (slf_frame.check (aTHX_ &slf_frame));
2284 2647
2285 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2648 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2286 2649
2287 /* exception handling */ 2650 /* exception handling */
2288 if (expect_false (CORO_THROW)) 2651 if (ecb_expect_false (CORO_THROW))
2289 { 2652 {
2290 SV *exception = sv_2mortal (CORO_THROW); 2653 SV *exception = sv_2mortal (CORO_THROW);
2291 2654
2292 CORO_THROW = 0; 2655 CORO_THROW = 0;
2293 sv_setsv (ERRSV, exception); 2656 sv_setsv (ERRSV, exception);
2294 croak (0); 2657 croak (0);
2295 } 2658 }
2296 2659
2297 /* return value handling - mostly like entersub */ 2660 /* return value handling - mostly like entersub */
2298 /* make sure we put something on the stack in scalar context */ 2661 /* make sure we put something on the stack in scalar context */
2299 if (GIMME_V == G_SCALAR) 2662 if (GIMME_V == G_SCALAR
2663 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2300 { 2664 {
2301 dSP; 2665 dSP;
2302 SV **bot = PL_stack_base + checkmark; 2666 SV **bot = PL_stack_base + checkmark;
2303 2667
2304 if (sp == bot) /* too few, push undef */ 2668 if (sp == bot) /* too few, push undef */
2305 bot [1] = &PL_sv_undef; 2669 bot [1] = &PL_sv_undef;
2306 else if (sp != bot + 1) /* too many, take last one */ 2670 else /* too many, take last one */
2307 bot [1] = *sp; 2671 bot [1] = *sp;
2308 2672
2309 SP = bot + 1; 2673 SP = bot + 1;
2310 2674
2311 PUTBACK; 2675 PUTBACK;
… …
2344 if (PL_op->op_flags & OPf_STACKED) 2708 if (PL_op->op_flags & OPf_STACKED)
2345 { 2709 {
2346 if (items > slf_arga) 2710 if (items > slf_arga)
2347 { 2711 {
2348 slf_arga = items; 2712 slf_arga = items;
2349 free (slf_argv); 2713 Safefree (slf_argv);
2350 slf_argv = malloc (slf_arga * sizeof (SV *)); 2714 New (0, slf_argv, slf_arga, SV *);
2351 } 2715 }
2352 2716
2353 slf_argc = items; 2717 slf_argc = items;
2354 2718
2355 for (i = 0; i < items; ++i) 2719 for (i = 0; i < items; ++i)
… …
2418{ 2782{
2419 PerlIOBuf base; 2783 PerlIOBuf base;
2420 NV next, every; 2784 NV next, every;
2421} PerlIOCede; 2785} PerlIOCede;
2422 2786
2423static IV 2787static IV ecb_cold
2424PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2788PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2425{ 2789{
2426 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2790 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2427 2791
2428 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2792 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2429 self->next = nvtime () + self->every; 2793 self->next = nvtime () + self->every;
2430 2794
2431 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2795 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2432} 2796}
2433 2797
2434static SV * 2798static SV * ecb_cold
2435PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2799PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2436{ 2800{
2437 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2801 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2438 2802
2439 return newSVnv (self->every); 2803 return newSVnv (self->every);
… …
2551 SvREFCNT_dec (cb); 2915 SvREFCNT_dec (cb);
2552 } 2916 }
2553} 2917}
2554 2918
2555static void 2919static void
2556coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2920coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2557{ 2921{
2558 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2922 /* call $sem->adjust (0) to possibly wake up some other waiters */
2559 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2923 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2560} 2924}
2561 2925
2562static int 2926static int
2563slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2927slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2564{ 2928{
2565 AV *av = (AV *)frame->data; 2929 AV *av = (AV *)frame->data;
2566 SV *count_sv = AvARRAY (av)[0]; 2930 SV *count_sv = AvARRAY (av)[0];
2931 SV *coro_hv = SvRV (coro_current);
2567 2932
2568 /* if we are about to throw, don't actually acquire the lock, just throw */ 2933 /* if we are about to throw, don't actually acquire the lock, just throw */
2569 if (CORO_THROW) 2934 if (CORO_THROW)
2570 return 0; 2935 return 0;
2571 else if (SvIVX (count_sv) > 0) 2936 else if (SvIVX (count_sv) > 0)
2572 { 2937 {
2573 SvSTATE_current->on_destroy = 0; 2938 frame->destroy = 0;
2574 2939
2575 if (acquire) 2940 if (acquire)
2576 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2941 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2577 else 2942 else
2578 coro_semaphore_adjust (aTHX_ av, 0); 2943 coro_semaphore_adjust (aTHX_ av, 0);
… …
2583 { 2948 {
2584 int i; 2949 int i;
2585 /* if we were woken up but can't down, we look through the whole */ 2950 /* 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 */ 2951 /* waiters list and only add us if we aren't in there already */
2587 /* this avoids some degenerate memory usage cases */ 2952 /* this avoids some degenerate memory usage cases */
2588 2953 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)) 2954 if (AvARRAY (av)[i] == coro_hv)
2591 return 1; 2955 return 1;
2592 2956
2593 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2957 av_push (av, SvREFCNT_inc (coro_hv));
2594 return 1; 2958 return 1;
2595 } 2959 }
2596} 2960}
2597 2961
2598static int 2962static int
… …
2621 { 2985 {
2622 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2986 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2623 2987
2624 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2988 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2625 frame->prepare = prepare_schedule; 2989 frame->prepare = prepare_schedule;
2626
2627 /* to avoid race conditions when a woken-up coro gets terminated */ 2990 /* to avoid race conditions when a woken-up coro gets terminated */
2628 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2991 /* we arrange for a temporary on_destroy that calls adjust (0) */
2629 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2992 frame->destroy = coro_semaphore_destroy;
2630 } 2993 }
2631} 2994}
2632 2995
2633static void 2996static void
2634slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2997slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2716 { 3079 {
2717 SV *cb_cv = s_get_cv_croak (arg [1]); 3080 SV *cb_cv = s_get_cv_croak (arg [1]);
2718 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3081 av_push (av, SvREFCNT_inc_NN (cb_cv));
2719 3082
2720 if (SvIVX (AvARRAY (av)[0])) 3083 if (SvIVX (AvARRAY (av)[0]))
2721 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3084 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2722 3085
2723 frame->prepare = prepare_nop; 3086 frame->prepare = prepare_nop;
2724 frame->check = slf_check_nop; 3087 frame->check = slf_check_nop;
2725 } 3088 }
2726 else if (SvIVX (AvARRAY (av)[0])) 3089 else if (SvIVX (AvARRAY (av)[0]))
… …
2803 /* it quickly returns */ 3166 /* it quickly returns */
2804 if (CORO_THROW) 3167 if (CORO_THROW)
2805 return 0; 3168 return 0;
2806 3169
2807 /* one element that is an RV? repeat! */ 3170 /* one element that is an RV? repeat! */
2808 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3171 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2809 return 1; 3172 return 1;
2810 3173
2811 /* restore status */ 3174 /* restore status */
2812 { 3175 {
2813 SV *data_sv = av_pop (state); 3176 SV *data_sv = av_pop (state);
… …
2852 dSP; 3215 dSP;
2853 3216
2854 static SV *prio_cv; 3217 static SV *prio_cv;
2855 static SV *prio_sv; 3218 static SV *prio_sv;
2856 3219
2857 if (expect_false (!prio_cv)) 3220 if (ecb_expect_false (!prio_cv))
2858 { 3221 {
2859 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3222 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2860 prio_sv = newSViv (0); 3223 prio_sv = newSViv (0);
2861 } 3224 }
2862 3225
… …
2888 /* now call the AIO function - we assume our request is uncancelable */ 3251 /* now call the AIO function - we assume our request is uncancelable */
2889 PUTBACK; 3252 PUTBACK;
2890 call_sv ((SV *)req, G_VOID | G_DISCARD); 3253 call_sv ((SV *)req, G_VOID | G_DISCARD);
2891 } 3254 }
2892 3255
2893 /* now that the requets is going, we loop toll we have a result */ 3256 /* now that the request is going, we loop till we have a result */
2894 frame->data = (void *)state; 3257 frame->data = (void *)state;
2895 frame->prepare = prepare_schedule; 3258 frame->prepare = prepare_schedule;
2896 frame->check = slf_check_aio_req; 3259 frame->check = slf_check_aio_req;
2897} 3260}
2898 3261
… …
2908 3271
2909/*****************************************************************************/ 3272/*****************************************************************************/
2910 3273
2911#if CORO_CLONE 3274#if CORO_CLONE
2912# include "clone.c" 3275# include "clone.c"
3276#endif
3277
3278/*****************************************************************************/
3279
3280static SV *
3281coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3282{
3283 SV *coro_sv;
3284 struct coro *coro;
3285 MAGIC *mg;
3286 HV *hv;
3287 SV *cb;
3288 int i;
3289
3290 if (argc > 0)
3291 {
3292 cb = s_get_cv_croak (argv [0]);
3293
3294 if (!is_coro)
3295 {
3296 if (CvISXSUB (cb))
3297 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3298
3299 if (!CvROOT (cb))
3300 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3301 }
3302 }
3303
3304 Newz (0, coro, 1, struct coro);
3305 coro->args = newAV ();
3306 coro->flags = CF_NEW;
3307
3308 if (coro_first) coro_first->prev = coro;
3309 coro->next = coro_first;
3310 coro_first = coro;
3311
3312 coro->hv = hv = newHV ();
3313 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3314 mg->mg_flags |= MGf_DUP;
3315 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3316
3317 if (argc > 0)
3318 {
3319 av_extend (coro->args, argc + is_coro - 1);
3320
3321 if (is_coro)
3322 {
3323 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3324 cb = (SV *)cv_coro_run;
3325 }
3326
3327 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3328
3329 for (i = 1; i < argc; i++)
3330 av_push (coro->args, newSVsv (argv [i]));
3331 }
3332
3333 return coro_sv;
3334}
3335
3336#ifndef __cplusplus
3337ecb_cold XS(boot_Coro__State);
3338#endif
3339
3340#if CORO_JIT
3341
3342static void ecb_noinline ecb_cold
3343pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3344{
3345 dSP;
3346 AV *av = newAV ();
3347
3348 av_store (av, 3, newSVuv (d));
3349 av_store (av, 2, newSVuv (c));
3350 av_store (av, 1, newSVuv (b));
3351 av_store (av, 0, newSVuv (a));
3352
3353 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3354
3355 PUTBACK;
3356}
3357
3358static void ecb_noinline ecb_cold
3359jit_init (pTHX)
3360{
3361 dSP;
3362 SV *load, *save;
3363 char *map_base;
3364 char *load_ptr, *save_ptr;
3365 STRLEN load_len, save_len, map_len;
3366 int count;
3367
3368 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3369
3370 PUSHMARK (SP);
3371 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3372 #include "state.h"
3373 count = call_pv ("Coro::State::_jit", G_ARRAY);
3374 SPAGAIN;
3375
3376 save = POPs; save_ptr = SvPVbyte (save, save_len);
3377 load = POPs; load_ptr = SvPVbyte (load, load_len);
3378
3379 map_len = load_len + save_len + 16;
3380
3381 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3382
3383 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3384
3385 load_perl_slots = (load_save_perl_slots_type)map_base;
3386 memcpy (map_base, load_ptr, load_len);
3387
3388 map_base += (load_len + 15) & ~15;
3389
3390 save_perl_slots = (load_save_perl_slots_type)map_base;
3391 memcpy (map_base, save_ptr, save_len);
3392
3393 /* we are good citizens and try to make the page read-only, so the evil evil */
3394 /* hackers might have it a bit more difficult */
3395 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3396
3397 PUTBACK;
3398 eval_pv ("undef &Coro::State::_jit", 1);
3399}
3400
2913#endif 3401#endif
2914 3402
2915MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3403MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2916 3404
2917PROTOTYPES: DISABLE 3405PROTOTYPES: DISABLE
… …
2921#ifdef USE_ITHREADS 3409#ifdef USE_ITHREADS
2922# if CORO_PTHREAD 3410# if CORO_PTHREAD
2923 coro_thx = PERL_GET_CONTEXT; 3411 coro_thx = PERL_GET_CONTEXT;
2924# endif 3412# endif
2925#endif 3413#endif
2926 BOOT_PAGESIZE; 3414 /* perl defines these to check for existance first, but why it doesn't */
3415 /* just create them one at init time is not clear to me, except for */
3416 /* programs trying to delete them, but... */
3417 /* anyway, we declare this as invalid and make sure they are initialised here */
3418 DEFSV;
3419 ERRSV;
2927 3420
2928 cctx_current = cctx_new_empty (); 3421 cctx_current = cctx_new_empty ();
2929 3422
2930 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3423 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2931 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3424 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
2971 coroapi.prepare_nop = prepare_nop; 3464 coroapi.prepare_nop = prepare_nop;
2972 coroapi.prepare_schedule = prepare_schedule; 3465 coroapi.prepare_schedule = prepare_schedule;
2973 coroapi.prepare_cede = prepare_cede; 3466 coroapi.prepare_cede = prepare_cede;
2974 coroapi.prepare_cede_notself = prepare_cede_notself; 3467 coroapi.prepare_cede_notself = prepare_cede_notself;
2975 3468
2976 { 3469 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 3470
2988 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3471 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3472#if CORO_JIT
3473 PUTBACK;
3474 jit_init (aTHX);
3475 SPAGAIN;
3476#endif
2989} 3477}
2990 3478
2991SV * 3479SV *
2992new (char *klass, ...) 3480new (SV *klass, ...)
2993 ALIAS: 3481 ALIAS:
2994 Coro::new = 1 3482 Coro::new = 1
2995 CODE: 3483 CODE:
2996{ 3484 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2997 struct coro *coro; 3485 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 3486 RETVAL
3048 3487
3049void 3488void
3050transfer (...) 3489transfer (...)
3051 PROTOTYPE: $$ 3490 PROTOTYPE: $$
3052 CODE: 3491 CODE:
3053 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3492 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 3493
3068SV * 3494SV *
3069clone (Coro::State coro) 3495clone (Coro::State coro)
3070 CODE: 3496 CODE:
3071{ 3497{
… …
3126void 3552void
3127list () 3553list ()
3128 PROTOTYPE: 3554 PROTOTYPE:
3129 PPCODE: 3555 PPCODE:
3130{ 3556{
3131 struct coro *coro; 3557 struct coro *coro;
3132 for (coro = coro_first; coro; coro = coro->next) 3558 for (coro = coro_first; coro; coro = coro->next)
3133 if (coro->hv) 3559 if (coro->hv)
3134 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3560 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3135} 3561}
3136 3562
… …
3141 CODE: 3567 CODE:
3142{ 3568{
3143 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3569 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3144 { 3570 {
3145 struct coro *current = SvSTATE_current; 3571 struct coro *current = SvSTATE_current;
3572 struct CoroSLF slf_save;
3146 3573
3147 if (current != coro) 3574 if (current != coro)
3148 { 3575 {
3149 PUTBACK; 3576 PUTBACK;
3150 save_perl (aTHX_ current); 3577 save_perl (aTHX_ current);
3151 load_perl (aTHX_ coro); 3578 load_perl (aTHX_ coro);
3579 /* the coro is most likely in an active SLF call.
3580 * while not strictly required (the code we execute is
3581 * not allowed to call any SLF functions), it's cleaner
3582 * to reinitialise the slf_frame and restore it later.
3583 * This might one day allow us to actually do SLF calls
3584 * from code executed here.
3585 */
3586 slf_save = slf_frame;
3587 slf_frame.prepare = 0;
3152 SPAGAIN; 3588 SPAGAIN;
3153 } 3589 }
3154 3590
3155 PUSHSTACK; 3591 PUSHSTACK;
3156 3592
… …
3166 SPAGAIN; 3602 SPAGAIN;
3167 3603
3168 if (current != coro) 3604 if (current != coro)
3169 { 3605 {
3170 PUTBACK; 3606 PUTBACK;
3607 slf_frame = slf_save;
3171 save_perl (aTHX_ coro); 3608 save_perl (aTHX_ coro);
3172 load_perl (aTHX_ current); 3609 load_perl (aTHX_ current);
3173 SPAGAIN; 3610 SPAGAIN;
3174 } 3611 }
3175 } 3612 }
… …
3180 PROTOTYPE: $ 3617 PROTOTYPE: $
3181 ALIAS: 3618 ALIAS:
3182 is_ready = CF_READY 3619 is_ready = CF_READY
3183 is_running = CF_RUNNING 3620 is_running = CF_RUNNING
3184 is_new = CF_NEW 3621 is_new = CF_NEW
3185 is_destroyed = CF_DESTROYED 3622 is_destroyed = CF_ZOMBIE
3623 is_zombie = CF_ZOMBIE
3186 is_suspended = CF_SUSPENDED 3624 is_suspended = CF_SUSPENDED
3187 CODE: 3625 CODE:
3188 RETVAL = boolSV (coro->flags & ix); 3626 RETVAL = boolSV (coro->flags & ix);
3189 OUTPUT: 3627 OUTPUT:
3190 RETVAL 3628 RETVAL
3191 3629
3192void 3630void
3193throw (Coro::State self, SV *throw = &PL_sv_undef) 3631throw (SV *self, SV *exception = &PL_sv_undef)
3194 PROTOTYPE: $;$ 3632 PROTOTYPE: $;$
3195 CODE: 3633 CODE:
3196{ 3634{
3635 struct coro *coro = SvSTATE (self);
3197 struct coro *current = SvSTATE_current; 3636 struct coro *current = SvSTATE_current;
3198 SV **throwp = self == current ? &CORO_THROW : &self->except; 3637 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3199 SvREFCNT_dec (*throwp); 3638 SvREFCNT_dec (*exceptionp);
3200 SvGETMAGIC (throw); 3639 SvGETMAGIC (exception);
3201 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3640 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3641
3642 api_ready (aTHX_ self);
3202} 3643}
3203 3644
3204void 3645void
3205api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3646api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3206 PROTOTYPE: $;$ 3647 PROTOTYPE: $;$
… …
3261 3702
3262void 3703void
3263cancel (Coro::State self) 3704cancel (Coro::State self)
3264 CODE: 3705 CODE:
3265 coro_state_destroy (aTHX_ self); 3706 coro_state_destroy (aTHX_ self);
3266 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3267
3268 3707
3269SV * 3708SV *
3270enable_times (int enabled = enable_times) 3709enable_times (int enabled = enable_times)
3271 CODE: 3710 CODE:
3272{ 3711{
… …
3285 3724
3286void 3725void
3287times (Coro::State self) 3726times (Coro::State self)
3288 PPCODE: 3727 PPCODE:
3289{ 3728{
3290 struct coro *current = SvSTATE (coro_current); 3729 struct coro *current = SvSTATE (coro_current);
3291 3730
3292 if (expect_false (current == self)) 3731 if (ecb_expect_false (current == self))
3293 { 3732 {
3294 coro_times_update (); 3733 coro_times_update ();
3295 coro_times_add (SvSTATE (coro_current)); 3734 coro_times_add (SvSTATE (coro_current));
3296 } 3735 }
3297 3736
3298 EXTEND (SP, 2); 3737 EXTEND (SP, 2);
3299 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3738 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))); 3739 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3301 3740
3302 if (expect_false (current == self)) 3741 if (ecb_expect_false (current == self))
3303 coro_times_sub (SvSTATE (coro_current)); 3742 coro_times_sub (SvSTATE (coro_current));
3304} 3743}
3744
3745void
3746swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3747 CODE:
3748{
3749 struct coro *current = SvSTATE_current;
3750
3751 if (current == coro)
3752 SWAP_SVS (current);
3753
3754 if (!coro->swap_sv)
3755 coro->swap_sv = newAV ();
3756
3757 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3758 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3759
3760 if (current == coro)
3761 SWAP_SVS (current);
3762}
3763
3305 3764
3306MODULE = Coro::State PACKAGE = Coro 3765MODULE = Coro::State PACKAGE = Coro
3307 3766
3308BOOT: 3767BOOT:
3309{ 3768{
3310 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3769 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3311 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3770 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3312 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3771 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); 3772 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); 3773 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3316 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3774 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3317 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3775 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3318 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3776 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3319 3777
3320 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3778 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); 3779 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); 3780 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); 3781 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3324 3782
3325 coro_stash = gv_stashpv ("Coro", TRUE); 3783 coro_stash = gv_stashpv ("Coro", TRUE);
3326 3784
3327 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3785 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3328 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3786 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
… …
3347 sv_setiv (sv, (IV)&coroapi); 3805 sv_setiv (sv, (IV)&coroapi);
3348 SvREADONLY_on (sv); 3806 SvREADONLY_on (sv);
3349 } 3807 }
3350} 3808}
3351 3809
3810SV *
3811async (...)
3812 PROTOTYPE: &@
3813 CODE:
3814 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3815 api_ready (aTHX_ RETVAL);
3816 OUTPUT:
3817 RETVAL
3818
3819void
3820_destroy (Coro::State coro)
3821 CODE:
3822 /* used by the manager thread */
3823 coro_state_destroy (aTHX_ coro);
3824
3825void
3826on_destroy (Coro::State coro, SV *cb)
3827 CODE:
3828 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3829
3830void
3831join (...)
3832 CODE:
3833 CORO_EXECUTE_SLF_XS (slf_init_join);
3834
3352void 3835void
3353terminate (...) 3836terminate (...)
3354 CODE: 3837 CODE:
3355 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3838 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3839
3840void
3841cancel (...)
3842 CODE:
3843 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3844
3845int
3846safe_cancel (Coro::State self, ...)
3847 C_ARGS: aTHX_ self, &ST (1), items - 1
3356 3848
3357void 3849void
3358schedule (...) 3850schedule (...)
3359 CODE: 3851 CODE:
3360 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3852 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3473 for (i = 1; i < items; ++i) 3965 for (i = 1; i < items; ++i)
3474 av_push (av, SvREFCNT_inc_NN (ST (i))); 3966 av_push (av, SvREFCNT_inc_NN (ST (i)));
3475 3967
3476 if ((SV *)hv == &PL_sv_undef) 3968 if ((SV *)hv == &PL_sv_undef)
3477 { 3969 {
3478 PUSHMARK (SP); 3970 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)); 3971 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3972 SvREFCNT_dec (sv);
3487 } 3973 }
3488 3974
3489 { 3975 {
3490 struct coro *coro = SvSTATE_hv (hv); 3976 struct coro *coro = SvSTATE_hv (hv);
3491 3977
… …
3523 on_leave = 1 4009 on_leave = 1
3524 PROTOTYPE: & 4010 PROTOTYPE: &
3525 CODE: 4011 CODE:
3526{ 4012{
3527 struct coro *coro = SvSTATE_current; 4013 struct coro *coro = SvSTATE_current;
3528 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4014 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3529 4015
3530 block = s_get_cv_croak (block); 4016 block = s_get_cv_croak (block);
3531 4017
3532 if (!*avp) 4018 if (!*avp)
3533 *avp = newAV (); 4019 *avp = newAV ();
… …
3553 4039
3554SV * 4040SV *
3555new (SV *klass, SV *count = 0) 4041new (SV *klass, SV *count = 0)
3556 CODE: 4042 CODE:
3557{ 4043{
3558 int semcnt = 1; 4044 int semcnt = 1;
3559 4045
3560 if (count) 4046 if (count)
3561 { 4047 {
3562 SvGETMAGIC (count); 4048 SvGETMAGIC (count);
3563 4049
… …
3623 XSRETURN_NO; 4109 XSRETURN_NO;
3624} 4110}
3625 4111
3626void 4112void
3627waiters (SV *self) 4113waiters (SV *self)
3628 PPCODE: 4114 PPCODE:
3629{ 4115{
3630 AV *av = (AV *)SvRV (self); 4116 AV *av = (AV *)SvRV (self);
3631 int wcount = AvFILLp (av) + 1 - 1; 4117 int wcount = AvFILLp (av) + 1 - 1;
3632 4118
3633 if (GIMME_V == G_SCALAR) 4119 if (GIMME_V == G_SCALAR)
… …
3642} 4128}
3643 4129
3644MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4130MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3645 4131
3646void 4132void
3647_may_delete (SV *sem, int count, int extra_refs) 4133_may_delete (SV *sem, int count, unsigned int extra_refs)
3648 PPCODE: 4134 PPCODE:
3649{ 4135{
3650 AV *av = (AV *)SvRV (sem); 4136 AV *av = (AV *)SvRV (sem);
3651 4137
3652 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4138 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3653 && AvFILLp (av) == 0 /* no waiters, just count */ 4139 && AvFILLp (av) == 0 /* no waiters, just count */
3654 && SvIV (AvARRAY (av)[0]) == count) 4140 && SvIV (AvARRAY (av)[0]) == count)
3655 XSRETURN_YES; 4141 XSRETURN_YES;
… …
3676 4162
3677void 4163void
3678broadcast (SV *self) 4164broadcast (SV *self)
3679 CODE: 4165 CODE:
3680{ 4166{
3681 AV *av = (AV *)SvRV (self); 4167 AV *av = (AV *)SvRV (self);
3682 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4168 coro_signal_wake (aTHX_ av, AvFILLp (av));
3683} 4169}
3684 4170
3685void 4171void
3686send (SV *self) 4172send (SV *self)
… …
3694 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4180 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3695} 4181}
3696 4182
3697IV 4183IV
3698awaited (SV *self) 4184awaited (SV *self)
3699 CODE: 4185 CODE:
3700 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4186 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3701 OUTPUT: 4187 OUTPUT:
3702 RETVAL 4188 RETVAL
3703 4189
3704 4190
… …
3709 4195
3710void 4196void
3711_schedule (...) 4197_schedule (...)
3712 CODE: 4198 CODE:
3713{ 4199{
3714 static int incede; 4200 static int incede;
3715 4201
3716 api_cede_notself (aTHX); 4202 api_cede_notself (aTHX);
3717 4203
3718 ++incede; 4204 ++incede;
3719 while (coro_nready >= incede && api_cede (aTHX)) 4205 while (coro_nready >= incede && api_cede (aTHX))
… …
3763 { 4249 {
3764 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4250 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3765 coro_old_pp_sselect = 0; 4251 coro_old_pp_sselect = 0;
3766 } 4252 }
3767 4253
4254MODULE = Coro::State PACKAGE = Coro::Util
3768 4255
4256void
4257_exit (int code)
4258 CODE:
4259 _exit (code);
4260
4261NV
4262time ()
4263 CODE:
4264 RETVAL = nvtime (aTHX);
4265 OUTPUT:
4266 RETVAL
4267
4268NV
4269gettimeofday ()
4270 PPCODE:
4271{
4272 UV tv [2];
4273 u2time (aTHX_ tv);
4274 EXTEND (SP, 2);
4275 PUSHs (sv_2mortal (newSVuv (tv [0])));
4276 PUSHs (sv_2mortal (newSVuv (tv [1])));
4277}
4278

Diff Legend

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