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.377 by root, Sat Oct 3 17:55:04 2009 UTC vs.
Revision 1.434 by root, Sat Nov 2 19:48:50 2013 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#include "ecb.h"
20
21#include <stddef.h>
15#include <stdio.h> 22#include <stdio.h>
16#include <errno.h> 23#include <errno.h>
17#include <assert.h> 24#include <assert.h>
18 25
19#ifndef SVs_PADSTALE 26#ifndef SVs_PADSTALE
20# define SVs_PADSTALE 0 27# define SVs_PADSTALE 0
21#endif 28#endif
22 29
23#ifdef WIN32 30#ifdef PadARRAY
31# define NEWPADAPI 1
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else
34typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST;
37typedef AV PAD;
38# endif
39# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
40# define PadlistMAX(pl) AvFILLp (pl)
41# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY
43# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45#endif
46
47#if defined(_WIN32)
48# undef HAS_GETTIMEOFDAY
24# undef setjmp 49# undef setjmp
25# undef longjmp 50# undef longjmp
26# undef _exit 51# undef _exit
27# define setjmp _setjmp /* deep magic */ 52# define setjmp _setjmp /* deep magic */
28#else 53#else
29# include <inttypes.h> /* most portable stdint.h */ 54# include <inttypes.h> /* most portable stdint.h */
30#endif 55#endif
31 56
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 */ 57/* the maximum number of idle cctx that will be pooled */
60static int cctx_max_idle = 4; 58static int cctx_max_idle = 4;
61 59
62#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 60#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
63# undef CORO_STACKGUARD 61# define HAS_SCOPESTACK_NAME 1
64#endif
65
66#ifndef CORO_STACKGUARD
67# define CORO_STACKGUARD 0
68#endif 62#endif
69 63
70/* prefer perl internal functions over our own? */ 64/* prefer perl internal functions over our own? */
71#ifndef CORO_PREFER_PERL_FUNCTIONS 65#ifndef CORO_PREFER_PERL_FUNCTIONS
72# define CORO_PREFER_PERL_FUNCTIONS 0 66# define CORO_PREFER_PERL_FUNCTIONS 0
… …
82# define STACKLEVEL ((void *)&stacklevel) 76# define STACKLEVEL ((void *)&stacklevel)
83#endif 77#endif
84 78
85#define IN_DESTRUCT PL_dirty 79#define IN_DESTRUCT PL_dirty
86 80
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" 81#include "CoroAPI.h"
103#define GCoroAPI (&coroapi) /* very sneaky */ 82#define GCoroAPI (&coroapi) /* very sneaky */
104 83
105#ifdef USE_ITHREADS 84#ifdef USE_ITHREADS
106# if CORO_PTHREAD 85# if CORO_PTHREAD
… …
122static void (*u2time)(pTHX_ UV ret[2]); 101static void (*u2time)(pTHX_ UV ret[2]);
123 102
124/* we hijack an hopefully unused CV flag for our purposes */ 103/* we hijack an hopefully unused CV flag for our purposes */
125#define CVf_SLF 0x4000 104#define CVf_SLF 0x4000
126static OP *pp_slf (pTHX); 105static OP *pp_slf (pTHX);
106static void slf_destroy (pTHX_ struct coro *coro);
127 107
128static U32 cctx_gen; 108static U32 cctx_gen;
129static size_t cctx_stacksize = CORO_STACKSIZE; 109static size_t cctx_stacksize = CORO_STACKSIZE;
130static struct CoroAPI coroapi; 110static struct CoroAPI coroapi;
131static AV *main_mainstack; /* used to differentiate between $main and others */ 111static AV *main_mainstack; /* used to differentiate between $main and others */
… …
161static char times_valid; 141static char times_valid;
162 142
163static struct coro_cctx *cctx_first; 143static struct coro_cctx *cctx_first;
164static int cctx_count, cctx_idle; 144static int cctx_count, cctx_idle;
165 145
166enum { 146enum
147{
167 CC_MAPPED = 0x01, 148 CC_MAPPED = 0x01,
168 CC_NOREUSE = 0x02, /* throw this away after tracing */ 149 CC_NOREUSE = 0x02, /* throw this away after tracing */
169 CC_TRACE = 0x04, 150 CC_TRACE = 0x04,
170 CC_TRACE_SUB = 0x08, /* trace sub calls */ 151 CC_TRACE_SUB = 0x08, /* trace sub calls */
171 CC_TRACE_LINE = 0x10, /* trace each statement */ 152 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
176typedef struct coro_cctx 157typedef struct coro_cctx
177{ 158{
178 struct coro_cctx *next; 159 struct coro_cctx *next;
179 160
180 /* the stack */ 161 /* the stack */
181 void *sptr; 162 struct coro_stack stack;
182 size_t ssize;
183 163
184 /* cpu state */ 164 /* cpu state */
185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 165 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
166#ifndef NDEBUG
186 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 167 JMPENV *idle_te; /* same as idle_sp, but for top_env */
168#endif
187 JMPENV *top_env; 169 JMPENV *top_env;
188 coro_context cctx; 170 coro_context cctx;
189 171
190 U32 gen; 172 U32 gen;
191#if CORO_USE_VALGRIND 173#if CORO_USE_VALGRIND
192 int valgrind_id; 174 int valgrind_id;
193#endif 175#endif
194 unsigned char flags; 176 unsigned char flags;
195} coro_cctx; 177} coro_cctx;
196 178
197coro_cctx *cctx_current; /* the currently running cctx */ 179static coro_cctx *cctx_current; /* the currently running cctx */
198 180
199/*****************************************************************************/ 181/*****************************************************************************/
200 182
183static MGVTBL coro_state_vtbl;
184
201enum { 185enum
186{
202 CF_RUNNING = 0x0001, /* coroutine is running */ 187 CF_RUNNING = 0x0001, /* coroutine is running */
203 CF_READY = 0x0002, /* coroutine is ready */ 188 CF_READY = 0x0002, /* coroutine is ready */
204 CF_NEW = 0x0004, /* has never been switched to */ 189 CF_NEW = 0x0004, /* has never been switched to */
205 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 190 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
206 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 191 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
192 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
207}; 193};
208 194
209/* the structure where most of the perl state is stored, overlaid on the cxstack */ 195/* the structure where most of the perl state is stored, overlaid on the cxstack */
210typedef struct 196typedef struct
211{ 197{
212 SV *defsv;
213 AV *defav;
214 SV *errsv;
215 SV *irsgv;
216 HV *hinthv;
217#define VAR(name,type) type name; 198 #define VARx(name,expr,type) type name;
218# include "state.h" 199 #include "state.h"
219#undef VAR
220} perl_slots; 200} perl_slots;
221 201
202/* 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)) 203#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
223 204
224/* this is a structure representing a perl-level coroutine */ 205/* this is a structure representing a perl-level coroutine */
225struct coro { 206struct coro
207{
226 /* the C coroutine allocated to this perl coroutine, if any */ 208 /* the C coroutine allocated to this perl coroutine, if any */
227 coro_cctx *cctx; 209 coro_cctx *cctx;
228 210
229 /* ready queue */ 211 /* ready queue */
230 struct coro *next_ready; 212 struct coro *next_ready;
… …
232 /* state data */ 214 /* state data */
233 struct CoroSLF slf_frame; /* saved slf frame */ 215 struct CoroSLF slf_frame; /* saved slf frame */
234 AV *mainstack; 216 AV *mainstack;
235 perl_slots *slot; /* basically the saved sp */ 217 perl_slots *slot; /* basically the saved sp */
236 218
237 CV *startcv; /* the CV to execute */ 219 CV *startcv; /* the CV to execute */
238 AV *args; /* data associated with this coroutine (initial args) */ 220 AV *args; /* data associated with this coroutine (initial args) */
239 int refcnt; /* coroutines are refcounted, yes */
240 int flags; /* CF_ flags */ 221 int flags; /* CF_ flags */
241 HV *hv; /* the perl hash associated with this coro, if any */ 222 HV *hv; /* the perl hash associated with this coro, if any */
242 void (*on_destroy)(pTHX_ struct coro *coro);
243 223
244 /* statistics */ 224 /* statistics */
245 int usecount; /* number of transfers to this coro */ 225 int usecount; /* number of transfers to this coro */
246 226
247 /* coro process data */ 227 /* coro process data */
248 int prio; 228 int prio;
249 SV *except; /* exception to be thrown */ 229 SV *except; /* exception to be thrown */
250 SV *rouse_cb; 230 SV *rouse_cb; /* last rouse callback */
231 AV *on_destroy; /* callbacks or coros to notify on destroy */
232 AV *status; /* the exit status list */
251 233
252 /* async_pool */ 234 /* async_pool */
253 SV *saved_deffh; 235 SV *saved_deffh;
254 SV *invoke_cb; 236 SV *invoke_cb;
255 AV *invoke_av; 237 AV *invoke_av;
… …
271typedef struct coro *Coro__State; 253typedef struct coro *Coro__State;
272typedef struct coro *Coro__State_or_hashref; 254typedef struct coro *Coro__State_or_hashref;
273 255
274/* the following variables are effectively part of the perl context */ 256/* the following variables are effectively part of the perl context */
275/* and get copied between struct coro and these variables */ 257/* and get copied between struct coro and these variables */
276/* the mainr easonw e don't support windows process emulation */ 258/* the main reason we don't support windows process emulation */
277static struct CoroSLF slf_frame; /* the current slf frame */ 259static struct CoroSLF slf_frame; /* the current slf frame */
278 260
279/** Coro ********************************************************************/ 261/** Coro ********************************************************************/
280 262
281#define CORO_PRIO_MAX 3 263#define CORO_PRIO_MAX 3
… …
287 269
288/* for Coro.pm */ 270/* for Coro.pm */
289static SV *coro_current; 271static SV *coro_current;
290static SV *coro_readyhook; 272static SV *coro_readyhook;
291static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 273static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
292static CV *cv_coro_run, *cv_coro_terminate; 274static CV *cv_coro_run;
293static struct coro *coro_first; 275static struct coro *coro_first;
294#define coro_nready coroapi.nready 276#define coro_nready coroapi.nready
277
278/** JIT *********************************************************************/
279
280#if CORO_JIT
281 /* APPLE doesn't have mmap though */
282 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
283 #ifndef CORO_JIT_TYPE
284 #if ECB_AMD64 && CORO_JIT_UNIXY
285 #define CORO_JIT_TYPE "amd64-unix"
286 #elif __i386 && CORO_JIT_UNIXY
287 #define CORO_JIT_TYPE "x86-unix"
288 #endif
289 #endif
290#endif
291
292#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
293 #undef CORO_JIT
294#endif
295
296#if CORO_JIT
297 typedef void (*load_save_perl_slots_type)(perl_slots *);
298 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
299#endif
295 300
296/** Coro::Select ************************************************************/ 301/** Coro::Select ************************************************************/
297 302
298static OP *(*coro_old_pp_sselect) (pTHX); 303static OP *(*coro_old_pp_sselect) (pTHX);
299static SV *coro_select_select; 304static SV *coro_select_select;
… …
311 PL_op->op_flags |= OPf_STACKED; 316 PL_op->op_flags |= OPf_STACKED;
312 PL_op->op_private = 0; 317 PL_op->op_private = 0;
313 return PL_ppaddr [OP_ENTERSUB](aTHX); 318 return PL_ppaddr [OP_ENTERSUB](aTHX);
314} 319}
315 320
321/** time stuff **************************************************************/
322
323#ifdef HAS_GETTIMEOFDAY
324
325ecb_inline void
326coro_u2time (pTHX_ UV ret[2])
327{
328 struct timeval tv;
329 gettimeofday (&tv, 0);
330
331 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec;
333}
334
335ecb_inline double
336coro_nvtime (void)
337{
338 struct timeval tv;
339 gettimeofday (&tv, 0);
340
341 return tv.tv_sec + tv.tv_usec * 1e-6;
342}
343
344ecb_inline void
345time_init (pTHX)
346{
347 nvtime = coro_nvtime;
348 u2time = coro_u2time;
349}
350
351#else
352
353ecb_inline void
354time_init (pTHX)
355{
356 SV **svp;
357
358 require_pv ("Time/HiRes.pm");
359
360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
361
362 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
364
365 nvtime = INT2PTR (double (*)(), SvIV (*svp));
366
367 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
368 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
369}
370
371#endif
372
316/** lowlevel stuff **********************************************************/ 373/** lowlevel stuff **********************************************************/
317 374
318static SV * 375static SV * ecb_noinline
319coro_get_sv (pTHX_ const char *name, int create) 376coro_get_sv (pTHX_ const char *name, int create)
320{ 377{
321#if PERL_VERSION_ATLEAST (5,10,0) 378#if PERL_VERSION_ATLEAST (5,10,0)
322 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 379 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
323 get_sv (name, create); 380 get_sv (name, create);
324#endif 381#endif
325 return get_sv (name, create); 382 return get_sv (name, create);
326} 383}
327 384
328static AV * 385static AV * ecb_noinline
329coro_get_av (pTHX_ const char *name, int create) 386coro_get_av (pTHX_ const char *name, int create)
330{ 387{
331#if PERL_VERSION_ATLEAST (5,10,0) 388#if PERL_VERSION_ATLEAST (5,10,0)
332 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 389 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
333 get_av (name, create); 390 get_av (name, create);
334#endif 391#endif
335 return get_av (name, create); 392 return get_av (name, create);
336} 393}
337 394
338static HV * 395static HV * ecb_noinline
339coro_get_hv (pTHX_ const char *name, int create) 396coro_get_hv (pTHX_ const char *name, int create)
340{ 397{
341#if PERL_VERSION_ATLEAST (5,10,0) 398#if PERL_VERSION_ATLEAST (5,10,0)
342 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 399 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
343 get_hv (name, create); 400 get_hv (name, create);
344#endif 401#endif
345 return get_hv (name, create); 402 return get_hv (name, create);
346} 403}
347 404
348INLINE void 405ecb_inline void
349coro_times_update () 406coro_times_update (void)
350{ 407{
351#ifdef coro_clock_gettime 408#ifdef coro_clock_gettime
352 struct timespec ts; 409 struct timespec ts;
353 410
354 ts.tv_sec = ts.tv_nsec = 0; 411 ts.tv_sec = ts.tv_nsec = 0;
… …
366 time_real [0] = tv [0]; 423 time_real [0] = tv [0];
367 time_real [1] = tv [1] * 1000; 424 time_real [1] = tv [1] * 1000;
368#endif 425#endif
369} 426}
370 427
371INLINE void 428ecb_inline void
372coro_times_add (struct coro *c) 429coro_times_add (struct coro *c)
373{ 430{
374 c->t_real [1] += time_real [1]; 431 c->t_real [1] += time_real [1];
375 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 432 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
376 c->t_real [0] += time_real [0]; 433 c->t_real [0] += time_real [0];
… …
378 c->t_cpu [1] += time_cpu [1]; 435 c->t_cpu [1] += time_cpu [1];
379 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 436 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
380 c->t_cpu [0] += time_cpu [0]; 437 c->t_cpu [0] += time_cpu [0];
381} 438}
382 439
383INLINE void 440ecb_inline void
384coro_times_sub (struct coro *c) 441coro_times_sub (struct coro *c)
385{ 442{
386 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 443 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
387 c->t_real [1] -= time_real [1]; 444 c->t_real [1] -= time_real [1];
388 c->t_real [0] -= time_real [0]; 445 c->t_real [0] -= time_real [0];
… …
396/* magic glue */ 453/* magic glue */
397 454
398#define CORO_MAGIC_type_cv 26 455#define CORO_MAGIC_type_cv 26
399#define CORO_MAGIC_type_state PERL_MAGIC_ext 456#define CORO_MAGIC_type_state PERL_MAGIC_ext
400 457
401#define CORO_MAGIC_NN(sv, type) \ 458#define CORO_MAGIC_NN(sv, type) \
402 (expect_true (SvMAGIC (sv)->mg_type == type) \ 459 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
403 ? SvMAGIC (sv) \ 460 ? SvMAGIC (sv) \
404 : mg_find (sv, type)) 461 : mg_find (sv, type))
405 462
406#define CORO_MAGIC(sv, type) \ 463#define CORO_MAGIC(sv, type) \
407 (expect_true (SvMAGIC (sv)) \ 464 (ecb_expect_true (SvMAGIC (sv)) \
408 ? CORO_MAGIC_NN (sv, type) \ 465 ? CORO_MAGIC_NN (sv, type) \
409 : 0) 466 : 0)
410 467
411#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 468#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
412#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 469#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
413 470
414INLINE struct coro * 471ecb_inline MAGIC *
472SvSTATEhv_p (pTHX_ SV *coro)
473{
474 MAGIC *mg;
475
476 if (ecb_expect_true (
477 SvTYPE (coro) == SVt_PVHV
478 && (mg = CORO_MAGIC_state (coro))
479 && mg->mg_virtual == &coro_state_vtbl
480 ))
481 return mg;
482
483 return 0;
484}
485
486ecb_inline struct coro *
415SvSTATE_ (pTHX_ SV *coro) 487SvSTATE_ (pTHX_ SV *coro)
416{ 488{
417 HV *stash;
418 MAGIC *mg; 489 MAGIC *mg;
419 490
420 if (SvROK (coro)) 491 if (SvROK (coro))
421 coro = SvRV (coro); 492 coro = SvRV (coro);
422 493
423 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 494 mg = SvSTATEhv_p (aTHX_ coro);
495 if (!mg)
424 croak ("Coro::State object required"); 496 croak ("Coro::State object required");
425 497
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; 498 return (struct coro *)mg->mg_ptr;
436} 499}
437 500
438#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 501#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
439 502
… …
442#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 505#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
443 506
444/*****************************************************************************/ 507/*****************************************************************************/
445/* padlist management and caching */ 508/* padlist management and caching */
446 509
447static AV * 510ecb_inline PADLIST *
448coro_derive_padlist (pTHX_ CV *cv) 511coro_derive_padlist (pTHX_ CV *cv)
449{ 512{
450 AV *padlist = CvPADLIST (cv); 513 PADLIST *padlist = CvPADLIST (cv);
451 AV *newpadlist, *newpad; 514 PADLIST *newpadlist;
515 PAD *newpad;
516 PADOFFSET off = PadlistMAX (padlist) + 1;
452 517
453 newpadlist = newAV (); 518#if NEWPADAPI
519
520 while (!PadlistARRAY (padlist)[off - 1])
521 --off;
522
523 Perl_pad_push (aTHX_ padlist, off);
524 newpad = PadlistARRAY (padlist)[off];
525 PadlistARRAY (padlist)[off] = 0;
526
527#else
528
529#if PERL_VERSION_ATLEAST (5,10,0)
530 Perl_pad_push (aTHX_ padlist, off);
531#else
532 Perl_pad_push (aTHX_ padlist, off, 1);
533#endif
534
535 newpad = PadlistARRAY (padlist)[off];
536 PadlistMAX (padlist) = off - 1;
537
538#endif
539
540 newPADLIST (newpadlist);
541#if !PERL_VERSION_ATLEAST(5,15,3)
542 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
454 AvREAL_off (newpadlist); 543 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 544#endif
460 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
461 --AvFILLp (padlist);
462 545
463 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 546 /* Already extended to 2 elements by newPADLIST. */
464 av_store (newpadlist, 1, (SV *)newpad); 547 PadlistMAX (newpadlist) = 1;
548 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
549 PadlistARRAY (newpadlist)[1] = newpad;
465 550
466 return newpadlist; 551 return newpadlist;
467} 552}
468 553
469static void 554ecb_inline void
470free_padlist (pTHX_ AV *padlist) 555free_padlist (pTHX_ PADLIST *padlist)
471{ 556{
472 /* may be during global destruction */ 557 /* may be during global destruction */
473 if (!IN_DESTRUCT) 558 if (!IN_DESTRUCT)
474 { 559 {
475 I32 i = AvFILLp (padlist); 560 I32 i = PadlistMAX (padlist);
476 561
477 while (i > 0) /* special-case index 0 */ 562 while (i > 0) /* special-case index 0 */
478 { 563 {
479 /* we try to be extra-careful here */ 564 /* we try to be extra-careful here */
480 AV *av = (AV *)AvARRAY (padlist)[i--]; 565 PAD *pad = PadlistARRAY (padlist)[i--];
481 I32 j = AvFILLp (av); 566 I32 j = PadMAX (pad);
482 567
483 while (j >= 0) 568 while (j >= 0)
484 SvREFCNT_dec (AvARRAY (av)[j--]); 569 SvREFCNT_dec (PadARRAY (pad)[j--]);
485 570
486 AvFILLp (av) = -1; 571 PadMAX (pad) = -1;
487 SvREFCNT_dec (av); 572 SvREFCNT_dec (pad);
488 } 573 }
489 574
490 SvREFCNT_dec (AvARRAY (padlist)[0]); 575 SvREFCNT_dec (PadlistNAMES (padlist));
491 576
577#if NEWPADAPI
578 Safefree (PadlistARRAY (padlist));
579 Safefree (padlist);
580#else
492 AvFILLp (padlist) = -1; 581 AvFILLp (padlist) = -1;
582 AvREAL_off (padlist);
493 SvREFCNT_dec ((SV*)padlist); 583 SvREFCNT_dec ((SV*)padlist);
584#endif
494 } 585 }
495} 586}
496 587
497static int 588static int
498coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 589coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
499{ 590{
500 AV *padlist; 591 PADLIST *padlist;
501 AV *av = (AV *)mg->mg_obj; 592 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
593 size_t len = *(size_t *)mg->mg_ptr;
502 594
503 /* perl manages to free our internal AV and _then_ call us */ 595 /* perl manages to free our internal AV and _then_ call us */
504 if (IN_DESTRUCT) 596 if (IN_DESTRUCT)
505 return 0; 597 return 0;
506 598
507 /* casting is fun. */ 599 while (len--)
508 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
509 free_padlist (aTHX_ padlist); 600 free_padlist (aTHX_ padlists[len]);
510
511 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
512 601
513 return 0; 602 return 0;
514} 603}
515 604
516static MGVTBL coro_cv_vtbl = { 605static MGVTBL coro_cv_vtbl = {
517 0, 0, 0, 0, 606 0, 0, 0, 0,
518 coro_cv_free 607 coro_cv_free
519}; 608};
520 609
521/* the next two functions merely cache the padlists */ 610/* the next two functions merely cache the padlists */
522static void 611ecb_inline void
523get_padlist (pTHX_ CV *cv) 612get_padlist (pTHX_ CV *cv)
524{ 613{
525 MAGIC *mg = CORO_MAGIC_cv (cv); 614 MAGIC *mg = CORO_MAGIC_cv (cv);
526 AV *av; 615 size_t *lenp;
527 616
528 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 617 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
529 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 618 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
530 else 619 else
531 { 620 {
532#if CORO_PREFER_PERL_FUNCTIONS 621#if CORO_PREFER_PERL_FUNCTIONS
533 /* this is probably cleaner? but also slower! */ 622 /* this is probably cleaner? but also slower! */
534 /* in practise, it seems to be less stable */ 623 /* in practise, it seems to be less stable */
… …
540 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 629 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
541#endif 630#endif
542 } 631 }
543} 632}
544 633
545static void 634ecb_inline void
546put_padlist (pTHX_ CV *cv) 635put_padlist (pTHX_ CV *cv)
547{ 636{
548 MAGIC *mg = CORO_MAGIC_cv (cv); 637 MAGIC *mg = CORO_MAGIC_cv (cv);
549 AV *av;
550 638
551 if (expect_false (!mg)) 639 if (ecb_expect_false (!mg))
640 {
552 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 641 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
642 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
643 mg->mg_len = 1; /* so mg_free frees mg_ptr */
644 }
645 else
646 Renew (mg->mg_ptr,
647 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
648 char);
553 649
554 av = (AV *)mg->mg_obj; 650 ((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} 651}
561 652
562/** load & save, init *******************************************************/ 653/** load & save, init *******************************************************/
563 654
655ecb_inline void
656swap_sv (SV *a, SV *b)
657{
658 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
659 SV tmp;
660
661 /* swap sv_any */
662 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
663
664 /* swap sv_flags */
665 SvFLAGS (&tmp) = SvFLAGS (a);
666 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
667 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
668
669#if PERL_VERSION_ATLEAST (5,10,0)
670 /* perl 5.10 and later complicates this _quite_ a bit, but it also
671 * is much faster, so no quarrels here. alternatively, we could
672 * sv_upgrade to avoid this.
673 */
674 {
675 /* swap sv_u */
676 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
677
678 /* if SvANY points to the head, we need to adjust the pointers,
679 * as the pointer for a still points to b, and maybe vice versa.
680 */
681 #define svany_in_head(type) \
682 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
683
684 if (svany_in_head (SvTYPE (a)))
685 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
686
687 if (svany_in_head (SvTYPE (b)))
688 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
689 }
690#endif
691}
692
564/* swap sv heads, at least logically */ 693/* swap sv heads, at least logically */
565static void 694static void
566swap_svs (pTHX_ Coro__State c) 695swap_svs (pTHX_ Coro__State c)
567{ 696{
568 int i; 697 int i;
569 698
570 for (i = 0; i <= AvFILLp (c->swap_sv); ) 699 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
571 { 700 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} 701}
610 702
611#define SWAP_SVS(coro) \ 703#define SWAP_SVS(coro) \
612 if (expect_false ((coro)->swap_sv)) \ 704 if (ecb_expect_false ((coro)->swap_sv)) \
613 swap_svs (aTHX_ (coro)) 705 swap_svs (aTHX_ (coro))
614 706
615static void 707static void
616on_enterleave_call (pTHX_ SV *cb); 708on_enterleave_call (pTHX_ SV *cb);
617 709
… …
621 perl_slots *slot = c->slot; 713 perl_slots *slot = c->slot;
622 c->slot = 0; 714 c->slot = 0;
623 715
624 PL_mainstack = c->mainstack; 716 PL_mainstack = c->mainstack;
625 717
626 GvSV (PL_defgv) = slot->defsv; 718#if CORO_JIT
627 GvAV (PL_defgv) = slot->defav; 719 load_perl_slots (slot);
628 GvSV (PL_errgv) = slot->errsv; 720#else
629 GvSV (irsgv) = slot->irsgv;
630 GvHV (PL_hintgv) = slot->hinthv;
631
632 #define VAR(name,type) PL_ ## name = slot->name; 721 #define VARx(name,expr,type) expr = slot->name;
633 # include "state.h" 722 #include "state.h"
634 #undef VAR 723#endif
635 724
636 { 725 {
637 dSP; 726 dSP;
638 727
639 CV *cv; 728 CV *cv;
640 729
641 /* now do the ugly restore mess */ 730 /* now do the ugly restore mess */
642 while (expect_true (cv = (CV *)POPs)) 731 while (ecb_expect_true (cv = (CV *)POPs))
643 { 732 {
644 put_padlist (aTHX_ cv); /* mark this padlist as available */ 733 put_padlist (aTHX_ cv); /* mark this padlist as available */
645 CvDEPTH (cv) = PTR2IV (POPs); 734 CvDEPTH (cv) = PTR2IV (POPs);
646 CvPADLIST (cv) = (AV *)POPs; 735 CvPADLIST (cv) = (PADLIST *)POPs;
647 } 736 }
648 737
649 PUTBACK; 738 PUTBACK;
650 } 739 }
651 740
652 slf_frame = c->slf_frame; 741 slf_frame = c->slf_frame;
653 CORO_THROW = c->except; 742 CORO_THROW = c->except;
654 743
655 if (expect_false (enable_times)) 744 if (ecb_expect_false (enable_times))
656 { 745 {
657 if (expect_false (!times_valid)) 746 if (ecb_expect_false (!times_valid))
658 coro_times_update (); 747 coro_times_update ();
659 748
660 coro_times_sub (c); 749 coro_times_sub (c);
661 } 750 }
662 751
663 if (expect_false (c->on_enter)) 752 if (ecb_expect_false (c->on_enter))
664 { 753 {
665 int i; 754 int i;
666 755
667 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 756 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
668 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 757 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
674static void 763static void
675save_perl (pTHX_ Coro__State c) 764save_perl (pTHX_ Coro__State c)
676{ 765{
677 SWAP_SVS (c); 766 SWAP_SVS (c);
678 767
679 if (expect_false (c->on_leave)) 768 if (ecb_expect_false (c->on_leave))
680 { 769 {
681 int i; 770 int i;
682 771
683 for (i = AvFILLp (c->on_leave); i >= 0; --i) 772 for (i = AvFILLp (c->on_leave); i >= 0; --i)
684 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 773 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
685 } 774 }
686 775
687 times_valid = 0; 776 times_valid = 0;
688 777
689 if (expect_false (enable_times)) 778 if (ecb_expect_false (enable_times))
690 { 779 {
691 coro_times_update (); times_valid = 1; 780 coro_times_update (); times_valid = 1;
692 coro_times_add (c); 781 coro_times_add (c);
693 } 782 }
694 783
… …
708 797
709 XPUSHs (Nullsv); 798 XPUSHs (Nullsv);
710 /* this loop was inspired by pp_caller */ 799 /* this loop was inspired by pp_caller */
711 for (;;) 800 for (;;)
712 { 801 {
713 while (expect_true (cxix >= 0)) 802 while (ecb_expect_true (cxix >= 0))
714 { 803 {
715 PERL_CONTEXT *cx = &ccstk[cxix--]; 804 PERL_CONTEXT *cx = &ccstk[cxix--];
716 805
717 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 806 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
718 { 807 {
719 CV *cv = cx->blk_sub.cv; 808 CV *cv = cx->blk_sub.cv;
720 809
721 if (expect_true (CvDEPTH (cv))) 810 if (ecb_expect_true (CvDEPTH (cv)))
722 { 811 {
723 EXTEND (SP, 3); 812 EXTEND (SP, 3);
724 PUSHs ((SV *)CvPADLIST (cv)); 813 PUSHs ((SV *)CvPADLIST (cv));
725 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 814 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
726 PUSHs ((SV *)cv); 815 PUSHs ((SV *)cv);
… …
729 get_padlist (aTHX_ cv); 818 get_padlist (aTHX_ cv);
730 } 819 }
731 } 820 }
732 } 821 }
733 822
734 if (expect_true (top_si->si_type == PERLSI_MAIN)) 823 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
735 break; 824 break;
736 825
737 top_si = top_si->si_prev; 826 top_si = top_si->si_prev;
738 ccstk = top_si->si_cxstack; 827 ccstk = top_si->si_cxstack;
739 cxix = top_si->si_cxix; 828 cxix = top_si->si_cxix;
… …
741 830
742 PUTBACK; 831 PUTBACK;
743 } 832 }
744 833
745 /* allocate some space on the context stack for our purposes */ 834 /* allocate some space on the context stack for our purposes */
746 /* we manually unroll here, as usually 2 slots is enough */ 835 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
747 if (SLOT_COUNT >= 1) CXINC;
748 if (SLOT_COUNT >= 2) CXINC;
749 if (SLOT_COUNT >= 3) CXINC;
750 { 836 {
751 unsigned int i; 837 unsigned int i;
838
752 for (i = 3; i < SLOT_COUNT; ++i) 839 for (i = 0; i < SLOT_COUNT; ++i)
753 CXINC; 840 CXINC;
754 } 841
755 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 842 cxstack_ix -= SLOT_COUNT; /* undo allocation */
843 }
756 844
757 c->mainstack = PL_mainstack; 845 c->mainstack = PL_mainstack;
758 846
759 { 847 {
760 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 848 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
761 849
762 slot->defav = GvAV (PL_defgv); 850#if CORO_JIT
763 slot->defsv = DEFSV; 851 save_perl_slots (slot);
764 slot->errsv = ERRSV; 852#else
765 slot->irsgv = GvSV (irsgv);
766 slot->hinthv = GvHV (PL_hintgv);
767
768 #define VAR(name,type) slot->name = PL_ ## name; 853 #define VARx(name,expr,type) slot->name = expr;
769 # include "state.h" 854 #include "state.h"
770 #undef VAR 855#endif
771 } 856 }
772} 857}
773 858
774/* 859/*
775 * allocate various perl stacks. This is almost an exact copy 860 * allocate various perl stacks. This is almost an exact copy
… …
781# define coro_init_stacks(thx) init_stacks () 866# define coro_init_stacks(thx) init_stacks ()
782#else 867#else
783static void 868static void
784coro_init_stacks (pTHX) 869coro_init_stacks (pTHX)
785{ 870{
786 PL_curstackinfo = new_stackinfo(32, 8); 871 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
787 PL_curstackinfo->si_type = PERLSI_MAIN; 872 PL_curstackinfo->si_type = PERLSI_MAIN;
788 PL_curstack = PL_curstackinfo->si_stack; 873 PL_curstack = PL_curstackinfo->si_stack;
789 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 874 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
790 875
791 PL_stack_base = AvARRAY(PL_curstack); 876 PL_stack_base = AvARRAY(PL_curstack);
… …
806#endif 891#endif
807 892
808 New(54,PL_scopestack,8,I32); 893 New(54,PL_scopestack,8,I32);
809 PL_scopestack_ix = 0; 894 PL_scopestack_ix = 0;
810 PL_scopestack_max = 8; 895 PL_scopestack_max = 8;
896#if HAS_SCOPESTACK_NAME
897 New(54,PL_scopestack_name,8,const char*);
898#endif
811 899
812 New(54,PL_savestack,24,ANY); 900 New(54,PL_savestack,24,ANY);
813 PL_savestack_ix = 0; 901 PL_savestack_ix = 0;
814 PL_savestack_max = 24; 902 PL_savestack_max = 24;
815 903
… …
843 } 931 }
844 932
845 Safefree (PL_tmps_stack); 933 Safefree (PL_tmps_stack);
846 Safefree (PL_markstack); 934 Safefree (PL_markstack);
847 Safefree (PL_scopestack); 935 Safefree (PL_scopestack);
936#if HAS_SCOPESTACK_NAME
937 Safefree (PL_scopestack_name);
938#endif
848 Safefree (PL_savestack); 939 Safefree (PL_savestack);
849#if !PERL_VERSION_ATLEAST (5,10,0) 940#if !PERL_VERSION_ATLEAST (5,10,0)
850 Safefree (PL_retstack); 941 Safefree (PL_retstack);
851#endif 942#endif
852} 943}
… …
898#endif 989#endif
899 990
900/* 991/*
901 * This overrides the default magic get method of %SIG elements. 992 * This overrides the default magic get method of %SIG elements.
902 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 993 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
903 * and instead of trying to save and restore the hash elements, we just provide 994 * and instead of trying to save and restore the hash elements (extremely slow),
904 * readback here. 995 * we just provide our own readback here.
905 */ 996 */
906static int 997static int ecb_cold
907coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 998coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
908{ 999{
909 const char *s = MgPV_nolen_const (mg); 1000 const char *s = MgPV_nolen_const (mg);
910 1001
911 if (*s == '_') 1002 if (*s == '_')
912 { 1003 {
913 SV **svp = 0; 1004 SV **svp = 0;
914 1005
915 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1006 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
916 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1007 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
917 1008
918 if (svp) 1009 if (svp)
919 { 1010 {
920 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1011 SV *ssv;
1012
1013 if (!*svp)
1014 ssv = &PL_sv_undef;
1015 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1016 ssv = sv_2mortal (newRV_inc (*svp));
1017 else
1018 ssv = *svp;
1019
1020 sv_setsv (sv, ssv);
921 return 0; 1021 return 0;
922 } 1022 }
923 } 1023 }
924 1024
925 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1025 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
926} 1026}
927 1027
928static int 1028static int ecb_cold
929coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1029coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
930{ 1030{
931 const char *s = MgPV_nolen_const (mg); 1031 const char *s = MgPV_nolen_const (mg);
932 1032
933 if (*s == '_') 1033 if (*s == '_')
… …
947 } 1047 }
948 1048
949 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1049 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
950} 1050}
951 1051
952static int 1052static int ecb_cold
953coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1053coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
954{ 1054{
955 const char *s = MgPV_nolen_const (mg); 1055 const char *s = MgPV_nolen_const (mg);
956 1056
957 if (*s == '_') 1057 if (*s == '_')
… …
992 return 1; 1092 return 1;
993} 1093}
994 1094
995static UNOP init_perl_op; 1095static UNOP init_perl_op;
996 1096
997static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1097ecb_noinline static void /* noinline to keep it out of the transfer fast path */
998init_perl (pTHX_ struct coro *coro) 1098init_perl (pTHX_ struct coro *coro)
999{ 1099{
1000 /* 1100 /*
1001 * emulate part of the perl startup here. 1101 * emulate part of the perl startup here.
1002 */ 1102 */
… …
1010 PL_comppad_name_fill = 0; 1110 PL_comppad_name_fill = 0;
1011 PL_comppad_name_floor = 0; 1111 PL_comppad_name_floor = 0;
1012 PL_curpm = 0; 1112 PL_curpm = 0;
1013 PL_curpad = 0; 1113 PL_curpad = 0;
1014 PL_localizing = 0; 1114 PL_localizing = 0;
1015 PL_dirty = 0;
1016 PL_restartop = 0; 1115 PL_restartop = 0;
1017#if PERL_VERSION_ATLEAST (5,10,0) 1116#if PERL_VERSION_ATLEAST (5,10,0)
1018 PL_parser = 0; 1117 PL_parser = 0;
1019#endif 1118#endif
1020 PL_hints = 0; 1119 PL_hints = 0;
1021 1120
1022 /* recreate the die/warn hooks */ 1121 /* recreate the die/warn hooks */
1023 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1122 PL_diehook = SvREFCNT_inc (rv_diehook);
1024 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1123 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1025 1124
1026 GvSV (PL_defgv) = newSV (0); 1125 GvSV (PL_defgv) = newSV (0);
1027 GvAV (PL_defgv) = coro->args; coro->args = 0; 1126 GvAV (PL_defgv) = coro->args; coro->args = 0;
1028 GvSV (PL_errgv) = newSV (0); 1127 GvSV (PL_errgv) = newSV (0);
1029 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1128 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1030 GvHV (PL_hintgv) = 0; 1129 GvHV (PL_hintgv) = 0;
… …
1050 /* this newly created coroutine might be run on an existing cctx which most 1149 /* this newly created coroutine might be run on an existing cctx which most
1051 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1150 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1052 */ 1151 */
1053 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1152 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1054 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1153 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1154 slf_frame.destroy = 0;
1055 1155
1056 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1156 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1057 init_perl_op.op_next = PL_op; 1157 init_perl_op.op_next = PL_op;
1058 init_perl_op.op_type = OP_ENTERSUB; 1158 init_perl_op.op_type = OP_ENTERSUB;
1059 init_perl_op.op_ppaddr = pp_slf; 1159 init_perl_op.op_ppaddr = pp_slf;
… …
1064 /* copy throw, in case it was set before init_perl */ 1164 /* copy throw, in case it was set before init_perl */
1065 CORO_THROW = coro->except; 1165 CORO_THROW = coro->except;
1066 1166
1067 SWAP_SVS (coro); 1167 SWAP_SVS (coro);
1068 1168
1069 if (expect_false (enable_times)) 1169 if (ecb_expect_false (enable_times))
1070 { 1170 {
1071 coro_times_update (); 1171 coro_times_update ();
1072 coro_times_sub (coro); 1172 coro_times_sub (coro);
1073 } 1173 }
1074} 1174}
… …
1098destroy_perl (pTHX_ struct coro *coro) 1198destroy_perl (pTHX_ struct coro *coro)
1099{ 1199{
1100 SV *svf [9]; 1200 SV *svf [9];
1101 1201
1102 { 1202 {
1203 SV *old_current = SvRV (coro_current);
1103 struct coro *current = SvSTATE_current; 1204 struct coro *current = SvSTATE (old_current);
1104 1205
1105 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1206 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1106 1207
1107 save_perl (aTHX_ current); 1208 save_perl (aTHX_ current);
1209
1210 /* this will cause transfer_check to croak on block*/
1211 SvRV_set (coro_current, (SV *)coro->hv);
1212
1108 load_perl (aTHX_ coro); 1213 load_perl (aTHX_ coro);
1109 1214
1110 coro_unwind_stacks (aTHX); 1215 coro_unwind_stacks (aTHX);
1111 coro_destruct_stacks (aTHX);
1112 1216
1113 /* restore swapped sv's */ 1217 /* restore swapped sv's */
1114 SWAP_SVS (coro); 1218 SWAP_SVS (coro);
1115 1219
1220 coro_destruct_stacks (aTHX);
1221
1116 // now save some sv's to be free'd later 1222 /* now save some sv's to be free'd later */
1117 svf [0] = GvSV (PL_defgv); 1223 svf [0] = GvSV (PL_defgv);
1118 svf [1] = (SV *)GvAV (PL_defgv); 1224 svf [1] = (SV *)GvAV (PL_defgv);
1119 svf [2] = GvSV (PL_errgv); 1225 svf [2] = GvSV (PL_errgv);
1120 svf [3] = (SV *)PL_defoutgv; 1226 svf [3] = (SV *)PL_defoutgv;
1121 svf [4] = PL_rs; 1227 svf [4] = PL_rs;
… …
1123 svf [6] = (SV *)GvHV (PL_hintgv); 1229 svf [6] = (SV *)GvHV (PL_hintgv);
1124 svf [7] = PL_diehook; 1230 svf [7] = PL_diehook;
1125 svf [8] = PL_warnhook; 1231 svf [8] = PL_warnhook;
1126 assert (9 == sizeof (svf) / sizeof (*svf)); 1232 assert (9 == sizeof (svf) / sizeof (*svf));
1127 1233
1234 SvRV_set (coro_current, old_current);
1235
1128 load_perl (aTHX_ current); 1236 load_perl (aTHX_ current);
1129 } 1237 }
1130 1238
1131 { 1239 {
1132 unsigned int i; 1240 unsigned int i;
… …
1139 SvREFCNT_dec (coro->invoke_cb); 1247 SvREFCNT_dec (coro->invoke_cb);
1140 SvREFCNT_dec (coro->invoke_av); 1248 SvREFCNT_dec (coro->invoke_av);
1141 } 1249 }
1142} 1250}
1143 1251
1144INLINE void 1252ecb_inline void
1145free_coro_mortal (pTHX) 1253free_coro_mortal (pTHX)
1146{ 1254{
1147 if (expect_true (coro_mortal)) 1255 if (ecb_expect_true (coro_mortal))
1148 { 1256 {
1149 SvREFCNT_dec (coro_mortal); 1257 SvREFCNT_dec ((SV *)coro_mortal);
1150 coro_mortal = 0; 1258 coro_mortal = 0;
1151 } 1259 }
1152} 1260}
1153 1261
1154static int 1262static int
… …
1287 1395
1288 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1396 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1289} 1397}
1290 1398
1291/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1399/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1292static void NOINLINE 1400static void ecb_noinline
1293cctx_prepare (pTHX) 1401cctx_prepare (pTHX)
1294{ 1402{
1295 PL_top_env = &PL_start_env; 1403 PL_top_env = &PL_start_env;
1296 1404
1297 if (cctx_current->flags & CC_TRACE) 1405 if (cctx_current->flags & CC_TRACE)
… …
1308 slf_frame.prepare = slf_prepare_set_stacklevel; 1416 slf_frame.prepare = slf_prepare_set_stacklevel;
1309 slf_frame.check = slf_check_set_stacklevel; 1417 slf_frame.check = slf_check_set_stacklevel;
1310} 1418}
1311 1419
1312/* the tail of transfer: execute stuff we can only do after a transfer */ 1420/* the tail of transfer: execute stuff we can only do after a transfer */
1313INLINE void 1421ecb_inline void
1314transfer_tail (pTHX) 1422transfer_tail (pTHX)
1315{ 1423{
1316 free_coro_mortal (aTHX); 1424 free_coro_mortal (aTHX);
1425}
1426
1427/* try to exit the same way perl's main function would do */
1428/* we do not bother resetting the environment or other things *7
1429/* that are not, uhm, essential */
1430/* this obviously also doesn't work when perl is embedded */
1431static void ecb_noinline ecb_cold
1432perlish_exit (pTHX)
1433{
1434 int exitstatus = perl_destruct (PL_curinterp);
1435 perl_free (PL_curinterp);
1436 exit (exitstatus);
1317} 1437}
1318 1438
1319/* 1439/*
1320 * this is a _very_ stripped down perl interpreter ;) 1440 * this is a _very_ stripped down perl interpreter ;)
1321 */ 1441 */
… …
1350 */ 1470 */
1351 1471
1352 /* 1472 /*
1353 * If perl-run returns we assume exit() was being called or the coro 1473 * If perl-run returns we assume exit() was being called or the coro
1354 * fell off the end, which seems to be the only valid (non-bug) 1474 * fell off the end, which seems to be the only valid (non-bug)
1355 * reason for perl_run to return. We try to exit by jumping to the 1475 * reason for perl_run to return. We try to mimic whatever perl is normally
1356 * bootstrap-time "top" top_env, as we cannot restore the "main" 1476 * doing in that case. YMMV.
1357 * coroutine as Coro has no such concept.
1358 * This actually isn't valid with the pthread backend, but OSes requiring
1359 * that backend are too broken to do it in a standards-compliant way.
1360 */ 1477 */
1361 PL_top_env = main_top_env; 1478 perlish_exit (aTHX);
1362 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1363 } 1479 }
1364} 1480}
1365 1481
1366static coro_cctx * 1482static coro_cctx *
1367cctx_new () 1483cctx_new (void)
1368{ 1484{
1369 coro_cctx *cctx; 1485 coro_cctx *cctx;
1370 1486
1371 ++cctx_count; 1487 ++cctx_count;
1372 New (0, cctx, 1, coro_cctx); 1488 New (0, cctx, 1, coro_cctx);
… …
1378 return cctx; 1494 return cctx;
1379} 1495}
1380 1496
1381/* create a new cctx only suitable as source */ 1497/* create a new cctx only suitable as source */
1382static coro_cctx * 1498static coro_cctx *
1383cctx_new_empty () 1499cctx_new_empty (void)
1384{ 1500{
1385 coro_cctx *cctx = cctx_new (); 1501 coro_cctx *cctx = cctx_new ();
1386 1502
1387 cctx->sptr = 0; 1503 cctx->stack.sptr = 0;
1388 coro_create (&cctx->cctx, 0, 0, 0, 0); 1504 coro_create (&cctx->cctx, 0, 0, 0, 0);
1389 1505
1390 return cctx; 1506 return cctx;
1391} 1507}
1392 1508
1393/* create a new cctx suitable as destination/running a perl interpreter */ 1509/* create a new cctx suitable as destination/running a perl interpreter */
1394static coro_cctx * 1510static coro_cctx *
1395cctx_new_run () 1511cctx_new_run (void)
1396{ 1512{
1397 coro_cctx *cctx = cctx_new (); 1513 coro_cctx *cctx = cctx_new ();
1398 void *stack_start;
1399 size_t stack_size;
1400 1514
1401#if HAVE_MMAP 1515 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1402 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1403 /* mmap supposedly does allocate-on-write for us */
1404 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1405
1406 if (cctx->sptr != (void *)-1)
1407 {
1408 #if CORO_STACKGUARD
1409 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1410 #endif
1411 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1412 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1413 cctx->flags |= CC_MAPPED;
1414 } 1516 {
1415 else
1416#endif
1417 {
1418 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1419 New (0, cctx->sptr, cctx_stacksize, long);
1420
1421 if (!cctx->sptr)
1422 {
1423 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1517 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1424 _exit (EXIT_FAILURE); 1518 _exit (EXIT_FAILURE);
1425 }
1426
1427 stack_start = cctx->sptr;
1428 stack_size = cctx->ssize;
1429 } 1519 }
1430 1520
1431 #if CORO_USE_VALGRIND
1432 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1433 #endif
1434
1435 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1521 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1436 1522
1437 return cctx; 1523 return cctx;
1438} 1524}
1439 1525
1440static void 1526static void
1441cctx_destroy (coro_cctx *cctx) 1527cctx_destroy (coro_cctx *cctx)
1442{ 1528{
1443 if (!cctx) 1529 if (!cctx)
1444 return; 1530 return;
1445 1531
1446 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1532 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1447 1533
1448 --cctx_count; 1534 --cctx_count;
1449 coro_destroy (&cctx->cctx); 1535 coro_destroy (&cctx->cctx);
1450 1536
1451 /* coro_transfer creates new, empty cctx's */ 1537 coro_stack_free (&cctx->stack);
1452 if (cctx->sptr)
1453 {
1454 #if CORO_USE_VALGRIND
1455 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1456 #endif
1457
1458#if HAVE_MMAP
1459 if (cctx->flags & CC_MAPPED)
1460 munmap (cctx->sptr, cctx->ssize);
1461 else
1462#endif
1463 Safefree (cctx->sptr);
1464 }
1465 1538
1466 Safefree (cctx); 1539 Safefree (cctx);
1467} 1540}
1468 1541
1469/* wether this cctx should be destructed */ 1542/* wether this cctx should be destructed */
1470#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1543#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1471 1544
1472static coro_cctx * 1545static coro_cctx *
1473cctx_get (pTHX) 1546cctx_get (pTHX)
1474{ 1547{
1475 while (expect_true (cctx_first)) 1548 while (ecb_expect_true (cctx_first))
1476 { 1549 {
1477 coro_cctx *cctx = cctx_first; 1550 coro_cctx *cctx = cctx_first;
1478 cctx_first = cctx->next; 1551 cctx_first = cctx->next;
1479 --cctx_idle; 1552 --cctx_idle;
1480 1553
1481 if (expect_true (!CCTX_EXPIRED (cctx))) 1554 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1482 return cctx; 1555 return cctx;
1483 1556
1484 cctx_destroy (cctx); 1557 cctx_destroy (cctx);
1485 } 1558 }
1486 1559
… …
1488} 1561}
1489 1562
1490static void 1563static void
1491cctx_put (coro_cctx *cctx) 1564cctx_put (coro_cctx *cctx)
1492{ 1565{
1493 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1566 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1494 1567
1495 /* free another cctx if overlimit */ 1568 /* free another cctx if overlimit */
1496 if (expect_false (cctx_idle >= cctx_max_idle)) 1569 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1497 { 1570 {
1498 coro_cctx *first = cctx_first; 1571 coro_cctx *first = cctx_first;
1499 cctx_first = first->next; 1572 cctx_first = first->next;
1500 --cctx_idle; 1573 --cctx_idle;
1501 1574
… …
1512static void 1585static void
1513transfer_check (pTHX_ struct coro *prev, struct coro *next) 1586transfer_check (pTHX_ struct coro *prev, struct coro *next)
1514{ 1587{
1515 /* TODO: throwing up here is considered harmful */ 1588 /* TODO: throwing up here is considered harmful */
1516 1589
1517 if (expect_true (prev != next)) 1590 if (ecb_expect_true (prev != next))
1518 { 1591 {
1519 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1592 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1520 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1593 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1521 1594
1522 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1595 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1523 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1596 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1524 1597
1525#if !PERL_VERSION_ATLEAST (5,10,0) 1598#if !PERL_VERSION_ATLEAST (5,10,0)
1526 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1599 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1527 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1600 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1528#endif 1601#endif
1529 } 1602 }
1530} 1603}
1531 1604
1532/* always use the TRANSFER macro */ 1605/* always use the TRANSFER macro */
1533static void NOINLINE /* noinline so we have a fixed stackframe */ 1606static void ecb_noinline /* noinline so we have a fixed stackframe */
1534transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1607transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1535{ 1608{
1536 dSTACKLEVEL; 1609 dSTACKLEVEL;
1537 1610
1538 /* sometimes transfer is only called to set idle_sp */ 1611 /* sometimes transfer is only called to set idle_sp */
1539 if (expect_false (!prev)) 1612 if (ecb_expect_false (!prev))
1540 { 1613 {
1541 cctx_current->idle_sp = STACKLEVEL; 1614 cctx_current->idle_sp = STACKLEVEL;
1542 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1615 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1543 } 1616 }
1544 else if (expect_true (prev != next)) 1617 else if (ecb_expect_true (prev != next))
1545 { 1618 {
1546 coro_cctx *cctx_prev; 1619 coro_cctx *cctx_prev;
1547 1620
1548 if (expect_false (prev->flags & CF_NEW)) 1621 if (ecb_expect_false (prev->flags & CF_NEW))
1549 { 1622 {
1550 /* create a new empty/source context */ 1623 /* create a new empty/source context */
1551 prev->flags &= ~CF_NEW; 1624 prev->flags &= ~CF_NEW;
1552 prev->flags |= CF_RUNNING; 1625 prev->flags |= CF_RUNNING;
1553 } 1626 }
… …
1556 next->flags |= CF_RUNNING; 1629 next->flags |= CF_RUNNING;
1557 1630
1558 /* first get rid of the old state */ 1631 /* first get rid of the old state */
1559 save_perl (aTHX_ prev); 1632 save_perl (aTHX_ prev);
1560 1633
1561 if (expect_false (next->flags & CF_NEW)) 1634 if (ecb_expect_false (next->flags & CF_NEW))
1562 { 1635 {
1563 /* need to start coroutine */ 1636 /* need to start coroutine */
1564 next->flags &= ~CF_NEW; 1637 next->flags &= ~CF_NEW;
1565 /* setup coroutine call */ 1638 /* setup coroutine call */
1566 init_perl (aTHX_ next); 1639 init_perl (aTHX_ next);
1567 } 1640 }
1568 else 1641 else
1569 load_perl (aTHX_ next); 1642 load_perl (aTHX_ next);
1570 1643
1571 /* possibly untie and reuse the cctx */ 1644 /* possibly untie and reuse the cctx */
1572 if (expect_true ( 1645 if (ecb_expect_true (
1573 cctx_current->idle_sp == STACKLEVEL 1646 cctx_current->idle_sp == STACKLEVEL
1574 && !(cctx_current->flags & CC_TRACE) 1647 && !(cctx_current->flags & CC_TRACE)
1575 && !force_cctx 1648 && !force_cctx
1576 )) 1649 ))
1577 { 1650 {
1578 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1651 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1579 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1652 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1580 1653
1581 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1654 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1582 /* without this the next cctx_get might destroy the running cctx while still in use */ 1655 /* without this the next cctx_get might destroy the running cctx while still in use */
1583 if (expect_false (CCTX_EXPIRED (cctx_current))) 1656 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1584 if (expect_true (!next->cctx)) 1657 if (ecb_expect_true (!next->cctx))
1585 next->cctx = cctx_get (aTHX); 1658 next->cctx = cctx_get (aTHX);
1586 1659
1587 cctx_put (cctx_current); 1660 cctx_put (cctx_current);
1588 } 1661 }
1589 else 1662 else
1590 prev->cctx = cctx_current; 1663 prev->cctx = cctx_current;
1591 1664
1592 ++next->usecount; 1665 ++next->usecount;
1593 1666
1594 cctx_prev = cctx_current; 1667 cctx_prev = cctx_current;
1595 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1668 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1596 1669
1597 next->cctx = 0; 1670 next->cctx = 0;
1598 1671
1599 if (expect_false (cctx_prev != cctx_current)) 1672 if (ecb_expect_false (cctx_prev != cctx_current))
1600 { 1673 {
1601 cctx_prev->top_env = PL_top_env; 1674 cctx_prev->top_env = PL_top_env;
1602 PL_top_env = cctx_current->top_env; 1675 PL_top_env = cctx_current->top_env;
1603 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1676 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1604 } 1677 }
… …
1610#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1683#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1611#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1684#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1612 1685
1613/** high level stuff ********************************************************/ 1686/** high level stuff ********************************************************/
1614 1687
1688/* this function is actually Coro, not Coro::State, but we call it from here */
1689/* because it is convenient - but it hasn't been declared yet for that reason */
1615static int 1690static void
1691coro_call_on_destroy (pTHX_ struct coro *coro);
1692
1693static void
1616coro_state_destroy (pTHX_ struct coro *coro) 1694coro_state_destroy (pTHX_ struct coro *coro)
1617{ 1695{
1618 if (coro->flags & CF_DESTROYED) 1696 if (coro->flags & CF_ZOMBIE)
1619 return 0; 1697 return;
1620 1698
1621 if (coro->on_destroy && !PL_dirty)
1622 coro->on_destroy (aTHX_ coro); 1699 slf_destroy (aTHX_ coro);
1623 1700
1624 coro->flags |= CF_DESTROYED; 1701 coro->flags |= CF_ZOMBIE;
1625 1702
1626 if (coro->flags & CF_READY) 1703 if (coro->flags & CF_READY)
1627 { 1704 {
1628 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1705 /* reduce nready, as destroying a ready coro effectively unreadies it */
1629 /* alternative: look through all ready queues and remove the coro */ 1706 /* alternative: look through all ready queues and remove the coro */
1630 --coro_nready; 1707 --coro_nready;
1631 } 1708 }
1632 else 1709 else
1633 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1710 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1711
1712 if (coro->next) coro->next->prev = coro->prev;
1713 if (coro->prev) coro->prev->next = coro->next;
1714 if (coro == coro_first) coro_first = coro->next;
1634 1715
1635 if (coro->mainstack 1716 if (coro->mainstack
1636 && coro->mainstack != main_mainstack 1717 && coro->mainstack != main_mainstack
1637 && coro->slot 1718 && coro->slot
1638 && !PL_dirty) 1719 && !PL_dirty)
1639 destroy_perl (aTHX_ coro); 1720 destroy_perl (aTHX_ coro);
1640 1721
1641 if (coro->next) coro->next->prev = coro->prev;
1642 if (coro->prev) coro->prev->next = coro->next;
1643 if (coro == coro_first) coro_first = coro->next;
1644
1645 cctx_destroy (coro->cctx); 1722 cctx_destroy (coro->cctx);
1646 SvREFCNT_dec (coro->startcv); 1723 SvREFCNT_dec (coro->startcv);
1647 SvREFCNT_dec (coro->args); 1724 SvREFCNT_dec (coro->args);
1648 SvREFCNT_dec (coro->swap_sv); 1725 SvREFCNT_dec (coro->swap_sv);
1649 SvREFCNT_dec (CORO_THROW); 1726 SvREFCNT_dec (CORO_THROW);
1650 1727
1651 return 1; 1728 coro_call_on_destroy (aTHX_ coro);
1729
1730 /* more destruction mayhem in coro_state_free */
1652} 1731}
1653 1732
1654static int 1733static int
1655coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1734coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1656{ 1735{
1657 struct coro *coro = (struct coro *)mg->mg_ptr; 1736 struct coro *coro = (struct coro *)mg->mg_ptr;
1658 mg->mg_ptr = 0; 1737 mg->mg_ptr = 0;
1659 1738
1660 coro->hv = 0;
1661
1662 if (--coro->refcnt < 0)
1663 {
1664 coro_state_destroy (aTHX_ coro); 1739 coro_state_destroy (aTHX_ coro);
1740 SvREFCNT_dec (coro->on_destroy);
1741 SvREFCNT_dec (coro->status);
1742
1665 Safefree (coro); 1743 Safefree (coro);
1666 }
1667 1744
1668 return 0; 1745 return 0;
1669} 1746}
1670 1747
1671static int 1748static int ecb_cold
1672coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1749coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1673{ 1750{
1674 struct coro *coro = (struct coro *)mg->mg_ptr; 1751 /* called when perl clones the current process the slow way (windows process emulation) */
1675 1752 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1676 ++coro->refcnt; 1753 mg->mg_ptr = 0;
1754 mg->mg_virtual = 0;
1677 1755
1678 return 0; 1756 return 0;
1679} 1757}
1680 1758
1681static MGVTBL coro_state_vtbl = { 1759static MGVTBL coro_state_vtbl = {
… …
1706 TRANSFER (ta, 1); 1784 TRANSFER (ta, 1);
1707} 1785}
1708 1786
1709/** Coro ********************************************************************/ 1787/** Coro ********************************************************************/
1710 1788
1711INLINE void 1789ecb_inline void
1712coro_enq (pTHX_ struct coro *coro) 1790coro_enq (pTHX_ struct coro *coro)
1713{ 1791{
1714 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1792 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1715 1793
1716 SvREFCNT_inc_NN (coro->hv); 1794 SvREFCNT_inc_NN (coro->hv);
… …
1718 coro->next_ready = 0; 1796 coro->next_ready = 0;
1719 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1797 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1720 ready [1] = coro; 1798 ready [1] = coro;
1721} 1799}
1722 1800
1723INLINE struct coro * 1801ecb_inline struct coro *
1724coro_deq (pTHX) 1802coro_deq (pTHX)
1725{ 1803{
1726 int prio; 1804 int prio;
1727 1805
1728 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1806 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1781{ 1859{
1782 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1860 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1783} 1861}
1784 1862
1785/* expects to own a reference to next->hv */ 1863/* expects to own a reference to next->hv */
1786INLINE void 1864ecb_inline void
1787prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1865prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1788{ 1866{
1789 SV *prev_sv = SvRV (coro_current); 1867 SV *prev_sv = SvRV (coro_current);
1790 1868
1791 ta->prev = SvSTATE_hv (prev_sv); 1869 ta->prev = SvSTATE_hv (prev_sv);
… …
1804{ 1882{
1805 for (;;) 1883 for (;;)
1806 { 1884 {
1807 struct coro *next = coro_deq (aTHX); 1885 struct coro *next = coro_deq (aTHX);
1808 1886
1809 if (expect_true (next)) 1887 if (ecb_expect_true (next))
1810 { 1888 {
1811 /* cannot transfer to destroyed coros, skip and look for next */ 1889 /* cannot transfer to destroyed coros, skip and look for next */
1812 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1890 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1813 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1891 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1814 else 1892 else
1815 { 1893 {
1816 next->flags &= ~CF_READY; 1894 next->flags &= ~CF_READY;
1817 --coro_nready; 1895 --coro_nready;
… …
1824 { 1902 {
1825 /* nothing to schedule: call the idle handler */ 1903 /* nothing to schedule: call the idle handler */
1826 if (SvROK (sv_idle) 1904 if (SvROK (sv_idle)
1827 && SvOBJECT (SvRV (sv_idle))) 1905 && SvOBJECT (SvRV (sv_idle)))
1828 { 1906 {
1907 if (SvRV (sv_idle) == SvRV (coro_current))
1908 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1909
1829 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1910 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1830 api_ready (aTHX_ SvRV (sv_idle)); 1911 api_ready (aTHX_ SvRV (sv_idle));
1831 --coro_nready; 1912 --coro_nready;
1832 } 1913 }
1833 else 1914 else
… …
1847 } 1928 }
1848 } 1929 }
1849 } 1930 }
1850} 1931}
1851 1932
1852INLINE void 1933ecb_inline void
1853prepare_cede (pTHX_ struct coro_transfer_args *ta) 1934prepare_cede (pTHX_ struct coro_transfer_args *ta)
1854{ 1935{
1855 api_ready (aTHX_ coro_current); 1936 api_ready (aTHX_ coro_current);
1856 prepare_schedule (aTHX_ ta); 1937 prepare_schedule (aTHX_ ta);
1857} 1938}
1858 1939
1859INLINE void 1940ecb_inline void
1860prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1941prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1861{ 1942{
1862 SV *prev = SvRV (coro_current); 1943 SV *prev = SvRV (coro_current);
1863 1944
1864 if (coro_nready) 1945 if (coro_nready)
… …
1894{ 1975{
1895 struct coro_transfer_args ta; 1976 struct coro_transfer_args ta;
1896 1977
1897 prepare_cede (aTHX_ &ta); 1978 prepare_cede (aTHX_ &ta);
1898 1979
1899 if (expect_true (ta.prev != ta.next)) 1980 if (ecb_expect_true (ta.prev != ta.next))
1900 { 1981 {
1901 TRANSFER (ta, 1); 1982 TRANSFER (ta, 1);
1902 return 1; 1983 return 1;
1903 } 1984 }
1904 else 1985 else
… …
1947 coro->slot->runops = RUNOPS_DEFAULT; 2028 coro->slot->runops = RUNOPS_DEFAULT;
1948 } 2029 }
1949} 2030}
1950 2031
1951static void 2032static void
2033coro_push_av (pTHX_ AV *av, I32 gimme_v)
2034{
2035 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2036 {
2037 dSP;
2038
2039 if (gimme_v == G_SCALAR)
2040 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2041 else
2042 {
2043 int i;
2044 EXTEND (SP, AvFILLp (av) + 1);
2045
2046 for (i = 0; i <= AvFILLp (av); ++i)
2047 PUSHs (AvARRAY (av)[i]);
2048 }
2049
2050 PUTBACK;
2051 }
2052}
2053
2054static void
2055coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2056{
2057 if (!coro->on_destroy)
2058 coro->on_destroy = newAV ();
2059
2060 av_push (coro->on_destroy, cb);
2061}
2062
2063static void
2064slf_destroy_join (pTHX_ struct CoroSLF *frame)
2065{
2066 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2067}
2068
2069static int
2070slf_check_join (pTHX_ struct CoroSLF *frame)
2071{
2072 struct coro *coro = (struct coro *)frame->data;
2073
2074 if (!coro->status)
2075 return 1;
2076
2077 frame->destroy = 0;
2078
2079 coro_push_av (aTHX_ coro->status, GIMME_V);
2080
2081 SvREFCNT_dec ((SV *)coro->hv);
2082
2083 return 0;
2084}
2085
2086static void
2087slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2088{
2089 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2090
2091 if (items > 1)
2092 croak ("join called with too many arguments");
2093
2094 if (coro->status)
2095 frame->prepare = prepare_nop;
2096 else
2097 {
2098 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2099 frame->prepare = prepare_schedule;
2100 }
2101
2102 frame->check = slf_check_join;
2103 frame->destroy = slf_destroy_join;
2104 frame->data = (void *)coro;
2105 SvREFCNT_inc (coro->hv);
2106}
2107
2108static void
1952coro_call_on_destroy (pTHX_ struct coro *coro) 2109coro_call_on_destroy (pTHX_ struct coro *coro)
1953{ 2110{
1954 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2111 AV *od = coro->on_destroy;
1955 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1956 2112
1957 if (on_destroyp) 2113 if (!od)
1958 { 2114 return;
1959 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1960 2115
2116 coro->on_destroy = 0;
2117 sv_2mortal ((SV *)od);
2118
1961 while (AvFILLp (on_destroy) >= 0) 2119 while (AvFILLp (od) >= 0)
2120 {
2121 SV *cb = sv_2mortal (av_pop (od));
2122
2123 /* coro hv's (and only hv's at the moment) are supported as well */
2124 if (SvSTATEhv_p (aTHX_ cb))
2125 api_ready (aTHX_ cb);
2126 else
1962 { 2127 {
1963 dSP; /* don't disturb outer sp */ 2128 dSP; /* don't disturb outer sp */
1964 SV *cb = av_pop (on_destroy);
1965
1966 PUSHMARK (SP); 2129 PUSHMARK (SP);
1967 2130
1968 if (statusp) 2131 if (coro->status)
1969 { 2132 {
1970 int i; 2133 PUTBACK;
1971 AV *status = (AV *)SvRV (*statusp); 2134 coro_push_av (aTHX_ coro->status, G_ARRAY);
1972 EXTEND (SP, AvFILLp (status) + 1); 2135 SPAGAIN;
1973
1974 for (i = 0; i <= AvFILLp (status); ++i)
1975 PUSHs (AvARRAY (status)[i]);
1976 } 2136 }
1977 2137
1978 PUTBACK; 2138 PUTBACK;
1979 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2139 call_sv (cb, G_VOID | G_DISCARD);
1980 } 2140 }
1981 } 2141 }
1982} 2142}
1983 2143
1984static void 2144static void
1985slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2145coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1986{ 2146{
1987 int i; 2147 AV *av;
1988 HV *hv = (HV *)SvRV (coro_current); 2148
1989 AV *av = newAV (); 2149 if (coro->status)
2150 {
2151 av = coro->status;
2152 av_clear (av);
2153 }
2154 else
2155 av = coro->status = newAV ();
1990 2156
1991 /* items are actually not so common, so optimise for this case */ 2157 /* items are actually not so common, so optimise for this case */
1992 if (items) 2158 if (items)
1993 { 2159 {
2160 int i;
2161
1994 av_extend (av, items - 1); 2162 av_extend (av, items - 1);
1995 2163
1996 for (i = 0; i < items; ++i) 2164 for (i = 0; i < items; ++i)
1997 av_push (av, SvREFCNT_inc_NN (arg [i])); 2165 av_push (av, SvREFCNT_inc_NN (arg [i]));
1998 } 2166 }
2167}
1999 2168
2000 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2169static void
2001 2170slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2171{
2002 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2172 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2003 api_ready (aTHX_ sv_manager); 2173 api_ready (aTHX_ sv_manager);
2004 2174
2005 frame->prepare = prepare_schedule; 2175 frame->prepare = prepare_schedule;
2006 frame->check = slf_check_repeat; 2176 frame->check = slf_check_repeat;
2007 2177
2008 /* as a minor optimisation, we could unwind all stacks here */ 2178 /* as a minor optimisation, we could unwind all stacks here */
2009 /* but that puts extra pressure on pp_slf, and is not worth much */ 2179 /* but that puts extra pressure on pp_slf, and is not worth much */
2010 /*coro_unwind_stacks (aTHX);*/ 2180 /*coro_unwind_stacks (aTHX);*/
2181}
2182
2183static void
2184slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2185{
2186 HV *coro_hv = (HV *)SvRV (coro_current);
2187
2188 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2189 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2190}
2191
2192static void
2193slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2194{
2195 HV *coro_hv;
2196 struct coro *coro;
2197
2198 if (items <= 0)
2199 croak ("Coro::cancel called without coro object,");
2200
2201 coro = SvSTATE (arg [0]);
2202 coro_hv = coro->hv;
2203
2204 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2205
2206 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2207 {
2208 /* coro currently busy cancelling something, so just notify it */
2209 coro->slf_frame.data = (void *)coro;
2210
2211 frame->prepare = prepare_nop;
2212 frame->check = slf_check_nop;
2213 }
2214 else if (coro_hv == (HV *)SvRV (coro_current))
2215 {
2216 /* cancelling the current coro is allowed, and equals terminate */
2217 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2218 }
2219 else
2220 {
2221 struct coro *self = SvSTATE_current;
2222
2223 /* otherwise we cancel directly, purely for speed reasons
2224 * unfortunately, this requires some magic trickery, as
2225 * somebody else could cancel us, so we have to fight the cancellation.
2226 * this is ugly, and hopefully fully worth the extra speed.
2227 * besides, I can't get the slow-but-safe version working...
2228 */
2229 slf_frame.data = 0;
2230 self->flags |= CF_NOCANCEL;
2231 coro_state_destroy (aTHX_ coro);
2232 self->flags &= ~CF_NOCANCEL;
2233
2234 if (slf_frame.data)
2235 {
2236 /* while we were busy we have been cancelled, so terminate */
2237 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2238 }
2239 else
2240 {
2241 frame->prepare = prepare_nop;
2242 frame->check = slf_check_nop;
2243 }
2244 }
2245}
2246
2247static int
2248slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2249{
2250 frame->prepare = 0;
2251 coro_unwind_stacks (aTHX);
2252
2253 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2254
2255 return 1;
2256}
2257
2258static int
2259safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2260{
2261 if (coro->cctx)
2262 croak ("coro inside C callback, unable to cancel at this time, caught");
2263
2264 if (coro->flags & CF_NEW)
2265 {
2266 coro_set_status (aTHX_ coro, arg, items);
2267 coro_state_destroy (aTHX_ coro);
2268 }
2269 else
2270 {
2271 if (!coro->slf_frame.prepare)
2272 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2273
2274 slf_destroy (aTHX_ coro);
2275
2276 coro_set_status (aTHX_ coro, arg, items);
2277 coro->slf_frame.prepare = prepare_nop;
2278 coro->slf_frame.check = slf_check_safe_cancel;
2279
2280 api_ready (aTHX_ (SV *)coro->hv);
2281 }
2282
2283 return 1;
2011} 2284}
2012 2285
2013/*****************************************************************************/ 2286/*****************************************************************************/
2014/* async pool handler */ 2287/* async pool handler */
2015 2288
… …
2046slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2319slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2047{ 2320{
2048 HV *hv = (HV *)SvRV (coro_current); 2321 HV *hv = (HV *)SvRV (coro_current);
2049 struct coro *coro = SvSTATE_hv ((SV *)hv); 2322 struct coro *coro = SvSTATE_hv ((SV *)hv);
2050 2323
2051 if (expect_true (coro->saved_deffh)) 2324 if (ecb_expect_true (coro->saved_deffh))
2052 { 2325 {
2053 /* subsequent iteration */ 2326 /* subsequent iteration */
2054 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2327 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2055 coro->saved_deffh = 0; 2328 coro->saved_deffh = 0;
2056 2329
2057 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2330 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2058 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2331 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2059 { 2332 {
2060 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2333 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2061 coro->invoke_av = newAV (); 2334 return;
2062
2063 frame->prepare = prepare_nop;
2064 } 2335 }
2065 else 2336 else
2066 { 2337 {
2067 av_clear (GvAV (PL_defgv)); 2338 av_clear (GvAV (PL_defgv));
2068 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2339 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2118 2389
2119static int 2390static int
2120slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2391slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2121{ 2392{
2122 SV *data = (SV *)frame->data; 2393 SV *data = (SV *)frame->data;
2123 2394
2124 if (CORO_THROW) 2395 if (CORO_THROW)
2125 return 0; 2396 return 0;
2126 2397
2127 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2398 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2128 return 1; 2399 return 1;
… …
2164 cb = sv_2mortal (coro->rouse_cb); 2435 cb = sv_2mortal (coro->rouse_cb);
2165 coro->rouse_cb = 0; 2436 coro->rouse_cb = 0;
2166 } 2437 }
2167 2438
2168 if (!SvROK (cb) 2439 if (!SvROK (cb)
2169 || SvTYPE (SvRV (cb)) != SVt_PVCV 2440 || SvTYPE (SvRV (cb)) != SVt_PVCV
2170 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2441 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2171 croak ("Coro::rouse_wait called with illegal callback argument,"); 2442 croak ("Coro::rouse_wait called with illegal callback argument,");
2172 2443
2173 { 2444 {
2174 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2445 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2291static void 2562static void
2292slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2563slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2293{ 2564{
2294 frame->prepare = prepare_cede_notself; 2565 frame->prepare = prepare_cede_notself;
2295 frame->check = slf_check_nop; 2566 frame->check = slf_check_nop;
2567}
2568
2569/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2570static void
2571slf_destroy (pTHX_ struct coro *coro)
2572{
2573 /* this callback is reserved for slf functions needing to do cleanup */
2574 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2575 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2576
2577 /*
2578 * The on_destroy above most likely is from an SLF call.
2579 * Since by definition the SLF call will not finish when we destroy
2580 * the coro, we will have to force-finish it here, otherwise
2581 * cleanup functions cannot call SLF functions.
2582 */
2583 coro->slf_frame.prepare = 0;
2296} 2584}
2297 2585
2298/* 2586/*
2299 * these not obviously related functions are all rolled into one 2587 * these not obviously related functions are all rolled into one
2300 * function to increase chances that they all will call transfer with the same 2588 * function to increase chances that they all will call transfer with the same
… …
2307 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2595 I32 checkmark; /* mark SP to see how many elements check has pushed */
2308 2596
2309 /* set up the slf frame, unless it has already been set-up */ 2597 /* set up the slf frame, unless it has already been set-up */
2310 /* the latter happens when a new coro has been started */ 2598 /* the latter happens when a new coro has been started */
2311 /* or when a new cctx was attached to an existing coroutine */ 2599 /* or when a new cctx was attached to an existing coroutine */
2312 if (expect_true (!slf_frame.prepare)) 2600 if (ecb_expect_true (!slf_frame.prepare))
2313 { 2601 {
2314 /* first iteration */ 2602 /* first iteration */
2315 dSP; 2603 dSP;
2316 SV **arg = PL_stack_base + TOPMARK + 1; 2604 SV **arg = PL_stack_base + TOPMARK + 1;
2317 int items = SP - arg; /* args without function object */ 2605 int items = SP - arg; /* args without function object */
… …
2358 while (slf_frame.check (aTHX_ &slf_frame)); 2646 while (slf_frame.check (aTHX_ &slf_frame));
2359 2647
2360 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2648 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2361 2649
2362 /* exception handling */ 2650 /* exception handling */
2363 if (expect_false (CORO_THROW)) 2651 if (ecb_expect_false (CORO_THROW))
2364 { 2652 {
2365 SV *exception = sv_2mortal (CORO_THROW); 2653 SV *exception = sv_2mortal (CORO_THROW);
2366 2654
2367 CORO_THROW = 0; 2655 CORO_THROW = 0;
2368 sv_setsv (ERRSV, exception); 2656 sv_setsv (ERRSV, exception);
2369 croak (0); 2657 croak (0);
2370 } 2658 }
2371 2659
2372 /* return value handling - mostly like entersub */ 2660 /* return value handling - mostly like entersub */
2373 /* make sure we put something on the stack in scalar context */ 2661 /* make sure we put something on the stack in scalar context */
2374 if (GIMME_V == G_SCALAR) 2662 if (GIMME_V == G_SCALAR
2663 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2375 { 2664 {
2376 dSP; 2665 dSP;
2377 SV **bot = PL_stack_base + checkmark; 2666 SV **bot = PL_stack_base + checkmark;
2378 2667
2379 if (sp == bot) /* too few, push undef */ 2668 if (sp == bot) /* too few, push undef */
2380 bot [1] = &PL_sv_undef; 2669 bot [1] = &PL_sv_undef;
2381 else if (sp != bot + 1) /* too many, take last one */ 2670 else /* too many, take last one */
2382 bot [1] = *sp; 2671 bot [1] = *sp;
2383 2672
2384 SP = bot + 1; 2673 SP = bot + 1;
2385 2674
2386 PUTBACK; 2675 PUTBACK;
… …
2419 if (PL_op->op_flags & OPf_STACKED) 2708 if (PL_op->op_flags & OPf_STACKED)
2420 { 2709 {
2421 if (items > slf_arga) 2710 if (items > slf_arga)
2422 { 2711 {
2423 slf_arga = items; 2712 slf_arga = items;
2424 free (slf_argv); 2713 Safefree (slf_argv);
2425 slf_argv = malloc (slf_arga * sizeof (SV *)); 2714 New (0, slf_argv, slf_arga, SV *);
2426 } 2715 }
2427 2716
2428 slf_argc = items; 2717 slf_argc = items;
2429 2718
2430 for (i = 0; i < items; ++i) 2719 for (i = 0; i < items; ++i)
… …
2493{ 2782{
2494 PerlIOBuf base; 2783 PerlIOBuf base;
2495 NV next, every; 2784 NV next, every;
2496} PerlIOCede; 2785} PerlIOCede;
2497 2786
2498static IV 2787static IV ecb_cold
2499PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2788PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2500{ 2789{
2501 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2790 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2502 2791
2503 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2792 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2504 self->next = nvtime () + self->every; 2793 self->next = nvtime () + self->every;
2505 2794
2506 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2795 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2507} 2796}
2508 2797
2509static SV * 2798static SV * ecb_cold
2510PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2799PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2511{ 2800{
2512 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2801 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2513 2802
2514 return newSVnv (self->every); 2803 return newSVnv (self->every);
… …
2626 SvREFCNT_dec (cb); 2915 SvREFCNT_dec (cb);
2627 } 2916 }
2628} 2917}
2629 2918
2630static void 2919static void
2631coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2920coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2632{ 2921{
2633 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2922 /* call $sem->adjust (0) to possibly wake up some other waiters */
2634 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2923 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2635} 2924}
2636 2925
2637static int 2926static int
2638slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2927slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2639{ 2928{
2640 AV *av = (AV *)frame->data; 2929 AV *av = (AV *)frame->data;
2641 SV *count_sv = AvARRAY (av)[0]; 2930 SV *count_sv = AvARRAY (av)[0];
2931 SV *coro_hv = SvRV (coro_current);
2642 2932
2643 /* if we are about to throw, don't actually acquire the lock, just throw */ 2933 /* if we are about to throw, don't actually acquire the lock, just throw */
2644 if (CORO_THROW) 2934 if (CORO_THROW)
2645 return 0; 2935 return 0;
2646 else if (SvIVX (count_sv) > 0) 2936 else if (SvIVX (count_sv) > 0)
2647 { 2937 {
2648 SvSTATE_current->on_destroy = 0; 2938 frame->destroy = 0;
2649 2939
2650 if (acquire) 2940 if (acquire)
2651 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2941 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2652 else 2942 else
2653 coro_semaphore_adjust (aTHX_ av, 0); 2943 coro_semaphore_adjust (aTHX_ av, 0);
… …
2658 { 2948 {
2659 int i; 2949 int i;
2660 /* if we were woken up but can't down, we look through the whole */ 2950 /* if we were woken up but can't down, we look through the whole */
2661 /* waiters list and only add us if we aren't in there already */ 2951 /* waiters list and only add us if we aren't in there already */
2662 /* this avoids some degenerate memory usage cases */ 2952 /* this avoids some degenerate memory usage cases */
2663 2953 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2664 for (i = 1; i <= AvFILLp (av); ++i)
2665 if (AvARRAY (av)[i] == SvRV (coro_current)) 2954 if (AvARRAY (av)[i] == coro_hv)
2666 return 1; 2955 return 1;
2667 2956
2668 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2957 av_push (av, SvREFCNT_inc (coro_hv));
2669 return 1; 2958 return 1;
2670 } 2959 }
2671} 2960}
2672 2961
2673static int 2962static int
… …
2696 { 2985 {
2697 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2986 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2698 2987
2699 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2988 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2700 frame->prepare = prepare_schedule; 2989 frame->prepare = prepare_schedule;
2701
2702 /* to avoid race conditions when a woken-up coro gets terminated */ 2990 /* to avoid race conditions when a woken-up coro gets terminated */
2703 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2991 /* we arrange for a temporary on_destroy that calls adjust (0) */
2704 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2992 frame->destroy = coro_semaphore_destroy;
2705 } 2993 }
2706} 2994}
2707 2995
2708static void 2996static void
2709slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2997slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2791 { 3079 {
2792 SV *cb_cv = s_get_cv_croak (arg [1]); 3080 SV *cb_cv = s_get_cv_croak (arg [1]);
2793 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3081 av_push (av, SvREFCNT_inc_NN (cb_cv));
2794 3082
2795 if (SvIVX (AvARRAY (av)[0])) 3083 if (SvIVX (AvARRAY (av)[0]))
2796 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3084 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2797 3085
2798 frame->prepare = prepare_nop; 3086 frame->prepare = prepare_nop;
2799 frame->check = slf_check_nop; 3087 frame->check = slf_check_nop;
2800 } 3088 }
2801 else if (SvIVX (AvARRAY (av)[0])) 3089 else if (SvIVX (AvARRAY (av)[0]))
… …
2878 /* it quickly returns */ 3166 /* it quickly returns */
2879 if (CORO_THROW) 3167 if (CORO_THROW)
2880 return 0; 3168 return 0;
2881 3169
2882 /* one element that is an RV? repeat! */ 3170 /* one element that is an RV? repeat! */
2883 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3171 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2884 return 1; 3172 return 1;
2885 3173
2886 /* restore status */ 3174 /* restore status */
2887 { 3175 {
2888 SV *data_sv = av_pop (state); 3176 SV *data_sv = av_pop (state);
… …
2927 dSP; 3215 dSP;
2928 3216
2929 static SV *prio_cv; 3217 static SV *prio_cv;
2930 static SV *prio_sv; 3218 static SV *prio_sv;
2931 3219
2932 if (expect_false (!prio_cv)) 3220 if (ecb_expect_false (!prio_cv))
2933 { 3221 {
2934 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3222 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2935 prio_sv = newSViv (0); 3223 prio_sv = newSViv (0);
2936 } 3224 }
2937 3225
… …
2963 /* now call the AIO function - we assume our request is uncancelable */ 3251 /* now call the AIO function - we assume our request is uncancelable */
2964 PUTBACK; 3252 PUTBACK;
2965 call_sv ((SV *)req, G_VOID | G_DISCARD); 3253 call_sv ((SV *)req, G_VOID | G_DISCARD);
2966 } 3254 }
2967 3255
2968 /* now that the requets is going, we loop toll we have a result */ 3256 /* now that the request is going, we loop till we have a result */
2969 frame->data = (void *)state; 3257 frame->data = (void *)state;
2970 frame->prepare = prepare_schedule; 3258 frame->prepare = prepare_schedule;
2971 frame->check = slf_check_aio_req; 3259 frame->check = slf_check_aio_req;
2972} 3260}
2973 3261
… …
3043 } 3331 }
3044 3332
3045 return coro_sv; 3333 return coro_sv;
3046} 3334}
3047 3335
3336#ifndef __cplusplus
3337ecb_cold XS(boot_Coro__State);
3338#endif
3339
3340#if CORO_JIT
3341
3342static void ecb_noinline ecb_cold
3343pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3344{
3345 dSP;
3346 AV *av = newAV ();
3347
3348 av_store (av, 3, newSVuv (d));
3349 av_store (av, 2, newSVuv (c));
3350 av_store (av, 1, newSVuv (b));
3351 av_store (av, 0, newSVuv (a));
3352
3353 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3354
3355 PUTBACK;
3356}
3357
3358static void ecb_noinline ecb_cold
3359jit_init (pTHX)
3360{
3361 dSP;
3362 SV *load, *save;
3363 char *map_base;
3364 char *load_ptr, *save_ptr;
3365 STRLEN load_len, save_len, map_len;
3366 int count;
3367
3368 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3369
3370 PUSHMARK (SP);
3371 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3372 #include "state.h"
3373 count = call_pv ("Coro::State::_jit", G_ARRAY);
3374 SPAGAIN;
3375
3376 save = POPs; save_ptr = SvPVbyte (save, save_len);
3377 load = POPs; load_ptr = SvPVbyte (load, load_len);
3378
3379 map_len = load_len + save_len + 16;
3380
3381 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3382
3383 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3384
3385 load_perl_slots = (load_save_perl_slots_type)map_base;
3386 memcpy (map_base, load_ptr, load_len);
3387
3388 map_base += (load_len + 15) & ~15;
3389
3390 save_perl_slots = (load_save_perl_slots_type)map_base;
3391 memcpy (map_base, save_ptr, save_len);
3392
3393 /* we are good citizens and try to make the page read-only, so the evil evil */
3394 /* hackers might have it a bit more difficult */
3395 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3396
3397 PUTBACK;
3398 eval_pv ("undef &Coro::State::_jit", 1);
3399}
3400
3401#endif
3402
3048MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3403MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3049 3404
3050PROTOTYPES: DISABLE 3405PROTOTYPES: DISABLE
3051 3406
3052BOOT: 3407BOOT:
… …
3054#ifdef USE_ITHREADS 3409#ifdef USE_ITHREADS
3055# if CORO_PTHREAD 3410# if CORO_PTHREAD
3056 coro_thx = PERL_GET_CONTEXT; 3411 coro_thx = PERL_GET_CONTEXT;
3057# endif 3412# endif
3058#endif 3413#endif
3059 BOOT_PAGESIZE; 3414 /* perl defines these to check for existance first, but why it doesn't */
3415 /* just create them one at init time is not clear to me, except for */
3416 /* programs trying to delete them, but... */
3417 /* anyway, we declare this as invalid and make sure they are initialised here */
3418 DEFSV;
3419 ERRSV;
3060 3420
3061 cctx_current = cctx_new_empty (); 3421 cctx_current = cctx_new_empty ();
3062 3422
3063 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3423 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3064 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3424 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3104 coroapi.prepare_nop = prepare_nop; 3464 coroapi.prepare_nop = prepare_nop;
3105 coroapi.prepare_schedule = prepare_schedule; 3465 coroapi.prepare_schedule = prepare_schedule;
3106 coroapi.prepare_cede = prepare_cede; 3466 coroapi.prepare_cede = prepare_cede;
3107 coroapi.prepare_cede_notself = prepare_cede_notself; 3467 coroapi.prepare_cede_notself = prepare_cede_notself;
3108 3468
3109 { 3469 time_init (aTHX);
3110 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3111
3112 if (!svp) croak ("Time::HiRes is required");
3113 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3114
3115 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3116
3117 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3118 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3119 }
3120 3470
3121 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3471 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3472#if CORO_JIT
3473 PUTBACK;
3474 jit_init (aTHX);
3475 SPAGAIN;
3476#endif
3122} 3477}
3123 3478
3124SV * 3479SV *
3125new (SV *klass, ...) 3480new (SV *klass, ...)
3126 ALIAS: 3481 ALIAS:
… …
3133void 3488void
3134transfer (...) 3489transfer (...)
3135 PROTOTYPE: $$ 3490 PROTOTYPE: $$
3136 CODE: 3491 CODE:
3137 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3492 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3138
3139bool
3140_destroy (SV *coro_sv)
3141 CODE:
3142 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3143 OUTPUT:
3144 RETVAL
3145
3146void
3147_exit (int code)
3148 PROTOTYPE: $
3149 CODE:
3150 _exit (code);
3151 3493
3152SV * 3494SV *
3153clone (Coro::State coro) 3495clone (Coro::State coro)
3154 CODE: 3496 CODE:
3155{ 3497{
… …
3210void 3552void
3211list () 3553list ()
3212 PROTOTYPE: 3554 PROTOTYPE:
3213 PPCODE: 3555 PPCODE:
3214{ 3556{
3215 struct coro *coro; 3557 struct coro *coro;
3216 for (coro = coro_first; coro; coro = coro->next) 3558 for (coro = coro_first; coro; coro = coro->next)
3217 if (coro->hv) 3559 if (coro->hv)
3218 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3560 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3219} 3561}
3220 3562
… …
3225 CODE: 3567 CODE:
3226{ 3568{
3227 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3569 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3228 { 3570 {
3229 struct coro *current = SvSTATE_current; 3571 struct coro *current = SvSTATE_current;
3572 struct CoroSLF slf_save;
3230 3573
3231 if (current != coro) 3574 if (current != coro)
3232 { 3575 {
3233 PUTBACK; 3576 PUTBACK;
3234 save_perl (aTHX_ current); 3577 save_perl (aTHX_ current);
3235 load_perl (aTHX_ coro); 3578 load_perl (aTHX_ coro);
3579 /* the coro is most likely in an active SLF call.
3580 * while not strictly required (the code we execute is
3581 * not allowed to call any SLF functions), it's cleaner
3582 * to reinitialise the slf_frame and restore it later.
3583 * This might one day allow us to actually do SLF calls
3584 * from code executed here.
3585 */
3586 slf_save = slf_frame;
3587 slf_frame.prepare = 0;
3236 SPAGAIN; 3588 SPAGAIN;
3237 } 3589 }
3238 3590
3239 PUSHSTACK; 3591 PUSHSTACK;
3240 3592
… …
3250 SPAGAIN; 3602 SPAGAIN;
3251 3603
3252 if (current != coro) 3604 if (current != coro)
3253 { 3605 {
3254 PUTBACK; 3606 PUTBACK;
3607 slf_frame = slf_save;
3255 save_perl (aTHX_ coro); 3608 save_perl (aTHX_ coro);
3256 load_perl (aTHX_ current); 3609 load_perl (aTHX_ current);
3257 SPAGAIN; 3610 SPAGAIN;
3258 } 3611 }
3259 } 3612 }
… …
3264 PROTOTYPE: $ 3617 PROTOTYPE: $
3265 ALIAS: 3618 ALIAS:
3266 is_ready = CF_READY 3619 is_ready = CF_READY
3267 is_running = CF_RUNNING 3620 is_running = CF_RUNNING
3268 is_new = CF_NEW 3621 is_new = CF_NEW
3269 is_destroyed = CF_DESTROYED 3622 is_destroyed = CF_ZOMBIE
3623 is_zombie = CF_ZOMBIE
3270 is_suspended = CF_SUSPENDED 3624 is_suspended = CF_SUSPENDED
3271 CODE: 3625 CODE:
3272 RETVAL = boolSV (coro->flags & ix); 3626 RETVAL = boolSV (coro->flags & ix);
3273 OUTPUT: 3627 OUTPUT:
3274 RETVAL 3628 RETVAL
3275 3629
3276void 3630void
3277throw (Coro::State self, SV *throw = &PL_sv_undef) 3631throw (SV *self, SV *exception = &PL_sv_undef)
3278 PROTOTYPE: $;$ 3632 PROTOTYPE: $;$
3279 CODE: 3633 CODE:
3280{ 3634{
3635 struct coro *coro = SvSTATE (self);
3281 struct coro *current = SvSTATE_current; 3636 struct coro *current = SvSTATE_current;
3282 SV **throwp = self == current ? &CORO_THROW : &self->except; 3637 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3283 SvREFCNT_dec (*throwp); 3638 SvREFCNT_dec (*exceptionp);
3284 SvGETMAGIC (throw); 3639 SvGETMAGIC (exception);
3285 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3640 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3641
3642 api_ready (aTHX_ self);
3286} 3643}
3287 3644
3288void 3645void
3289api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3646api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3290 PROTOTYPE: $;$ 3647 PROTOTYPE: $;$
… …
3345 3702
3346void 3703void
3347cancel (Coro::State self) 3704cancel (Coro::State self)
3348 CODE: 3705 CODE:
3349 coro_state_destroy (aTHX_ self); 3706 coro_state_destroy (aTHX_ self);
3350 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3351
3352 3707
3353SV * 3708SV *
3354enable_times (int enabled = enable_times) 3709enable_times (int enabled = enable_times)
3355 CODE: 3710 CODE:
3356{ 3711{
… …
3369 3724
3370void 3725void
3371times (Coro::State self) 3726times (Coro::State self)
3372 PPCODE: 3727 PPCODE:
3373{ 3728{
3374 struct coro *current = SvSTATE (coro_current); 3729 struct coro *current = SvSTATE (coro_current);
3375 3730
3376 if (expect_false (current == self)) 3731 if (ecb_expect_false (current == self))
3377 { 3732 {
3378 coro_times_update (); 3733 coro_times_update ();
3379 coro_times_add (SvSTATE (coro_current)); 3734 coro_times_add (SvSTATE (coro_current));
3380 } 3735 }
3381 3736
3382 EXTEND (SP, 2); 3737 EXTEND (SP, 2);
3383 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3738 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3384 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3739 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3385 3740
3386 if (expect_false (current == self)) 3741 if (ecb_expect_false (current == self))
3387 coro_times_sub (SvSTATE (coro_current)); 3742 coro_times_sub (SvSTATE (coro_current));
3388} 3743}
3389 3744
3390void 3745void
3391swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3746swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3412BOOT: 3767BOOT:
3413{ 3768{
3414 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3769 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3415 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3770 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3416 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3771 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3417 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3418 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3772 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3419 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3773 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3420 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3774 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3421 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3775 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3422 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3776 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3423 3777
3424 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3778 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3425 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3779 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3426 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3780 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3427 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3781 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3428 3782
3429 coro_stash = gv_stashpv ("Coro", TRUE); 3783 coro_stash = gv_stashpv ("Coro", TRUE);
3430 3784
3431 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3785 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3432 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3786 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3433 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3787 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3461 api_ready (aTHX_ RETVAL); 3815 api_ready (aTHX_ RETVAL);
3462 OUTPUT: 3816 OUTPUT:
3463 RETVAL 3817 RETVAL
3464 3818
3465void 3819void
3820_destroy (Coro::State coro)
3821 CODE:
3822 /* used by the manager thread */
3823 coro_state_destroy (aTHX_ coro);
3824
3825void
3826on_destroy (Coro::State coro, SV *cb)
3827 CODE:
3828 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3829
3830void
3831join (...)
3832 CODE:
3833 CORO_EXECUTE_SLF_XS (slf_init_join);
3834
3835void
3466terminate (...) 3836terminate (...)
3467 CODE: 3837 CODE:
3468 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3838 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3839
3840void
3841cancel (...)
3842 CODE:
3843 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3844
3845int
3846safe_cancel (Coro::State self, ...)
3847 C_ARGS: aTHX_ self, &ST (1), items - 1
3469 3848
3470void 3849void
3471schedule (...) 3850schedule (...)
3472 CODE: 3851 CODE:
3473 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3852 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3630 on_leave = 1 4009 on_leave = 1
3631 PROTOTYPE: & 4010 PROTOTYPE: &
3632 CODE: 4011 CODE:
3633{ 4012{
3634 struct coro *coro = SvSTATE_current; 4013 struct coro *coro = SvSTATE_current;
3635 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4014 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3636 4015
3637 block = s_get_cv_croak (block); 4016 block = s_get_cv_croak (block);
3638 4017
3639 if (!*avp) 4018 if (!*avp)
3640 *avp = newAV (); 4019 *avp = newAV ();
… …
3660 4039
3661SV * 4040SV *
3662new (SV *klass, SV *count = 0) 4041new (SV *klass, SV *count = 0)
3663 CODE: 4042 CODE:
3664{ 4043{
3665 int semcnt = 1; 4044 int semcnt = 1;
3666 4045
3667 if (count) 4046 if (count)
3668 { 4047 {
3669 SvGETMAGIC (count); 4048 SvGETMAGIC (count);
3670 4049
… …
3730 XSRETURN_NO; 4109 XSRETURN_NO;
3731} 4110}
3732 4111
3733void 4112void
3734waiters (SV *self) 4113waiters (SV *self)
3735 PPCODE: 4114 PPCODE:
3736{ 4115{
3737 AV *av = (AV *)SvRV (self); 4116 AV *av = (AV *)SvRV (self);
3738 int wcount = AvFILLp (av) + 1 - 1; 4117 int wcount = AvFILLp (av) + 1 - 1;
3739 4118
3740 if (GIMME_V == G_SCALAR) 4119 if (GIMME_V == G_SCALAR)
… …
3749} 4128}
3750 4129
3751MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4130MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3752 4131
3753void 4132void
3754_may_delete (SV *sem, int count, int extra_refs) 4133_may_delete (SV *sem, int count, unsigned int extra_refs)
3755 PPCODE: 4134 PPCODE:
3756{ 4135{
3757 AV *av = (AV *)SvRV (sem); 4136 AV *av = (AV *)SvRV (sem);
3758 4137
3759 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4138 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3760 && AvFILLp (av) == 0 /* no waiters, just count */ 4139 && AvFILLp (av) == 0 /* no waiters, just count */
3761 && SvIV (AvARRAY (av)[0]) == count) 4140 && SvIV (AvARRAY (av)[0]) == count)
3762 XSRETURN_YES; 4141 XSRETURN_YES;
… …
3783 4162
3784void 4163void
3785broadcast (SV *self) 4164broadcast (SV *self)
3786 CODE: 4165 CODE:
3787{ 4166{
3788 AV *av = (AV *)SvRV (self); 4167 AV *av = (AV *)SvRV (self);
3789 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4168 coro_signal_wake (aTHX_ av, AvFILLp (av));
3790} 4169}
3791 4170
3792void 4171void
3793send (SV *self) 4172send (SV *self)
… …
3801 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4180 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3802} 4181}
3803 4182
3804IV 4183IV
3805awaited (SV *self) 4184awaited (SV *self)
3806 CODE: 4185 CODE:
3807 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4186 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3808 OUTPUT: 4187 OUTPUT:
3809 RETVAL 4188 RETVAL
3810 4189
3811 4190
… …
3816 4195
3817void 4196void
3818_schedule (...) 4197_schedule (...)
3819 CODE: 4198 CODE:
3820{ 4199{
3821 static int incede; 4200 static int incede;
3822 4201
3823 api_cede_notself (aTHX); 4202 api_cede_notself (aTHX);
3824 4203
3825 ++incede; 4204 ++incede;
3826 while (coro_nready >= incede && api_cede (aTHX)) 4205 while (coro_nready >= incede && api_cede (aTHX))
… …
3870 { 4249 {
3871 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4250 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3872 coro_old_pp_sselect = 0; 4251 coro_old_pp_sselect = 0;
3873 } 4252 }
3874 4253
4254MODULE = Coro::State PACKAGE = Coro::Util
3875 4255
4256void
4257_exit (int code)
4258 CODE:
4259 _exit (code);
4260
4261NV
4262time ()
4263 CODE:
4264 RETVAL = nvtime (aTHX);
4265 OUTPUT:
4266 RETVAL
4267
4268NV
4269gettimeofday ()
4270 PPCODE:
4271{
4272 UV tv [2];
4273 u2time (aTHX_ tv);
4274 EXTEND (SP, 2);
4275 PUSHs (sv_2mortal (newSVuv (tv [0])));
4276 PUSHs (sv_2mortal (newSVuv (tv [1])));
4277}
4278

Diff Legend

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