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.369 by root, Thu Aug 13 02:48:32 2009 UTC vs.
Revision 1.438 by root, Mon Nov 18 10:27:53 2013 UTC

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

Diff Legend

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