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.376 by root, Fri Oct 2 20:48:04 2009 UTC vs.
Revision 1.445 by root, Thu May 1 08:09:43 2014 UTC

1#define NDEBUG 1 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 */
2 5
3#include "libcoro/coro.c" 6#include "libcoro/coro.c"
4 7
5#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
6#define PERL_EXT 9#define PERL_EXT
… …
10#include "XSUB.h" 13#include "XSUB.h"
11#include "perliol.h" 14#include "perliol.h"
12 15
13#include "schmorp.h" 16#include "schmorp.h"
14 17
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
20#include "ecb.h"
21
22#include <stddef.h>
15#include <stdio.h> 23#include <stdio.h>
16#include <errno.h> 24#include <errno.h>
17#include <assert.h> 25#include <assert.h>
18 26
19#ifndef SVs_PADSTALE 27#ifndef SVs_PADSTALE
20# define SVs_PADSTALE 0 28# define SVs_PADSTALE 0
21#endif 29#endif
22 30
23#ifdef WIN32 31#ifdef PadARRAY
32# define NEWPADAPI 1
33# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
34#else
35typedef AV PADNAMELIST;
36# if !PERL_VERSION_ATLEAST(5,8,0)
37typedef AV PADLIST;
38typedef AV PAD;
39# endif
40# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
41# define PadlistMAX(pl) AvFILLp (pl)
42# define PadlistNAMES(pl) (*PadlistARRAY (pl))
43# define PadARRAY AvARRAY
44# define PadMAX AvFILLp
45# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
46#endif
47
48/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
49/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
50#if PERL_VERSION_ATLEAST(5,19,0)
51# define SVt_BIND SVt_IV
52#endif
53
54#if defined(_WIN32)
55# undef HAS_GETTIMEOFDAY
24# undef setjmp 56# undef setjmp
25# undef longjmp 57# undef longjmp
26# undef _exit 58# undef _exit
27# define setjmp _setjmp /* deep magic */ 59# define setjmp _setjmp /* deep magic */
28#else 60#else
29# include <inttypes.h> /* most portable stdint.h */ 61# include <inttypes.h> /* most portable stdint.h */
30#endif 62#endif
31 63
32#ifdef HAVE_MMAP
33# include <unistd.h>
34# include <sys/mman.h>
35# ifndef MAP_ANONYMOUS
36# ifdef MAP_ANON
37# define MAP_ANONYMOUS MAP_ANON
38# else
39# undef HAVE_MMAP
40# endif
41# endif
42# include <limits.h>
43# ifndef PAGESIZE
44# define PAGESIZE pagesize
45# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
46static long pagesize;
47# else
48# define BOOT_PAGESIZE (void)0
49# endif
50#else
51# define PAGESIZE 0
52# define BOOT_PAGESIZE (void)0
53#endif
54
55#if CORO_USE_VALGRIND
56# include <valgrind/valgrind.h>
57#endif
58
59/* the maximum number of idle cctx that will be pooled */ 64/* the maximum number of idle cctx that will be pooled */
60static int cctx_max_idle = 4; 65static int cctx_max_idle = 4;
61 66
62#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 67#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
63# undef CORO_STACKGUARD 68# define HAS_SCOPESTACK_NAME 1
64#endif
65
66#ifndef CORO_STACKGUARD
67# define CORO_STACKGUARD 0
68#endif 69#endif
69 70
70/* prefer perl internal functions over our own? */ 71/* prefer perl internal functions over our own? */
71#ifndef CORO_PREFER_PERL_FUNCTIONS 72#ifndef CORO_PREFER_PERL_FUNCTIONS
72# define CORO_PREFER_PERL_FUNCTIONS 0 73# define CORO_PREFER_PERL_FUNCTIONS 0
… …
82# define STACKLEVEL ((void *)&stacklevel) 83# define STACKLEVEL ((void *)&stacklevel)
83#endif 84#endif
84 85
85#define IN_DESTRUCT PL_dirty 86#define IN_DESTRUCT PL_dirty
86 87
87#if __GNUC__ >= 3
88# define attribute(x) __attribute__(x)
89# define expect(expr,value) __builtin_expect ((expr), (value))
90# define INLINE static inline
91#else
92# define attribute(x)
93# define expect(expr,value) (expr)
94# define INLINE static
95#endif
96
97#define expect_false(expr) expect ((expr) != 0, 0)
98#define expect_true(expr) expect ((expr) != 0, 1)
99
100#define NOINLINE attribute ((noinline))
101
102#include "CoroAPI.h" 88#include "CoroAPI.h"
103#define GCoroAPI (&coroapi) /* very sneaky */ 89#define GCoroAPI (&coroapi) /* very sneaky */
104 90
105#ifdef USE_ITHREADS 91#ifdef USE_ITHREADS
106# if CORO_PTHREAD 92# if CORO_PTHREAD
… …
122static void (*u2time)(pTHX_ UV ret[2]); 108static void (*u2time)(pTHX_ UV ret[2]);
123 109
124/* we hijack an hopefully unused CV flag for our purposes */ 110/* we hijack an hopefully unused CV flag for our purposes */
125#define CVf_SLF 0x4000 111#define CVf_SLF 0x4000
126static OP *pp_slf (pTHX); 112static OP *pp_slf (pTHX);
113static void slf_destroy (pTHX_ struct coro *coro);
127 114
128static U32 cctx_gen; 115static U32 cctx_gen;
129static size_t cctx_stacksize = CORO_STACKSIZE; 116static size_t cctx_stacksize = CORO_STACKSIZE;
130static struct CoroAPI coroapi; 117static struct CoroAPI coroapi;
131static AV *main_mainstack; /* used to differentiate between $main and others */ 118static AV *main_mainstack; /* used to differentiate between $main and others */
… …
161static char times_valid; 148static char times_valid;
162 149
163static struct coro_cctx *cctx_first; 150static struct coro_cctx *cctx_first;
164static int cctx_count, cctx_idle; 151static int cctx_count, cctx_idle;
165 152
166enum { 153enum
154{
167 CC_MAPPED = 0x01, 155 CC_MAPPED = 0x01,
168 CC_NOREUSE = 0x02, /* throw this away after tracing */ 156 CC_NOREUSE = 0x02, /* throw this away after tracing */
169 CC_TRACE = 0x04, 157 CC_TRACE = 0x04,
170 CC_TRACE_SUB = 0x08, /* trace sub calls */ 158 CC_TRACE_SUB = 0x08, /* trace sub calls */
171 CC_TRACE_LINE = 0x10, /* trace each statement */ 159 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
176typedef struct coro_cctx 164typedef struct coro_cctx
177{ 165{
178 struct coro_cctx *next; 166 struct coro_cctx *next;
179 167
180 /* the stack */ 168 /* the stack */
181 void *sptr; 169 struct coro_stack stack;
182 size_t ssize;
183 170
184 /* cpu state */ 171 /* cpu state */
185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 172 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
173#ifndef NDEBUG
186 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 174 JMPENV *idle_te; /* same as idle_sp, but for top_env */
175#endif
187 JMPENV *top_env; 176 JMPENV *top_env;
188 coro_context cctx; 177 coro_context cctx;
189 178
190 U32 gen; 179 U32 gen;
191#if CORO_USE_VALGRIND 180#if CORO_USE_VALGRIND
192 int valgrind_id; 181 int valgrind_id;
193#endif 182#endif
194 unsigned char flags; 183 unsigned char flags;
195} coro_cctx; 184} coro_cctx;
196 185
197coro_cctx *cctx_current; /* the currently running cctx */ 186static coro_cctx *cctx_current; /* the currently running cctx */
198 187
199/*****************************************************************************/ 188/*****************************************************************************/
200 189
190static MGVTBL coro_state_vtbl;
191
201enum { 192enum
193{
202 CF_RUNNING = 0x0001, /* coroutine is running */ 194 CF_RUNNING = 0x0001, /* coroutine is running */
203 CF_READY = 0x0002, /* coroutine is ready */ 195 CF_READY = 0x0002, /* coroutine is ready */
204 CF_NEW = 0x0004, /* has never been switched to */ 196 CF_NEW = 0x0004, /* has never been switched to */
205 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 197 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
206 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 198 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
199 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
207}; 200};
208 201
209/* the structure where most of the perl state is stored, overlaid on the cxstack */ 202/* the structure where most of the perl state is stored, overlaid on the cxstack */
210typedef struct 203typedef struct
211{ 204{
212 SV *defsv;
213 AV *defav;
214 SV *errsv;
215 SV *irsgv;
216 HV *hinthv;
217#define VAR(name,type) type name; 205 #define VARx(name,expr,type) type name;
218# include "state.h" 206 #include "state.h"
219#undef VAR
220} perl_slots; 207} perl_slots;
221 208
209/* how many context stack entries do we need for perl_slots */
222#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 210#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
223 211
224/* this is a structure representing a perl-level coroutine */ 212/* this is a structure representing a perl-level coroutine */
225struct coro { 213struct coro
214{
226 /* the C coroutine allocated to this perl coroutine, if any */ 215 /* the C coroutine allocated to this perl coroutine, if any */
227 coro_cctx *cctx; 216 coro_cctx *cctx;
228 217
229 /* ready queue */ 218 /* ready queue */
230 struct coro *next_ready; 219 struct coro *next_ready;
… …
232 /* state data */ 221 /* state data */
233 struct CoroSLF slf_frame; /* saved slf frame */ 222 struct CoroSLF slf_frame; /* saved slf frame */
234 AV *mainstack; 223 AV *mainstack;
235 perl_slots *slot; /* basically the saved sp */ 224 perl_slots *slot; /* basically the saved sp */
236 225
237 CV *startcv; /* the CV to execute */ 226 CV *startcv; /* the CV to execute */
238 AV *args; /* data associated with this coroutine (initial args) */ 227 AV *args; /* data associated with this coroutine (initial args) */
239 int refcnt; /* coroutines are refcounted, yes */
240 int flags; /* CF_ flags */ 228 int flags; /* CF_ flags */
241 HV *hv; /* the perl hash associated with this coro, if any */ 229 HV *hv; /* the perl hash associated with this coro, if any */
242 void (*on_destroy)(pTHX_ struct coro *coro);
243 230
244 /* statistics */ 231 /* statistics */
245 int usecount; /* number of transfers to this coro */ 232 int usecount; /* number of transfers to this coro */
246 233
247 /* coro process data */ 234 /* coro process data */
248 int prio; 235 int prio;
249 SV *except; /* exception to be thrown */ 236 SV *except; /* exception to be thrown */
250 SV *rouse_cb; 237 SV *rouse_cb; /* last rouse callback */
238 AV *on_destroy; /* callbacks or coros to notify on destroy */
239 AV *status; /* the exit status list */
251 240
252 /* async_pool */ 241 /* async_pool */
253 SV *saved_deffh; 242 SV *saved_deffh;
254 SV *invoke_cb; 243 SV *invoke_cb;
255 AV *invoke_av; 244 AV *invoke_av;
… …
271typedef struct coro *Coro__State; 260typedef struct coro *Coro__State;
272typedef struct coro *Coro__State_or_hashref; 261typedef struct coro *Coro__State_or_hashref;
273 262
274/* the following variables are effectively part of the perl context */ 263/* the following variables are effectively part of the perl context */
275/* and get copied between struct coro and these variables */ 264/* and get copied between struct coro and these variables */
276/* the mainr easonw e don't support windows process emulation */ 265/* the main reason we don't support windows process emulation */
277static struct CoroSLF slf_frame; /* the current slf frame */ 266static struct CoroSLF slf_frame; /* the current slf frame */
278 267
279/** Coro ********************************************************************/ 268/** Coro ********************************************************************/
280 269
281#define CORO_PRIO_MAX 3 270#define CORO_PRIO_MAX 3
… …
287 276
288/* for Coro.pm */ 277/* for Coro.pm */
289static SV *coro_current; 278static SV *coro_current;
290static SV *coro_readyhook; 279static SV *coro_readyhook;
291static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 280static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
292static CV *cv_coro_run, *cv_coro_terminate; 281static CV *cv_coro_run;
293static struct coro *coro_first; 282static struct coro *coro_first;
294#define coro_nready coroapi.nready 283#define coro_nready coroapi.nready
284
285/** JIT *********************************************************************/
286
287#if CORO_JIT
288 /* APPLE doesn't have mmap though */
289 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
290 #ifndef CORO_JIT_TYPE
291 #if ECB_AMD64 && CORO_JIT_UNIXY
292 #define CORO_JIT_TYPE "amd64-unix"
293 #elif __i386 && CORO_JIT_UNIXY
294 #define CORO_JIT_TYPE "x86-unix"
295 #endif
296 #endif
297#endif
298
299#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
300 #undef CORO_JIT
301#endif
302
303#if CORO_JIT
304 typedef void (*load_save_perl_slots_type)(perl_slots *);
305 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
306#endif
295 307
296/** Coro::Select ************************************************************/ 308/** Coro::Select ************************************************************/
297 309
298static OP *(*coro_old_pp_sselect) (pTHX); 310static OP *(*coro_old_pp_sselect) (pTHX);
299static SV *coro_select_select; 311static SV *coro_select_select;
… …
311 PL_op->op_flags |= OPf_STACKED; 323 PL_op->op_flags |= OPf_STACKED;
312 PL_op->op_private = 0; 324 PL_op->op_private = 0;
313 return PL_ppaddr [OP_ENTERSUB](aTHX); 325 return PL_ppaddr [OP_ENTERSUB](aTHX);
314} 326}
315 327
328/** time stuff **************************************************************/
329
330#ifdef HAS_GETTIMEOFDAY
331
332ecb_inline void
333coro_u2time (pTHX_ UV ret[2])
334{
335 struct timeval tv;
336 gettimeofday (&tv, 0);
337
338 ret [0] = tv.tv_sec;
339 ret [1] = tv.tv_usec;
340}
341
342ecb_inline double
343coro_nvtime (void)
344{
345 struct timeval tv;
346 gettimeofday (&tv, 0);
347
348 return tv.tv_sec + tv.tv_usec * 1e-6;
349}
350
351ecb_inline void
352time_init (pTHX)
353{
354 nvtime = coro_nvtime;
355 u2time = coro_u2time;
356}
357
358#else
359
360ecb_inline void
361time_init (pTHX)
362{
363 SV **svp;
364
365 require_pv ("Time/HiRes.pm");
366
367 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
368
369 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
370 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
371
372 nvtime = INT2PTR (double (*)(), SvIV (*svp));
373
374 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
375 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
376}
377
378#endif
379
316/** lowlevel stuff **********************************************************/ 380/** lowlevel stuff **********************************************************/
317 381
318static SV * 382static SV * ecb_noinline
319coro_get_sv (pTHX_ const char *name, int create) 383coro_get_sv (pTHX_ const char *name, int create)
320{ 384{
321#if PERL_VERSION_ATLEAST (5,10,0) 385#if PERL_VERSION_ATLEAST (5,10,0)
322 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 386 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
323 get_sv (name, create); 387 get_sv (name, create);
324#endif 388#endif
325 return get_sv (name, create); 389 return get_sv (name, create);
326} 390}
327 391
328static AV * 392static AV * ecb_noinline
329coro_get_av (pTHX_ const char *name, int create) 393coro_get_av (pTHX_ const char *name, int create)
330{ 394{
331#if PERL_VERSION_ATLEAST (5,10,0) 395#if PERL_VERSION_ATLEAST (5,10,0)
332 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 396 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
333 get_av (name, create); 397 get_av (name, create);
334#endif 398#endif
335 return get_av (name, create); 399 return get_av (name, create);
336} 400}
337 401
338static HV * 402static HV * ecb_noinline
339coro_get_hv (pTHX_ const char *name, int create) 403coro_get_hv (pTHX_ const char *name, int create)
340{ 404{
341#if PERL_VERSION_ATLEAST (5,10,0) 405#if PERL_VERSION_ATLEAST (5,10,0)
342 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 406 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
343 get_hv (name, create); 407 get_hv (name, create);
344#endif 408#endif
345 return get_hv (name, create); 409 return get_hv (name, create);
346} 410}
347 411
348INLINE void 412ecb_inline void
349coro_times_update () 413coro_times_update (void)
350{ 414{
351#ifdef coro_clock_gettime 415#ifdef coro_clock_gettime
352 struct timespec ts; 416 struct timespec ts;
353 417
354 ts.tv_sec = ts.tv_nsec = 0; 418 ts.tv_sec = ts.tv_nsec = 0;
… …
366 time_real [0] = tv [0]; 430 time_real [0] = tv [0];
367 time_real [1] = tv [1] * 1000; 431 time_real [1] = tv [1] * 1000;
368#endif 432#endif
369} 433}
370 434
371INLINE void 435ecb_inline void
372coro_times_add (struct coro *c) 436coro_times_add (struct coro *c)
373{ 437{
374 c->t_real [1] += time_real [1]; 438 c->t_real [1] += time_real [1];
375 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 439 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
376 c->t_real [0] += time_real [0]; 440 c->t_real [0] += time_real [0];
… …
378 c->t_cpu [1] += time_cpu [1]; 442 c->t_cpu [1] += time_cpu [1];
379 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 443 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
380 c->t_cpu [0] += time_cpu [0]; 444 c->t_cpu [0] += time_cpu [0];
381} 445}
382 446
383INLINE void 447ecb_inline void
384coro_times_sub (struct coro *c) 448coro_times_sub (struct coro *c)
385{ 449{
386 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 450 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
387 c->t_real [1] -= time_real [1]; 451 c->t_real [1] -= time_real [1];
388 c->t_real [0] -= time_real [0]; 452 c->t_real [0] -= time_real [0];
… …
396/* magic glue */ 460/* magic glue */
397 461
398#define CORO_MAGIC_type_cv 26 462#define CORO_MAGIC_type_cv 26
399#define CORO_MAGIC_type_state PERL_MAGIC_ext 463#define CORO_MAGIC_type_state PERL_MAGIC_ext
400 464
401#define CORO_MAGIC_NN(sv, type) \ 465#define CORO_MAGIC_NN(sv, type) \
402 (expect_true (SvMAGIC (sv)->mg_type == type) \ 466 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
403 ? SvMAGIC (sv) \ 467 ? SvMAGIC (sv) \
404 : mg_find (sv, type)) 468 : mg_find (sv, type))
405 469
406#define CORO_MAGIC(sv, type) \ 470#define CORO_MAGIC(sv, type) \
407 (expect_true (SvMAGIC (sv)) \ 471 (ecb_expect_true (SvMAGIC (sv)) \
408 ? CORO_MAGIC_NN (sv, type) \ 472 ? CORO_MAGIC_NN (sv, type) \
409 : 0) 473 : 0)
410 474
411#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 475#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
412#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 476#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
413 477
414INLINE struct coro * 478ecb_inline MAGIC *
479SvSTATEhv_p (pTHX_ SV *coro)
480{
481 MAGIC *mg;
482
483 if (ecb_expect_true (
484 SvTYPE (coro) == SVt_PVHV
485 && (mg = CORO_MAGIC_state (coro))
486 && mg->mg_virtual == &coro_state_vtbl
487 ))
488 return mg;
489
490 return 0;
491}
492
493ecb_inline struct coro *
415SvSTATE_ (pTHX_ SV *coro) 494SvSTATE_ (pTHX_ SV *coro)
416{ 495{
417 HV *stash;
418 MAGIC *mg; 496 MAGIC *mg;
419 497
420 if (SvROK (coro)) 498 if (SvROK (coro))
421 coro = SvRV (coro); 499 coro = SvRV (coro);
422 500
423 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 501 mg = SvSTATEhv_p (aTHX_ coro);
502 if (!mg)
424 croak ("Coro::State object required"); 503 croak ("Coro::State object required");
425 504
426 stash = SvSTASH (coro);
427 if (expect_false (stash != coro_stash && stash != coro_state_stash))
428 {
429 /* very slow, but rare, check */
430 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
431 croak ("Coro::State object required");
432 }
433
434 mg = CORO_MAGIC_state (coro);
435 return (struct coro *)mg->mg_ptr; 505 return (struct coro *)mg->mg_ptr;
436} 506}
437 507
438#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 508#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
439 509
… …
442#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 512#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
443 513
444/*****************************************************************************/ 514/*****************************************************************************/
445/* padlist management and caching */ 515/* padlist management and caching */
446 516
447static AV * 517ecb_inline PADLIST *
448coro_derive_padlist (pTHX_ CV *cv) 518coro_derive_padlist (pTHX_ CV *cv)
449{ 519{
450 AV *padlist = CvPADLIST (cv); 520 PADLIST *padlist = CvPADLIST (cv);
451 AV *newpadlist, *newpad; 521 PADLIST *newpadlist;
522 PAD *newpad;
523 PADOFFSET off = PadlistMAX (padlist) + 1;
452 524
453 newpadlist = newAV (); 525#if NEWPADAPI
526
527 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
528 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
529 while (!PadlistARRAY (padlist)[off - 1])
530 --off;
531
532 Perl_pad_push (aTHX_ padlist, off);
533
534 newpad = PadlistARRAY (padlist)[off];
535 PadlistARRAY (padlist)[off] = 0;
536
537#else
538
539#if PERL_VERSION_ATLEAST (5,10,0)
540 Perl_pad_push (aTHX_ padlist, off);
541#else
542 Perl_pad_push (aTHX_ padlist, off, 1);
543#endif
544
545 newpad = PadlistARRAY (padlist)[off];
546 PadlistMAX (padlist) = off - 1;
547
548#endif
549
550 newPADLIST (newpadlist);
551#if !PERL_VERSION_ATLEAST(5,15,3)
552 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
454 AvREAL_off (newpadlist); 553 AvREAL_off (newpadlist);
455#if PERL_VERSION_ATLEAST (5,10,0)
456 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
457#else
458 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
459#endif 554#endif
460 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
461 --AvFILLp (padlist);
462 555
463 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 556 /* Already extended to 2 elements by newPADLIST. */
464 av_store (newpadlist, 1, (SV *)newpad); 557 PadlistMAX (newpadlist) = 1;
558 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
559 PadlistARRAY (newpadlist)[1] = newpad;
465 560
466 return newpadlist; 561 return newpadlist;
467} 562}
468 563
469static void 564ecb_inline void
470free_padlist (pTHX_ AV *padlist) 565free_padlist (pTHX_ PADLIST *padlist)
471{ 566{
472 /* may be during global destruction */ 567 /* may be during global destruction */
473 if (!IN_DESTRUCT) 568 if (!IN_DESTRUCT)
474 { 569 {
475 I32 i = AvFILLp (padlist); 570 I32 i = PadlistMAX (padlist);
476 571
477 while (i > 0) /* special-case index 0 */ 572 while (i > 0) /* special-case index 0 */
478 { 573 {
479 /* we try to be extra-careful here */ 574 /* we try to be extra-careful here */
480 AV *av = (AV *)AvARRAY (padlist)[i--]; 575 PAD *pad = PadlistARRAY (padlist)[i--];
481 I32 j = AvFILLp (av);
482 576
577 if (pad)
578 {
579 I32 j = PadMAX (pad);
580
483 while (j >= 0) 581 while (j >= 0)
484 SvREFCNT_dec (AvARRAY (av)[j--]); 582 SvREFCNT_dec (PadARRAY (pad)[j--]);
485 583
486 AvFILLp (av) = -1; 584 PadMAX (pad) = -1;
487 SvREFCNT_dec (av); 585 SvREFCNT_dec (pad);
586 }
488 } 587 }
489 588
490 SvREFCNT_dec (AvARRAY (padlist)[0]); 589 SvREFCNT_dec (PadlistNAMES (padlist));
491 590
591#if NEWPADAPI
592 Safefree (PadlistARRAY (padlist));
593 Safefree (padlist);
594#else
492 AvFILLp (padlist) = -1; 595 AvFILLp (padlist) = -1;
596 AvREAL_off (padlist);
493 SvREFCNT_dec ((SV*)padlist); 597 SvREFCNT_dec ((SV*)padlist);
598#endif
494 } 599 }
495} 600}
496 601
497static int 602static int
498coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 603coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
499{ 604{
500 AV *padlist; 605 PADLIST *padlist;
501 AV *av = (AV *)mg->mg_obj; 606 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
607 size_t len = *(size_t *)mg->mg_ptr;
502 608
503 /* perl manages to free our internal AV and _then_ call us */ 609 /* perl manages to free our internal AV and _then_ call us */
504 if (IN_DESTRUCT) 610 if (IN_DESTRUCT)
505 return 0; 611 return 0;
506 612
507 /* casting is fun. */ 613 while (len--)
508 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
509 free_padlist (aTHX_ padlist); 614 free_padlist (aTHX_ padlists[len]);
510
511 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
512 615
513 return 0; 616 return 0;
514} 617}
515 618
516static MGVTBL coro_cv_vtbl = { 619static MGVTBL coro_cv_vtbl = {
517 0, 0, 0, 0, 620 0, 0, 0, 0,
518 coro_cv_free 621 coro_cv_free
519}; 622};
520 623
521/* the next two functions merely cache the padlists */ 624/* the next two functions merely cache the padlists */
522static void 625ecb_inline void
523get_padlist (pTHX_ CV *cv) 626get_padlist (pTHX_ CV *cv)
524{ 627{
525 MAGIC *mg = CORO_MAGIC_cv (cv); 628 MAGIC *mg = CORO_MAGIC_cv (cv);
526 AV *av; 629 size_t *lenp;
527 630
528 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 631 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
529 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 632 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
530 else 633 else
531 { 634 {
532#if CORO_PREFER_PERL_FUNCTIONS 635#if CORO_PREFER_PERL_FUNCTIONS
533 /* this is probably cleaner? but also slower! */ 636 /* this is probably cleaner? but also slower! */
534 /* in practise, it seems to be less stable */ 637 /* in practise, it seems to be less stable */
… …
540 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 643 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
541#endif 644#endif
542 } 645 }
543} 646}
544 647
545static void 648ecb_inline void
546put_padlist (pTHX_ CV *cv) 649put_padlist (pTHX_ CV *cv)
547{ 650{
548 MAGIC *mg = CORO_MAGIC_cv (cv); 651 MAGIC *mg = CORO_MAGIC_cv (cv);
549 AV *av;
550 652
551 if (expect_false (!mg)) 653 if (ecb_expect_false (!mg))
654 {
552 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 655 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
656 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
657 mg->mg_len = 1; /* so mg_free frees mg_ptr */
658 }
659 else
660 Renew (mg->mg_ptr,
661 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
662 char);
553 663
554 av = (AV *)mg->mg_obj; 664 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
555
556 if (expect_false (AvFILLp (av) >= AvMAX (av)))
557 av_extend (av, AvFILLp (av) + 1);
558
559 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
560} 665}
561 666
562/** load & save, init *******************************************************/ 667/** load & save, init *******************************************************/
563 668
669ecb_inline void
670swap_sv (SV *a, SV *b)
671{
672 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
673 SV tmp;
674
675 /* swap sv_any */
676 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
677
678 /* swap sv_flags */
679 SvFLAGS (&tmp) = SvFLAGS (a);
680 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
681 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
682
683#if PERL_VERSION_ATLEAST (5,10,0)
684 /* perl 5.10 and later complicates this _quite_ a bit, but it also
685 * is much faster, so no quarrels here. alternatively, we could
686 * sv_upgrade to avoid this.
687 */
688 {
689 /* swap sv_u */
690 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
691
692 /* if SvANY points to the head, we need to adjust the pointers,
693 * as the pointer for a still points to b, and maybe vice versa.
694 */
695 #define svany_in_head(type) \
696 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
697
698 if (svany_in_head (SvTYPE (a)))
699 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
700
701 if (svany_in_head (SvTYPE (b)))
702 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
703 }
704#endif
705}
706
564/* swap sv heads, at least logically */ 707/* swap sv heads, at least logically */
565static void 708static void
566swap_svs (pTHX_ Coro__State c) 709swap_svs (pTHX_ Coro__State c)
567{ 710{
568 int i; 711 int i;
569 712
570 for (i = 0; i <= AvFILLp (c->swap_sv); ) 713 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
571 { 714 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
572 SV *a = AvARRAY (c->swap_sv)[i++];
573 SV *b = AvARRAY (c->swap_sv)[i++];
574
575 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
576 SV tmp;
577
578 /* swap sv_any */
579 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
580
581 /* swap sv_flags */
582 SvFLAGS (&tmp) = SvFLAGS (a);
583 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
584 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
585
586#if PERL_VERSION_ATLEAST (5,10,0)
587 /* perl 5.10 complicates this _quite_ a bit, but it also is
588 * is much faster, so no quarrels here. alternatively, we could
589 * sv_upgrade to avoid this.
590 */
591 {
592 /* swap sv_u */
593 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
594
595 /* if SvANY points to the head, we need to adjust the pointers,
596 * as the pointer for a still points to b, and maybe vice versa.
597 */
598 #define svany_in_head(type) \
599 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
600
601 if (svany_in_head (SvTYPE (a)))
602 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
603
604 if (svany_in_head (SvTYPE (b)))
605 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
606 }
607#endif
608 }
609} 715}
610 716
611#define SWAP_SVS(coro) \ 717#define SWAP_SVS(coro) \
612 if (expect_false ((coro)->swap_sv)) \ 718 if (ecb_expect_false ((coro)->swap_sv)) \
613 swap_svs (aTHX_ (coro)) 719 swap_svs (aTHX_ (coro))
614 720
615static void 721static void
616on_enterleave_call (pTHX_ SV *cb); 722on_enterleave_call (pTHX_ SV *cb);
617 723
… …
621 perl_slots *slot = c->slot; 727 perl_slots *slot = c->slot;
622 c->slot = 0; 728 c->slot = 0;
623 729
624 PL_mainstack = c->mainstack; 730 PL_mainstack = c->mainstack;
625 731
626 GvSV (PL_defgv) = slot->defsv; 732#if CORO_JIT
627 GvAV (PL_defgv) = slot->defav; 733 load_perl_slots (slot);
628 GvSV (PL_errgv) = slot->errsv; 734#else
629 GvSV (irsgv) = slot->irsgv;
630 GvHV (PL_hintgv) = slot->hinthv;
631
632 #define VAR(name,type) PL_ ## name = slot->name; 735 #define VARx(name,expr,type) expr = slot->name;
633 # include "state.h" 736 #include "state.h"
634 #undef VAR 737#endif
635 738
636 { 739 {
637 dSP; 740 dSP;
638 741
639 CV *cv; 742 CV *cv;
640 743
641 /* now do the ugly restore mess */ 744 /* now do the ugly restore mess */
642 while (expect_true (cv = (CV *)POPs)) 745 while (ecb_expect_true (cv = (CV *)POPs))
643 { 746 {
644 put_padlist (aTHX_ cv); /* mark this padlist as available */ 747 put_padlist (aTHX_ cv); /* mark this padlist as available */
645 CvDEPTH (cv) = PTR2IV (POPs); 748 CvDEPTH (cv) = PTR2IV (POPs);
646 CvPADLIST (cv) = (AV *)POPs; 749 CvPADLIST (cv) = (PADLIST *)POPs;
647 } 750 }
648 751
649 PUTBACK; 752 PUTBACK;
650 } 753 }
651 754
652 slf_frame = c->slf_frame; 755 slf_frame = c->slf_frame;
653 CORO_THROW = c->except; 756 CORO_THROW = c->except;
654 757
655 if (expect_false (enable_times)) 758 if (ecb_expect_false (enable_times))
656 { 759 {
657 if (expect_false (!times_valid)) 760 if (ecb_expect_false (!times_valid))
658 coro_times_update (); 761 coro_times_update ();
659 762
660 coro_times_sub (c); 763 coro_times_sub (c);
661 } 764 }
662 765
663 if (expect_false (c->on_enter)) 766 if (ecb_expect_false (c->on_enter))
664 { 767 {
665 int i; 768 int i;
666 769
667 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 770 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
668 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 771 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
674static void 777static void
675save_perl (pTHX_ Coro__State c) 778save_perl (pTHX_ Coro__State c)
676{ 779{
677 SWAP_SVS (c); 780 SWAP_SVS (c);
678 781
679 if (expect_false (c->on_leave)) 782 if (ecb_expect_false (c->on_leave))
680 { 783 {
681 int i; 784 int i;
682 785
683 for (i = AvFILLp (c->on_leave); i >= 0; --i) 786 for (i = AvFILLp (c->on_leave); i >= 0; --i)
684 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 787 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
685 } 788 }
686 789
687 times_valid = 0; 790 times_valid = 0;
688 791
689 if (expect_false (enable_times)) 792 if (ecb_expect_false (enable_times))
690 { 793 {
691 coro_times_update (); times_valid = 1; 794 coro_times_update (); times_valid = 1;
692 coro_times_add (c); 795 coro_times_add (c);
693 } 796 }
694 797
… …
708 811
709 XPUSHs (Nullsv); 812 XPUSHs (Nullsv);
710 /* this loop was inspired by pp_caller */ 813 /* this loop was inspired by pp_caller */
711 for (;;) 814 for (;;)
712 { 815 {
713 while (expect_true (cxix >= 0)) 816 while (ecb_expect_true (cxix >= 0))
714 { 817 {
715 PERL_CONTEXT *cx = &ccstk[cxix--]; 818 PERL_CONTEXT *cx = &ccstk[cxix--];
716 819
717 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 820 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
718 { 821 {
719 CV *cv = cx->blk_sub.cv; 822 CV *cv = cx->blk_sub.cv;
720 823
721 if (expect_true (CvDEPTH (cv))) 824 if (ecb_expect_true (CvDEPTH (cv)))
722 { 825 {
826 EXTEND (SP, 3);
723 PUSHs ((SV *)CvPADLIST (cv)); 827 PUSHs ((SV *)CvPADLIST (cv));
724 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 828 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
725 PUSHs ((SV *)cv); 829 PUSHs ((SV *)cv);
726 830
727 CvDEPTH (cv) = 0; 831 CvDEPTH (cv) = 0;
728 get_padlist (aTHX_ cv); 832 get_padlist (aTHX_ cv);
729 } 833 }
730 } 834 }
731 } 835 }
732 836
733 if (expect_true (top_si->si_type == PERLSI_MAIN)) 837 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
734 break; 838 break;
735 839
736 top_si = top_si->si_prev; 840 top_si = top_si->si_prev;
737 ccstk = top_si->si_cxstack; 841 ccstk = top_si->si_cxstack;
738 cxix = top_si->si_cxix; 842 cxix = top_si->si_cxix;
… …
740 844
741 PUTBACK; 845 PUTBACK;
742 } 846 }
743 847
744 /* allocate some space on the context stack for our purposes */ 848 /* allocate some space on the context stack for our purposes */
745 /* we manually unroll here, as usually 2 slots is enough */ 849 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
746 if (SLOT_COUNT >= 1) CXINC;
747 if (SLOT_COUNT >= 2) CXINC;
748 if (SLOT_COUNT >= 3) CXINC;
749 { 850 {
750 unsigned int i; 851 unsigned int i;
852
751 for (i = 3; i < SLOT_COUNT; ++i) 853 for (i = 0; i < SLOT_COUNT; ++i)
752 CXINC; 854 CXINC;
753 } 855
754 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 856 cxstack_ix -= SLOT_COUNT; /* undo allocation */
857 }
755 858
756 c->mainstack = PL_mainstack; 859 c->mainstack = PL_mainstack;
757 860
758 { 861 {
759 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 862 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
760 863
761 slot->defav = GvAV (PL_defgv); 864#if CORO_JIT
762 slot->defsv = DEFSV; 865 save_perl_slots (slot);
763 slot->errsv = ERRSV; 866#else
764 slot->irsgv = GvSV (irsgv);
765 slot->hinthv = GvHV (PL_hintgv);
766
767 #define VAR(name,type) slot->name = PL_ ## name; 867 #define VARx(name,expr,type) slot->name = expr;
768 # include "state.h" 868 #include "state.h"
769 #undef VAR 869#endif
770 } 870 }
771} 871}
772 872
773/* 873/*
774 * allocate various perl stacks. This is almost an exact copy 874 * allocate various perl stacks. This is almost an exact copy
… …
780# define coro_init_stacks(thx) init_stacks () 880# define coro_init_stacks(thx) init_stacks ()
781#else 881#else
782static void 882static void
783coro_init_stacks (pTHX) 883coro_init_stacks (pTHX)
784{ 884{
785 PL_curstackinfo = new_stackinfo(32, 8); 885 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
786 PL_curstackinfo->si_type = PERLSI_MAIN; 886 PL_curstackinfo->si_type = PERLSI_MAIN;
787 PL_curstack = PL_curstackinfo->si_stack; 887 PL_curstack = PL_curstackinfo->si_stack;
788 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 888 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
789 889
790 PL_stack_base = AvARRAY(PL_curstack); 890 PL_stack_base = AvARRAY(PL_curstack);
… …
805#endif 905#endif
806 906
807 New(54,PL_scopestack,8,I32); 907 New(54,PL_scopestack,8,I32);
808 PL_scopestack_ix = 0; 908 PL_scopestack_ix = 0;
809 PL_scopestack_max = 8; 909 PL_scopestack_max = 8;
910#if HAS_SCOPESTACK_NAME
911 New(54,PL_scopestack_name,8,const char*);
912#endif
810 913
811 New(54,PL_savestack,24,ANY); 914 New(54,PL_savestack,24,ANY);
812 PL_savestack_ix = 0; 915 PL_savestack_ix = 0;
813 PL_savestack_max = 24; 916 PL_savestack_max = 24;
814 917
… …
842 } 945 }
843 946
844 Safefree (PL_tmps_stack); 947 Safefree (PL_tmps_stack);
845 Safefree (PL_markstack); 948 Safefree (PL_markstack);
846 Safefree (PL_scopestack); 949 Safefree (PL_scopestack);
950#if HAS_SCOPESTACK_NAME
951 Safefree (PL_scopestack_name);
952#endif
847 Safefree (PL_savestack); 953 Safefree (PL_savestack);
848#if !PERL_VERSION_ATLEAST (5,10,0) 954#if !PERL_VERSION_ATLEAST (5,10,0)
849 Safefree (PL_retstack); 955 Safefree (PL_retstack);
850#endif 956#endif
851} 957}
… …
897#endif 1003#endif
898 1004
899/* 1005/*
900 * This overrides the default magic get method of %SIG elements. 1006 * This overrides the default magic get method of %SIG elements.
901 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1007 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
902 * and instead of trying to save and restore the hash elements, we just provide 1008 * and instead of trying to save and restore the hash elements (extremely slow),
903 * readback here. 1009 * we just provide our own readback here.
904 */ 1010 */
905static int 1011static int ecb_cold
906coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1012coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
907{ 1013{
908 const char *s = MgPV_nolen_const (mg); 1014 const char *s = MgPV_nolen_const (mg);
909 1015
910 if (*s == '_') 1016 if (*s == '_')
911 { 1017 {
912 SV **svp = 0; 1018 SV **svp = 0;
913 1019
914 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1020 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
915 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1021 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
916 1022
917 if (svp) 1023 if (svp)
918 { 1024 {
919 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1025 SV *ssv;
1026
1027 if (!*svp)
1028 ssv = &PL_sv_undef;
1029 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1030 ssv = sv_2mortal (newRV_inc (*svp));
1031 else
1032 ssv = *svp;
1033
1034 sv_setsv (sv, ssv);
920 return 0; 1035 return 0;
921 } 1036 }
922 } 1037 }
923 1038
924 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1039 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
925} 1040}
926 1041
927static int 1042static int ecb_cold
928coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1043coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
929{ 1044{
930 const char *s = MgPV_nolen_const (mg); 1045 const char *s = MgPV_nolen_const (mg);
931 1046
932 if (*s == '_') 1047 if (*s == '_')
… …
946 } 1061 }
947 1062
948 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1063 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
949} 1064}
950 1065
951static int 1066static int ecb_cold
952coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1067coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
953{ 1068{
954 const char *s = MgPV_nolen_const (mg); 1069 const char *s = MgPV_nolen_const (mg);
955 1070
956 if (*s == '_') 1071 if (*s == '_')
… …
991 return 1; 1106 return 1;
992} 1107}
993 1108
994static UNOP init_perl_op; 1109static UNOP init_perl_op;
995 1110
996static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1111ecb_noinline static void /* noinline to keep it out of the transfer fast path */
997init_perl (pTHX_ struct coro *coro) 1112init_perl (pTHX_ struct coro *coro)
998{ 1113{
999 /* 1114 /*
1000 * emulate part of the perl startup here. 1115 * emulate part of the perl startup here.
1001 */ 1116 */
… …
1009 PL_comppad_name_fill = 0; 1124 PL_comppad_name_fill = 0;
1010 PL_comppad_name_floor = 0; 1125 PL_comppad_name_floor = 0;
1011 PL_curpm = 0; 1126 PL_curpm = 0;
1012 PL_curpad = 0; 1127 PL_curpad = 0;
1013 PL_localizing = 0; 1128 PL_localizing = 0;
1014 PL_dirty = 0;
1015 PL_restartop = 0; 1129 PL_restartop = 0;
1016#if PERL_VERSION_ATLEAST (5,10,0) 1130#if PERL_VERSION_ATLEAST (5,10,0)
1017 PL_parser = 0; 1131 PL_parser = 0;
1018#endif 1132#endif
1019 PL_hints = 0; 1133 PL_hints = 0;
1020 1134
1021 /* recreate the die/warn hooks */ 1135 /* recreate the die/warn hooks */
1022 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1136 PL_diehook = SvREFCNT_inc (rv_diehook);
1023 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1137 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1024 1138
1025 GvSV (PL_defgv) = newSV (0); 1139 GvSV (PL_defgv) = newSV (0);
1026 GvAV (PL_defgv) = coro->args; coro->args = 0; 1140 GvAV (PL_defgv) = coro->args; coro->args = 0;
1027 GvSV (PL_errgv) = newSV (0); 1141 GvSV (PL_errgv) = newSV (0);
1028 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1142 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1029 GvHV (PL_hintgv) = 0; 1143 GvHV (PL_hintgv) = 0;
… …
1049 /* this newly created coroutine might be run on an existing cctx which most 1163 /* this newly created coroutine might be run on an existing cctx which most
1050 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1164 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1051 */ 1165 */
1052 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1166 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1053 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1167 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1168 slf_frame.destroy = 0;
1054 1169
1055 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1170 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1056 init_perl_op.op_next = PL_op; 1171 init_perl_op.op_next = PL_op;
1057 init_perl_op.op_type = OP_ENTERSUB; 1172 init_perl_op.op_type = OP_ENTERSUB;
1058 init_perl_op.op_ppaddr = pp_slf; 1173 init_perl_op.op_ppaddr = pp_slf;
… …
1063 /* copy throw, in case it was set before init_perl */ 1178 /* copy throw, in case it was set before init_perl */
1064 CORO_THROW = coro->except; 1179 CORO_THROW = coro->except;
1065 1180
1066 SWAP_SVS (coro); 1181 SWAP_SVS (coro);
1067 1182
1068 if (expect_false (enable_times)) 1183 if (ecb_expect_false (enable_times))
1069 { 1184 {
1070 coro_times_update (); 1185 coro_times_update ();
1071 coro_times_sub (coro); 1186 coro_times_sub (coro);
1072 } 1187 }
1073} 1188}
… …
1097destroy_perl (pTHX_ struct coro *coro) 1212destroy_perl (pTHX_ struct coro *coro)
1098{ 1213{
1099 SV *svf [9]; 1214 SV *svf [9];
1100 1215
1101 { 1216 {
1217 SV *old_current = SvRV (coro_current);
1102 struct coro *current = SvSTATE_current; 1218 struct coro *current = SvSTATE (old_current);
1103 1219
1104 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1220 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1105 1221
1106 save_perl (aTHX_ current); 1222 save_perl (aTHX_ current);
1223
1224 /* this will cause transfer_check to croak on block*/
1225 SvRV_set (coro_current, (SV *)coro->hv);
1226
1107 load_perl (aTHX_ coro); 1227 load_perl (aTHX_ coro);
1108 1228
1109 coro_unwind_stacks (aTHX); 1229 coro_unwind_stacks (aTHX);
1110 coro_destruct_stacks (aTHX);
1111 1230
1112 /* restore swapped sv's */ 1231 /* restore swapped sv's */
1113 SWAP_SVS (coro); 1232 SWAP_SVS (coro);
1114 1233
1234 coro_destruct_stacks (aTHX);
1235
1115 // now save some sv's to be free'd later 1236 /* now save some sv's to be free'd later */
1116 svf [0] = GvSV (PL_defgv); 1237 svf [0] = GvSV (PL_defgv);
1117 svf [1] = (SV *)GvAV (PL_defgv); 1238 svf [1] = (SV *)GvAV (PL_defgv);
1118 svf [2] = GvSV (PL_errgv); 1239 svf [2] = GvSV (PL_errgv);
1119 svf [3] = (SV *)PL_defoutgv; 1240 svf [3] = (SV *)PL_defoutgv;
1120 svf [4] = PL_rs; 1241 svf [4] = PL_rs;
… …
1122 svf [6] = (SV *)GvHV (PL_hintgv); 1243 svf [6] = (SV *)GvHV (PL_hintgv);
1123 svf [7] = PL_diehook; 1244 svf [7] = PL_diehook;
1124 svf [8] = PL_warnhook; 1245 svf [8] = PL_warnhook;
1125 assert (9 == sizeof (svf) / sizeof (*svf)); 1246 assert (9 == sizeof (svf) / sizeof (*svf));
1126 1247
1248 SvRV_set (coro_current, old_current);
1249
1127 load_perl (aTHX_ current); 1250 load_perl (aTHX_ current);
1128 } 1251 }
1129 1252
1130 { 1253 {
1131 unsigned int i; 1254 unsigned int i;
… …
1138 SvREFCNT_dec (coro->invoke_cb); 1261 SvREFCNT_dec (coro->invoke_cb);
1139 SvREFCNT_dec (coro->invoke_av); 1262 SvREFCNT_dec (coro->invoke_av);
1140 } 1263 }
1141} 1264}
1142 1265
1143INLINE void 1266ecb_inline void
1144free_coro_mortal (pTHX) 1267free_coro_mortal (pTHX)
1145{ 1268{
1146 if (expect_true (coro_mortal)) 1269 if (ecb_expect_true (coro_mortal))
1147 { 1270 {
1148 SvREFCNT_dec (coro_mortal); 1271 SvREFCNT_dec ((SV *)coro_mortal);
1149 coro_mortal = 0; 1272 coro_mortal = 0;
1150 } 1273 }
1151} 1274}
1152 1275
1153static int 1276static int
… …
1286 1409
1287 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1410 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1288} 1411}
1289 1412
1290/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1413/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1291static void NOINLINE 1414static void ecb_noinline
1292cctx_prepare (pTHX) 1415cctx_prepare (pTHX)
1293{ 1416{
1294 PL_top_env = &PL_start_env; 1417 PL_top_env = &PL_start_env;
1295 1418
1296 if (cctx_current->flags & CC_TRACE) 1419 if (cctx_current->flags & CC_TRACE)
… …
1307 slf_frame.prepare = slf_prepare_set_stacklevel; 1430 slf_frame.prepare = slf_prepare_set_stacklevel;
1308 slf_frame.check = slf_check_set_stacklevel; 1431 slf_frame.check = slf_check_set_stacklevel;
1309} 1432}
1310 1433
1311/* the tail of transfer: execute stuff we can only do after a transfer */ 1434/* the tail of transfer: execute stuff we can only do after a transfer */
1312INLINE void 1435ecb_inline void
1313transfer_tail (pTHX) 1436transfer_tail (pTHX)
1314{ 1437{
1315 free_coro_mortal (aTHX); 1438 free_coro_mortal (aTHX);
1439}
1440
1441/* try to exit the same way perl's main function would do */
1442/* we do not bother resetting the environment or other things *7
1443/* that are not, uhm, essential */
1444/* this obviously also doesn't work when perl is embedded */
1445static void ecb_noinline ecb_cold
1446perlish_exit (pTHX)
1447{
1448 int exitstatus = perl_destruct (PL_curinterp);
1449 perl_free (PL_curinterp);
1450 exit (exitstatus);
1316} 1451}
1317 1452
1318/* 1453/*
1319 * this is a _very_ stripped down perl interpreter ;) 1454 * this is a _very_ stripped down perl interpreter ;)
1320 */ 1455 */
… …
1349 */ 1484 */
1350 1485
1351 /* 1486 /*
1352 * If perl-run returns we assume exit() was being called or the coro 1487 * If perl-run returns we assume exit() was being called or the coro
1353 * fell off the end, which seems to be the only valid (non-bug) 1488 * fell off the end, which seems to be the only valid (non-bug)
1354 * reason for perl_run to return. We try to exit by jumping to the 1489 * reason for perl_run to return. We try to mimic whatever perl is normally
1355 * bootstrap-time "top" top_env, as we cannot restore the "main" 1490 * doing in that case. YMMV.
1356 * coroutine as Coro has no such concept.
1357 * This actually isn't valid with the pthread backend, but OSes requiring
1358 * that backend are too broken to do it in a standards-compliant way.
1359 */ 1491 */
1360 PL_top_env = main_top_env; 1492 perlish_exit (aTHX);
1361 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1362 } 1493 }
1363} 1494}
1364 1495
1365static coro_cctx * 1496static coro_cctx *
1366cctx_new () 1497cctx_new (void)
1367{ 1498{
1368 coro_cctx *cctx; 1499 coro_cctx *cctx;
1369 1500
1370 ++cctx_count; 1501 ++cctx_count;
1371 New (0, cctx, 1, coro_cctx); 1502 New (0, cctx, 1, coro_cctx);
… …
1377 return cctx; 1508 return cctx;
1378} 1509}
1379 1510
1380/* create a new cctx only suitable as source */ 1511/* create a new cctx only suitable as source */
1381static coro_cctx * 1512static coro_cctx *
1382cctx_new_empty () 1513cctx_new_empty (void)
1383{ 1514{
1384 coro_cctx *cctx = cctx_new (); 1515 coro_cctx *cctx = cctx_new ();
1385 1516
1386 cctx->sptr = 0; 1517 cctx->stack.sptr = 0;
1387 coro_create (&cctx->cctx, 0, 0, 0, 0); 1518 coro_create (&cctx->cctx, 0, 0, 0, 0);
1388 1519
1389 return cctx; 1520 return cctx;
1390} 1521}
1391 1522
1392/* create a new cctx suitable as destination/running a perl interpreter */ 1523/* create a new cctx suitable as destination/running a perl interpreter */
1393static coro_cctx * 1524static coro_cctx *
1394cctx_new_run () 1525cctx_new_run (void)
1395{ 1526{
1396 coro_cctx *cctx = cctx_new (); 1527 coro_cctx *cctx = cctx_new ();
1397 void *stack_start;
1398 size_t stack_size;
1399 1528
1400#if HAVE_MMAP 1529 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1401 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1402 /* mmap supposedly does allocate-on-write for us */
1403 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1404
1405 if (cctx->sptr != (void *)-1)
1406 {
1407 #if CORO_STACKGUARD
1408 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1409 #endif
1410 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1411 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1412 cctx->flags |= CC_MAPPED;
1413 } 1530 {
1414 else
1415#endif
1416 {
1417 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1418 New (0, cctx->sptr, cctx_stacksize, long);
1419
1420 if (!cctx->sptr)
1421 {
1422 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1531 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1423 _exit (EXIT_FAILURE); 1532 _exit (EXIT_FAILURE);
1424 }
1425
1426 stack_start = cctx->sptr;
1427 stack_size = cctx->ssize;
1428 } 1533 }
1429 1534
1430 #if CORO_USE_VALGRIND
1431 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1432 #endif
1433
1434 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1535 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1435 1536
1436 return cctx; 1537 return cctx;
1437} 1538}
1438 1539
1439static void 1540static void
1440cctx_destroy (coro_cctx *cctx) 1541cctx_destroy (coro_cctx *cctx)
1441{ 1542{
1442 if (!cctx) 1543 if (!cctx)
1443 return; 1544 return;
1444 1545
1445 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1546 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1446 1547
1447 --cctx_count; 1548 --cctx_count;
1448 coro_destroy (&cctx->cctx); 1549 coro_destroy (&cctx->cctx);
1449 1550
1450 /* coro_transfer creates new, empty cctx's */ 1551 coro_stack_free (&cctx->stack);
1451 if (cctx->sptr)
1452 {
1453 #if CORO_USE_VALGRIND
1454 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1455 #endif
1456
1457#if HAVE_MMAP
1458 if (cctx->flags & CC_MAPPED)
1459 munmap (cctx->sptr, cctx->ssize);
1460 else
1461#endif
1462 Safefree (cctx->sptr);
1463 }
1464 1552
1465 Safefree (cctx); 1553 Safefree (cctx);
1466} 1554}
1467 1555
1468/* wether this cctx should be destructed */ 1556/* wether this cctx should be destructed */
1469#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1557#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1470 1558
1471static coro_cctx * 1559static coro_cctx *
1472cctx_get (pTHX) 1560cctx_get (pTHX)
1473{ 1561{
1474 while (expect_true (cctx_first)) 1562 while (ecb_expect_true (cctx_first))
1475 { 1563 {
1476 coro_cctx *cctx = cctx_first; 1564 coro_cctx *cctx = cctx_first;
1477 cctx_first = cctx->next; 1565 cctx_first = cctx->next;
1478 --cctx_idle; 1566 --cctx_idle;
1479 1567
1480 if (expect_true (!CCTX_EXPIRED (cctx))) 1568 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1481 return cctx; 1569 return cctx;
1482 1570
1483 cctx_destroy (cctx); 1571 cctx_destroy (cctx);
1484 } 1572 }
1485 1573
… …
1487} 1575}
1488 1576
1489static void 1577static void
1490cctx_put (coro_cctx *cctx) 1578cctx_put (coro_cctx *cctx)
1491{ 1579{
1492 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1580 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1493 1581
1494 /* free another cctx if overlimit */ 1582 /* free another cctx if overlimit */
1495 if (expect_false (cctx_idle >= cctx_max_idle)) 1583 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1496 { 1584 {
1497 coro_cctx *first = cctx_first; 1585 coro_cctx *first = cctx_first;
1498 cctx_first = first->next; 1586 cctx_first = first->next;
1499 --cctx_idle; 1587 --cctx_idle;
1500 1588
… …
1511static void 1599static void
1512transfer_check (pTHX_ struct coro *prev, struct coro *next) 1600transfer_check (pTHX_ struct coro *prev, struct coro *next)
1513{ 1601{
1514 /* TODO: throwing up here is considered harmful */ 1602 /* TODO: throwing up here is considered harmful */
1515 1603
1516 if (expect_true (prev != next)) 1604 if (ecb_expect_true (prev != next))
1517 { 1605 {
1518 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1606 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1519 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1607 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1520 1608
1521 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1609 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1522 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1610 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1523 1611
1524#if !PERL_VERSION_ATLEAST (5,10,0) 1612#if !PERL_VERSION_ATLEAST (5,10,0)
1525 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1613 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1526 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1614 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1527#endif 1615#endif
1528 } 1616 }
1529} 1617}
1530 1618
1531/* always use the TRANSFER macro */ 1619/* always use the TRANSFER macro */
1532static void NOINLINE /* noinline so we have a fixed stackframe */ 1620static void ecb_noinline /* noinline so we have a fixed stackframe */
1533transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1621transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1534{ 1622{
1535 dSTACKLEVEL; 1623 dSTACKLEVEL;
1536 1624
1537 /* sometimes transfer is only called to set idle_sp */ 1625 /* sometimes transfer is only called to set idle_sp */
1538 if (expect_false (!prev)) 1626 if (ecb_expect_false (!prev))
1539 { 1627 {
1540 cctx_current->idle_sp = STACKLEVEL; 1628 cctx_current->idle_sp = STACKLEVEL;
1541 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1629 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1542 } 1630 }
1543 else if (expect_true (prev != next)) 1631 else if (ecb_expect_true (prev != next))
1544 { 1632 {
1545 coro_cctx *cctx_prev; 1633 coro_cctx *cctx_prev;
1546 1634
1547 if (expect_false (prev->flags & CF_NEW)) 1635 if (ecb_expect_false (prev->flags & CF_NEW))
1548 { 1636 {
1549 /* create a new empty/source context */ 1637 /* create a new empty/source context */
1550 prev->flags &= ~CF_NEW; 1638 prev->flags &= ~CF_NEW;
1551 prev->flags |= CF_RUNNING; 1639 prev->flags |= CF_RUNNING;
1552 } 1640 }
… …
1555 next->flags |= CF_RUNNING; 1643 next->flags |= CF_RUNNING;
1556 1644
1557 /* first get rid of the old state */ 1645 /* first get rid of the old state */
1558 save_perl (aTHX_ prev); 1646 save_perl (aTHX_ prev);
1559 1647
1560 if (expect_false (next->flags & CF_NEW)) 1648 if (ecb_expect_false (next->flags & CF_NEW))
1561 { 1649 {
1562 /* need to start coroutine */ 1650 /* need to start coroutine */
1563 next->flags &= ~CF_NEW; 1651 next->flags &= ~CF_NEW;
1564 /* setup coroutine call */ 1652 /* setup coroutine call */
1565 init_perl (aTHX_ next); 1653 init_perl (aTHX_ next);
1566 } 1654 }
1567 else 1655 else
1568 load_perl (aTHX_ next); 1656 load_perl (aTHX_ next);
1569 1657
1570 /* possibly untie and reuse the cctx */ 1658 /* possibly untie and reuse the cctx */
1571 if (expect_true ( 1659 if (ecb_expect_true (
1572 cctx_current->idle_sp == STACKLEVEL 1660 cctx_current->idle_sp == STACKLEVEL
1573 && !(cctx_current->flags & CC_TRACE) 1661 && !(cctx_current->flags & CC_TRACE)
1574 && !force_cctx 1662 && !force_cctx
1575 )) 1663 ))
1576 { 1664 {
1577 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1665 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1578 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1666 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1579 1667
1580 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1668 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1581 /* without this the next cctx_get might destroy the running cctx while still in use */ 1669 /* without this the next cctx_get might destroy the running cctx while still in use */
1582 if (expect_false (CCTX_EXPIRED (cctx_current))) 1670 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1583 if (expect_true (!next->cctx)) 1671 if (ecb_expect_true (!next->cctx))
1584 next->cctx = cctx_get (aTHX); 1672 next->cctx = cctx_get (aTHX);
1585 1673
1586 cctx_put (cctx_current); 1674 cctx_put (cctx_current);
1587 } 1675 }
1588 else 1676 else
1589 prev->cctx = cctx_current; 1677 prev->cctx = cctx_current;
1590 1678
1591 ++next->usecount; 1679 ++next->usecount;
1592 1680
1593 cctx_prev = cctx_current; 1681 cctx_prev = cctx_current;
1594 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1682 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1595 1683
1596 next->cctx = 0; 1684 next->cctx = 0;
1597 1685
1598 if (expect_false (cctx_prev != cctx_current)) 1686 if (ecb_expect_false (cctx_prev != cctx_current))
1599 { 1687 {
1600 cctx_prev->top_env = PL_top_env; 1688 cctx_prev->top_env = PL_top_env;
1601 PL_top_env = cctx_current->top_env; 1689 PL_top_env = cctx_current->top_env;
1602 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1690 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1603 } 1691 }
… …
1609#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1697#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1610#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1698#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1611 1699
1612/** high level stuff ********************************************************/ 1700/** high level stuff ********************************************************/
1613 1701
1702/* this function is actually Coro, not Coro::State, but we call it from here */
1703/* because it is convenient - but it hasn't been declared yet for that reason */
1614static int 1704static void
1705coro_call_on_destroy (pTHX_ struct coro *coro);
1706
1707static void
1615coro_state_destroy (pTHX_ struct coro *coro) 1708coro_state_destroy (pTHX_ struct coro *coro)
1616{ 1709{
1617 if (coro->flags & CF_DESTROYED) 1710 if (coro->flags & CF_ZOMBIE)
1618 return 0; 1711 return;
1619 1712
1620 if (coro->on_destroy && !PL_dirty)
1621 coro->on_destroy (aTHX_ coro); 1713 slf_destroy (aTHX_ coro);
1622 1714
1623 coro->flags |= CF_DESTROYED; 1715 coro->flags |= CF_ZOMBIE;
1624 1716
1625 if (coro->flags & CF_READY) 1717 if (coro->flags & CF_READY)
1626 { 1718 {
1627 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1719 /* reduce nready, as destroying a ready coro effectively unreadies it */
1628 /* alternative: look through all ready queues and remove the coro */ 1720 /* alternative: look through all ready queues and remove the coro */
1629 --coro_nready; 1721 --coro_nready;
1630 } 1722 }
1631 else 1723 else
1632 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1724 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1725
1726 if (coro->next) coro->next->prev = coro->prev;
1727 if (coro->prev) coro->prev->next = coro->next;
1728 if (coro == coro_first) coro_first = coro->next;
1633 1729
1634 if (coro->mainstack 1730 if (coro->mainstack
1635 && coro->mainstack != main_mainstack 1731 && coro->mainstack != main_mainstack
1636 && coro->slot 1732 && coro->slot
1637 && !PL_dirty) 1733 && !PL_dirty)
1638 destroy_perl (aTHX_ coro); 1734 destroy_perl (aTHX_ coro);
1639 1735
1640 if (coro->next) coro->next->prev = coro->prev;
1641 if (coro->prev) coro->prev->next = coro->next;
1642 if (coro == coro_first) coro_first = coro->next;
1643
1644 cctx_destroy (coro->cctx); 1736 cctx_destroy (coro->cctx);
1645 SvREFCNT_dec (coro->startcv); 1737 SvREFCNT_dec (coro->startcv);
1646 SvREFCNT_dec (coro->args); 1738 SvREFCNT_dec (coro->args);
1647 SvREFCNT_dec (coro->swap_sv); 1739 SvREFCNT_dec (coro->swap_sv);
1648 SvREFCNT_dec (CORO_THROW); 1740 SvREFCNT_dec (CORO_THROW);
1649 1741
1650 return 1; 1742 coro_call_on_destroy (aTHX_ coro);
1743
1744 /* more destruction mayhem in coro_state_free */
1651} 1745}
1652 1746
1653static int 1747static int
1654coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1748coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1655{ 1749{
1656 struct coro *coro = (struct coro *)mg->mg_ptr; 1750 struct coro *coro = (struct coro *)mg->mg_ptr;
1657 mg->mg_ptr = 0; 1751 mg->mg_ptr = 0;
1658 1752
1659 coro->hv = 0;
1660
1661 if (--coro->refcnt < 0)
1662 {
1663 coro_state_destroy (aTHX_ coro); 1753 coro_state_destroy (aTHX_ coro);
1754 SvREFCNT_dec (coro->on_destroy);
1755 SvREFCNT_dec (coro->status);
1756
1664 Safefree (coro); 1757 Safefree (coro);
1665 }
1666 1758
1667 return 0; 1759 return 0;
1668} 1760}
1669 1761
1670static int 1762static int ecb_cold
1671coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1763coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1672{ 1764{
1673 struct coro *coro = (struct coro *)mg->mg_ptr; 1765 /* called when perl clones the current process the slow way (windows process emulation) */
1674 1766 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1675 ++coro->refcnt; 1767 mg->mg_ptr = 0;
1768 mg->mg_virtual = 0;
1676 1769
1677 return 0; 1770 return 0;
1678} 1771}
1679 1772
1680static MGVTBL coro_state_vtbl = { 1773static MGVTBL coro_state_vtbl = {
… …
1705 TRANSFER (ta, 1); 1798 TRANSFER (ta, 1);
1706} 1799}
1707 1800
1708/** Coro ********************************************************************/ 1801/** Coro ********************************************************************/
1709 1802
1710INLINE void 1803ecb_inline void
1711coro_enq (pTHX_ struct coro *coro) 1804coro_enq (pTHX_ struct coro *coro)
1712{ 1805{
1713 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1806 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1714 1807
1715 SvREFCNT_inc_NN (coro->hv); 1808 SvREFCNT_inc_NN (coro->hv);
… …
1717 coro->next_ready = 0; 1810 coro->next_ready = 0;
1718 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1811 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1719 ready [1] = coro; 1812 ready [1] = coro;
1720} 1813}
1721 1814
1722INLINE struct coro * 1815ecb_inline struct coro *
1723coro_deq (pTHX) 1816coro_deq (pTHX)
1724{ 1817{
1725 int prio; 1818 int prio;
1726 1819
1727 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1820 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1780{ 1873{
1781 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1874 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1782} 1875}
1783 1876
1784/* expects to own a reference to next->hv */ 1877/* expects to own a reference to next->hv */
1785INLINE void 1878ecb_inline void
1786prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1879prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1787{ 1880{
1788 SV *prev_sv = SvRV (coro_current); 1881 SV *prev_sv = SvRV (coro_current);
1789 1882
1790 ta->prev = SvSTATE_hv (prev_sv); 1883 ta->prev = SvSTATE_hv (prev_sv);
… …
1803{ 1896{
1804 for (;;) 1897 for (;;)
1805 { 1898 {
1806 struct coro *next = coro_deq (aTHX); 1899 struct coro *next = coro_deq (aTHX);
1807 1900
1808 if (expect_true (next)) 1901 if (ecb_expect_true (next))
1809 { 1902 {
1810 /* cannot transfer to destroyed coros, skip and look for next */ 1903 /* cannot transfer to destroyed coros, skip and look for next */
1811 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1904 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1812 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1905 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1813 else 1906 else
1814 { 1907 {
1815 next->flags &= ~CF_READY; 1908 next->flags &= ~CF_READY;
1816 --coro_nready; 1909 --coro_nready;
… …
1823 { 1916 {
1824 /* nothing to schedule: call the idle handler */ 1917 /* nothing to schedule: call the idle handler */
1825 if (SvROK (sv_idle) 1918 if (SvROK (sv_idle)
1826 && SvOBJECT (SvRV (sv_idle))) 1919 && SvOBJECT (SvRV (sv_idle)))
1827 { 1920 {
1921 if (SvRV (sv_idle) == SvRV (coro_current))
1922 {
1923 require_pv ("Carp");
1924
1925 {
1926 dSP;
1927
1928 ENTER;
1929 SAVETMPS;
1930
1931 PUSHMARK (SP);
1932 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1933 PUTBACK;
1934 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1935
1936 FREETMPS;
1937 LEAVE;
1938 }
1939 }
1940
1828 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1941 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1829 api_ready (aTHX_ SvRV (sv_idle)); 1942 api_ready (aTHX_ SvRV (sv_idle));
1830 --coro_nready; 1943 --coro_nready;
1831 } 1944 }
1832 else 1945 else
… …
1846 } 1959 }
1847 } 1960 }
1848 } 1961 }
1849} 1962}
1850 1963
1851INLINE void 1964ecb_inline void
1852prepare_cede (pTHX_ struct coro_transfer_args *ta) 1965prepare_cede (pTHX_ struct coro_transfer_args *ta)
1853{ 1966{
1854 api_ready (aTHX_ coro_current); 1967 api_ready (aTHX_ coro_current);
1855 prepare_schedule (aTHX_ ta); 1968 prepare_schedule (aTHX_ ta);
1856} 1969}
1857 1970
1858INLINE void 1971ecb_inline void
1859prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1972prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1860{ 1973{
1861 SV *prev = SvRV (coro_current); 1974 SV *prev = SvRV (coro_current);
1862 1975
1863 if (coro_nready) 1976 if (coro_nready)
… …
1893{ 2006{
1894 struct coro_transfer_args ta; 2007 struct coro_transfer_args ta;
1895 2008
1896 prepare_cede (aTHX_ &ta); 2009 prepare_cede (aTHX_ &ta);
1897 2010
1898 if (expect_true (ta.prev != ta.next)) 2011 if (ecb_expect_true (ta.prev != ta.next))
1899 { 2012 {
1900 TRANSFER (ta, 1); 2013 TRANSFER (ta, 1);
1901 return 1; 2014 return 1;
1902 } 2015 }
1903 else 2016 else
… …
1946 coro->slot->runops = RUNOPS_DEFAULT; 2059 coro->slot->runops = RUNOPS_DEFAULT;
1947 } 2060 }
1948} 2061}
1949 2062
1950static void 2063static void
2064coro_push_av (pTHX_ AV *av, I32 gimme_v)
2065{
2066 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2067 {
2068 dSP;
2069
2070 if (gimme_v == G_SCALAR)
2071 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2072 else
2073 {
2074 int i;
2075 EXTEND (SP, AvFILLp (av) + 1);
2076
2077 for (i = 0; i <= AvFILLp (av); ++i)
2078 PUSHs (AvARRAY (av)[i]);
2079 }
2080
2081 PUTBACK;
2082 }
2083}
2084
2085static void
2086coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2087{
2088 if (!coro->on_destroy)
2089 coro->on_destroy = newAV ();
2090
2091 av_push (coro->on_destroy, cb);
2092}
2093
2094static void
2095slf_destroy_join (pTHX_ struct CoroSLF *frame)
2096{
2097 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2098}
2099
2100static int
2101slf_check_join (pTHX_ struct CoroSLF *frame)
2102{
2103 struct coro *coro = (struct coro *)frame->data;
2104
2105 if (!coro->status)
2106 return 1;
2107
2108 frame->destroy = 0;
2109
2110 coro_push_av (aTHX_ coro->status, GIMME_V);
2111
2112 SvREFCNT_dec ((SV *)coro->hv);
2113
2114 return 0;
2115}
2116
2117static void
2118slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2119{
2120 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2121
2122 if (items > 1)
2123 croak ("join called with too many arguments");
2124
2125 if (coro->status)
2126 frame->prepare = prepare_nop;
2127 else
2128 {
2129 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2130 frame->prepare = prepare_schedule;
2131 }
2132
2133 frame->check = slf_check_join;
2134 frame->destroy = slf_destroy_join;
2135 frame->data = (void *)coro;
2136 SvREFCNT_inc (coro->hv);
2137}
2138
2139static void
1951coro_call_on_destroy (pTHX_ struct coro *coro) 2140coro_call_on_destroy (pTHX_ struct coro *coro)
1952{ 2141{
1953 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2142 AV *od = coro->on_destroy;
1954 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1955 2143
1956 if (on_destroyp) 2144 if (!od)
1957 { 2145 return;
1958 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1959 2146
2147 coro->on_destroy = 0;
2148 sv_2mortal ((SV *)od);
2149
1960 while (AvFILLp (on_destroy) >= 0) 2150 while (AvFILLp (od) >= 0)
2151 {
2152 SV *cb = sv_2mortal (av_pop (od));
2153
2154 /* coro hv's (and only hv's at the moment) are supported as well */
2155 if (SvSTATEhv_p (aTHX_ cb))
2156 api_ready (aTHX_ cb);
2157 else
1961 { 2158 {
1962 dSP; /* don't disturb outer sp */ 2159 dSP; /* don't disturb outer sp */
1963 SV *cb = av_pop (on_destroy);
1964
1965 PUSHMARK (SP); 2160 PUSHMARK (SP);
1966 2161
1967 if (statusp) 2162 if (coro->status)
1968 { 2163 {
1969 int i; 2164 PUTBACK;
1970 AV *status = (AV *)SvRV (*statusp); 2165 coro_push_av (aTHX_ coro->status, G_ARRAY);
1971 EXTEND (SP, AvFILLp (status) + 1); 2166 SPAGAIN;
1972
1973 for (i = 0; i <= AvFILLp (status); ++i)
1974 PUSHs (AvARRAY (status)[i]);
1975 } 2167 }
1976 2168
1977 PUTBACK; 2169 PUTBACK;
1978 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2170 call_sv (cb, G_VOID | G_DISCARD);
1979 } 2171 }
1980 } 2172 }
1981} 2173}
1982 2174
1983static void 2175static void
1984slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2176coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1985{ 2177{
1986 int i; 2178 AV *av;
1987 HV *hv = (HV *)SvRV (coro_current); 2179
1988 AV *av = newAV (); 2180 if (coro->status)
2181 {
2182 av = coro->status;
2183 av_clear (av);
2184 }
2185 else
2186 av = coro->status = newAV ();
1989 2187
1990 /* items are actually not so common, so optimise for this case */ 2188 /* items are actually not so common, so optimise for this case */
1991 if (items) 2189 if (items)
1992 { 2190 {
2191 int i;
2192
1993 av_extend (av, items - 1); 2193 av_extend (av, items - 1);
1994 2194
1995 for (i = 0; i < items; ++i) 2195 for (i = 0; i < items; ++i)
1996 av_push (av, SvREFCNT_inc_NN (arg [i])); 2196 av_push (av, SvREFCNT_inc_NN (arg [i]));
1997 } 2197 }
2198}
1998 2199
1999 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2200static void
2000 2201slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2202{
2001 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2203 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2002 api_ready (aTHX_ sv_manager); 2204 api_ready (aTHX_ sv_manager);
2003 2205
2004 frame->prepare = prepare_schedule; 2206 frame->prepare = prepare_schedule;
2005 frame->check = slf_check_repeat; 2207 frame->check = slf_check_repeat;
2006 2208
2007 /* as a minor optimisation, we could unwind all stacks here */ 2209 /* as a minor optimisation, we could unwind all stacks here */
2008 /* but that puts extra pressure on pp_slf, and is not worth much */ 2210 /* but that puts extra pressure on pp_slf, and is not worth much */
2009 /*coro_unwind_stacks (aTHX);*/ 2211 /*coro_unwind_stacks (aTHX);*/
2212}
2213
2214static void
2215slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2216{
2217 HV *coro_hv = (HV *)SvRV (coro_current);
2218
2219 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2220 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2221}
2222
2223static void
2224slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2225{
2226 HV *coro_hv;
2227 struct coro *coro;
2228
2229 if (items <= 0)
2230 croak ("Coro::cancel called without coro object,");
2231
2232 coro = SvSTATE (arg [0]);
2233 coro_hv = coro->hv;
2234
2235 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2236
2237 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2238 {
2239 /* coro currently busy cancelling something, so just notify it */
2240 coro->slf_frame.data = (void *)coro;
2241
2242 frame->prepare = prepare_nop;
2243 frame->check = slf_check_nop;
2244 }
2245 else if (coro_hv == (HV *)SvRV (coro_current))
2246 {
2247 /* cancelling the current coro is allowed, and equals terminate */
2248 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2249 }
2250 else
2251 {
2252 struct coro *self = SvSTATE_current;
2253
2254 if (!self)
2255 croak ("Coro::cancel called outside of thread content,");
2256
2257 /* otherwise we cancel directly, purely for speed reasons
2258 * unfortunately, this requires some magic trickery, as
2259 * somebody else could cancel us, so we have to fight the cancellation.
2260 * this is ugly, and hopefully fully worth the extra speed.
2261 * besides, I can't get the slow-but-safe version working...
2262 */
2263 slf_frame.data = 0;
2264 self->flags |= CF_NOCANCEL;
2265 coro_state_destroy (aTHX_ coro);
2266 self->flags &= ~CF_NOCANCEL;
2267
2268 if (slf_frame.data)
2269 {
2270 /* while we were busy we have been cancelled, so terminate */
2271 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2272 }
2273 else
2274 {
2275 frame->prepare = prepare_nop;
2276 frame->check = slf_check_nop;
2277 }
2278 }
2279}
2280
2281static int
2282slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2283{
2284 frame->prepare = 0;
2285 coro_unwind_stacks (aTHX);
2286
2287 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2288
2289 return 1;
2290}
2291
2292static int
2293safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2294{
2295 if (coro->cctx)
2296 croak ("coro inside C callback, unable to cancel at this time, caught");
2297
2298 if (coro->flags & CF_NEW)
2299 {
2300 coro_set_status (aTHX_ coro, arg, items);
2301 coro_state_destroy (aTHX_ coro);
2302 }
2303 else
2304 {
2305 if (!coro->slf_frame.prepare)
2306 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2307
2308 slf_destroy (aTHX_ coro);
2309
2310 coro_set_status (aTHX_ coro, arg, items);
2311 coro->slf_frame.prepare = prepare_nop;
2312 coro->slf_frame.check = slf_check_safe_cancel;
2313
2314 api_ready (aTHX_ (SV *)coro->hv);
2315 }
2316
2317 return 1;
2010} 2318}
2011 2319
2012/*****************************************************************************/ 2320/*****************************************************************************/
2013/* async pool handler */ 2321/* async pool handler */
2014 2322
… …
2045slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2353slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2046{ 2354{
2047 HV *hv = (HV *)SvRV (coro_current); 2355 HV *hv = (HV *)SvRV (coro_current);
2048 struct coro *coro = SvSTATE_hv ((SV *)hv); 2356 struct coro *coro = SvSTATE_hv ((SV *)hv);
2049 2357
2050 if (expect_true (coro->saved_deffh)) 2358 if (ecb_expect_true (coro->saved_deffh))
2051 { 2359 {
2052 /* subsequent iteration */ 2360 /* subsequent iteration */
2053 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2361 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2054 coro->saved_deffh = 0; 2362 coro->saved_deffh = 0;
2055 2363
2056 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2364 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2057 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2365 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2058 { 2366 {
2059 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2367 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2060 coro->invoke_av = newAV (); 2368 return;
2061
2062 frame->prepare = prepare_nop;
2063 } 2369 }
2064 else 2370 else
2065 { 2371 {
2066 av_clear (GvAV (PL_defgv)); 2372 av_clear (GvAV (PL_defgv));
2067 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2373 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2117 2423
2118static int 2424static int
2119slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2425slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2120{ 2426{
2121 SV *data = (SV *)frame->data; 2427 SV *data = (SV *)frame->data;
2122 2428
2123 if (CORO_THROW) 2429 if (CORO_THROW)
2124 return 0; 2430 return 0;
2125 2431
2126 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2432 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2127 return 1; 2433 return 1;
… …
2163 cb = sv_2mortal (coro->rouse_cb); 2469 cb = sv_2mortal (coro->rouse_cb);
2164 coro->rouse_cb = 0; 2470 coro->rouse_cb = 0;
2165 } 2471 }
2166 2472
2167 if (!SvROK (cb) 2473 if (!SvROK (cb)
2168 || SvTYPE (SvRV (cb)) != SVt_PVCV 2474 || SvTYPE (SvRV (cb)) != SVt_PVCV
2169 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2475 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2170 croak ("Coro::rouse_wait called with illegal callback argument,"); 2476 croak ("Coro::rouse_wait called with illegal callback argument,");
2171 2477
2172 { 2478 {
2173 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2479 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2290static void 2596static void
2291slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2597slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2292{ 2598{
2293 frame->prepare = prepare_cede_notself; 2599 frame->prepare = prepare_cede_notself;
2294 frame->check = slf_check_nop; 2600 frame->check = slf_check_nop;
2601}
2602
2603/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2604static void
2605slf_destroy (pTHX_ struct coro *coro)
2606{
2607 struct CoroSLF frame = coro->slf_frame;
2608
2609 /*
2610 * The on_destroy below most likely is from an SLF call.
2611 * Since by definition the SLF call will not finish when we destroy
2612 * the coro, we will have to force-finish it here, otherwise
2613 * cleanup functions cannot call SLF functions.
2614 */
2615 coro->slf_frame.prepare = 0;
2616
2617 /* this callback is reserved for slf functions needing to do cleanup */
2618 if (frame.destroy && frame.prepare && !PL_dirty)
2619 frame.destroy (aTHX_ &frame);
2295} 2620}
2296 2621
2297/* 2622/*
2298 * these not obviously related functions are all rolled into one 2623 * these not obviously related functions are all rolled into one
2299 * function to increase chances that they all will call transfer with the same 2624 * function to increase chances that they all will call transfer with the same
… …
2306 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2631 I32 checkmark; /* mark SP to see how many elements check has pushed */
2307 2632
2308 /* set up the slf frame, unless it has already been set-up */ 2633 /* set up the slf frame, unless it has already been set-up */
2309 /* the latter happens when a new coro has been started */ 2634 /* the latter happens when a new coro has been started */
2310 /* or when a new cctx was attached to an existing coroutine */ 2635 /* or when a new cctx was attached to an existing coroutine */
2311 if (expect_true (!slf_frame.prepare)) 2636 if (ecb_expect_true (!slf_frame.prepare))
2312 { 2637 {
2313 /* first iteration */ 2638 /* first iteration */
2314 dSP; 2639 dSP;
2315 SV **arg = PL_stack_base + TOPMARK + 1; 2640 SV **arg = PL_stack_base + TOPMARK + 1;
2316 int items = SP - arg; /* args without function object */ 2641 int items = SP - arg; /* args without function object */
… …
2357 while (slf_frame.check (aTHX_ &slf_frame)); 2682 while (slf_frame.check (aTHX_ &slf_frame));
2358 2683
2359 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2684 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2360 2685
2361 /* exception handling */ 2686 /* exception handling */
2362 if (expect_false (CORO_THROW)) 2687 if (ecb_expect_false (CORO_THROW))
2363 { 2688 {
2364 SV *exception = sv_2mortal (CORO_THROW); 2689 SV *exception = sv_2mortal (CORO_THROW);
2365 2690
2366 CORO_THROW = 0; 2691 CORO_THROW = 0;
2367 sv_setsv (ERRSV, exception); 2692 sv_setsv (ERRSV, exception);
2368 croak (0); 2693 croak (0);
2369 } 2694 }
2370 2695
2371 /* return value handling - mostly like entersub */ 2696 /* return value handling - mostly like entersub */
2372 /* make sure we put something on the stack in scalar context */ 2697 /* make sure we put something on the stack in scalar context */
2373 if (GIMME_V == G_SCALAR) 2698 if (GIMME_V == G_SCALAR
2699 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2374 { 2700 {
2375 dSP; 2701 dSP;
2376 SV **bot = PL_stack_base + checkmark; 2702 SV **bot = PL_stack_base + checkmark;
2377 2703
2378 if (sp == bot) /* too few, push undef */ 2704 if (sp == bot) /* too few, push undef */
2379 bot [1] = &PL_sv_undef; 2705 bot [1] = &PL_sv_undef;
2380 else if (sp != bot + 1) /* too many, take last one */ 2706 else /* too many, take last one */
2381 bot [1] = *sp; 2707 bot [1] = *sp;
2382 2708
2383 SP = bot + 1; 2709 SP = bot + 1;
2384 2710
2385 PUTBACK; 2711 PUTBACK;
… …
2418 if (PL_op->op_flags & OPf_STACKED) 2744 if (PL_op->op_flags & OPf_STACKED)
2419 { 2745 {
2420 if (items > slf_arga) 2746 if (items > slf_arga)
2421 { 2747 {
2422 slf_arga = items; 2748 slf_arga = items;
2423 free (slf_argv); 2749 Safefree (slf_argv);
2424 slf_argv = malloc (slf_arga * sizeof (SV *)); 2750 New (0, slf_argv, slf_arga, SV *);
2425 } 2751 }
2426 2752
2427 slf_argc = items; 2753 slf_argc = items;
2428 2754
2429 for (i = 0; i < items; ++i) 2755 for (i = 0; i < items; ++i)
… …
2492{ 2818{
2493 PerlIOBuf base; 2819 PerlIOBuf base;
2494 NV next, every; 2820 NV next, every;
2495} PerlIOCede; 2821} PerlIOCede;
2496 2822
2497static IV 2823static IV ecb_cold
2498PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2824PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2499{ 2825{
2500 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2826 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2501 2827
2502 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2828 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2503 self->next = nvtime () + self->every; 2829 self->next = nvtime () + self->every;
2504 2830
2505 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2831 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2506} 2832}
2507 2833
2508static SV * 2834static SV * ecb_cold
2509PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2835PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2510{ 2836{
2511 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2837 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2512 2838
2513 return newSVnv (self->every); 2839 return newSVnv (self->every);
… …
2625 SvREFCNT_dec (cb); 2951 SvREFCNT_dec (cb);
2626 } 2952 }
2627} 2953}
2628 2954
2629static void 2955static void
2630coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2956coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2631{ 2957{
2632 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2958 /* call $sem->adjust (0) to possibly wake up some other waiters */
2633 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2959 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2634} 2960}
2635 2961
2636static int 2962static int
2637slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2963slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2638{ 2964{
2639 AV *av = (AV *)frame->data; 2965 AV *av = (AV *)frame->data;
2640 SV *count_sv = AvARRAY (av)[0]; 2966 SV *count_sv = AvARRAY (av)[0];
2967 SV *coro_hv = SvRV (coro_current);
2968
2969 frame->destroy = 0;
2641 2970
2642 /* if we are about to throw, don't actually acquire the lock, just throw */ 2971 /* if we are about to throw, don't actually acquire the lock, just throw */
2643 if (CORO_THROW) 2972 if (ecb_expect_false (CORO_THROW))
2973 {
2974 /* we still might be responsible for the semaphore, so wake up others */
2975 coro_semaphore_adjust (aTHX_ av, 0);
2976
2644 return 0; 2977 return 0;
2978 }
2645 else if (SvIVX (count_sv) > 0) 2979 else if (SvIVX (count_sv) > 0)
2646 { 2980 {
2647 SvSTATE_current->on_destroy = 0;
2648
2649 if (acquire) 2981 if (acquire)
2650 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2982 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2651 else 2983 else
2652 coro_semaphore_adjust (aTHX_ av, 0); 2984 coro_semaphore_adjust (aTHX_ av, 0);
2653 2985
… …
2657 { 2989 {
2658 int i; 2990 int i;
2659 /* if we were woken up but can't down, we look through the whole */ 2991 /* if we were woken up but can't down, we look through the whole */
2660 /* waiters list and only add us if we aren't in there already */ 2992 /* waiters list and only add us if we aren't in there already */
2661 /* this avoids some degenerate memory usage cases */ 2993 /* this avoids some degenerate memory usage cases */
2662 2994 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2663 for (i = 1; i <= AvFILLp (av); ++i)
2664 if (AvARRAY (av)[i] == SvRV (coro_current)) 2995 if (AvARRAY (av)[i] == coro_hv)
2665 return 1; 2996 return 1;
2666 2997
2667 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2998 av_push (av, SvREFCNT_inc (coro_hv));
2668 return 1; 2999 return 1;
2669 } 3000 }
2670} 3001}
2671 3002
2672static int 3003static int
… …
2695 { 3026 {
2696 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3027 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2697 3028
2698 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3029 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2699 frame->prepare = prepare_schedule; 3030 frame->prepare = prepare_schedule;
2700
2701 /* to avoid race conditions when a woken-up coro gets terminated */ 3031 /* to avoid race conditions when a woken-up coro gets terminated */
2702 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3032 /* we arrange for a temporary on_destroy that calls adjust (0) */
2703 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3033 frame->destroy = coro_semaphore_destroy;
2704 } 3034 }
2705} 3035}
2706 3036
2707static void 3037static void
2708slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3038slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2790 { 3120 {
2791 SV *cb_cv = s_get_cv_croak (arg [1]); 3121 SV *cb_cv = s_get_cv_croak (arg [1]);
2792 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3122 av_push (av, SvREFCNT_inc_NN (cb_cv));
2793 3123
2794 if (SvIVX (AvARRAY (av)[0])) 3124 if (SvIVX (AvARRAY (av)[0]))
2795 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3125 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2796 3126
2797 frame->prepare = prepare_nop; 3127 frame->prepare = prepare_nop;
2798 frame->check = slf_check_nop; 3128 frame->check = slf_check_nop;
2799 } 3129 }
2800 else if (SvIVX (AvARRAY (av)[0])) 3130 else if (SvIVX (AvARRAY (av)[0]))
… …
2877 /* it quickly returns */ 3207 /* it quickly returns */
2878 if (CORO_THROW) 3208 if (CORO_THROW)
2879 return 0; 3209 return 0;
2880 3210
2881 /* one element that is an RV? repeat! */ 3211 /* one element that is an RV? repeat! */
2882 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3212 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2883 return 1; 3213 return 1;
2884 3214
2885 /* restore status */ 3215 /* restore status */
2886 { 3216 {
2887 SV *data_sv = av_pop (state); 3217 SV *data_sv = av_pop (state);
… …
2926 dSP; 3256 dSP;
2927 3257
2928 static SV *prio_cv; 3258 static SV *prio_cv;
2929 static SV *prio_sv; 3259 static SV *prio_sv;
2930 3260
2931 if (expect_false (!prio_cv)) 3261 if (ecb_expect_false (!prio_cv))
2932 { 3262 {
2933 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3263 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2934 prio_sv = newSViv (0); 3264 prio_sv = newSViv (0);
2935 } 3265 }
2936 3266
… …
2962 /* now call the AIO function - we assume our request is uncancelable */ 3292 /* now call the AIO function - we assume our request is uncancelable */
2963 PUTBACK; 3293 PUTBACK;
2964 call_sv ((SV *)req, G_VOID | G_DISCARD); 3294 call_sv ((SV *)req, G_VOID | G_DISCARD);
2965 } 3295 }
2966 3296
2967 /* now that the requets is going, we loop toll we have a result */ 3297 /* now that the request is going, we loop till we have a result */
2968 frame->data = (void *)state; 3298 frame->data = (void *)state;
2969 frame->prepare = prepare_schedule; 3299 frame->prepare = prepare_schedule;
2970 frame->check = slf_check_aio_req; 3300 frame->check = slf_check_aio_req;
2971} 3301}
2972 3302
… …
3042 } 3372 }
3043 3373
3044 return coro_sv; 3374 return coro_sv;
3045} 3375}
3046 3376
3377#ifndef __cplusplus
3378ecb_cold XS(boot_Coro__State);
3379#endif
3380
3381#if CORO_JIT
3382
3383static void ecb_noinline ecb_cold
3384pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3385{
3386 dSP;
3387 AV *av = newAV ();
3388
3389 av_store (av, 3, newSVuv (d));
3390 av_store (av, 2, newSVuv (c));
3391 av_store (av, 1, newSVuv (b));
3392 av_store (av, 0, newSVuv (a));
3393
3394 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3395
3396 PUTBACK;
3397}
3398
3399static void ecb_noinline ecb_cold
3400jit_init (pTHX)
3401{
3402 dSP;
3403 SV *load, *save;
3404 char *map_base;
3405 char *load_ptr, *save_ptr;
3406 STRLEN load_len, save_len, map_len;
3407 int count;
3408
3409 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3410
3411 PUSHMARK (SP);
3412 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3413 #include "state.h"
3414 count = call_pv ("Coro::State::_jit", G_ARRAY);
3415 SPAGAIN;
3416
3417 save = POPs; save_ptr = SvPVbyte (save, save_len);
3418 load = POPs; load_ptr = SvPVbyte (load, load_len);
3419
3420 map_len = load_len + save_len + 16;
3421
3422 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3423
3424 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3425
3426 load_perl_slots = (load_save_perl_slots_type)map_base;
3427 memcpy (map_base, load_ptr, load_len);
3428
3429 map_base += (load_len + 15) & ~15;
3430
3431 save_perl_slots = (load_save_perl_slots_type)map_base;
3432 memcpy (map_base, save_ptr, save_len);
3433
3434 /* we are good citizens and try to make the page read-only, so the evil evil */
3435 /* hackers might have it a bit more difficult */
3436 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3437
3438 PUTBACK;
3439 eval_pv ("undef &Coro::State::_jit", 1);
3440}
3441
3442#endif
3443
3047MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3444MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3048 3445
3049PROTOTYPES: DISABLE 3446PROTOTYPES: DISABLE
3050 3447
3051BOOT: 3448BOOT:
3052{ 3449{
3450#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3451#include "state.h"
3053#ifdef USE_ITHREADS 3452#ifdef USE_ITHREADS
3054# if CORO_PTHREAD 3453# if CORO_PTHREAD
3055 coro_thx = PERL_GET_CONTEXT; 3454 coro_thx = PERL_GET_CONTEXT;
3056# endif 3455# endif
3057#endif 3456#endif
3058 BOOT_PAGESIZE; 3457 /* perl defines these to check for existance first, but why it doesn't */
3458 /* just create them one at init time is not clear to me, except for */
3459 /* programs trying to delete them, but... */
3460 /* anyway, we declare this as invalid and make sure they are initialised here */
3461 DEFSV;
3462 ERRSV;
3059 3463
3060 cctx_current = cctx_new_empty (); 3464 cctx_current = cctx_new_empty ();
3061 3465
3062 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3466 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3063 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3467 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3103 coroapi.prepare_nop = prepare_nop; 3507 coroapi.prepare_nop = prepare_nop;
3104 coroapi.prepare_schedule = prepare_schedule; 3508 coroapi.prepare_schedule = prepare_schedule;
3105 coroapi.prepare_cede = prepare_cede; 3509 coroapi.prepare_cede = prepare_cede;
3106 coroapi.prepare_cede_notself = prepare_cede_notself; 3510 coroapi.prepare_cede_notself = prepare_cede_notself;
3107 3511
3108 { 3512 time_init (aTHX);
3109 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3110
3111 if (!svp) croak ("Time::HiRes is required");
3112 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3113
3114 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3115
3116 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3117 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3118 }
3119 3513
3120 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3514 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3515#if CORO_JIT
3516 PUTBACK;
3517 jit_init (aTHX);
3518 SPAGAIN;
3519#endif
3121} 3520}
3122 3521
3123SV * 3522SV *
3124new (SV *klass, ...) 3523new (SV *klass, ...)
3125 ALIAS: 3524 ALIAS:
… …
3132void 3531void
3133transfer (...) 3532transfer (...)
3134 PROTOTYPE: $$ 3533 PROTOTYPE: $$
3135 CODE: 3534 CODE:
3136 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3535 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3137
3138bool
3139_destroy (SV *coro_sv)
3140 CODE:
3141 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3142 OUTPUT:
3143 RETVAL
3144
3145void
3146_exit (int code)
3147 PROTOTYPE: $
3148 CODE:
3149 _exit (code);
3150 3536
3151SV * 3537SV *
3152clone (Coro::State coro) 3538clone (Coro::State coro)
3153 CODE: 3539 CODE:
3154{ 3540{
… …
3209void 3595void
3210list () 3596list ()
3211 PROTOTYPE: 3597 PROTOTYPE:
3212 PPCODE: 3598 PPCODE:
3213{ 3599{
3214 struct coro *coro; 3600 struct coro *coro;
3215 for (coro = coro_first; coro; coro = coro->next) 3601 for (coro = coro_first; coro; coro = coro->next)
3216 if (coro->hv) 3602 if (coro->hv)
3217 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3603 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3218} 3604}
3219 3605
… …
3224 CODE: 3610 CODE:
3225{ 3611{
3226 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3612 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3227 { 3613 {
3228 struct coro *current = SvSTATE_current; 3614 struct coro *current = SvSTATE_current;
3615 struct CoroSLF slf_save;
3229 3616
3230 if (current != coro) 3617 if (current != coro)
3231 { 3618 {
3232 PUTBACK; 3619 PUTBACK;
3233 save_perl (aTHX_ current); 3620 save_perl (aTHX_ current);
3234 load_perl (aTHX_ coro); 3621 load_perl (aTHX_ coro);
3622 /* the coro is most likely in an active SLF call.
3623 * while not strictly required (the code we execute is
3624 * not allowed to call any SLF functions), it's cleaner
3625 * to reinitialise the slf_frame and restore it later.
3626 * This might one day allow us to actually do SLF calls
3627 * from code executed here.
3628 */
3629 slf_save = slf_frame;
3630 slf_frame.prepare = 0;
3235 SPAGAIN; 3631 SPAGAIN;
3236 } 3632 }
3237 3633
3238 PUSHSTACK; 3634 PUSHSTACK;
3239 3635
… …
3249 SPAGAIN; 3645 SPAGAIN;
3250 3646
3251 if (current != coro) 3647 if (current != coro)
3252 { 3648 {
3253 PUTBACK; 3649 PUTBACK;
3650 slf_frame = slf_save;
3254 save_perl (aTHX_ coro); 3651 save_perl (aTHX_ coro);
3255 load_perl (aTHX_ current); 3652 load_perl (aTHX_ current);
3256 SPAGAIN; 3653 SPAGAIN;
3257 } 3654 }
3258 } 3655 }
… …
3263 PROTOTYPE: $ 3660 PROTOTYPE: $
3264 ALIAS: 3661 ALIAS:
3265 is_ready = CF_READY 3662 is_ready = CF_READY
3266 is_running = CF_RUNNING 3663 is_running = CF_RUNNING
3267 is_new = CF_NEW 3664 is_new = CF_NEW
3268 is_destroyed = CF_DESTROYED 3665 is_destroyed = CF_ZOMBIE
3666 is_zombie = CF_ZOMBIE
3269 is_suspended = CF_SUSPENDED 3667 is_suspended = CF_SUSPENDED
3270 CODE: 3668 CODE:
3271 RETVAL = boolSV (coro->flags & ix); 3669 RETVAL = boolSV (coro->flags & ix);
3272 OUTPUT: 3670 OUTPUT:
3273 RETVAL 3671 RETVAL
3274 3672
3275void 3673void
3276throw (Coro::State self, SV *throw = &PL_sv_undef) 3674throw (SV *self, SV *exception = &PL_sv_undef)
3277 PROTOTYPE: $;$ 3675 PROTOTYPE: $;$
3278 CODE: 3676 CODE:
3279{ 3677{
3678 struct coro *coro = SvSTATE (self);
3280 struct coro *current = SvSTATE_current; 3679 struct coro *current = SvSTATE_current;
3281 SV **throwp = self == current ? &CORO_THROW : &self->except; 3680 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3282 SvREFCNT_dec (*throwp); 3681 SvREFCNT_dec (*exceptionp);
3283 SvGETMAGIC (throw); 3682 SvGETMAGIC (exception);
3284 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3683 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3684
3685 api_ready (aTHX_ self);
3285} 3686}
3286 3687
3287void 3688void
3288api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3689api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3289 PROTOTYPE: $;$ 3690 PROTOTYPE: $;$
… …
3344 3745
3345void 3746void
3346cancel (Coro::State self) 3747cancel (Coro::State self)
3347 CODE: 3748 CODE:
3348 coro_state_destroy (aTHX_ self); 3749 coro_state_destroy (aTHX_ self);
3349 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3350
3351 3750
3352SV * 3751SV *
3353enable_times (int enabled = enable_times) 3752enable_times (int enabled = enable_times)
3354 CODE: 3753 CODE:
3355{ 3754{
… …
3368 3767
3369void 3768void
3370times (Coro::State self) 3769times (Coro::State self)
3371 PPCODE: 3770 PPCODE:
3372{ 3771{
3373 struct coro *current = SvSTATE (coro_current); 3772 struct coro *current = SvSTATE (coro_current);
3374 3773
3375 if (expect_false (current == self)) 3774 if (ecb_expect_false (current == self))
3376 { 3775 {
3377 coro_times_update (); 3776 coro_times_update ();
3378 coro_times_add (SvSTATE (coro_current)); 3777 coro_times_add (SvSTATE (coro_current));
3379 } 3778 }
3380 3779
3381 EXTEND (SP, 2); 3780 EXTEND (SP, 2);
3382 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3781 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3383 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3782 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3384 3783
3385 if (expect_false (current == self)) 3784 if (ecb_expect_false (current == self))
3386 coro_times_sub (SvSTATE (coro_current)); 3785 coro_times_sub (SvSTATE (coro_current));
3387} 3786}
3388 3787
3389void 3788void
3390swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3789swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3411BOOT: 3810BOOT:
3412{ 3811{
3413 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3812 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3414 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3813 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3415 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3814 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3416 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3417 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3815 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3418 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3816 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3419 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3817 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3420 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3818 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3421 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3819 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3422 3820
3423 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3821 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3424 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3822 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3425 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3823 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3426 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3824 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3427 3825
3428 coro_stash = gv_stashpv ("Coro", TRUE); 3826 coro_stash = gv_stashpv ("Coro", TRUE);
3429 3827
3430 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3828 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3431 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3829 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3432 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3830 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3460 api_ready (aTHX_ RETVAL); 3858 api_ready (aTHX_ RETVAL);
3461 OUTPUT: 3859 OUTPUT:
3462 RETVAL 3860 RETVAL
3463 3861
3464void 3862void
3863_destroy (Coro::State coro)
3864 CODE:
3865 /* used by the manager thread */
3866 coro_state_destroy (aTHX_ coro);
3867
3868void
3869on_destroy (Coro::State coro, SV *cb)
3870 CODE:
3871 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3872
3873void
3874join (...)
3875 CODE:
3876 CORO_EXECUTE_SLF_XS (slf_init_join);
3877
3878void
3465terminate (...) 3879terminate (...)
3466 CODE: 3880 CODE:
3467 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3881 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3882
3883void
3884cancel (...)
3885 CODE:
3886 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3887
3888int
3889safe_cancel (Coro::State self, ...)
3890 C_ARGS: aTHX_ self, &ST (1), items - 1
3468 3891
3469void 3892void
3470schedule (...) 3893schedule (...)
3471 CODE: 3894 CODE:
3472 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3895 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3629 on_leave = 1 4052 on_leave = 1
3630 PROTOTYPE: & 4053 PROTOTYPE: &
3631 CODE: 4054 CODE:
3632{ 4055{
3633 struct coro *coro = SvSTATE_current; 4056 struct coro *coro = SvSTATE_current;
3634 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4057 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3635 4058
3636 block = s_get_cv_croak (block); 4059 block = s_get_cv_croak (block);
3637 4060
3638 if (!*avp) 4061 if (!*avp)
3639 *avp = newAV (); 4062 *avp = newAV ();
… …
3659 4082
3660SV * 4083SV *
3661new (SV *klass, SV *count = 0) 4084new (SV *klass, SV *count = 0)
3662 CODE: 4085 CODE:
3663{ 4086{
3664 int semcnt = 1; 4087 int semcnt = 1;
3665 4088
3666 if (count) 4089 if (count)
3667 { 4090 {
3668 SvGETMAGIC (count); 4091 SvGETMAGIC (count);
3669 4092
… …
3729 XSRETURN_NO; 4152 XSRETURN_NO;
3730} 4153}
3731 4154
3732void 4155void
3733waiters (SV *self) 4156waiters (SV *self)
3734 PPCODE: 4157 PPCODE:
3735{ 4158{
3736 AV *av = (AV *)SvRV (self); 4159 AV *av = (AV *)SvRV (self);
3737 int wcount = AvFILLp (av) + 1 - 1; 4160 int wcount = AvFILLp (av) + 1 - 1;
3738 4161
3739 if (GIMME_V == G_SCALAR) 4162 if (GIMME_V == G_SCALAR)
… …
3748} 4171}
3749 4172
3750MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4173MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3751 4174
3752void 4175void
3753_may_delete (SV *sem, int count, int extra_refs) 4176_may_delete (SV *sem, int count, unsigned int extra_refs)
3754 PPCODE: 4177 PPCODE:
3755{ 4178{
3756 AV *av = (AV *)SvRV (sem); 4179 AV *av = (AV *)SvRV (sem);
3757 4180
3758 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4181 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3759 && AvFILLp (av) == 0 /* no waiters, just count */ 4182 && AvFILLp (av) == 0 /* no waiters, just count */
3760 && SvIV (AvARRAY (av)[0]) == count) 4183 && SvIV (AvARRAY (av)[0]) == count)
3761 XSRETURN_YES; 4184 XSRETURN_YES;
… …
3782 4205
3783void 4206void
3784broadcast (SV *self) 4207broadcast (SV *self)
3785 CODE: 4208 CODE:
3786{ 4209{
3787 AV *av = (AV *)SvRV (self); 4210 AV *av = (AV *)SvRV (self);
3788 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4211 coro_signal_wake (aTHX_ av, AvFILLp (av));
3789} 4212}
3790 4213
3791void 4214void
3792send (SV *self) 4215send (SV *self)
… …
3800 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4223 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3801} 4224}
3802 4225
3803IV 4226IV
3804awaited (SV *self) 4227awaited (SV *self)
3805 CODE: 4228 CODE:
3806 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4229 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3807 OUTPUT: 4230 OUTPUT:
3808 RETVAL 4231 RETVAL
3809 4232
3810 4233
… …
3815 4238
3816void 4239void
3817_schedule (...) 4240_schedule (...)
3818 CODE: 4241 CODE:
3819{ 4242{
3820 static int incede; 4243 static int incede;
3821 4244
3822 api_cede_notself (aTHX); 4245 api_cede_notself (aTHX);
3823 4246
3824 ++incede; 4247 ++incede;
3825 while (coro_nready >= incede && api_cede (aTHX)) 4248 while (coro_nready >= incede && api_cede (aTHX))
… …
3869 { 4292 {
3870 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4293 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3871 coro_old_pp_sselect = 0; 4294 coro_old_pp_sselect = 0;
3872 } 4295 }
3873 4296
4297MODULE = Coro::State PACKAGE = Coro::Util
3874 4298
4299void
4300_exit (int code)
4301 CODE:
4302 _exit (code);
4303
4304NV
4305time ()
4306 CODE:
4307 RETVAL = nvtime (aTHX);
4308 OUTPUT:
4309 RETVAL
4310
4311NV
4312gettimeofday ()
4313 PPCODE:
4314{
4315 UV tv [2];
4316 u2time (aTHX_ tv);
4317 EXTEND (SP, 2);
4318 PUSHs (sv_2mortal (newSVuv (tv [0])));
4319 PUSHs (sv_2mortal (newSVuv (tv [1])));
4320}
4321

Diff Legend

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