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.381 by root, Sat Oct 23 09:28:50 2010 UTC vs.
Revision 1.431 by root, Fri Feb 8 22:29:18 2013 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */ 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7 7
8#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 9#define PERL_EXT
… …
13#include "XSUB.h" 13#include "XSUB.h"
14#include "perliol.h" 14#include "perliol.h"
15 15
16#include "schmorp.h" 16#include "schmorp.h"
17 17
18#define ECB_NO_THREADS 1
19#include "ecb.h"
20
21#include <stddef.h>
18#include <stdio.h> 22#include <stdio.h>
19#include <errno.h> 23#include <errno.h>
20#include <assert.h> 24#include <assert.h>
21 25
22#ifndef SVs_PADSTALE 26#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0 27# define SVs_PADSTALE 0
24#endif 28#endif
25 29
26#ifdef WIN32 30#ifdef PadARRAY
31# define NEWPADAPI
32# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
33#else
34typedef AV PADNAMELIST;
35# if !PERL_VERSION_ATLEAST(5,8,0)
36typedef AV PADLIST;
37typedef AV PAD;
38# endif
39# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
40# define PadlistMAX(pl) AvFILLp (pl)
41# define PadlistNAMES(pl) (*PadlistARRAY (pl))
42# define PadARRAY AvARRAY
43# define PadMAX AvFILLp
44# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
45#endif
46
47#if defined(_WIN32)
48# undef HAS_GETTIMEOFDAY
27# undef setjmp 49# undef setjmp
28# undef longjmp 50# undef longjmp
29# undef _exit 51# undef _exit
30# define setjmp _setjmp /* deep magic */ 52# define setjmp _setjmp /* deep magic */
31#else 53#else
32# include <inttypes.h> /* most portable stdint.h */ 54# include <inttypes.h> /* most portable stdint.h */
33#endif 55#endif
34 56
35#ifdef HAVE_MMAP
36# include <unistd.h>
37# include <sys/mman.h>
38# ifndef MAP_ANONYMOUS
39# ifdef MAP_ANON
40# define MAP_ANONYMOUS MAP_ANON
41# else
42# undef HAVE_MMAP
43# endif
44# endif
45# include <limits.h>
46# ifndef PAGESIZE
47# define PAGESIZE pagesize
48# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
49static long pagesize;
50# else
51# define BOOT_PAGESIZE (void)0
52# endif
53#else
54# define PAGESIZE 0
55# define BOOT_PAGESIZE (void)0
56#endif
57
58#if CORO_USE_VALGRIND
59# include <valgrind/valgrind.h>
60#endif
61
62/* the maximum number of idle cctx that will be pooled */ 57/* the maximum number of idle cctx that will be pooled */
63static int cctx_max_idle = 4; 58static int cctx_max_idle = 4;
64 59
65#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 60#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
66# undef CORO_STACKGUARD 61# define HAS_SCOPESTACK_NAME 1
67#endif
68
69#ifndef CORO_STACKGUARD
70# define CORO_STACKGUARD 0
71#endif 62#endif
72 63
73/* prefer perl internal functions over our own? */ 64/* prefer perl internal functions over our own? */
74#ifndef CORO_PREFER_PERL_FUNCTIONS 65#ifndef CORO_PREFER_PERL_FUNCTIONS
75# define CORO_PREFER_PERL_FUNCTIONS 0 66# define CORO_PREFER_PERL_FUNCTIONS 0
… …
85# define STACKLEVEL ((void *)&stacklevel) 76# define STACKLEVEL ((void *)&stacklevel)
86#endif 77#endif
87 78
88#define IN_DESTRUCT PL_dirty 79#define IN_DESTRUCT PL_dirty
89 80
90#if __GNUC__ >= 3
91# define attribute(x) __attribute__(x)
92# define expect(expr,value) __builtin_expect ((expr), (value))
93# define INLINE static inline
94#else
95# define attribute(x)
96# define expect(expr,value) (expr)
97# define INLINE static
98#endif
99
100#define expect_false(expr) expect ((expr) != 0, 0)
101#define expect_true(expr) expect ((expr) != 0, 1)
102
103#define NOINLINE attribute ((noinline))
104
105#include "CoroAPI.h" 81#include "CoroAPI.h"
106#define GCoroAPI (&coroapi) /* very sneaky */ 82#define GCoroAPI (&coroapi) /* very sneaky */
107 83
108#ifdef USE_ITHREADS 84#ifdef USE_ITHREADS
109# if CORO_PTHREAD 85# if CORO_PTHREAD
… …
125static void (*u2time)(pTHX_ UV ret[2]); 101static void (*u2time)(pTHX_ UV ret[2]);
126 102
127/* we hijack an hopefully unused CV flag for our purposes */ 103/* we hijack an hopefully unused CV flag for our purposes */
128#define CVf_SLF 0x4000 104#define CVf_SLF 0x4000
129static OP *pp_slf (pTHX); 105static OP *pp_slf (pTHX);
106static void slf_destroy (pTHX_ struct coro *coro);
130 107
131static U32 cctx_gen; 108static U32 cctx_gen;
132static size_t cctx_stacksize = CORO_STACKSIZE; 109static size_t cctx_stacksize = CORO_STACKSIZE;
133static struct CoroAPI coroapi; 110static struct CoroAPI coroapi;
134static AV *main_mainstack; /* used to differentiate between $main and others */ 111static AV *main_mainstack; /* used to differentiate between $main and others */
… …
164static char times_valid; 141static char times_valid;
165 142
166static struct coro_cctx *cctx_first; 143static struct coro_cctx *cctx_first;
167static int cctx_count, cctx_idle; 144static int cctx_count, cctx_idle;
168 145
169enum { 146enum
147{
170 CC_MAPPED = 0x01, 148 CC_MAPPED = 0x01,
171 CC_NOREUSE = 0x02, /* throw this away after tracing */ 149 CC_NOREUSE = 0x02, /* throw this away after tracing */
172 CC_TRACE = 0x04, 150 CC_TRACE = 0x04,
173 CC_TRACE_SUB = 0x08, /* trace sub calls */ 151 CC_TRACE_SUB = 0x08, /* trace sub calls */
174 CC_TRACE_LINE = 0x10, /* trace each statement */ 152 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
179typedef struct coro_cctx 157typedef struct coro_cctx
180{ 158{
181 struct coro_cctx *next; 159 struct coro_cctx *next;
182 160
183 /* the stack */ 161 /* the stack */
184 void *sptr; 162 struct coro_stack stack;
185 size_t ssize;
186 163
187 /* cpu state */ 164 /* cpu state */
188 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
189 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
190 JMPENV *top_env; 169 JMPENV *top_env;
191 coro_context cctx; 170 coro_context cctx;
192 171
193 U32 gen; 172 U32 gen;
194#if CORO_USE_VALGRIND 173#if CORO_USE_VALGRIND
195 int valgrind_id; 174 int valgrind_id;
196#endif 175#endif
197 unsigned char flags; 176 unsigned char flags;
198} coro_cctx; 177} coro_cctx;
199 178
200coro_cctx *cctx_current; /* the currently running cctx */ 179static coro_cctx *cctx_current; /* the currently running cctx */
201 180
202/*****************************************************************************/ 181/*****************************************************************************/
203 182
183static MGVTBL coro_state_vtbl;
184
204enum { 185enum
186{
205 CF_RUNNING = 0x0001, /* coroutine is running */ 187 CF_RUNNING = 0x0001, /* coroutine is running */
206 CF_READY = 0x0002, /* coroutine is ready */ 188 CF_READY = 0x0002, /* coroutine is ready */
207 CF_NEW = 0x0004, /* has never been switched to */ 189 CF_NEW = 0x0004, /* has never been switched to */
208 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 190 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
209 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) */
210}; 193};
211 194
212/* 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 */
213typedef struct 196typedef struct
214{ 197{
215 SV *defsv;
216 AV *defav;
217 SV *errsv;
218 SV *irsgv;
219 HV *hinthv;
220#define VAR(name,type) type name; 198 #define VARx(name,expr,type) type name;
221# include "state.h" 199 #include "state.h"
222#undef VAR
223} perl_slots; 200} perl_slots;
224 201
202/* how many context stack entries do we need for perl_slots */
225#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))
226 204
227/* this is a structure representing a perl-level coroutine */ 205/* this is a structure representing a perl-level coroutine */
228struct coro { 206struct coro
207{
229 /* the C coroutine allocated to this perl coroutine, if any */ 208 /* the C coroutine allocated to this perl coroutine, if any */
230 coro_cctx *cctx; 209 coro_cctx *cctx;
231 210
232 /* ready queue */ 211 /* ready queue */
233 struct coro *next_ready; 212 struct coro *next_ready;
… …
235 /* state data */ 214 /* state data */
236 struct CoroSLF slf_frame; /* saved slf frame */ 215 struct CoroSLF slf_frame; /* saved slf frame */
237 AV *mainstack; 216 AV *mainstack;
238 perl_slots *slot; /* basically the saved sp */ 217 perl_slots *slot; /* basically the saved sp */
239 218
240 CV *startcv; /* the CV to execute */ 219 CV *startcv; /* the CV to execute */
241 AV *args; /* data associated with this coroutine (initial args) */ 220 AV *args; /* data associated with this coroutine (initial args) */
242 int refcnt; /* coroutines are refcounted, yes */
243 int flags; /* CF_ flags */ 221 int flags; /* CF_ flags */
244 HV *hv; /* the perl hash associated with this coro, if any */ 222 HV *hv; /* the perl hash associated with this coro, if any */
245 void (*on_destroy)(pTHX_ struct coro *coro);
246 223
247 /* statistics */ 224 /* statistics */
248 int usecount; /* number of transfers to this coro */ 225 int usecount; /* number of transfers to this coro */
249 226
250 /* coro process data */ 227 /* coro process data */
251 int prio; 228 int prio;
252 SV *except; /* exception to be thrown */ 229 SV *except; /* exception to be thrown */
253 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 */
254 233
255 /* async_pool */ 234 /* async_pool */
256 SV *saved_deffh; 235 SV *saved_deffh;
257 SV *invoke_cb; 236 SV *invoke_cb;
258 AV *invoke_av; 237 AV *invoke_av;
… …
274typedef struct coro *Coro__State; 253typedef struct coro *Coro__State;
275typedef struct coro *Coro__State_or_hashref; 254typedef struct coro *Coro__State_or_hashref;
276 255
277/* the following variables are effectively part of the perl context */ 256/* the following variables are effectively part of the perl context */
278/* and get copied between struct coro and these variables */ 257/* and get copied between struct coro and these variables */
279/* the mainr easonw e don't support windows process emulation */ 258/* the main reason we don't support windows process emulation */
280static struct CoroSLF slf_frame; /* the current slf frame */ 259static struct CoroSLF slf_frame; /* the current slf frame */
281 260
282/** Coro ********************************************************************/ 261/** Coro ********************************************************************/
283 262
284#define CORO_PRIO_MAX 3 263#define CORO_PRIO_MAX 3
… …
290 269
291/* for Coro.pm */ 270/* for Coro.pm */
292static SV *coro_current; 271static SV *coro_current;
293static SV *coro_readyhook; 272static SV *coro_readyhook;
294static 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 */
295static CV *cv_coro_run, *cv_coro_terminate; 274static CV *cv_coro_run;
296static struct coro *coro_first; 275static struct coro *coro_first;
297#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
298 300
299/** Coro::Select ************************************************************/ 301/** Coro::Select ************************************************************/
300 302
301static OP *(*coro_old_pp_sselect) (pTHX); 303static OP *(*coro_old_pp_sselect) (pTHX);
302static SV *coro_select_select; 304static SV *coro_select_select;
… …
314 PL_op->op_flags |= OPf_STACKED; 316 PL_op->op_flags |= OPf_STACKED;
315 PL_op->op_private = 0; 317 PL_op->op_private = 0;
316 return PL_ppaddr [OP_ENTERSUB](aTHX); 318 return PL_ppaddr [OP_ENTERSUB](aTHX);
317} 319}
318 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
319/** lowlevel stuff **********************************************************/ 373/** lowlevel stuff **********************************************************/
320 374
321static SV * 375static SV * ecb_noinline
322coro_get_sv (pTHX_ const char *name, int create) 376coro_get_sv (pTHX_ const char *name, int create)
323{ 377{
324#if PERL_VERSION_ATLEAST (5,10,0) 378#if PERL_VERSION_ATLEAST (5,10,0)
325 /* 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 */
326 get_sv (name, create); 380 get_sv (name, create);
327#endif 381#endif
328 return get_sv (name, create); 382 return get_sv (name, create);
329} 383}
330 384
331static AV * 385static AV * ecb_noinline
332coro_get_av (pTHX_ const char *name, int create) 386coro_get_av (pTHX_ const char *name, int create)
333{ 387{
334#if PERL_VERSION_ATLEAST (5,10,0) 388#if PERL_VERSION_ATLEAST (5,10,0)
335 /* 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 */
336 get_av (name, create); 390 get_av (name, create);
337#endif 391#endif
338 return get_av (name, create); 392 return get_av (name, create);
339} 393}
340 394
341static HV * 395static HV * ecb_noinline
342coro_get_hv (pTHX_ const char *name, int create) 396coro_get_hv (pTHX_ const char *name, int create)
343{ 397{
344#if PERL_VERSION_ATLEAST (5,10,0) 398#if PERL_VERSION_ATLEAST (5,10,0)
345 /* 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 */
346 get_hv (name, create); 400 get_hv (name, create);
347#endif 401#endif
348 return get_hv (name, create); 402 return get_hv (name, create);
349} 403}
350 404
351INLINE void 405ecb_inline void
352coro_times_update () 406coro_times_update (void)
353{ 407{
354#ifdef coro_clock_gettime 408#ifdef coro_clock_gettime
355 struct timespec ts; 409 struct timespec ts;
356 410
357 ts.tv_sec = ts.tv_nsec = 0; 411 ts.tv_sec = ts.tv_nsec = 0;
… …
369 time_real [0] = tv [0]; 423 time_real [0] = tv [0];
370 time_real [1] = tv [1] * 1000; 424 time_real [1] = tv [1] * 1000;
371#endif 425#endif
372} 426}
373 427
374INLINE void 428ecb_inline void
375coro_times_add (struct coro *c) 429coro_times_add (struct coro *c)
376{ 430{
377 c->t_real [1] += time_real [1]; 431 c->t_real [1] += time_real [1];
378 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]; }
379 c->t_real [0] += time_real [0]; 433 c->t_real [0] += time_real [0];
… …
381 c->t_cpu [1] += time_cpu [1]; 435 c->t_cpu [1] += time_cpu [1];
382 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]; }
383 c->t_cpu [0] += time_cpu [0]; 437 c->t_cpu [0] += time_cpu [0];
384} 438}
385 439
386INLINE void 440ecb_inline void
387coro_times_sub (struct coro *c) 441coro_times_sub (struct coro *c)
388{ 442{
389 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]; }
390 c->t_real [1] -= time_real [1]; 444 c->t_real [1] -= time_real [1];
391 c->t_real [0] -= time_real [0]; 445 c->t_real [0] -= time_real [0];
… …
399/* magic glue */ 453/* magic glue */
400 454
401#define CORO_MAGIC_type_cv 26 455#define CORO_MAGIC_type_cv 26
402#define CORO_MAGIC_type_state PERL_MAGIC_ext 456#define CORO_MAGIC_type_state PERL_MAGIC_ext
403 457
404#define CORO_MAGIC_NN(sv, type) \ 458#define CORO_MAGIC_NN(sv, type) \
405 (expect_true (SvMAGIC (sv)->mg_type == type) \ 459 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
406 ? SvMAGIC (sv) \ 460 ? SvMAGIC (sv) \
407 : mg_find (sv, type)) 461 : mg_find (sv, type))
408 462
409#define CORO_MAGIC(sv, type) \ 463#define CORO_MAGIC(sv, type) \
410 (expect_true (SvMAGIC (sv)) \ 464 (ecb_expect_true (SvMAGIC (sv)) \
411 ? CORO_MAGIC_NN (sv, type) \ 465 ? CORO_MAGIC_NN (sv, type) \
412 : 0) 466 : 0)
413 467
414#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)
415#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)
416 470
417INLINE 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 *
418SvSTATE_ (pTHX_ SV *coro) 487SvSTATE_ (pTHX_ SV *coro)
419{ 488{
420 HV *stash;
421 MAGIC *mg; 489 MAGIC *mg;
422 490
423 if (SvROK (coro)) 491 if (SvROK (coro))
424 coro = SvRV (coro); 492 coro = SvRV (coro);
425 493
426 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 494 mg = SvSTATEhv_p (aTHX_ coro);
495 if (!mg)
427 croak ("Coro::State object required"); 496 croak ("Coro::State object required");
428 497
429 stash = SvSTASH (coro);
430 if (expect_false (stash != coro_stash && stash != coro_state_stash))
431 {
432 /* very slow, but rare, check */
433 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
434 croak ("Coro::State object required");
435 }
436
437 mg = CORO_MAGIC_state (coro);
438 return (struct coro *)mg->mg_ptr; 498 return (struct coro *)mg->mg_ptr;
439} 499}
440 500
441#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 501#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
442 502
… …
445#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 505#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
446 506
447/*****************************************************************************/ 507/*****************************************************************************/
448/* padlist management and caching */ 508/* padlist management and caching */
449 509
450static AV * 510ecb_inline PADLIST *
451coro_derive_padlist (pTHX_ CV *cv) 511coro_derive_padlist (pTHX_ CV *cv)
452{ 512{
453 AV *padlist = CvPADLIST (cv); 513 PADLIST *padlist = CvPADLIST (cv);
454 AV *newpadlist, *newpad; 514 PADLIST *newpadlist;
515 PAD *newpad;
516 PADOFFSET const off = PadlistMAX (padlist) + 1;
455 517
456 newpadlist = newAV (); 518 newPADLIST(newpadlist);
519#if !PERL_VERSION_ATLEAST(5,15,3)
520 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
457 AvREAL_off (newpadlist); 521 AvREAL_off (newpadlist);
522#endif
458#if PERL_VERSION_ATLEAST (5,10,0) 523#if PERL_VERSION_ATLEAST (5,10,0)
459 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 524 Perl_pad_push (aTHX_ padlist, off);
460#else 525#else
461 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 526 Perl_pad_push (aTHX_ padlist, off, 1);
462#endif 527#endif
463 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 528 newpad = PadlistARRAY (padlist)[off];
464 --AvFILLp (padlist); 529 PadlistMAX (padlist) = off - 1;
465 530
466 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 531 /* Already extended to 2 elements by newPADLIST. */
467 av_store (newpadlist, 1, (SV *)newpad); 532 PadlistMAX (newpadlist) = 1;
533 PadlistNAMES (newpadlist) = (PADNAMELIST *)SvREFCNT_inc_NN (PadlistNAMES (padlist));
534 PadlistARRAY (newpadlist)[1] = newpad;
468 535
469 return newpadlist; 536 return newpadlist;
470} 537}
471 538
472static void 539ecb_inline void
473free_padlist (pTHX_ AV *padlist) 540free_padlist (pTHX_ PADLIST *padlist)
474{ 541{
475 /* may be during global destruction */ 542 /* may be during global destruction */
476 if (!IN_DESTRUCT) 543 if (!IN_DESTRUCT)
477 { 544 {
478 I32 i = AvFILLp (padlist); 545 I32 i = PadlistMAX (padlist);
479 546
480 while (i > 0) /* special-case index 0 */ 547 while (i > 0) /* special-case index 0 */
481 { 548 {
482 /* we try to be extra-careful here */ 549 /* we try to be extra-careful here */
483 AV *av = (AV *)AvARRAY (padlist)[i--]; 550 PAD *pad = PadlistARRAY (padlist)[i--];
484 I32 j = AvFILLp (av); 551 I32 j = PadMAX (pad);
485 552
486 while (j >= 0) 553 while (j >= 0)
487 SvREFCNT_dec (AvARRAY (av)[j--]); 554 SvREFCNT_dec (PadARRAY (pad)[j--]);
488 555
489 AvFILLp (av) = -1; 556 PadMAX (pad) = -1;
490 SvREFCNT_dec (av); 557 SvREFCNT_dec (pad);
491 } 558 }
492 559
493 SvREFCNT_dec (AvARRAY (padlist)[0]); 560 SvREFCNT_dec (PadlistNAMES (padlist));
494 561
562#ifdef NEWPADAPI
563 Safefree (PadlistARRAY (padlist));
564 Safefree (padlist);
565#else
495 AvFILLp (padlist) = -1; 566 AvFILLp (padlist) = -1;
567 AvREAL_off (padlist);
496 SvREFCNT_dec ((SV*)padlist); 568 SvREFCNT_dec ((SV*)padlist);
569#endif
497 } 570 }
498} 571}
499 572
500static int 573static int
501coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 574coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
502{ 575{
503 AV *padlist; 576 PADLIST *padlist;
504 AV *av = (AV *)mg->mg_obj; 577 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
578 size_t len = *(size_t *)mg->mg_ptr;
505 579
506 /* perl manages to free our internal AV and _then_ call us */ 580 /* perl manages to free our internal AV and _then_ call us */
507 if (IN_DESTRUCT) 581 if (IN_DESTRUCT)
508 return 0; 582 return 0;
509 583
510 /* casting is fun. */ 584 while (len--)
511 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
512 free_padlist (aTHX_ padlist); 585 free_padlist (aTHX_ padlists[len]);
513
514 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
515 586
516 return 0; 587 return 0;
517} 588}
518 589
519static MGVTBL coro_cv_vtbl = { 590static MGVTBL coro_cv_vtbl = {
520 0, 0, 0, 0, 591 0, 0, 0, 0,
521 coro_cv_free 592 coro_cv_free
522}; 593};
523 594
524/* the next two functions merely cache the padlists */ 595/* the next two functions merely cache the padlists */
525static void 596ecb_inline void
526get_padlist (pTHX_ CV *cv) 597get_padlist (pTHX_ CV *cv)
527{ 598{
528 MAGIC *mg = CORO_MAGIC_cv (cv); 599 MAGIC *mg = CORO_MAGIC_cv (cv);
529 AV *av; 600 size_t *lenp;
530 601
531 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 602 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
532 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 603 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
533 else 604 else
534 { 605 {
535#if CORO_PREFER_PERL_FUNCTIONS 606#if CORO_PREFER_PERL_FUNCTIONS
536 /* this is probably cleaner? but also slower! */ 607 /* this is probably cleaner? but also slower! */
537 /* in practise, it seems to be less stable */ 608 /* in practise, it seems to be less stable */
… …
543 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 614 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
544#endif 615#endif
545 } 616 }
546} 617}
547 618
548static void 619ecb_inline void
549put_padlist (pTHX_ CV *cv) 620put_padlist (pTHX_ CV *cv)
550{ 621{
551 MAGIC *mg = CORO_MAGIC_cv (cv); 622 MAGIC *mg = CORO_MAGIC_cv (cv);
552 AV *av;
553 623
554 if (expect_false (!mg)) 624 if (ecb_expect_false (!mg))
625 {
555 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 626 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
627 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
628 mg->mg_len = 1; /* so mg_free frees mg_ptr */
629 }
630 else
631 Renew (mg->mg_ptr,
632 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
633 char);
556 634
557 av = (AV *)mg->mg_obj; 635 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
558
559 if (expect_false (AvFILLp (av) >= AvMAX (av)))
560 av_extend (av, AvFILLp (av) + 1);
561
562 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
563} 636}
564 637
565/** load & save, init *******************************************************/ 638/** load & save, init *******************************************************/
566 639
640ecb_inline void
641swap_sv (SV *a, SV *b)
642{
643 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
644 SV tmp;
645
646 /* swap sv_any */
647 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
648
649 /* swap sv_flags */
650 SvFLAGS (&tmp) = SvFLAGS (a);
651 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
652 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
653
654#if PERL_VERSION_ATLEAST (5,10,0)
655 /* perl 5.10 and later complicates this _quite_ a bit, but it also
656 * is much faster, so no quarrels here. alternatively, we could
657 * sv_upgrade to avoid this.
658 */
659 {
660 /* swap sv_u */
661 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
662
663 /* if SvANY points to the head, we need to adjust the pointers,
664 * as the pointer for a still points to b, and maybe vice versa.
665 */
666 #define svany_in_head(type) \
667 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
668
669 if (svany_in_head (SvTYPE (a)))
670 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
671
672 if (svany_in_head (SvTYPE (b)))
673 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
674 }
675#endif
676}
677
567/* swap sv heads, at least logically */ 678/* swap sv heads, at least logically */
568static void 679static void
569swap_svs (pTHX_ Coro__State c) 680swap_svs (pTHX_ Coro__State c)
570{ 681{
571 int i; 682 int i;
572 683
573 for (i = 0; i <= AvFILLp (c->swap_sv); ) 684 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
574 { 685 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
575 SV *a = AvARRAY (c->swap_sv)[i++];
576 SV *b = AvARRAY (c->swap_sv)[i++];
577
578 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
579 SV tmp;
580
581 /* swap sv_any */
582 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
583
584 /* swap sv_flags */
585 SvFLAGS (&tmp) = SvFLAGS (a);
586 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
587 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
588
589#if PERL_VERSION_ATLEAST (5,10,0)
590 /* perl 5.10 complicates this _quite_ a bit, but it also is
591 * is much faster, so no quarrels here. alternatively, we could
592 * sv_upgrade to avoid this.
593 */
594 {
595 /* swap sv_u */
596 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
597
598 /* if SvANY points to the head, we need to adjust the pointers,
599 * as the pointer for a still points to b, and maybe vice versa.
600 */
601 #define svany_in_head(type) \
602 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
603
604 if (svany_in_head (SvTYPE (a)))
605 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
606
607 if (svany_in_head (SvTYPE (b)))
608 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
609 }
610#endif
611 }
612} 686}
613 687
614#define SWAP_SVS(coro) \ 688#define SWAP_SVS(coro) \
615 if (expect_false ((coro)->swap_sv)) \ 689 if (ecb_expect_false ((coro)->swap_sv)) \
616 swap_svs (aTHX_ (coro)) 690 swap_svs (aTHX_ (coro))
617 691
618static void 692static void
619on_enterleave_call (pTHX_ SV *cb); 693on_enterleave_call (pTHX_ SV *cb);
620 694
… …
624 perl_slots *slot = c->slot; 698 perl_slots *slot = c->slot;
625 c->slot = 0; 699 c->slot = 0;
626 700
627 PL_mainstack = c->mainstack; 701 PL_mainstack = c->mainstack;
628 702
629 GvSV (PL_defgv) = slot->defsv; 703#if CORO_JIT
630 GvAV (PL_defgv) = slot->defav; 704 load_perl_slots (slot);
631 GvSV (PL_errgv) = slot->errsv; 705#else
632 GvSV (irsgv) = slot->irsgv;
633 GvHV (PL_hintgv) = slot->hinthv;
634
635 #define VAR(name,type) PL_ ## name = slot->name; 706 #define VARx(name,expr,type) expr = slot->name;
636 # include "state.h" 707 #include "state.h"
637 #undef VAR 708#endif
638 709
639 { 710 {
640 dSP; 711 dSP;
641 712
642 CV *cv; 713 CV *cv;
643 714
644 /* now do the ugly restore mess */ 715 /* now do the ugly restore mess */
645 while (expect_true (cv = (CV *)POPs)) 716 while (ecb_expect_true (cv = (CV *)POPs))
646 { 717 {
647 put_padlist (aTHX_ cv); /* mark this padlist as available */ 718 put_padlist (aTHX_ cv); /* mark this padlist as available */
648 CvDEPTH (cv) = PTR2IV (POPs); 719 CvDEPTH (cv) = PTR2IV (POPs);
649 CvPADLIST (cv) = (AV *)POPs; 720 CvPADLIST (cv) = (PADLIST *)POPs;
650 } 721 }
651 722
652 PUTBACK; 723 PUTBACK;
653 } 724 }
654 725
655 slf_frame = c->slf_frame; 726 slf_frame = c->slf_frame;
656 CORO_THROW = c->except; 727 CORO_THROW = c->except;
657 728
658 if (expect_false (enable_times)) 729 if (ecb_expect_false (enable_times))
659 { 730 {
660 if (expect_false (!times_valid)) 731 if (ecb_expect_false (!times_valid))
661 coro_times_update (); 732 coro_times_update ();
662 733
663 coro_times_sub (c); 734 coro_times_sub (c);
664 } 735 }
665 736
666 if (expect_false (c->on_enter)) 737 if (ecb_expect_false (c->on_enter))
667 { 738 {
668 int i; 739 int i;
669 740
670 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 741 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
671 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 742 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
… …
677static void 748static void
678save_perl (pTHX_ Coro__State c) 749save_perl (pTHX_ Coro__State c)
679{ 750{
680 SWAP_SVS (c); 751 SWAP_SVS (c);
681 752
682 if (expect_false (c->on_leave)) 753 if (ecb_expect_false (c->on_leave))
683 { 754 {
684 int i; 755 int i;
685 756
686 for (i = AvFILLp (c->on_leave); i >= 0; --i) 757 for (i = AvFILLp (c->on_leave); i >= 0; --i)
687 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 758 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
688 } 759 }
689 760
690 times_valid = 0; 761 times_valid = 0;
691 762
692 if (expect_false (enable_times)) 763 if (ecb_expect_false (enable_times))
693 { 764 {
694 coro_times_update (); times_valid = 1; 765 coro_times_update (); times_valid = 1;
695 coro_times_add (c); 766 coro_times_add (c);
696 } 767 }
697 768
… …
711 782
712 XPUSHs (Nullsv); 783 XPUSHs (Nullsv);
713 /* this loop was inspired by pp_caller */ 784 /* this loop was inspired by pp_caller */
714 for (;;) 785 for (;;)
715 { 786 {
716 while (expect_true (cxix >= 0)) 787 while (ecb_expect_true (cxix >= 0))
717 { 788 {
718 PERL_CONTEXT *cx = &ccstk[cxix--]; 789 PERL_CONTEXT *cx = &ccstk[cxix--];
719 790
720 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 791 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
721 { 792 {
722 CV *cv = cx->blk_sub.cv; 793 CV *cv = cx->blk_sub.cv;
723 794
724 if (expect_true (CvDEPTH (cv))) 795 if (ecb_expect_true (CvDEPTH (cv)))
725 { 796 {
726 EXTEND (SP, 3); 797 EXTEND (SP, 3);
727 PUSHs ((SV *)CvPADLIST (cv)); 798 PUSHs ((SV *)CvPADLIST (cv));
728 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 799 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
729 PUSHs ((SV *)cv); 800 PUSHs ((SV *)cv);
… …
732 get_padlist (aTHX_ cv); 803 get_padlist (aTHX_ cv);
733 } 804 }
734 } 805 }
735 } 806 }
736 807
737 if (expect_true (top_si->si_type == PERLSI_MAIN)) 808 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
738 break; 809 break;
739 810
740 top_si = top_si->si_prev; 811 top_si = top_si->si_prev;
741 ccstk = top_si->si_cxstack; 812 ccstk = top_si->si_cxstack;
742 cxix = top_si->si_cxix; 813 cxix = top_si->si_cxix;
… …
744 815
745 PUTBACK; 816 PUTBACK;
746 } 817 }
747 818
748 /* allocate some space on the context stack for our purposes */ 819 /* allocate some space on the context stack for our purposes */
749 /* we manually unroll here, as usually 2 slots is enough */ 820 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
750 if (SLOT_COUNT >= 1) CXINC;
751 if (SLOT_COUNT >= 2) CXINC;
752 if (SLOT_COUNT >= 3) CXINC;
753 { 821 {
754 unsigned int i; 822 unsigned int i;
823
755 for (i = 3; i < SLOT_COUNT; ++i) 824 for (i = 0; i < SLOT_COUNT; ++i)
756 CXINC; 825 CXINC;
757 } 826
758 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 827 cxstack_ix -= SLOT_COUNT; /* undo allocation */
828 }
759 829
760 c->mainstack = PL_mainstack; 830 c->mainstack = PL_mainstack;
761 831
762 { 832 {
763 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 833 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
764 834
765 slot->defav = GvAV (PL_defgv); 835#if CORO_JIT
766 slot->defsv = DEFSV; 836 save_perl_slots (slot);
767 slot->errsv = ERRSV; 837#else
768 slot->irsgv = GvSV (irsgv);
769 slot->hinthv = GvHV (PL_hintgv);
770
771 #define VAR(name,type) slot->name = PL_ ## name; 838 #define VARx(name,expr,type) slot->name = expr;
772 # include "state.h" 839 #include "state.h"
773 #undef VAR 840#endif
774 } 841 }
775} 842}
776 843
777/* 844/*
778 * allocate various perl stacks. This is almost an exact copy 845 * allocate various perl stacks. This is almost an exact copy
… …
784# define coro_init_stacks(thx) init_stacks () 851# define coro_init_stacks(thx) init_stacks ()
785#else 852#else
786static void 853static void
787coro_init_stacks (pTHX) 854coro_init_stacks (pTHX)
788{ 855{
789 PL_curstackinfo = new_stackinfo(32, 8); 856 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
790 PL_curstackinfo->si_type = PERLSI_MAIN; 857 PL_curstackinfo->si_type = PERLSI_MAIN;
791 PL_curstack = PL_curstackinfo->si_stack; 858 PL_curstack = PL_curstackinfo->si_stack;
792 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 859 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
793 860
794 PL_stack_base = AvARRAY(PL_curstack); 861 PL_stack_base = AvARRAY(PL_curstack);
… …
809#endif 876#endif
810 877
811 New(54,PL_scopestack,8,I32); 878 New(54,PL_scopestack,8,I32);
812 PL_scopestack_ix = 0; 879 PL_scopestack_ix = 0;
813 PL_scopestack_max = 8; 880 PL_scopestack_max = 8;
881#if HAS_SCOPESTACK_NAME
882 New(54,PL_scopestack_name,8,const char*);
883#endif
814 884
815 New(54,PL_savestack,24,ANY); 885 New(54,PL_savestack,24,ANY);
816 PL_savestack_ix = 0; 886 PL_savestack_ix = 0;
817 PL_savestack_max = 24; 887 PL_savestack_max = 24;
818 888
… …
846 } 916 }
847 917
848 Safefree (PL_tmps_stack); 918 Safefree (PL_tmps_stack);
849 Safefree (PL_markstack); 919 Safefree (PL_markstack);
850 Safefree (PL_scopestack); 920 Safefree (PL_scopestack);
921#if HAS_SCOPESTACK_NAME
922 Safefree (PL_scopestack_name);
923#endif
851 Safefree (PL_savestack); 924 Safefree (PL_savestack);
852#if !PERL_VERSION_ATLEAST (5,10,0) 925#if !PERL_VERSION_ATLEAST (5,10,0)
853 Safefree (PL_retstack); 926 Safefree (PL_retstack);
854#endif 927#endif
855} 928}
… …
901#endif 974#endif
902 975
903/* 976/*
904 * This overrides the default magic get method of %SIG elements. 977 * This overrides the default magic get method of %SIG elements.
905 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 978 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
906 * and instead of trying to save and restore the hash elements, we just provide 979 * and instead of trying to save and restore the hash elements (extremely slow),
907 * readback here. 980 * we just provide our own readback here.
908 */ 981 */
909static int 982static int ecb_cold
910coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 983coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
911{ 984{
912 const char *s = MgPV_nolen_const (mg); 985 const char *s = MgPV_nolen_const (mg);
913 986
914 if (*s == '_') 987 if (*s == '_')
915 { 988 {
916 SV **svp = 0; 989 SV **svp = 0;
917 990
918 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 991 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
919 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 992 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
920 993
921 if (svp) 994 if (svp)
922 { 995 {
923 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 996 SV *ssv;
997
998 if (!*svp)
999 ssv = &PL_sv_undef;
1000 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1001 ssv = sv_2mortal (newRV_inc (*svp));
1002 else
1003 ssv = *svp;
1004
1005 sv_setsv (sv, ssv);
924 return 0; 1006 return 0;
925 } 1007 }
926 } 1008 }
927 1009
928 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1010 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
929} 1011}
930 1012
931static int 1013static int ecb_cold
932coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1014coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
933{ 1015{
934 const char *s = MgPV_nolen_const (mg); 1016 const char *s = MgPV_nolen_const (mg);
935 1017
936 if (*s == '_') 1018 if (*s == '_')
… …
950 } 1032 }
951 1033
952 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1034 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
953} 1035}
954 1036
955static int 1037static int ecb_cold
956coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1038coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
957{ 1039{
958 const char *s = MgPV_nolen_const (mg); 1040 const char *s = MgPV_nolen_const (mg);
959 1041
960 if (*s == '_') 1042 if (*s == '_')
… …
995 return 1; 1077 return 1;
996} 1078}
997 1079
998static UNOP init_perl_op; 1080static UNOP init_perl_op;
999 1081
1000static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1082ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1001init_perl (pTHX_ struct coro *coro) 1083init_perl (pTHX_ struct coro *coro)
1002{ 1084{
1003 /* 1085 /*
1004 * emulate part of the perl startup here. 1086 * emulate part of the perl startup here.
1005 */ 1087 */
… …
1013 PL_comppad_name_fill = 0; 1095 PL_comppad_name_fill = 0;
1014 PL_comppad_name_floor = 0; 1096 PL_comppad_name_floor = 0;
1015 PL_curpm = 0; 1097 PL_curpm = 0;
1016 PL_curpad = 0; 1098 PL_curpad = 0;
1017 PL_localizing = 0; 1099 PL_localizing = 0;
1018 PL_dirty = 0;
1019 PL_restartop = 0; 1100 PL_restartop = 0;
1020#if PERL_VERSION_ATLEAST (5,10,0) 1101#if PERL_VERSION_ATLEAST (5,10,0)
1021 PL_parser = 0; 1102 PL_parser = 0;
1022#endif 1103#endif
1023 PL_hints = 0; 1104 PL_hints = 0;
1024 1105
1025 /* recreate the die/warn hooks */ 1106 /* recreate the die/warn hooks */
1026 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1107 PL_diehook = SvREFCNT_inc (rv_diehook);
1027 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1108 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1028 1109
1029 GvSV (PL_defgv) = newSV (0); 1110 GvSV (PL_defgv) = newSV (0);
1030 GvAV (PL_defgv) = coro->args; coro->args = 0; 1111 GvAV (PL_defgv) = coro->args; coro->args = 0;
1031 GvSV (PL_errgv) = newSV (0); 1112 GvSV (PL_errgv) = newSV (0);
1032 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1113 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1033 GvHV (PL_hintgv) = 0; 1114 GvHV (PL_hintgv) = 0;
… …
1053 /* this newly created coroutine might be run on an existing cctx which most 1134 /* this newly created coroutine might be run on an existing cctx which most
1054 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1135 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1055 */ 1136 */
1056 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1137 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1057 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1138 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1139 slf_frame.destroy = 0;
1058 1140
1059 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1141 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1060 init_perl_op.op_next = PL_op; 1142 init_perl_op.op_next = PL_op;
1061 init_perl_op.op_type = OP_ENTERSUB; 1143 init_perl_op.op_type = OP_ENTERSUB;
1062 init_perl_op.op_ppaddr = pp_slf; 1144 init_perl_op.op_ppaddr = pp_slf;
… …
1067 /* copy throw, in case it was set before init_perl */ 1149 /* copy throw, in case it was set before init_perl */
1068 CORO_THROW = coro->except; 1150 CORO_THROW = coro->except;
1069 1151
1070 SWAP_SVS (coro); 1152 SWAP_SVS (coro);
1071 1153
1072 if (expect_false (enable_times)) 1154 if (ecb_expect_false (enable_times))
1073 { 1155 {
1074 coro_times_update (); 1156 coro_times_update ();
1075 coro_times_sub (coro); 1157 coro_times_sub (coro);
1076 } 1158 }
1077} 1159}
… …
1101destroy_perl (pTHX_ struct coro *coro) 1183destroy_perl (pTHX_ struct coro *coro)
1102{ 1184{
1103 SV *svf [9]; 1185 SV *svf [9];
1104 1186
1105 { 1187 {
1188 SV *old_current = SvRV (coro_current);
1106 struct coro *current = SvSTATE_current; 1189 struct coro *current = SvSTATE (old_current);
1107 1190
1108 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1191 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1109 1192
1110 save_perl (aTHX_ current); 1193 save_perl (aTHX_ current);
1194
1195 /* this will cause transfer_check to croak on block*/
1196 SvRV_set (coro_current, (SV *)coro->hv);
1197
1111 load_perl (aTHX_ coro); 1198 load_perl (aTHX_ coro);
1112 1199
1113 coro_unwind_stacks (aTHX); 1200 coro_unwind_stacks (aTHX);
1114 coro_destruct_stacks (aTHX);
1115 1201
1116 /* restore swapped sv's */ 1202 /* restore swapped sv's */
1117 SWAP_SVS (coro); 1203 SWAP_SVS (coro);
1118 1204
1205 coro_destruct_stacks (aTHX);
1206
1119 // now save some sv's to be free'd later 1207 /* now save some sv's to be free'd later */
1120 svf [0] = GvSV (PL_defgv); 1208 svf [0] = GvSV (PL_defgv);
1121 svf [1] = (SV *)GvAV (PL_defgv); 1209 svf [1] = (SV *)GvAV (PL_defgv);
1122 svf [2] = GvSV (PL_errgv); 1210 svf [2] = GvSV (PL_errgv);
1123 svf [3] = (SV *)PL_defoutgv; 1211 svf [3] = (SV *)PL_defoutgv;
1124 svf [4] = PL_rs; 1212 svf [4] = PL_rs;
… …
1126 svf [6] = (SV *)GvHV (PL_hintgv); 1214 svf [6] = (SV *)GvHV (PL_hintgv);
1127 svf [7] = PL_diehook; 1215 svf [7] = PL_diehook;
1128 svf [8] = PL_warnhook; 1216 svf [8] = PL_warnhook;
1129 assert (9 == sizeof (svf) / sizeof (*svf)); 1217 assert (9 == sizeof (svf) / sizeof (*svf));
1130 1218
1219 SvRV_set (coro_current, old_current);
1220
1131 load_perl (aTHX_ current); 1221 load_perl (aTHX_ current);
1132 } 1222 }
1133 1223
1134 { 1224 {
1135 unsigned int i; 1225 unsigned int i;
… …
1142 SvREFCNT_dec (coro->invoke_cb); 1232 SvREFCNT_dec (coro->invoke_cb);
1143 SvREFCNT_dec (coro->invoke_av); 1233 SvREFCNT_dec (coro->invoke_av);
1144 } 1234 }
1145} 1235}
1146 1236
1147INLINE void 1237ecb_inline void
1148free_coro_mortal (pTHX) 1238free_coro_mortal (pTHX)
1149{ 1239{
1150 if (expect_true (coro_mortal)) 1240 if (ecb_expect_true (coro_mortal))
1151 { 1241 {
1152 SvREFCNT_dec (coro_mortal); 1242 SvREFCNT_dec ((SV *)coro_mortal);
1153 coro_mortal = 0; 1243 coro_mortal = 0;
1154 } 1244 }
1155} 1245}
1156 1246
1157static int 1247static int
… …
1290 1380
1291 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1381 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1292} 1382}
1293 1383
1294/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1384/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1295static void NOINLINE 1385static void ecb_noinline
1296cctx_prepare (pTHX) 1386cctx_prepare (pTHX)
1297{ 1387{
1298 PL_top_env = &PL_start_env; 1388 PL_top_env = &PL_start_env;
1299 1389
1300 if (cctx_current->flags & CC_TRACE) 1390 if (cctx_current->flags & CC_TRACE)
… …
1311 slf_frame.prepare = slf_prepare_set_stacklevel; 1401 slf_frame.prepare = slf_prepare_set_stacklevel;
1312 slf_frame.check = slf_check_set_stacklevel; 1402 slf_frame.check = slf_check_set_stacklevel;
1313} 1403}
1314 1404
1315/* the tail of transfer: execute stuff we can only do after a transfer */ 1405/* the tail of transfer: execute stuff we can only do after a transfer */
1316INLINE void 1406ecb_inline void
1317transfer_tail (pTHX) 1407transfer_tail (pTHX)
1318{ 1408{
1319 free_coro_mortal (aTHX); 1409 free_coro_mortal (aTHX);
1410}
1411
1412/* try to exit the same way perl's main function would do */
1413/* we do not bother resetting the environment or other things *7
1414/* that are not, uhm, essential */
1415/* this obviously also doesn't work when perl is embedded */
1416static void ecb_noinline ecb_cold
1417perlish_exit (pTHX)
1418{
1419 int exitstatus = perl_destruct (PL_curinterp);
1420 perl_free (PL_curinterp);
1421 exit (exitstatus);
1320} 1422}
1321 1423
1322/* 1424/*
1323 * this is a _very_ stripped down perl interpreter ;) 1425 * this is a _very_ stripped down perl interpreter ;)
1324 */ 1426 */
… …
1353 */ 1455 */
1354 1456
1355 /* 1457 /*
1356 * If perl-run returns we assume exit() was being called or the coro 1458 * If perl-run returns we assume exit() was being called or the coro
1357 * fell off the end, which seems to be the only valid (non-bug) 1459 * fell off the end, which seems to be the only valid (non-bug)
1358 * reason for perl_run to return. We try to exit by jumping to the 1460 * reason for perl_run to return. We try to mimic whatever perl is normally
1359 * bootstrap-time "top" top_env, as we cannot restore the "main" 1461 * doing in that case. YMMV.
1360 * coroutine as Coro has no such concept.
1361 * This actually isn't valid with the pthread backend, but OSes requiring
1362 * that backend are too broken to do it in a standards-compliant way.
1363 */ 1462 */
1364 PL_top_env = main_top_env; 1463 perlish_exit (aTHX);
1365 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1366 } 1464 }
1367} 1465}
1368 1466
1369static coro_cctx * 1467static coro_cctx *
1370cctx_new () 1468cctx_new (void)
1371{ 1469{
1372 coro_cctx *cctx; 1470 coro_cctx *cctx;
1373 1471
1374 ++cctx_count; 1472 ++cctx_count;
1375 New (0, cctx, 1, coro_cctx); 1473 New (0, cctx, 1, coro_cctx);
… …
1381 return cctx; 1479 return cctx;
1382} 1480}
1383 1481
1384/* create a new cctx only suitable as source */ 1482/* create a new cctx only suitable as source */
1385static coro_cctx * 1483static coro_cctx *
1386cctx_new_empty () 1484cctx_new_empty (void)
1387{ 1485{
1388 coro_cctx *cctx = cctx_new (); 1486 coro_cctx *cctx = cctx_new ();
1389 1487
1390 cctx->sptr = 0; 1488 cctx->stack.sptr = 0;
1391 coro_create (&cctx->cctx, 0, 0, 0, 0); 1489 coro_create (&cctx->cctx, 0, 0, 0, 0);
1392 1490
1393 return cctx; 1491 return cctx;
1394} 1492}
1395 1493
1396/* create a new cctx suitable as destination/running a perl interpreter */ 1494/* create a new cctx suitable as destination/running a perl interpreter */
1397static coro_cctx * 1495static coro_cctx *
1398cctx_new_run () 1496cctx_new_run (void)
1399{ 1497{
1400 coro_cctx *cctx = cctx_new (); 1498 coro_cctx *cctx = cctx_new ();
1401 void *stack_start;
1402 size_t stack_size;
1403 1499
1404#if HAVE_MMAP 1500 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1405 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1406 /* mmap supposedly does allocate-on-write for us */
1407 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1408
1409 if (cctx->sptr != (void *)-1)
1410 {
1411 #if CORO_STACKGUARD
1412 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1413 #endif
1414 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1415 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1416 cctx->flags |= CC_MAPPED;
1417 } 1501 {
1418 else
1419#endif
1420 {
1421 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1422 New (0, cctx->sptr, cctx_stacksize, long);
1423
1424 if (!cctx->sptr)
1425 {
1426 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1502 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1427 _exit (EXIT_FAILURE); 1503 _exit (EXIT_FAILURE);
1428 }
1429
1430 stack_start = cctx->sptr;
1431 stack_size = cctx->ssize;
1432 } 1504 }
1433 1505
1434 #if CORO_USE_VALGRIND
1435 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1436 #endif
1437
1438 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1506 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1439 1507
1440 return cctx; 1508 return cctx;
1441} 1509}
1442 1510
1443static void 1511static void
1444cctx_destroy (coro_cctx *cctx) 1512cctx_destroy (coro_cctx *cctx)
1445{ 1513{
1446 if (!cctx) 1514 if (!cctx)
1447 return; 1515 return;
1448 1516
1449 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1517 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1450 1518
1451 --cctx_count; 1519 --cctx_count;
1452 coro_destroy (&cctx->cctx); 1520 coro_destroy (&cctx->cctx);
1453 1521
1454 /* coro_transfer creates new, empty cctx's */ 1522 coro_stack_free (&cctx->stack);
1455 if (cctx->sptr)
1456 {
1457 #if CORO_USE_VALGRIND
1458 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1459 #endif
1460
1461#if HAVE_MMAP
1462 if (cctx->flags & CC_MAPPED)
1463 munmap (cctx->sptr, cctx->ssize);
1464 else
1465#endif
1466 Safefree (cctx->sptr);
1467 }
1468 1523
1469 Safefree (cctx); 1524 Safefree (cctx);
1470} 1525}
1471 1526
1472/* wether this cctx should be destructed */ 1527/* wether this cctx should be destructed */
1473#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1528#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1474 1529
1475static coro_cctx * 1530static coro_cctx *
1476cctx_get (pTHX) 1531cctx_get (pTHX)
1477{ 1532{
1478 while (expect_true (cctx_first)) 1533 while (ecb_expect_true (cctx_first))
1479 { 1534 {
1480 coro_cctx *cctx = cctx_first; 1535 coro_cctx *cctx = cctx_first;
1481 cctx_first = cctx->next; 1536 cctx_first = cctx->next;
1482 --cctx_idle; 1537 --cctx_idle;
1483 1538
1484 if (expect_true (!CCTX_EXPIRED (cctx))) 1539 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1485 return cctx; 1540 return cctx;
1486 1541
1487 cctx_destroy (cctx); 1542 cctx_destroy (cctx);
1488 } 1543 }
1489 1544
… …
1491} 1546}
1492 1547
1493static void 1548static void
1494cctx_put (coro_cctx *cctx) 1549cctx_put (coro_cctx *cctx)
1495{ 1550{
1496 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1551 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1497 1552
1498 /* free another cctx if overlimit */ 1553 /* free another cctx if overlimit */
1499 if (expect_false (cctx_idle >= cctx_max_idle)) 1554 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1500 { 1555 {
1501 coro_cctx *first = cctx_first; 1556 coro_cctx *first = cctx_first;
1502 cctx_first = first->next; 1557 cctx_first = first->next;
1503 --cctx_idle; 1558 --cctx_idle;
1504 1559
… …
1515static void 1570static void
1516transfer_check (pTHX_ struct coro *prev, struct coro *next) 1571transfer_check (pTHX_ struct coro *prev, struct coro *next)
1517{ 1572{
1518 /* TODO: throwing up here is considered harmful */ 1573 /* TODO: throwing up here is considered harmful */
1519 1574
1520 if (expect_true (prev != next)) 1575 if (ecb_expect_true (prev != next))
1521 { 1576 {
1522 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1577 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1523 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1578 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1524 1579
1525 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1580 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1526 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1581 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1527 1582
1528#if !PERL_VERSION_ATLEAST (5,10,0) 1583#if !PERL_VERSION_ATLEAST (5,10,0)
1529 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1584 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1530 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1585 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1531#endif 1586#endif
1532 } 1587 }
1533} 1588}
1534 1589
1535/* always use the TRANSFER macro */ 1590/* always use the TRANSFER macro */
1536static void NOINLINE /* noinline so we have a fixed stackframe */ 1591static void ecb_noinline /* noinline so we have a fixed stackframe */
1537transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1592transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1538{ 1593{
1539 dSTACKLEVEL; 1594 dSTACKLEVEL;
1540 1595
1541 /* sometimes transfer is only called to set idle_sp */ 1596 /* sometimes transfer is only called to set idle_sp */
1542 if (expect_false (!prev)) 1597 if (ecb_expect_false (!prev))
1543 { 1598 {
1544 cctx_current->idle_sp = STACKLEVEL; 1599 cctx_current->idle_sp = STACKLEVEL;
1545 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1600 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1546 } 1601 }
1547 else if (expect_true (prev != next)) 1602 else if (ecb_expect_true (prev != next))
1548 { 1603 {
1549 coro_cctx *cctx_prev; 1604 coro_cctx *cctx_prev;
1550 1605
1551 if (expect_false (prev->flags & CF_NEW)) 1606 if (ecb_expect_false (prev->flags & CF_NEW))
1552 { 1607 {
1553 /* create a new empty/source context */ 1608 /* create a new empty/source context */
1554 prev->flags &= ~CF_NEW; 1609 prev->flags &= ~CF_NEW;
1555 prev->flags |= CF_RUNNING; 1610 prev->flags |= CF_RUNNING;
1556 } 1611 }
… …
1559 next->flags |= CF_RUNNING; 1614 next->flags |= CF_RUNNING;
1560 1615
1561 /* first get rid of the old state */ 1616 /* first get rid of the old state */
1562 save_perl (aTHX_ prev); 1617 save_perl (aTHX_ prev);
1563 1618
1564 if (expect_false (next->flags & CF_NEW)) 1619 if (ecb_expect_false (next->flags & CF_NEW))
1565 { 1620 {
1566 /* need to start coroutine */ 1621 /* need to start coroutine */
1567 next->flags &= ~CF_NEW; 1622 next->flags &= ~CF_NEW;
1568 /* setup coroutine call */ 1623 /* setup coroutine call */
1569 init_perl (aTHX_ next); 1624 init_perl (aTHX_ next);
1570 } 1625 }
1571 else 1626 else
1572 load_perl (aTHX_ next); 1627 load_perl (aTHX_ next);
1573 1628
1574 /* possibly untie and reuse the cctx */ 1629 /* possibly untie and reuse the cctx */
1575 if (expect_true ( 1630 if (ecb_expect_true (
1576 cctx_current->idle_sp == STACKLEVEL 1631 cctx_current->idle_sp == STACKLEVEL
1577 && !(cctx_current->flags & CC_TRACE) 1632 && !(cctx_current->flags & CC_TRACE)
1578 && !force_cctx 1633 && !force_cctx
1579 )) 1634 ))
1580 { 1635 {
1581 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1636 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1582 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1637 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1583 1638
1584 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1639 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1585 /* without this the next cctx_get might destroy the running cctx while still in use */ 1640 /* without this the next cctx_get might destroy the running cctx while still in use */
1586 if (expect_false (CCTX_EXPIRED (cctx_current))) 1641 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1587 if (expect_true (!next->cctx)) 1642 if (ecb_expect_true (!next->cctx))
1588 next->cctx = cctx_get (aTHX); 1643 next->cctx = cctx_get (aTHX);
1589 1644
1590 cctx_put (cctx_current); 1645 cctx_put (cctx_current);
1591 } 1646 }
1592 else 1647 else
1593 prev->cctx = cctx_current; 1648 prev->cctx = cctx_current;
1594 1649
1595 ++next->usecount; 1650 ++next->usecount;
1596 1651
1597 cctx_prev = cctx_current; 1652 cctx_prev = cctx_current;
1598 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1653 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1599 1654
1600 next->cctx = 0; 1655 next->cctx = 0;
1601 1656
1602 if (expect_false (cctx_prev != cctx_current)) 1657 if (ecb_expect_false (cctx_prev != cctx_current))
1603 { 1658 {
1604 cctx_prev->top_env = PL_top_env; 1659 cctx_prev->top_env = PL_top_env;
1605 PL_top_env = cctx_current->top_env; 1660 PL_top_env = cctx_current->top_env;
1606 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1661 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1607 } 1662 }
… …
1613#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1668#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1614#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1669#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1615 1670
1616/** high level stuff ********************************************************/ 1671/** high level stuff ********************************************************/
1617 1672
1673/* this function is actually Coro, not Coro::State, but we call it from here */
1674/* because it is convenient - but it hasn't been declared yet for that reason */
1618static int 1675static void
1676coro_call_on_destroy (pTHX_ struct coro *coro);
1677
1678static void
1619coro_state_destroy (pTHX_ struct coro *coro) 1679coro_state_destroy (pTHX_ struct coro *coro)
1620{ 1680{
1621 if (coro->flags & CF_DESTROYED) 1681 if (coro->flags & CF_ZOMBIE)
1622 return 0; 1682 return;
1623 1683
1624 if (coro->on_destroy && !PL_dirty)
1625 coro->on_destroy (aTHX_ coro); 1684 slf_destroy (aTHX_ coro);
1626 1685
1627 coro->flags |= CF_DESTROYED; 1686 coro->flags |= CF_ZOMBIE;
1628 1687
1629 if (coro->flags & CF_READY) 1688 if (coro->flags & CF_READY)
1630 { 1689 {
1631 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1690 /* reduce nready, as destroying a ready coro effectively unreadies it */
1632 /* alternative: look through all ready queues and remove the coro */ 1691 /* alternative: look through all ready queues and remove the coro */
1633 --coro_nready; 1692 --coro_nready;
1634 } 1693 }
1635 else 1694 else
1636 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1695 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1696
1697 if (coro->next) coro->next->prev = coro->prev;
1698 if (coro->prev) coro->prev->next = coro->next;
1699 if (coro == coro_first) coro_first = coro->next;
1637 1700
1638 if (coro->mainstack 1701 if (coro->mainstack
1639 && coro->mainstack != main_mainstack 1702 && coro->mainstack != main_mainstack
1640 && coro->slot 1703 && coro->slot
1641 && !PL_dirty) 1704 && !PL_dirty)
1642 destroy_perl (aTHX_ coro); 1705 destroy_perl (aTHX_ coro);
1643 1706
1644 if (coro->next) coro->next->prev = coro->prev;
1645 if (coro->prev) coro->prev->next = coro->next;
1646 if (coro == coro_first) coro_first = coro->next;
1647
1648 cctx_destroy (coro->cctx); 1707 cctx_destroy (coro->cctx);
1649 SvREFCNT_dec (coro->startcv); 1708 SvREFCNT_dec (coro->startcv);
1650 SvREFCNT_dec (coro->args); 1709 SvREFCNT_dec (coro->args);
1651 SvREFCNT_dec (coro->swap_sv); 1710 SvREFCNT_dec (coro->swap_sv);
1652 SvREFCNT_dec (CORO_THROW); 1711 SvREFCNT_dec (CORO_THROW);
1653 1712
1654 return 1; 1713 coro_call_on_destroy (aTHX_ coro);
1714
1715 /* more destruction mayhem in coro_state_free */
1655} 1716}
1656 1717
1657static int 1718static int
1658coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1719coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1659{ 1720{
1660 struct coro *coro = (struct coro *)mg->mg_ptr; 1721 struct coro *coro = (struct coro *)mg->mg_ptr;
1661 mg->mg_ptr = 0; 1722 mg->mg_ptr = 0;
1662 1723
1663 coro->hv = 0;
1664
1665 if (--coro->refcnt < 0)
1666 {
1667 coro_state_destroy (aTHX_ coro); 1724 coro_state_destroy (aTHX_ coro);
1725 SvREFCNT_dec (coro->on_destroy);
1726 SvREFCNT_dec (coro->status);
1727
1668 Safefree (coro); 1728 Safefree (coro);
1669 }
1670 1729
1671 return 0; 1730 return 0;
1672} 1731}
1673 1732
1674static int 1733static int ecb_cold
1675coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1734coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1676{ 1735{
1677 struct coro *coro = (struct coro *)mg->mg_ptr; 1736 /* called when perl clones the current process the slow way (windows process emulation) */
1678 1737 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1679 ++coro->refcnt; 1738 mg->mg_ptr = 0;
1739 mg->mg_virtual = 0;
1680 1740
1681 return 0; 1741 return 0;
1682} 1742}
1683 1743
1684static MGVTBL coro_state_vtbl = { 1744static MGVTBL coro_state_vtbl = {
… …
1709 TRANSFER (ta, 1); 1769 TRANSFER (ta, 1);
1710} 1770}
1711 1771
1712/** Coro ********************************************************************/ 1772/** Coro ********************************************************************/
1713 1773
1714INLINE void 1774ecb_inline void
1715coro_enq (pTHX_ struct coro *coro) 1775coro_enq (pTHX_ struct coro *coro)
1716{ 1776{
1717 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1777 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1718 1778
1719 SvREFCNT_inc_NN (coro->hv); 1779 SvREFCNT_inc_NN (coro->hv);
… …
1721 coro->next_ready = 0; 1781 coro->next_ready = 0;
1722 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1782 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1723 ready [1] = coro; 1783 ready [1] = coro;
1724} 1784}
1725 1785
1726INLINE struct coro * 1786ecb_inline struct coro *
1727coro_deq (pTHX) 1787coro_deq (pTHX)
1728{ 1788{
1729 int prio; 1789 int prio;
1730 1790
1731 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1791 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1784{ 1844{
1785 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1845 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1786} 1846}
1787 1847
1788/* expects to own a reference to next->hv */ 1848/* expects to own a reference to next->hv */
1789INLINE void 1849ecb_inline void
1790prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1850prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1791{ 1851{
1792 SV *prev_sv = SvRV (coro_current); 1852 SV *prev_sv = SvRV (coro_current);
1793 1853
1794 ta->prev = SvSTATE_hv (prev_sv); 1854 ta->prev = SvSTATE_hv (prev_sv);
… …
1807{ 1867{
1808 for (;;) 1868 for (;;)
1809 { 1869 {
1810 struct coro *next = coro_deq (aTHX); 1870 struct coro *next = coro_deq (aTHX);
1811 1871
1812 if (expect_true (next)) 1872 if (ecb_expect_true (next))
1813 { 1873 {
1814 /* cannot transfer to destroyed coros, skip and look for next */ 1874 /* cannot transfer to destroyed coros, skip and look for next */
1815 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1875 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1816 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1876 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1817 else 1877 else
1818 { 1878 {
1819 next->flags &= ~CF_READY; 1879 next->flags &= ~CF_READY;
1820 --coro_nready; 1880 --coro_nready;
… …
1853 } 1913 }
1854 } 1914 }
1855 } 1915 }
1856} 1916}
1857 1917
1858INLINE void 1918ecb_inline void
1859prepare_cede (pTHX_ struct coro_transfer_args *ta) 1919prepare_cede (pTHX_ struct coro_transfer_args *ta)
1860{ 1920{
1861 api_ready (aTHX_ coro_current); 1921 api_ready (aTHX_ coro_current);
1862 prepare_schedule (aTHX_ ta); 1922 prepare_schedule (aTHX_ ta);
1863} 1923}
1864 1924
1865INLINE void 1925ecb_inline void
1866prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 1926prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1867{ 1927{
1868 SV *prev = SvRV (coro_current); 1928 SV *prev = SvRV (coro_current);
1869 1929
1870 if (coro_nready) 1930 if (coro_nready)
… …
1900{ 1960{
1901 struct coro_transfer_args ta; 1961 struct coro_transfer_args ta;
1902 1962
1903 prepare_cede (aTHX_ &ta); 1963 prepare_cede (aTHX_ &ta);
1904 1964
1905 if (expect_true (ta.prev != ta.next)) 1965 if (ecb_expect_true (ta.prev != ta.next))
1906 { 1966 {
1907 TRANSFER (ta, 1); 1967 TRANSFER (ta, 1);
1908 return 1; 1968 return 1;
1909 } 1969 }
1910 else 1970 else
… …
1953 coro->slot->runops = RUNOPS_DEFAULT; 2013 coro->slot->runops = RUNOPS_DEFAULT;
1954 } 2014 }
1955} 2015}
1956 2016
1957static void 2017static void
2018coro_push_av (pTHX_ AV *av, I32 gimme_v)
2019{
2020 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2021 {
2022 dSP;
2023
2024 if (gimme_v == G_SCALAR)
2025 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2026 else
2027 {
2028 int i;
2029 EXTEND (SP, AvFILLp (av) + 1);
2030
2031 for (i = 0; i <= AvFILLp (av); ++i)
2032 PUSHs (AvARRAY (av)[i]);
2033 }
2034
2035 PUTBACK;
2036 }
2037}
2038
2039static void
2040coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2041{
2042 if (!coro->on_destroy)
2043 coro->on_destroy = newAV ();
2044
2045 av_push (coro->on_destroy, cb);
2046}
2047
2048static void
2049slf_destroy_join (pTHX_ struct CoroSLF *frame)
2050{
2051 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2052}
2053
2054static int
2055slf_check_join (pTHX_ struct CoroSLF *frame)
2056{
2057 struct coro *coro = (struct coro *)frame->data;
2058
2059 if (!coro->status)
2060 return 1;
2061
2062 frame->destroy = 0;
2063
2064 coro_push_av (aTHX_ coro->status, GIMME_V);
2065
2066 SvREFCNT_dec ((SV *)coro->hv);
2067
2068 return 0;
2069}
2070
2071static void
2072slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2073{
2074 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2075
2076 if (items > 1)
2077 croak ("join called with too many arguments");
2078
2079 if (coro->status)
2080 frame->prepare = prepare_nop;
2081 else
2082 {
2083 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2084 frame->prepare = prepare_schedule;
2085 }
2086
2087 frame->check = slf_check_join;
2088 frame->destroy = slf_destroy_join;
2089 frame->data = (void *)coro;
2090 SvREFCNT_inc (coro->hv);
2091}
2092
2093static void
1958coro_call_on_destroy (pTHX_ struct coro *coro) 2094coro_call_on_destroy (pTHX_ struct coro *coro)
1959{ 2095{
1960 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2096 AV *od = coro->on_destroy;
1961 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1962 2097
1963 if (on_destroyp) 2098 if (!od)
1964 { 2099 return;
1965 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1966 2100
1967 while (AvFILLp (on_destroy) >= 0) 2101 while (AvFILLp (od) >= 0)
2102 {
2103 SV *cb = sv_2mortal (av_pop (od));
2104
2105 /* coro hv's (and only hv's at the moment) are supported as well */
2106 if (SvSTATEhv_p (aTHX_ cb))
2107 api_ready (aTHX_ cb);
2108 else
1968 { 2109 {
1969 dSP; /* don't disturb outer sp */ 2110 dSP; /* don't disturb outer sp */
1970 SV *cb = av_pop (on_destroy);
1971
1972 PUSHMARK (SP); 2111 PUSHMARK (SP);
1973 2112
1974 if (statusp) 2113 if (coro->status)
1975 { 2114 {
1976 int i; 2115 PUTBACK;
1977 AV *status = (AV *)SvRV (*statusp); 2116 coro_push_av (aTHX_ coro->status, G_ARRAY);
1978 EXTEND (SP, AvFILLp (status) + 1); 2117 SPAGAIN;
1979
1980 for (i = 0; i <= AvFILLp (status); ++i)
1981 PUSHs (AvARRAY (status)[i]);
1982 } 2118 }
1983 2119
1984 PUTBACK; 2120 PUTBACK;
1985 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2121 call_sv (cb, G_VOID | G_DISCARD);
1986 } 2122 }
1987 } 2123 }
1988} 2124}
1989 2125
1990static void 2126static void
1991slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2127coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1992{ 2128{
1993 int i; 2129 AV *av;
1994 HV *hv = (HV *)SvRV (coro_current); 2130
1995 AV *av = newAV (); 2131 if (coro->status)
2132 {
2133 av = coro->status;
2134 av_clear (av);
2135 }
2136 else
2137 av = coro->status = newAV ();
1996 2138
1997 /* items are actually not so common, so optimise for this case */ 2139 /* items are actually not so common, so optimise for this case */
1998 if (items) 2140 if (items)
1999 { 2141 {
2142 int i;
2143
2000 av_extend (av, items - 1); 2144 av_extend (av, items - 1);
2001 2145
2002 for (i = 0; i < items; ++i) 2146 for (i = 0; i < items; ++i)
2003 av_push (av, SvREFCNT_inc_NN (arg [i])); 2147 av_push (av, SvREFCNT_inc_NN (arg [i]));
2004 } 2148 }
2149}
2005 2150
2006 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2151static void
2007 2152slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2153{
2008 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2154 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2009 api_ready (aTHX_ sv_manager); 2155 api_ready (aTHX_ sv_manager);
2010 2156
2011 frame->prepare = prepare_schedule; 2157 frame->prepare = prepare_schedule;
2012 frame->check = slf_check_repeat; 2158 frame->check = slf_check_repeat;
2013 2159
2014 /* as a minor optimisation, we could unwind all stacks here */ 2160 /* as a minor optimisation, we could unwind all stacks here */
2015 /* but that puts extra pressure on pp_slf, and is not worth much */ 2161 /* but that puts extra pressure on pp_slf, and is not worth much */
2016 /*coro_unwind_stacks (aTHX);*/ 2162 /*coro_unwind_stacks (aTHX);*/
2163}
2164
2165static void
2166slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2167{
2168 HV *coro_hv = (HV *)SvRV (coro_current);
2169
2170 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2171 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2172}
2173
2174static void
2175slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2176{
2177 HV *coro_hv;
2178 struct coro *coro;
2179
2180 if (items <= 0)
2181 croak ("Coro::cancel called without coro object,");
2182
2183 coro = SvSTATE (arg [0]);
2184 coro_hv = coro->hv;
2185
2186 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2187
2188 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2189 {
2190 /* coro currently busy cancelling something, so just notify it */
2191 coro->slf_frame.data = (void *)coro;
2192
2193 frame->prepare = prepare_nop;
2194 frame->check = slf_check_nop;
2195 }
2196 else if (coro_hv == (HV *)SvRV (coro_current))
2197 {
2198 /* cancelling the current coro is allowed, and equals terminate */
2199 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2200 }
2201 else
2202 {
2203 struct coro *self = SvSTATE_current;
2204
2205 /* otherwise we cancel directly, purely for speed reasons
2206 * unfortunately, this requires some magic trickery, as
2207 * somebody else could cancel us, so we have to fight the cancellation.
2208 * this is ugly, and hopefully fully worth the extra speed.
2209 * besides, I can't get the slow-but-safe version working...
2210 */
2211 slf_frame.data = 0;
2212 self->flags |= CF_NOCANCEL;
2213 coro_state_destroy (aTHX_ coro);
2214 self->flags &= ~CF_NOCANCEL;
2215
2216 if (slf_frame.data)
2217 {
2218 /* while we were busy we have been cancelled, so terminate */
2219 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2220 }
2221 else
2222 {
2223 frame->prepare = prepare_nop;
2224 frame->check = slf_check_nop;
2225 }
2226 }
2227}
2228
2229static int
2230slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2231{
2232 frame->prepare = 0;
2233 coro_unwind_stacks (aTHX);
2234
2235 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2236
2237 return 1;
2238}
2239
2240static int
2241safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2242{
2243 if (coro->cctx)
2244 croak ("coro inside C callback, unable to cancel at this time, caught");
2245
2246 if (coro->flags & CF_NEW)
2247 {
2248 coro_set_status (aTHX_ coro, arg, items);
2249 coro_state_destroy (aTHX_ coro);
2250 }
2251 else
2252 {
2253 if (!coro->slf_frame.prepare)
2254 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2255
2256 slf_destroy (aTHX_ coro);
2257
2258 coro_set_status (aTHX_ coro, arg, items);
2259 coro->slf_frame.prepare = prepare_nop;
2260 coro->slf_frame.check = slf_check_safe_cancel;
2261
2262 api_ready (aTHX_ (SV *)coro->hv);
2263 }
2264
2265 return 1;
2017} 2266}
2018 2267
2019/*****************************************************************************/ 2268/*****************************************************************************/
2020/* async pool handler */ 2269/* async pool handler */
2021 2270
… …
2052slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2301slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2053{ 2302{
2054 HV *hv = (HV *)SvRV (coro_current); 2303 HV *hv = (HV *)SvRV (coro_current);
2055 struct coro *coro = SvSTATE_hv ((SV *)hv); 2304 struct coro *coro = SvSTATE_hv ((SV *)hv);
2056 2305
2057 if (expect_true (coro->saved_deffh)) 2306 if (ecb_expect_true (coro->saved_deffh))
2058 { 2307 {
2059 /* subsequent iteration */ 2308 /* subsequent iteration */
2060 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2309 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2061 coro->saved_deffh = 0; 2310 coro->saved_deffh = 0;
2062 2311
2063 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2312 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2064 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2313 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2065 { 2314 {
2066 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2315 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2067 coro->invoke_av = newAV (); 2316 return;
2068
2069 frame->prepare = prepare_nop;
2070 } 2317 }
2071 else 2318 else
2072 { 2319 {
2073 av_clear (GvAV (PL_defgv)); 2320 av_clear (GvAV (PL_defgv));
2074 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2321 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
2124 2371
2125static int 2372static int
2126slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2373slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2127{ 2374{
2128 SV *data = (SV *)frame->data; 2375 SV *data = (SV *)frame->data;
2129 2376
2130 if (CORO_THROW) 2377 if (CORO_THROW)
2131 return 0; 2378 return 0;
2132 2379
2133 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2380 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2134 return 1; 2381 return 1;
… …
2170 cb = sv_2mortal (coro->rouse_cb); 2417 cb = sv_2mortal (coro->rouse_cb);
2171 coro->rouse_cb = 0; 2418 coro->rouse_cb = 0;
2172 } 2419 }
2173 2420
2174 if (!SvROK (cb) 2421 if (!SvROK (cb)
2175 || SvTYPE (SvRV (cb)) != SVt_PVCV 2422 || SvTYPE (SvRV (cb)) != SVt_PVCV
2176 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2423 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2177 croak ("Coro::rouse_wait called with illegal callback argument,"); 2424 croak ("Coro::rouse_wait called with illegal callback argument,");
2178 2425
2179 { 2426 {
2180 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2427 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2297static void 2544static void
2298slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2545slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2299{ 2546{
2300 frame->prepare = prepare_cede_notself; 2547 frame->prepare = prepare_cede_notself;
2301 frame->check = slf_check_nop; 2548 frame->check = slf_check_nop;
2549}
2550
2551/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2552static void
2553slf_destroy (pTHX_ struct coro *coro)
2554{
2555 /* this callback is reserved for slf functions needing to do cleanup */
2556 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2557 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2558
2559 /*
2560 * The on_destroy above most likely is from an SLF call.
2561 * Since by definition the SLF call will not finish when we destroy
2562 * the coro, we will have to force-finish it here, otherwise
2563 * cleanup functions cannot call SLF functions.
2564 */
2565 coro->slf_frame.prepare = 0;
2302} 2566}
2303 2567
2304/* 2568/*
2305 * these not obviously related functions are all rolled into one 2569 * these not obviously related functions are all rolled into one
2306 * function to increase chances that they all will call transfer with the same 2570 * function to increase chances that they all will call transfer with the same
… …
2313 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2577 I32 checkmark; /* mark SP to see how many elements check has pushed */
2314 2578
2315 /* set up the slf frame, unless it has already been set-up */ 2579 /* set up the slf frame, unless it has already been set-up */
2316 /* the latter happens when a new coro has been started */ 2580 /* the latter happens when a new coro has been started */
2317 /* or when a new cctx was attached to an existing coroutine */ 2581 /* or when a new cctx was attached to an existing coroutine */
2318 if (expect_true (!slf_frame.prepare)) 2582 if (ecb_expect_true (!slf_frame.prepare))
2319 { 2583 {
2320 /* first iteration */ 2584 /* first iteration */
2321 dSP; 2585 dSP;
2322 SV **arg = PL_stack_base + TOPMARK + 1; 2586 SV **arg = PL_stack_base + TOPMARK + 1;
2323 int items = SP - arg; /* args without function object */ 2587 int items = SP - arg; /* args without function object */
… …
2364 while (slf_frame.check (aTHX_ &slf_frame)); 2628 while (slf_frame.check (aTHX_ &slf_frame));
2365 2629
2366 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2630 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2367 2631
2368 /* exception handling */ 2632 /* exception handling */
2369 if (expect_false (CORO_THROW)) 2633 if (ecb_expect_false (CORO_THROW))
2370 { 2634 {
2371 SV *exception = sv_2mortal (CORO_THROW); 2635 SV *exception = sv_2mortal (CORO_THROW);
2372 2636
2373 CORO_THROW = 0; 2637 CORO_THROW = 0;
2374 sv_setsv (ERRSV, exception); 2638 sv_setsv (ERRSV, exception);
2375 croak (0); 2639 croak (0);
2376 } 2640 }
2377 2641
2378 /* return value handling - mostly like entersub */ 2642 /* return value handling - mostly like entersub */
2379 /* make sure we put something on the stack in scalar context */ 2643 /* make sure we put something on the stack in scalar context */
2380 if (GIMME_V == G_SCALAR) 2644 if (GIMME_V == G_SCALAR
2645 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2381 { 2646 {
2382 dSP; 2647 dSP;
2383 SV **bot = PL_stack_base + checkmark; 2648 SV **bot = PL_stack_base + checkmark;
2384 2649
2385 if (sp == bot) /* too few, push undef */ 2650 if (sp == bot) /* too few, push undef */
2386 bot [1] = &PL_sv_undef; 2651 bot [1] = &PL_sv_undef;
2387 else if (sp != bot + 1) /* too many, take last one */ 2652 else /* too many, take last one */
2388 bot [1] = *sp; 2653 bot [1] = *sp;
2389 2654
2390 SP = bot + 1; 2655 SP = bot + 1;
2391 2656
2392 PUTBACK; 2657 PUTBACK;
… …
2499{ 2764{
2500 PerlIOBuf base; 2765 PerlIOBuf base;
2501 NV next, every; 2766 NV next, every;
2502} PerlIOCede; 2767} PerlIOCede;
2503 2768
2504static IV 2769static IV ecb_cold
2505PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2770PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2506{ 2771{
2507 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2772 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2508 2773
2509 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2774 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2510 self->next = nvtime () + self->every; 2775 self->next = nvtime () + self->every;
2511 2776
2512 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2777 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2513} 2778}
2514 2779
2515static SV * 2780static SV * ecb_cold
2516PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2781PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2517{ 2782{
2518 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2783 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2519 2784
2520 return newSVnv (self->every); 2785 return newSVnv (self->every);
… …
2632 SvREFCNT_dec (cb); 2897 SvREFCNT_dec (cb);
2633 } 2898 }
2634} 2899}
2635 2900
2636static void 2901static void
2637coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2902coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2638{ 2903{
2639 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2904 /* call $sem->adjust (0) to possibly wake up some other waiters */
2640 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2905 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2641} 2906}
2642 2907
2643static int 2908static int
2644slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2909slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2645{ 2910{
2646 AV *av = (AV *)frame->data; 2911 AV *av = (AV *)frame->data;
2647 SV *count_sv = AvARRAY (av)[0]; 2912 SV *count_sv = AvARRAY (av)[0];
2913 SV *coro_hv = SvRV (coro_current);
2648 2914
2649 /* if we are about to throw, don't actually acquire the lock, just throw */ 2915 /* if we are about to throw, don't actually acquire the lock, just throw */
2650 if (CORO_THROW) 2916 if (CORO_THROW)
2651 return 0; 2917 return 0;
2652 else if (SvIVX (count_sv) > 0) 2918 else if (SvIVX (count_sv) > 0)
2653 { 2919 {
2654 SvSTATE_current->on_destroy = 0; 2920 frame->destroy = 0;
2655 2921
2656 if (acquire) 2922 if (acquire)
2657 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2923 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2658 else 2924 else
2659 coro_semaphore_adjust (aTHX_ av, 0); 2925 coro_semaphore_adjust (aTHX_ av, 0);
… …
2664 { 2930 {
2665 int i; 2931 int i;
2666 /* if we were woken up but can't down, we look through the whole */ 2932 /* if we were woken up but can't down, we look through the whole */
2667 /* waiters list and only add us if we aren't in there already */ 2933 /* waiters list and only add us if we aren't in there already */
2668 /* this avoids some degenerate memory usage cases */ 2934 /* this avoids some degenerate memory usage cases */
2669 2935 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2670 for (i = 1; i <= AvFILLp (av); ++i)
2671 if (AvARRAY (av)[i] == SvRV (coro_current)) 2936 if (AvARRAY (av)[i] == coro_hv)
2672 return 1; 2937 return 1;
2673 2938
2674 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2939 av_push (av, SvREFCNT_inc (coro_hv));
2675 return 1; 2940 return 1;
2676 } 2941 }
2677} 2942}
2678 2943
2679static int 2944static int
… …
2702 { 2967 {
2703 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2968 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2704 2969
2705 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2970 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2706 frame->prepare = prepare_schedule; 2971 frame->prepare = prepare_schedule;
2707
2708 /* to avoid race conditions when a woken-up coro gets terminated */ 2972 /* to avoid race conditions when a woken-up coro gets terminated */
2709 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2973 /* we arrange for a temporary on_destroy that calls adjust (0) */
2710 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2974 frame->destroy = coro_semaphore_destroy;
2711 } 2975 }
2712} 2976}
2713 2977
2714static void 2978static void
2715slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2979slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2933 dSP; 3197 dSP;
2934 3198
2935 static SV *prio_cv; 3199 static SV *prio_cv;
2936 static SV *prio_sv; 3200 static SV *prio_sv;
2937 3201
2938 if (expect_false (!prio_cv)) 3202 if (ecb_expect_false (!prio_cv))
2939 { 3203 {
2940 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3204 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2941 prio_sv = newSViv (0); 3205 prio_sv = newSViv (0);
2942 } 3206 }
2943 3207
… …
3049 } 3313 }
3050 3314
3051 return coro_sv; 3315 return coro_sv;
3052} 3316}
3053 3317
3318#ifndef __cplusplus
3319ecb_cold XS(boot_Coro__State);
3320#endif
3321
3322#if CORO_JIT
3323
3324static void ecb_noinline ecb_cold
3325pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3326{
3327 dSP;
3328 AV *av = newAV ();
3329
3330 av_store (av, 3, newSVuv (d));
3331 av_store (av, 2, newSVuv (c));
3332 av_store (av, 1, newSVuv (b));
3333 av_store (av, 0, newSVuv (a));
3334
3335 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3336
3337 PUTBACK;
3338}
3339
3340static void ecb_noinline ecb_cold
3341jit_init (pTHX)
3342{
3343 dSP;
3344 SV *load, *save;
3345 char *map_base;
3346 char *load_ptr, *save_ptr;
3347 STRLEN load_len, save_len, map_len;
3348 int count;
3349
3350 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3351
3352 PUSHMARK (SP);
3353 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3354 #include "state.h"
3355 count = call_pv ("Coro::State::_jit", G_ARRAY);
3356 SPAGAIN;
3357
3358 save = POPs; save_ptr = SvPVbyte (save, save_len);
3359 load = POPs; load_ptr = SvPVbyte (load, load_len);
3360
3361 map_len = load_len + save_len + 16;
3362
3363 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3364
3365 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3366
3367 load_perl_slots = (load_save_perl_slots_type)map_base;
3368 memcpy (map_base, load_ptr, load_len);
3369
3370 map_base += (load_len + 15) & ~15;
3371
3372 save_perl_slots = (load_save_perl_slots_type)map_base;
3373 memcpy (map_base, save_ptr, save_len);
3374
3375 /* we are good citizens and try to make the page read-only, so the evil evil */
3376 /* hackers might have it a bit more difficult */
3377 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3378
3379 PUTBACK;
3380 eval_pv ("undef &Coro::State::_jit", 1);
3381}
3382
3383#endif
3384
3054MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3385MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3055 3386
3056PROTOTYPES: DISABLE 3387PROTOTYPES: DISABLE
3057 3388
3058BOOT: 3389BOOT:
… …
3060#ifdef USE_ITHREADS 3391#ifdef USE_ITHREADS
3061# if CORO_PTHREAD 3392# if CORO_PTHREAD
3062 coro_thx = PERL_GET_CONTEXT; 3393 coro_thx = PERL_GET_CONTEXT;
3063# endif 3394# endif
3064#endif 3395#endif
3065 BOOT_PAGESIZE; 3396 /* perl defines these to check for existance first, but why it doesn't */
3397 /* just create them one at init time is not clear to me, except for */
3398 /* programs trying to delete them, but... */
3399 /* anyway, we declare this as invalid and make sure they are initialised here */
3400 DEFSV;
3401 ERRSV;
3066 3402
3067 cctx_current = cctx_new_empty (); 3403 cctx_current = cctx_new_empty ();
3068 3404
3069 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3405 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3070 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3406 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
3110 coroapi.prepare_nop = prepare_nop; 3446 coroapi.prepare_nop = prepare_nop;
3111 coroapi.prepare_schedule = prepare_schedule; 3447 coroapi.prepare_schedule = prepare_schedule;
3112 coroapi.prepare_cede = prepare_cede; 3448 coroapi.prepare_cede = prepare_cede;
3113 coroapi.prepare_cede_notself = prepare_cede_notself; 3449 coroapi.prepare_cede_notself = prepare_cede_notself;
3114 3450
3115 { 3451 time_init (aTHX);
3116 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3117
3118 if (!svp) croak ("Time::HiRes is required");
3119 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3120
3121 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3122
3123 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3124 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3125 }
3126 3452
3127 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3453 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3454#if CORO_JIT
3455 PUTBACK;
3456 jit_init (aTHX);
3457 SPAGAIN;
3458#endif
3128} 3459}
3129 3460
3130SV * 3461SV *
3131new (SV *klass, ...) 3462new (SV *klass, ...)
3132 ALIAS: 3463 ALIAS:
… …
3139void 3470void
3140transfer (...) 3471transfer (...)
3141 PROTOTYPE: $$ 3472 PROTOTYPE: $$
3142 CODE: 3473 CODE:
3143 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3474 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3144
3145bool
3146_destroy (SV *coro_sv)
3147 CODE:
3148 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3149 OUTPUT:
3150 RETVAL
3151
3152void
3153_exit (int code)
3154 PROTOTYPE: $
3155 CODE:
3156 _exit (code);
3157 3475
3158SV * 3476SV *
3159clone (Coro::State coro) 3477clone (Coro::State coro)
3160 CODE: 3478 CODE:
3161{ 3479{
… …
3216void 3534void
3217list () 3535list ()
3218 PROTOTYPE: 3536 PROTOTYPE:
3219 PPCODE: 3537 PPCODE:
3220{ 3538{
3221 struct coro *coro; 3539 struct coro *coro;
3222 for (coro = coro_first; coro; coro = coro->next) 3540 for (coro = coro_first; coro; coro = coro->next)
3223 if (coro->hv) 3541 if (coro->hv)
3224 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3542 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3225} 3543}
3226 3544
… …
3231 CODE: 3549 CODE:
3232{ 3550{
3233 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3551 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3234 { 3552 {
3235 struct coro *current = SvSTATE_current; 3553 struct coro *current = SvSTATE_current;
3554 struct CoroSLF slf_save;
3236 3555
3237 if (current != coro) 3556 if (current != coro)
3238 { 3557 {
3239 PUTBACK; 3558 PUTBACK;
3240 save_perl (aTHX_ current); 3559 save_perl (aTHX_ current);
3241 load_perl (aTHX_ coro); 3560 load_perl (aTHX_ coro);
3561 /* the coro is most likely in an active SLF call.
3562 * while not strictly required (the code we execute is
3563 * not allowed to call any SLF functions), it's cleaner
3564 * to reinitialise the slf_frame and restore it later.
3565 * This might one day allow us to actually do SLF calls
3566 * from code executed here.
3567 */
3568 slf_save = slf_frame;
3569 slf_frame.prepare = 0;
3242 SPAGAIN; 3570 SPAGAIN;
3243 } 3571 }
3244 3572
3245 PUSHSTACK; 3573 PUSHSTACK;
3246 3574
… …
3256 SPAGAIN; 3584 SPAGAIN;
3257 3585
3258 if (current != coro) 3586 if (current != coro)
3259 { 3587 {
3260 PUTBACK; 3588 PUTBACK;
3589 slf_frame = slf_save;
3261 save_perl (aTHX_ coro); 3590 save_perl (aTHX_ coro);
3262 load_perl (aTHX_ current); 3591 load_perl (aTHX_ current);
3263 SPAGAIN; 3592 SPAGAIN;
3264 } 3593 }
3265 } 3594 }
… …
3270 PROTOTYPE: $ 3599 PROTOTYPE: $
3271 ALIAS: 3600 ALIAS:
3272 is_ready = CF_READY 3601 is_ready = CF_READY
3273 is_running = CF_RUNNING 3602 is_running = CF_RUNNING
3274 is_new = CF_NEW 3603 is_new = CF_NEW
3275 is_destroyed = CF_DESTROYED 3604 is_destroyed = CF_ZOMBIE
3605 is_zombie = CF_ZOMBIE
3276 is_suspended = CF_SUSPENDED 3606 is_suspended = CF_SUSPENDED
3277 CODE: 3607 CODE:
3278 RETVAL = boolSV (coro->flags & ix); 3608 RETVAL = boolSV (coro->flags & ix);
3279 OUTPUT: 3609 OUTPUT:
3280 RETVAL 3610 RETVAL
3281 3611
3282void 3612void
3283throw (Coro::State self, SV *exception = &PL_sv_undef) 3613throw (SV *self, SV *exception = &PL_sv_undef)
3284 PROTOTYPE: $;$ 3614 PROTOTYPE: $;$
3285 CODE: 3615 CODE:
3286{ 3616{
3617 struct coro *coro = SvSTATE (self);
3287 struct coro *current = SvSTATE_current; 3618 struct coro *current = SvSTATE_current;
3288 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3619 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3289 SvREFCNT_dec (*exceptionp); 3620 SvREFCNT_dec (*exceptionp);
3290 SvGETMAGIC (exception); 3621 SvGETMAGIC (exception);
3291 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3622 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3623
3624 api_ready (aTHX_ self);
3292} 3625}
3293 3626
3294void 3627void
3295api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3628api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3296 PROTOTYPE: $;$ 3629 PROTOTYPE: $;$
… …
3351 3684
3352void 3685void
3353cancel (Coro::State self) 3686cancel (Coro::State self)
3354 CODE: 3687 CODE:
3355 coro_state_destroy (aTHX_ self); 3688 coro_state_destroy (aTHX_ self);
3356 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3357
3358 3689
3359SV * 3690SV *
3360enable_times (int enabled = enable_times) 3691enable_times (int enabled = enable_times)
3361 CODE: 3692 CODE:
3362{ 3693{
… …
3375 3706
3376void 3707void
3377times (Coro::State self) 3708times (Coro::State self)
3378 PPCODE: 3709 PPCODE:
3379{ 3710{
3380 struct coro *current = SvSTATE (coro_current); 3711 struct coro *current = SvSTATE (coro_current);
3381 3712
3382 if (expect_false (current == self)) 3713 if (ecb_expect_false (current == self))
3383 { 3714 {
3384 coro_times_update (); 3715 coro_times_update ();
3385 coro_times_add (SvSTATE (coro_current)); 3716 coro_times_add (SvSTATE (coro_current));
3386 } 3717 }
3387 3718
3388 EXTEND (SP, 2); 3719 EXTEND (SP, 2);
3389 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3720 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3390 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3721 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3391 3722
3392 if (expect_false (current == self)) 3723 if (ecb_expect_false (current == self))
3393 coro_times_sub (SvSTATE (coro_current)); 3724 coro_times_sub (SvSTATE (coro_current));
3394} 3725}
3395 3726
3396void 3727void
3397swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3728swap_sv (Coro::State coro, SV *sv, SV *swapsv)
… …
3418BOOT: 3749BOOT:
3419{ 3750{
3420 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3751 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3421 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3752 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3422 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3753 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3423 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3424 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3754 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3425 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3755 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3426 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3756 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3427 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3757 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3428 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3758 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3429 3759
3430 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3760 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3431 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3761 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3432 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3762 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3433 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 3763 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3434 3764
3435 coro_stash = gv_stashpv ("Coro", TRUE); 3765 coro_stash = gv_stashpv ("Coro", TRUE);
3436 3766
3437 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3767 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3438 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3768 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3439 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3769 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3467 api_ready (aTHX_ RETVAL); 3797 api_ready (aTHX_ RETVAL);
3468 OUTPUT: 3798 OUTPUT:
3469 RETVAL 3799 RETVAL
3470 3800
3471void 3801void
3802_destroy (Coro::State coro)
3803 CODE:
3804 /* used by the manager thread */
3805 coro_state_destroy (aTHX_ coro);
3806
3807void
3808on_destroy (Coro::State coro, SV *cb)
3809 CODE:
3810 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3811
3812void
3813join (...)
3814 CODE:
3815 CORO_EXECUTE_SLF_XS (slf_init_join);
3816
3817void
3472terminate (...) 3818terminate (...)
3473 CODE: 3819 CODE:
3474 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3820 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3821
3822void
3823cancel (...)
3824 CODE:
3825 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3826
3827int
3828safe_cancel (Coro::State self, ...)
3829 C_ARGS: aTHX_ self, &ST (1), items - 1
3475 3830
3476void 3831void
3477schedule (...) 3832schedule (...)
3478 CODE: 3833 CODE:
3479 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3834 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3636 on_leave = 1 3991 on_leave = 1
3637 PROTOTYPE: & 3992 PROTOTYPE: &
3638 CODE: 3993 CODE:
3639{ 3994{
3640 struct coro *coro = SvSTATE_current; 3995 struct coro *coro = SvSTATE_current;
3641 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3996 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3642 3997
3643 block = s_get_cv_croak (block); 3998 block = s_get_cv_croak (block);
3644 3999
3645 if (!*avp) 4000 if (!*avp)
3646 *avp = newAV (); 4001 *avp = newAV ();
… …
3666 4021
3667SV * 4022SV *
3668new (SV *klass, SV *count = 0) 4023new (SV *klass, SV *count = 0)
3669 CODE: 4024 CODE:
3670{ 4025{
3671 int semcnt = 1; 4026 int semcnt = 1;
3672 4027
3673 if (count) 4028 if (count)
3674 { 4029 {
3675 SvGETMAGIC (count); 4030 SvGETMAGIC (count);
3676 4031
… …
3736 XSRETURN_NO; 4091 XSRETURN_NO;
3737} 4092}
3738 4093
3739void 4094void
3740waiters (SV *self) 4095waiters (SV *self)
3741 PPCODE: 4096 PPCODE:
3742{ 4097{
3743 AV *av = (AV *)SvRV (self); 4098 AV *av = (AV *)SvRV (self);
3744 int wcount = AvFILLp (av) + 1 - 1; 4099 int wcount = AvFILLp (av) + 1 - 1;
3745 4100
3746 if (GIMME_V == G_SCALAR) 4101 if (GIMME_V == G_SCALAR)
… …
3755} 4110}
3756 4111
3757MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4112MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3758 4113
3759void 4114void
3760_may_delete (SV *sem, int count, int extra_refs) 4115_may_delete (SV *sem, int count, unsigned int extra_refs)
3761 PPCODE: 4116 PPCODE:
3762{ 4117{
3763 AV *av = (AV *)SvRV (sem); 4118 AV *av = (AV *)SvRV (sem);
3764 4119
3765 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4120 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3766 && AvFILLp (av) == 0 /* no waiters, just count */ 4121 && AvFILLp (av) == 0 /* no waiters, just count */
3767 && SvIV (AvARRAY (av)[0]) == count) 4122 && SvIV (AvARRAY (av)[0]) == count)
3768 XSRETURN_YES; 4123 XSRETURN_YES;
… …
3789 4144
3790void 4145void
3791broadcast (SV *self) 4146broadcast (SV *self)
3792 CODE: 4147 CODE:
3793{ 4148{
3794 AV *av = (AV *)SvRV (self); 4149 AV *av = (AV *)SvRV (self);
3795 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4150 coro_signal_wake (aTHX_ av, AvFILLp (av));
3796} 4151}
3797 4152
3798void 4153void
3799send (SV *self) 4154send (SV *self)
… …
3807 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4162 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3808} 4163}
3809 4164
3810IV 4165IV
3811awaited (SV *self) 4166awaited (SV *self)
3812 CODE: 4167 CODE:
3813 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4168 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3814 OUTPUT: 4169 OUTPUT:
3815 RETVAL 4170 RETVAL
3816 4171
3817 4172
… …
3822 4177
3823void 4178void
3824_schedule (...) 4179_schedule (...)
3825 CODE: 4180 CODE:
3826{ 4181{
3827 static int incede; 4182 static int incede;
3828 4183
3829 api_cede_notself (aTHX); 4184 api_cede_notself (aTHX);
3830 4185
3831 ++incede; 4186 ++incede;
3832 while (coro_nready >= incede && api_cede (aTHX)) 4187 while (coro_nready >= incede && api_cede (aTHX))
… …
3876 { 4231 {
3877 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4232 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3878 coro_old_pp_sselect = 0; 4233 coro_old_pp_sselect = 0;
3879 } 4234 }
3880 4235
4236MODULE = Coro::State PACKAGE = Coro::Util
3881 4237
4238void
4239_exit (int code)
4240 CODE:
4241 _exit (code);
4242
4243NV
4244time ()
4245 CODE:
4246 RETVAL = nvtime (aTHX);
4247 OUTPUT:
4248 RETVAL
4249
4250NV
4251gettimeofday ()
4252 PPCODE:
4253{
4254 UV tv [2];
4255 u2time (aTHX_ tv);
4256 EXTEND (SP, 2);
4257 PUSHs (sv_2mortal (newSVuv (tv [0])));
4258 PUSHs (sv_2mortal (newSVuv (tv [1])));
4259}
4260

Diff Legend

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