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.384 by root, Thu Feb 17 01:32:18 2011 UTC vs.
Revision 1.462 by root, Wed Jun 22 20:24:38 2016 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#define ECB_NO_LIBM 1
20#include "ecb.h"
21
22#include <stddef.h>
18#include <stdio.h> 23#include <stdio.h>
19#include <errno.h> 24#include <errno.h>
20#include <assert.h> 25#include <assert.h>
21 26
27#ifndef SvREFCNT_dec_NN
28 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
29#endif
30
31#ifndef SvREFCNT_inc_NN
32 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
33#endif
34
22#ifndef SVs_PADSTALE 35#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0 36# define SVs_PADSTALE 0
24#endif 37#endif
25 38
26#ifdef WIN32 39#ifdef PadARRAY
40# define NEWPADAPI 1
41# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
42#else
43typedef AV PADNAMELIST;
44# if !PERL_VERSION_ATLEAST(5,8,0)
45typedef AV PADLIST;
46typedef AV PAD;
47# endif
48# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
49# define PadlistMAX(pl) AvFILLp (pl)
50# define PadlistNAMES(pl) (*PadlistARRAY (pl))
51# define PadARRAY AvARRAY
52# define PadMAX AvFILLp
53# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
54#endif
55#ifndef PadnamelistREFCNT
56# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
57#endif
58#ifndef PadnamelistREFCNT_dec
59# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
60#endif
61
62/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
63/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
64#if PERL_VERSION_ATLEAST(5,19,0)
65# define SVt_BIND SVt_IV
66#endif
67
68#if defined(_WIN32)
69# undef HAS_GETTIMEOFDAY
27# undef setjmp 70# undef setjmp
28# undef longjmp 71# undef longjmp
29# undef _exit 72# undef _exit
30# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
31#else 74#else
32# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
33#endif 76#endif
34 77
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 */ 78/* the maximum number of idle cctx that will be pooled */
63static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
64 80
65#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
66# undef CORO_STACKGUARD 82# define HAS_SCOPESTACK_NAME 1
67#endif
68
69#ifndef CORO_STACKGUARD
70# define CORO_STACKGUARD 0
71#endif 83#endif
72 84
73/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
74#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
75# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
… …
85# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
86#endif 98#endif
87 99
88#define IN_DESTRUCT PL_dirty 100#define IN_DESTRUCT PL_dirty
89 101
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" 102#include "CoroAPI.h"
106#define GCoroAPI (&coroapi) /* very sneaky */ 103#define GCoroAPI (&coroapi) /* very sneaky */
107 104
108#ifdef USE_ITHREADS 105#ifdef USE_ITHREADS
109# if CORO_PTHREAD 106# if CORO_PTHREAD
… …
125static void (*u2time)(pTHX_ UV ret[2]); 122static void (*u2time)(pTHX_ UV ret[2]);
126 123
127/* we hijack an hopefully unused CV flag for our purposes */ 124/* we hijack an hopefully unused CV flag for our purposes */
128#define CVf_SLF 0x4000 125#define CVf_SLF 0x4000
129static OP *pp_slf (pTHX); 126static OP *pp_slf (pTHX);
127static void slf_destroy (pTHX_ struct coro *coro);
130 128
131static U32 cctx_gen; 129static U32 cctx_gen;
132static size_t cctx_stacksize = CORO_STACKSIZE; 130static size_t cctx_stacksize = CORO_STACKSIZE;
133static struct CoroAPI coroapi; 131static struct CoroAPI coroapi;
134static AV *main_mainstack; /* used to differentiate between $main and others */ 132static AV *main_mainstack; /* used to differentiate between $main and others */
… …
142 140
143static GV *irsgv; /* $/ */ 141static GV *irsgv; /* $/ */
144static GV *stdoutgv; /* *STDOUT */ 142static GV *stdoutgv; /* *STDOUT */
145static SV *rv_diehook; 143static SV *rv_diehook;
146static SV *rv_warnhook; 144static SV *rv_warnhook;
147static HV *hv_sig; /* %SIG */
148 145
149/* async_pool helper stuff */ 146/* async_pool helper stuff */
150static SV *sv_pool_rss; 147static SV *sv_pool_rss;
151static SV *sv_pool_size; 148static SV *sv_pool_size;
152static SV *sv_async_pool_idle; /* description string */ 149static SV *sv_async_pool_idle; /* description string */
… …
164static char times_valid; 161static char times_valid;
165 162
166static struct coro_cctx *cctx_first; 163static struct coro_cctx *cctx_first;
167static int cctx_count, cctx_idle; 164static int cctx_count, cctx_idle;
168 165
169enum { 166enum
167{
170 CC_MAPPED = 0x01, 168 CC_MAPPED = 0x01,
171 CC_NOREUSE = 0x02, /* throw this away after tracing */ 169 CC_NOREUSE = 0x02, /* throw this away after tracing */
172 CC_TRACE = 0x04, 170 CC_TRACE = 0x04,
173 CC_TRACE_SUB = 0x08, /* trace sub calls */ 171 CC_TRACE_SUB = 0x08, /* trace sub calls */
174 CC_TRACE_LINE = 0x10, /* trace each statement */ 172 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
179typedef struct coro_cctx 177typedef struct coro_cctx
180{ 178{
181 struct coro_cctx *next; 179 struct coro_cctx *next;
182 180
183 /* the stack */ 181 /* the stack */
184 void *sptr; 182 struct coro_stack stack;
185 size_t ssize;
186 183
187 /* cpu state */ 184 /* cpu state */
188 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
186#ifndef NDEBUG
189 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 187 JMPENV *idle_te; /* same as idle_sp, but for top_env */
188#endif
190 JMPENV *top_env; 189 JMPENV *top_env;
191 coro_context cctx; 190 coro_context cctx;
192 191
193 U32 gen; 192 U32 gen;
194#if CORO_USE_VALGRIND 193#if CORO_USE_VALGRIND
195 int valgrind_id; 194 int valgrind_id;
196#endif 195#endif
197 unsigned char flags; 196 unsigned char flags;
198} coro_cctx; 197} coro_cctx;
199 198
200coro_cctx *cctx_current; /* the currently running cctx */ 199static coro_cctx *cctx_current; /* the currently running cctx */
201 200
202/*****************************************************************************/ 201/*****************************************************************************/
203 202
203static MGVTBL coro_state_vtbl;
204
204enum { 205enum
206{
205 CF_RUNNING = 0x0001, /* coroutine is running */ 207 CF_RUNNING = 0x0001, /* coroutine is running */
206 CF_READY = 0x0002, /* coroutine is ready */ 208 CF_READY = 0x0002, /* coroutine is ready */
207 CF_NEW = 0x0004, /* has never been switched to */ 209 CF_NEW = 0x0004, /* has never been switched to */
208 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 210 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
209 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
210}; 213};
211 214
212/* the structure where most of the perl state is stored, overlaid on the cxstack */ 215/* the structure where most of the perl state is stored, overlaid on the cxstack */
213typedef struct 216typedef struct
214{ 217{
215 SV *defsv;
216 AV *defav;
217 SV *errsv;
218 SV *irsgv;
219 HV *hinthv;
220#define VAR(name,type) type name; 218 #define VARx(name,expr,type) type name;
221# include "state.h" 219 #include "state.h"
222#undef VAR
223} perl_slots; 220} perl_slots;
224 221
222/* 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)) 223#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
226 224
227/* this is a structure representing a perl-level coroutine */ 225/* this is a structure representing a perl-level coroutine */
228struct coro { 226struct coro
227{
229 /* the C coroutine allocated to this perl coroutine, if any */ 228 /* the C coroutine allocated to this perl coroutine, if any */
230 coro_cctx *cctx; 229 coro_cctx *cctx;
231 230
232 /* ready queue */ 231 /* ready queue */
233 struct coro *next_ready; 232 struct coro *next_ready;
… …
235 /* state data */ 234 /* state data */
236 struct CoroSLF slf_frame; /* saved slf frame */ 235 struct CoroSLF slf_frame; /* saved slf frame */
237 AV *mainstack; 236 AV *mainstack;
238 perl_slots *slot; /* basically the saved sp */ 237 perl_slots *slot; /* basically the saved sp */
239 238
240 CV *startcv; /* the CV to execute */ 239 CV *startcv; /* the CV to execute */
241 AV *args; /* data associated with this coroutine (initial args) */ 240 AV *args; /* data associated with this coroutine (initial args) */
242 int refcnt; /* coroutines are refcounted, yes */
243 int flags; /* CF_ flags */ 241 int flags; /* CF_ flags */
244 HV *hv; /* the perl hash associated with this coro, if any */ 242 HV *hv; /* the perl hash associated with this coro, if any */
245 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
246 243
247 /* statistics */ 244 /* statistics */
248 int usecount; /* number of transfers to this coro */ 245 int usecount; /* number of transfers to this coro */
249 246
250 /* coro process data */ 247 /* coro process data */
251 int prio; 248 int prio;
252 SV *except; /* exception to be thrown */ 249 SV *except; /* exception to be thrown */
253 SV *rouse_cb; 250 SV *rouse_cb; /* last rouse callback */
251 AV *on_destroy; /* callbacks or coros to notify on destroy */
252 AV *status; /* the exit status list */
254 253
255 /* async_pool */ 254 /* async_pool */
256 SV *saved_deffh; 255 SV *saved_deffh;
257 SV *invoke_cb; 256 SV *invoke_cb;
258 AV *invoke_av; 257 AV *invoke_av;
259 258
260 /* on_enter/on_leave */ 259 /* on_enter/on_leave */
261 AV *on_enter; 260 AV *on_enter; AV *on_enter_xs;
262 AV *on_leave; 261 AV *on_leave; AV *on_leave_xs;
263 262
264 /* swap_sv */ 263 /* swap_sv */
265 AV *swap_sv; 264 AV *swap_sv;
266 265
267 /* times */ 266 /* times */
… …
274typedef struct coro *Coro__State; 273typedef struct coro *Coro__State;
275typedef struct coro *Coro__State_or_hashref; 274typedef struct coro *Coro__State_or_hashref;
276 275
277/* the following variables are effectively part of the perl context */ 276/* the following variables are effectively part of the perl context */
278/* and get copied between struct coro and these variables */ 277/* and get copied between struct coro and these variables */
279/* the mainr easonw e don't support windows process emulation */ 278/* the main reason we don't support windows process emulation */
280static struct CoroSLF slf_frame; /* the current slf frame */ 279static struct CoroSLF slf_frame; /* the current slf frame */
281 280
282/** Coro ********************************************************************/ 281/** Coro ********************************************************************/
283 282
284#define CORO_PRIO_MAX 3 283#define CORO_PRIO_MAX 3
… …
290 289
291/* for Coro.pm */ 290/* for Coro.pm */
292static SV *coro_current; 291static SV *coro_current;
293static SV *coro_readyhook; 292static SV *coro_readyhook;
294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 293static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
295static CV *cv_coro_run, *cv_coro_terminate; 294static CV *cv_coro_run;
296static struct coro *coro_first; 295static struct coro *coro_first;
297#define coro_nready coroapi.nready 296#define coro_nready coroapi.nready
297
298/** JIT *********************************************************************/
299
300#if CORO_JIT
301 /* APPLE doesn't have mmap though */
302 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
303 #ifndef CORO_JIT_TYPE
304 #if ECB_AMD64 && CORO_JIT_UNIXY
305 #define CORO_JIT_TYPE "amd64-unix"
306 #elif __i386 && CORO_JIT_UNIXY
307 #define CORO_JIT_TYPE "x86-unix"
308 #endif
309 #endif
310#endif
311
312#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
313 #undef CORO_JIT
314#endif
315
316#if CORO_JIT
317 typedef void (*load_save_perl_slots_type)(perl_slots *);
318 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
319#endif
298 320
299/** Coro::Select ************************************************************/ 321/** Coro::Select ************************************************************/
300 322
301static OP *(*coro_old_pp_sselect) (pTHX); 323static OP *(*coro_old_pp_sselect) (pTHX);
302static SV *coro_select_select; 324static SV *coro_select_select;
… …
314 PL_op->op_flags |= OPf_STACKED; 336 PL_op->op_flags |= OPf_STACKED;
315 PL_op->op_private = 0; 337 PL_op->op_private = 0;
316 return PL_ppaddr [OP_ENTERSUB](aTHX); 338 return PL_ppaddr [OP_ENTERSUB](aTHX);
317} 339}
318 340
341/** time stuff **************************************************************/
342
343#ifdef HAS_GETTIMEOFDAY
344
345ecb_inline void
346coro_u2time (pTHX_ UV ret[2])
347{
348 struct timeval tv;
349 gettimeofday (&tv, 0);
350
351 ret [0] = tv.tv_sec;
352 ret [1] = tv.tv_usec;
353}
354
355ecb_inline double
356coro_nvtime (void)
357{
358 struct timeval tv;
359 gettimeofday (&tv, 0);
360
361 return tv.tv_sec + tv.tv_usec * 1e-6;
362}
363
364ecb_inline void
365time_init (pTHX)
366{
367 nvtime = coro_nvtime;
368 u2time = coro_u2time;
369}
370
371#else
372
373ecb_inline void
374time_init (pTHX)
375{
376 SV **svp;
377
378 require_pv ("Time/HiRes.pm");
379
380 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
381
382 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
383 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
384
385 nvtime = INT2PTR (double (*)(), SvIV (*svp));
386
387 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
388 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
389}
390
391#endif
392
319/** lowlevel stuff **********************************************************/ 393/** lowlevel stuff **********************************************************/
320 394
321static SV * 395static SV * ecb_noinline
322coro_get_sv (pTHX_ const char *name, int create) 396coro_get_sv (pTHX_ const char *name, int create)
323{ 397{
324#if PERL_VERSION_ATLEAST (5,10,0) 398#if PERL_VERSION_ATLEAST (5,10,0)
325 /* 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 */
326 get_sv (name, create); 400 get_sv (name, create);
327#endif 401#endif
328 return get_sv (name, create); 402 return get_sv (name, create);
329} 403}
330 404
331static AV * 405static AV * ecb_noinline
332coro_get_av (pTHX_ const char *name, int create) 406coro_get_av (pTHX_ const char *name, int create)
333{ 407{
334#if PERL_VERSION_ATLEAST (5,10,0) 408#if PERL_VERSION_ATLEAST (5,10,0)
335 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 409 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
336 get_av (name, create); 410 get_av (name, create);
337#endif 411#endif
338 return get_av (name, create); 412 return get_av (name, create);
339} 413}
340 414
341static HV * 415static HV * ecb_noinline
342coro_get_hv (pTHX_ const char *name, int create) 416coro_get_hv (pTHX_ const char *name, int create)
343{ 417{
344#if PERL_VERSION_ATLEAST (5,10,0) 418#if PERL_VERSION_ATLEAST (5,10,0)
345 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 419 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
346 get_hv (name, create); 420 get_hv (name, create);
347#endif 421#endif
348 return get_hv (name, create); 422 return get_hv (name, create);
349} 423}
350 424
351INLINE void 425ecb_inline void
352coro_times_update () 426coro_times_update (void)
353{ 427{
354#ifdef coro_clock_gettime 428#ifdef coro_clock_gettime
355 struct timespec ts; 429 struct timespec ts;
356 430
357 ts.tv_sec = ts.tv_nsec = 0; 431 ts.tv_sec = ts.tv_nsec = 0;
… …
369 time_real [0] = tv [0]; 443 time_real [0] = tv [0];
370 time_real [1] = tv [1] * 1000; 444 time_real [1] = tv [1] * 1000;
371#endif 445#endif
372} 446}
373 447
374INLINE void 448ecb_inline void
375coro_times_add (struct coro *c) 449coro_times_add (struct coro *c)
376{ 450{
377 c->t_real [1] += time_real [1]; 451 c->t_real [1] += time_real [1];
378 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 452 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
379 c->t_real [0] += time_real [0]; 453 c->t_real [0] += time_real [0];
… …
381 c->t_cpu [1] += time_cpu [1]; 455 c->t_cpu [1] += time_cpu [1];
382 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 456 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
383 c->t_cpu [0] += time_cpu [0]; 457 c->t_cpu [0] += time_cpu [0];
384} 458}
385 459
386INLINE void 460ecb_inline void
387coro_times_sub (struct coro *c) 461coro_times_sub (struct coro *c)
388{ 462{
389 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 463 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]; 464 c->t_real [1] -= time_real [1];
391 c->t_real [0] -= time_real [0]; 465 c->t_real [0] -= time_real [0];
… …
399/* magic glue */ 473/* magic glue */
400 474
401#define CORO_MAGIC_type_cv 26 475#define CORO_MAGIC_type_cv 26
402#define CORO_MAGIC_type_state PERL_MAGIC_ext 476#define CORO_MAGIC_type_state PERL_MAGIC_ext
403 477
404#define CORO_MAGIC_NN(sv, type) \ 478#define CORO_MAGIC_NN(sv, type) \
405 (expect_true (SvMAGIC (sv)->mg_type == type) \ 479 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
406 ? SvMAGIC (sv) \ 480 ? SvMAGIC (sv) \
407 : mg_find (sv, type)) 481 : mg_find (sv, type))
408 482
409#define CORO_MAGIC(sv, type) \ 483#define CORO_MAGIC(sv, type) \
410 (expect_true (SvMAGIC (sv)) \ 484 (ecb_expect_true (SvMAGIC (sv)) \
411 ? CORO_MAGIC_NN (sv, type) \ 485 ? CORO_MAGIC_NN (sv, type) \
412 : 0) 486 : 0)
413 487
414#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 488#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) 489#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
416 490
417INLINE struct coro * 491ecb_inline MAGIC *
418SvSTATE_ (pTHX_ SV *coro) 492SvSTATEhv_p (pTHX_ SV *coro)
419{ 493{
420 HV *stash;
421 MAGIC *mg; 494 MAGIC *mg;
422 495
496 if (ecb_expect_true (
497 SvTYPE (coro) == SVt_PVHV
498 && (mg = CORO_MAGIC_state (coro))
499 && mg->mg_virtual == &coro_state_vtbl
500 ))
501 return mg;
502
503 return 0;
504}
505
506ecb_inline struct coro *
507SvSTATE_ (pTHX_ SV *coro_sv)
508{
509 MAGIC *mg;
510
423 if (SvROK (coro)) 511 if (SvROK (coro_sv))
424 coro = SvRV (coro); 512 coro_sv = SvRV (coro_sv);
425 513
426 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 514 mg = SvSTATEhv_p (aTHX_ coro_sv);
515 if (!mg)
427 croak ("Coro::State object required"); 516 croak ("Coro::State object required");
428 517
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; 518 return (struct coro *)mg->mg_ptr;
439} 519}
440 520
441#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 521#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
442 522
… …
445#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 525#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
446 526
447/*****************************************************************************/ 527/*****************************************************************************/
448/* padlist management and caching */ 528/* padlist management and caching */
449 529
450static AV * 530ecb_inline PADLIST *
451coro_derive_padlist (pTHX_ CV *cv) 531coro_derive_padlist (pTHX_ CV *cv)
452{ 532{
453 AV *padlist = CvPADLIST (cv); 533 PADLIST *padlist = CvPADLIST (cv);
454 AV *newpadlist, *newpad; 534 PADLIST *newpadlist;
535 PADNAMELIST *padnames;
536 PAD *newpad;
537 PADOFFSET off = PadlistMAX (padlist) + 1;
455 538
456 newpadlist = newAV (); 539#if NEWPADAPI
540
541 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
542 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
543 while (!PadlistARRAY (padlist)[off - 1])
544 --off;
545
546 Perl_pad_push (aTHX_ padlist, off);
547
548 newpad = PadlistARRAY (padlist)[off];
549 PadlistARRAY (padlist)[off] = 0;
550
551#else
552
553#if PERL_VERSION_ATLEAST (5,10,0)
554 Perl_pad_push (aTHX_ padlist, off);
555#else
556 Perl_pad_push (aTHX_ padlist, off, 1);
557#endif
558
559 newpad = PadlistARRAY (padlist)[off];
560 PadlistMAX (padlist) = off - 1;
561
562#endif
563
564 newPADLIST (newpadlist);
565#if !PERL_VERSION_ATLEAST(5,15,3)
566 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
457 AvREAL_off (newpadlist); 567 AvREAL_off (newpadlist);
458#if PERL_VERSION_ATLEAST (5,10,0)
459 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
460#else
461 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
462#endif 568#endif
463 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
464 --AvFILLp (padlist);
465 569
466 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 570 /* Already extended to 2 elements by newPADLIST. */
467 av_store (newpadlist, 1, (SV *)newpad); 571 PadlistMAX (newpadlist) = 1;
572
573 padnames = PadlistNAMES (padlist);
574 ++PadnamelistREFCNT (padnames);
575 PadlistNAMES (newpadlist) = padnames;
576
577 PadlistARRAY (newpadlist)[1] = newpad;
468 578
469 return newpadlist; 579 return newpadlist;
470} 580}
471 581
472static void 582ecb_inline void
473free_padlist (pTHX_ AV *padlist) 583free_padlist (pTHX_ PADLIST *padlist)
474{ 584{
475 /* may be during global destruction */ 585 /* may be during global destruction */
476 if (!IN_DESTRUCT) 586 if (!IN_DESTRUCT)
477 { 587 {
478 I32 i = AvFILLp (padlist); 588 I32 i = PadlistMAX (padlist);
479 589
480 while (i > 0) /* special-case index 0 */ 590 while (i > 0) /* special-case index 0 */
481 { 591 {
482 /* we try to be extra-careful here */ 592 /* we try to be extra-careful here */
483 AV *av = (AV *)AvARRAY (padlist)[i--]; 593 PAD *pad = PadlistARRAY (padlist)[i--];
484 I32 j = AvFILLp (av);
485 594
595 if (pad)
596 {
597 I32 j = PadMAX (pad);
598
486 while (j >= 0) 599 while (j >= 0)
487 SvREFCNT_dec (AvARRAY (av)[j--]); 600 SvREFCNT_dec (PadARRAY (pad)[j--]);
488 601
489 AvFILLp (av) = -1; 602 PadMAX (pad) = -1;
490 SvREFCNT_dec (av); 603 SvREFCNT_dec (pad);
604 }
491 } 605 }
492 606
493 SvREFCNT_dec (AvARRAY (padlist)[0]); 607 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
494 608
609#if NEWPADAPI
610 Safefree (PadlistARRAY (padlist));
611 Safefree (padlist);
612#else
495 AvFILLp (padlist) = -1; 613 AvFILLp (padlist) = -1;
614 AvREAL_off (padlist);
496 SvREFCNT_dec ((SV*)padlist); 615 SvREFCNT_dec ((SV*)padlist);
616#endif
497 } 617 }
498} 618}
499 619
500static int 620static int
501coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 621coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
502{ 622{
503 AV *padlist; 623 PADLIST *padlist;
504 AV *av = (AV *)mg->mg_obj; 624 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
625 size_t len = *(size_t *)mg->mg_ptr;
505 626
506 /* perl manages to free our internal AV and _then_ call us */ 627 /* perl manages to free our internal AV and _then_ call us */
507 if (IN_DESTRUCT) 628 if (IN_DESTRUCT)
508 return 0; 629 return 0;
509 630
510 /* casting is fun. */ 631 while (len--)
511 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
512 free_padlist (aTHX_ padlist); 632 free_padlist (aTHX_ padlists[len]);
513
514 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
515 633
516 return 0; 634 return 0;
517} 635}
518 636
519static MGVTBL coro_cv_vtbl = { 637static MGVTBL coro_cv_vtbl = {
520 0, 0, 0, 0, 638 0, 0, 0, 0,
521 coro_cv_free 639 coro_cv_free
522}; 640};
523 641
524/* the next two functions merely cache the padlists */ 642/* the next two functions merely cache the padlists */
525static void 643ecb_inline void
526get_padlist (pTHX_ CV *cv) 644get_padlist (pTHX_ CV *cv)
527{ 645{
528 MAGIC *mg = CORO_MAGIC_cv (cv); 646 MAGIC *mg = CORO_MAGIC_cv (cv);
529 AV *av; 647 size_t *lenp;
530 648
531 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 649 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
532 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 650 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
533 else 651 else
534 { 652 {
535#if CORO_PREFER_PERL_FUNCTIONS 653#if CORO_PREFER_PERL_FUNCTIONS
536 /* this is probably cleaner? but also slower! */ 654 /* this is probably cleaner? but also slower! */
537 /* in practise, it seems to be less stable */ 655 /* in practise, it seems to be less stable */
… …
543 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 661 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
544#endif 662#endif
545 } 663 }
546} 664}
547 665
548static void 666ecb_inline void
549put_padlist (pTHX_ CV *cv) 667put_padlist (pTHX_ CV *cv)
550{ 668{
551 MAGIC *mg = CORO_MAGIC_cv (cv); 669 MAGIC *mg = CORO_MAGIC_cv (cv);
552 AV *av;
553 670
554 if (expect_false (!mg)) 671 if (ecb_expect_false (!mg))
672 {
555 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 673 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
674 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
675 mg->mg_len = 1; /* so mg_free frees mg_ptr */
676 }
677 else
678 Renew (mg->mg_ptr,
679 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
680 char);
556 681
557 av = (AV *)mg->mg_obj; 682 ((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} 683}
564 684
565/** load & save, init *******************************************************/ 685/** load & save, init *******************************************************/
566 686
687ecb_inline void
688swap_sv (SV *a, SV *b)
689{
690 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
691 SV tmp;
692
693 /* swap sv_any */
694 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
695
696 /* swap sv_flags */
697 SvFLAGS (&tmp) = SvFLAGS (a);
698 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
699 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
700
701#if PERL_VERSION_ATLEAST (5,10,0)
702 /* perl 5.10 and later complicates this _quite_ a bit, but it also
703 * is much faster, so no quarrels here. alternatively, we could
704 * sv_upgrade to avoid this.
705 */
706 {
707 /* swap sv_u */
708 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
709
710 /* if SvANY points to the head, we need to adjust the pointers,
711 * as the pointer for a still points to b, and maybe vice versa.
712 */
713 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
714 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
715 svany_in_head_set |= 1 << SVt_NV;
716 #endif
717
718 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
719
720 if (svany_in_head (SvTYPE (a)))
721 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
722
723 if (svany_in_head (SvTYPE (b)))
724 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
725 }
726#endif
727}
728
567/* swap sv heads, at least logically */ 729/* swap sv heads, at least logically */
568static void 730static void
569swap_svs (pTHX_ Coro__State c) 731swap_svs_enter (pTHX_ Coro__State c)
570{ 732{
571 int i; 733 int i;
572 734
573 for (i = 0; i <= AvFILLp (c->swap_sv); ) 735 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
574 { 736 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} 737}
613 738
739static void
740swap_svs_leave (pTHX_ Coro__State c)
741{
742 int i;
743
744 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
745 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
746}
747
614#define SWAP_SVS(coro) \ 748#define SWAP_SVS_ENTER(coro) \
615 if (expect_false ((coro)->swap_sv)) \ 749 if (ecb_expect_false ((coro)->swap_sv)) \
616 swap_svs (aTHX_ (coro)) 750 swap_svs_enter (aTHX_ (coro))
751
752#define SWAP_SVS_LEAVE(coro) \
753 if (ecb_expect_false ((coro)->swap_sv)) \
754 swap_svs_leave (aTHX_ (coro))
617 755
618static void 756static void
619on_enterleave_call (pTHX_ SV *cb); 757on_enterleave_call (pTHX_ SV *cb);
620 758
621static void 759static void
… …
624 perl_slots *slot = c->slot; 762 perl_slots *slot = c->slot;
625 c->slot = 0; 763 c->slot = 0;
626 764
627 PL_mainstack = c->mainstack; 765 PL_mainstack = c->mainstack;
628 766
629 GvSV (PL_defgv) = slot->defsv; 767#if CORO_JIT
630 GvAV (PL_defgv) = slot->defav; 768 load_perl_slots (slot);
631 GvSV (PL_errgv) = slot->errsv; 769#else
632 GvSV (irsgv) = slot->irsgv;
633 GvHV (PL_hintgv) = slot->hinthv;
634
635 #define VAR(name,type) PL_ ## name = slot->name; 770 #define VARx(name,expr,type) expr = slot->name;
636 # include "state.h" 771 #include "state.h"
637 #undef VAR 772#endif
638 773
639 { 774 {
640 dSP; 775 dSP;
641 776
642 CV *cv; 777 CV *cv;
643 778
644 /* now do the ugly restore mess */ 779 /* now do the ugly restore mess */
645 while (expect_true (cv = (CV *)POPs)) 780 while (ecb_expect_true (cv = (CV *)POPs))
646 { 781 {
647 put_padlist (aTHX_ cv); /* mark this padlist as available */ 782 put_padlist (aTHX_ cv); /* mark this padlist as available */
648 CvDEPTH (cv) = PTR2IV (POPs); 783 CvDEPTH (cv) = PTR2IV (POPs);
649 CvPADLIST (cv) = (AV *)POPs; 784 CvPADLIST (cv) = (PADLIST *)POPs;
650 } 785 }
651 786
652 PUTBACK; 787 PUTBACK;
653 } 788 }
654 789
655 slf_frame = c->slf_frame; 790 slf_frame = c->slf_frame;
656 CORO_THROW = c->except; 791 CORO_THROW = c->except;
657 792
658 if (expect_false (enable_times)) 793 if (ecb_expect_false (enable_times))
659 { 794 {
660 if (expect_false (!times_valid)) 795 if (ecb_expect_false (!times_valid))
661 coro_times_update (); 796 coro_times_update ();
662 797
663 coro_times_sub (c); 798 coro_times_sub (c);
664 } 799 }
665 800
666 if (expect_false (c->on_enter)) 801 if (ecb_expect_false (c->on_enter))
667 { 802 {
668 int i; 803 int i;
669 804
670 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 805 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
671 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 806 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
672 } 807 }
673 808
809 if (ecb_expect_false (c->on_enter_xs))
810 {
811 int i;
812
813 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
814 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
815 }
816
674 SWAP_SVS (c); 817 SWAP_SVS_ENTER (c);
675} 818}
676 819
677static void 820static void
678save_perl (pTHX_ Coro__State c) 821save_perl (pTHX_ Coro__State c)
679{ 822{
680 SWAP_SVS (c); 823 SWAP_SVS_LEAVE (c);
681 824
825 if (ecb_expect_false (c->on_leave_xs))
826 {
827 int i;
828
829 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
830 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
831 }
832
682 if (expect_false (c->on_leave)) 833 if (ecb_expect_false (c->on_leave))
683 { 834 {
684 int i; 835 int i;
685 836
686 for (i = AvFILLp (c->on_leave); i >= 0; --i) 837 for (i = AvFILLp (c->on_leave); i >= 0; --i)
687 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 838 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
688 } 839 }
689 840
690 times_valid = 0; 841 times_valid = 0;
691 842
692 if (expect_false (enable_times)) 843 if (ecb_expect_false (enable_times))
693 { 844 {
694 coro_times_update (); times_valid = 1; 845 coro_times_update (); times_valid = 1;
695 coro_times_add (c); 846 coro_times_add (c);
696 } 847 }
697 848
… …
711 862
712 XPUSHs (Nullsv); 863 XPUSHs (Nullsv);
713 /* this loop was inspired by pp_caller */ 864 /* this loop was inspired by pp_caller */
714 for (;;) 865 for (;;)
715 { 866 {
716 while (expect_true (cxix >= 0)) 867 while (ecb_expect_true (cxix >= 0))
717 { 868 {
718 PERL_CONTEXT *cx = &ccstk[cxix--]; 869 PERL_CONTEXT *cx = &ccstk[cxix--];
719 870
720 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 871 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
721 { 872 {
722 CV *cv = cx->blk_sub.cv; 873 CV *cv = cx->blk_sub.cv;
723 874
724 if (expect_true (CvDEPTH (cv))) 875 if (ecb_expect_true (CvDEPTH (cv)))
725 { 876 {
726 EXTEND (SP, 3); 877 EXTEND (SP, 3);
727 PUSHs ((SV *)CvPADLIST (cv)); 878 PUSHs ((SV *)CvPADLIST (cv));
728 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 879 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
729 PUSHs ((SV *)cv); 880 PUSHs ((SV *)cv);
… …
732 get_padlist (aTHX_ cv); 883 get_padlist (aTHX_ cv);
733 } 884 }
734 } 885 }
735 } 886 }
736 887
737 if (expect_true (top_si->si_type == PERLSI_MAIN)) 888 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
738 break; 889 break;
739 890
740 top_si = top_si->si_prev; 891 top_si = top_si->si_prev;
741 ccstk = top_si->si_cxstack; 892 ccstk = top_si->si_cxstack;
742 cxix = top_si->si_cxix; 893 cxix = top_si->si_cxix;
… …
744 895
745 PUTBACK; 896 PUTBACK;
746 } 897 }
747 898
748 /* allocate some space on the context stack for our purposes */ 899 /* allocate some space on the context stack for our purposes */
749 /* we manually unroll here, as usually 2 slots is enough */ 900 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 { 901 {
754 unsigned int i; 902 unsigned int i;
903
755 for (i = 3; i < SLOT_COUNT; ++i) 904 for (i = 0; i < SLOT_COUNT; ++i)
756 CXINC; 905 CXINC;
757 } 906
758 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 907 cxstack_ix -= SLOT_COUNT; /* undo allocation */
908 }
759 909
760 c->mainstack = PL_mainstack; 910 c->mainstack = PL_mainstack;
761 911
762 { 912 {
763 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 913 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
764 914
765 slot->defav = GvAV (PL_defgv); 915#if CORO_JIT
766 slot->defsv = DEFSV; 916 save_perl_slots (slot);
767 slot->errsv = ERRSV; 917#else
768 slot->irsgv = GvSV (irsgv);
769 slot->hinthv = GvHV (PL_hintgv);
770
771 #define VAR(name,type) slot->name = PL_ ## name; 918 #define VARx(name,expr,type) slot->name = expr;
772 # include "state.h" 919 #include "state.h"
773 #undef VAR 920#endif
774 } 921 }
775} 922}
776 923
777/* 924/*
778 * allocate various perl stacks. This is almost an exact copy 925 * allocate various perl stacks. This is almost an exact copy
… …
784# define coro_init_stacks(thx) init_stacks () 931# define coro_init_stacks(thx) init_stacks ()
785#else 932#else
786static void 933static void
787coro_init_stacks (pTHX) 934coro_init_stacks (pTHX)
788{ 935{
789 PL_curstackinfo = new_stackinfo(32, 8); 936 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; 937 PL_curstackinfo->si_type = PERLSI_MAIN;
791 PL_curstack = PL_curstackinfo->si_stack; 938 PL_curstack = PL_curstackinfo->si_stack;
792 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 939 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
793 940
794 PL_stack_base = AvARRAY(PL_curstack); 941 PL_stack_base = AvARRAY(PL_curstack);
… …
809#endif 956#endif
810 957
811 New(54,PL_scopestack,8,I32); 958 New(54,PL_scopestack,8,I32);
812 PL_scopestack_ix = 0; 959 PL_scopestack_ix = 0;
813 PL_scopestack_max = 8; 960 PL_scopestack_max = 8;
961#if HAS_SCOPESTACK_NAME
962 New(54,PL_scopestack_name,8,const char*);
963#endif
814 964
815 New(54,PL_savestack,24,ANY); 965 New(54,PL_savestack,24,ANY);
816 PL_savestack_ix = 0; 966 PL_savestack_ix = 0;
817 PL_savestack_max = 24; 967 PL_savestack_max = 24;
968#if !PERL_VERSION_ATLEAST (5,24,0)
969 /* perl 5.24 moves SS_MAXPUSH optimisation from */
970 /* the header macros to PL_savestack_max */
971 PL_savestack_max -= SS_MAXPUSH;
972#endif
818 973
819#if !PERL_VERSION_ATLEAST (5,10,0) 974#if !PERL_VERSION_ATLEAST (5,10,0)
820 New(54,PL_retstack,4,OP*); 975 New(54,PL_retstack,4,OP*);
821 PL_retstack_ix = 0; 976 PL_retstack_ix = 0;
822 PL_retstack_max = 4; 977 PL_retstack_max = 4;
… …
846 } 1001 }
847 1002
848 Safefree (PL_tmps_stack); 1003 Safefree (PL_tmps_stack);
849 Safefree (PL_markstack); 1004 Safefree (PL_markstack);
850 Safefree (PL_scopestack); 1005 Safefree (PL_scopestack);
1006#if HAS_SCOPESTACK_NAME
1007 Safefree (PL_scopestack_name);
1008#endif
851 Safefree (PL_savestack); 1009 Safefree (PL_savestack);
852#if !PERL_VERSION_ATLEAST (5,10,0) 1010#if !PERL_VERSION_ATLEAST (5,10,0)
853 Safefree (PL_retstack); 1011 Safefree (PL_retstack);
854#endif 1012#endif
855} 1013}
… …
901#endif 1059#endif
902 1060
903/* 1061/*
904 * This overrides the default magic get method of %SIG elements. 1062 * 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 1063 * 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 1064 * and instead of trying to save and restore the hash elements (extremely slow),
907 * readback here. 1065 * we just provide our own readback here.
908 */ 1066 */
909static int 1067static int ecb_cold
910coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1068coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
911{ 1069{
912 const char *s = MgPV_nolen_const (mg); 1070 const char *s = MgPV_nolen_const (mg);
913 1071
914 if (*s == '_') 1072 if (*s == '_')
915 { 1073 {
916 SV **svp = 0; 1074 SV **svp = 0;
917 1075
918 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1076 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
919 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1077 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
920 1078
921 if (svp) 1079 if (svp)
922 { 1080 {
923 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1081 SV *ssv;
1082
1083 if (!*svp)
1084 ssv = &PL_sv_undef;
1085 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1086 ssv = sv_2mortal (newRV_inc (*svp));
1087 else
1088 ssv = *svp;
1089
1090 sv_setsv (sv, ssv);
924 return 0; 1091 return 0;
925 } 1092 }
926 } 1093 }
927 1094
928 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1095 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
929} 1096}
930 1097
931static int 1098static int ecb_cold
932coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1099coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
933{ 1100{
934 const char *s = MgPV_nolen_const (mg); 1101 const char *s = MgPV_nolen_const (mg);
935 1102
936 if (*s == '_') 1103 if (*s == '_')
… …
950 } 1117 }
951 1118
952 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1119 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
953} 1120}
954 1121
955static int 1122static int ecb_cold
956coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1123coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
957{ 1124{
958 const char *s = MgPV_nolen_const (mg); 1125 const char *s = MgPV_nolen_const (mg);
959 1126
960 if (*s == '_') 1127 if (*s == '_')
… …
995 return 1; 1162 return 1;
996} 1163}
997 1164
998static UNOP init_perl_op; 1165static UNOP init_perl_op;
999 1166
1000static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1167ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1001init_perl (pTHX_ struct coro *coro) 1168init_perl (pTHX_ struct coro *coro)
1002{ 1169{
1003 /* 1170 /*
1004 * emulate part of the perl startup here. 1171 * emulate part of the perl startup here.
1005 */ 1172 */
… …
1020 PL_parser = 0; 1187 PL_parser = 0;
1021#endif 1188#endif
1022 PL_hints = 0; 1189 PL_hints = 0;
1023 1190
1024 /* recreate the die/warn hooks */ 1191 /* recreate the die/warn hooks */
1025 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1192 PL_diehook = SvREFCNT_inc (rv_diehook);
1026 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1193 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1027 1194
1028 GvSV (PL_defgv) = newSV (0); 1195 GvSV (PL_defgv) = newSV (0);
1029 GvAV (PL_defgv) = coro->args; coro->args = 0; 1196 GvAV (PL_defgv) = coro->args; coro->args = 0;
1030 GvSV (PL_errgv) = newSV (0); 1197 GvSV (PL_errgv) = newSV (0);
1031 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1198 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1032 GvHV (PL_hintgv) = 0; 1199 GvHV (PL_hintgv) = newHV ();
1200#if PERL_VERSION_ATLEAST (5,10,0)
1201 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1202#endif
1033 PL_rs = newSVsv (GvSV (irsgv)); 1203 PL_rs = newSVsv (GvSV (irsgv));
1034 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1204 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1035 1205
1036 { 1206 {
1037 dSP; 1207 dSP;
… …
1052 /* this newly created coroutine might be run on an existing cctx which most 1222 /* this newly created coroutine might be run on an existing cctx which most
1053 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1223 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1054 */ 1224 */
1055 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1225 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1056 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1226 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1227 slf_frame.destroy = 0;
1057 1228
1058 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1229 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1059 init_perl_op.op_next = PL_op; 1230 init_perl_op.op_next = PL_op;
1060 init_perl_op.op_type = OP_ENTERSUB; 1231 init_perl_op.op_type = OP_ENTERSUB;
1061 init_perl_op.op_ppaddr = pp_slf; 1232 init_perl_op.op_ppaddr = pp_slf;
… …
1064 PL_op = (OP *)&init_perl_op; 1235 PL_op = (OP *)&init_perl_op;
1065 1236
1066 /* copy throw, in case it was set before init_perl */ 1237 /* copy throw, in case it was set before init_perl */
1067 CORO_THROW = coro->except; 1238 CORO_THROW = coro->except;
1068 1239
1069 SWAP_SVS (coro); 1240 SWAP_SVS_ENTER (coro);
1070 1241
1071 if (expect_false (enable_times)) 1242 if (ecb_expect_false (enable_times))
1072 { 1243 {
1073 coro_times_update (); 1244 coro_times_update ();
1074 coro_times_sub (coro); 1245 coro_times_sub (coro);
1075 } 1246 }
1076} 1247}
… …
1100destroy_perl (pTHX_ struct coro *coro) 1271destroy_perl (pTHX_ struct coro *coro)
1101{ 1272{
1102 SV *svf [9]; 1273 SV *svf [9];
1103 1274
1104 { 1275 {
1276 SV *old_current = SvRV (coro_current);
1105 struct coro *current = SvSTATE_current; 1277 struct coro *current = SvSTATE (old_current);
1106 1278
1107 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1279 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1108 1280
1109 save_perl (aTHX_ current); 1281 save_perl (aTHX_ current);
1282
1283 /* this will cause transfer_check to croak on block*/
1284 SvRV_set (coro_current, (SV *)coro->hv);
1285
1110 load_perl (aTHX_ coro); 1286 load_perl (aTHX_ coro);
1111 1287
1288 /* restore swapped sv's */
1289 SWAP_SVS_LEAVE (coro);
1290
1112 coro_unwind_stacks (aTHX); 1291 coro_unwind_stacks (aTHX);
1292
1113 coro_destruct_stacks (aTHX); 1293 coro_destruct_stacks (aTHX);
1114 1294
1115 /* restore swapped sv's */
1116 SWAP_SVS (coro);
1117
1118 // now save some sv's to be free'd later 1295 /* now save some sv's to be free'd later */
1119 svf [0] = GvSV (PL_defgv); 1296 svf [0] = GvSV (PL_defgv);
1120 svf [1] = (SV *)GvAV (PL_defgv); 1297 svf [1] = (SV *)GvAV (PL_defgv);
1121 svf [2] = GvSV (PL_errgv); 1298 svf [2] = GvSV (PL_errgv);
1122 svf [3] = (SV *)PL_defoutgv; 1299 svf [3] = (SV *)PL_defoutgv;
1123 svf [4] = PL_rs; 1300 svf [4] = PL_rs;
… …
1125 svf [6] = (SV *)GvHV (PL_hintgv); 1302 svf [6] = (SV *)GvHV (PL_hintgv);
1126 svf [7] = PL_diehook; 1303 svf [7] = PL_diehook;
1127 svf [8] = PL_warnhook; 1304 svf [8] = PL_warnhook;
1128 assert (9 == sizeof (svf) / sizeof (*svf)); 1305 assert (9 == sizeof (svf) / sizeof (*svf));
1129 1306
1307 SvRV_set (coro_current, old_current);
1308
1130 load_perl (aTHX_ current); 1309 load_perl (aTHX_ current);
1131 } 1310 }
1132 1311
1133 { 1312 {
1134 unsigned int i; 1313 unsigned int i;
… …
1138 1317
1139 SvREFCNT_dec (coro->saved_deffh); 1318 SvREFCNT_dec (coro->saved_deffh);
1140 SvREFCNT_dec (coro->rouse_cb); 1319 SvREFCNT_dec (coro->rouse_cb);
1141 SvREFCNT_dec (coro->invoke_cb); 1320 SvREFCNT_dec (coro->invoke_cb);
1142 SvREFCNT_dec (coro->invoke_av); 1321 SvREFCNT_dec (coro->invoke_av);
1322 SvREFCNT_dec (coro->on_enter_xs);
1323 SvREFCNT_dec (coro->on_leave_xs);
1143 } 1324 }
1144} 1325}
1145 1326
1146INLINE void 1327ecb_inline void
1147free_coro_mortal (pTHX) 1328free_coro_mortal (pTHX)
1148{ 1329{
1149 if (expect_true (coro_mortal)) 1330 if (ecb_expect_true (coro_mortal))
1150 { 1331 {
1151 SvREFCNT_dec (coro_mortal); 1332 SvREFCNT_dec ((SV *)coro_mortal);
1152 coro_mortal = 0; 1333 coro_mortal = 0;
1153 } 1334 }
1154} 1335}
1155 1336
1156static int 1337static int
… …
1210 1391
1211 if (PL_curcop != &PL_compiling) 1392 if (PL_curcop != &PL_compiling)
1212 { 1393 {
1213 SV **cb; 1394 SV **cb;
1214 1395
1215 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1396 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1216 { 1397 {
1217 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1398 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1218 1399
1219 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1400 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1220 { 1401 {
… …
1289 1470
1290 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1471 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1291} 1472}
1292 1473
1293/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1474/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1294static void NOINLINE 1475static void ecb_noinline
1295cctx_prepare (pTHX) 1476cctx_prepare (pTHX)
1296{ 1477{
1297 PL_top_env = &PL_start_env; 1478 PL_top_env = &PL_start_env;
1298 1479
1299 if (cctx_current->flags & CC_TRACE) 1480 if (cctx_current->flags & CC_TRACE)
… …
1310 slf_frame.prepare = slf_prepare_set_stacklevel; 1491 slf_frame.prepare = slf_prepare_set_stacklevel;
1311 slf_frame.check = slf_check_set_stacklevel; 1492 slf_frame.check = slf_check_set_stacklevel;
1312} 1493}
1313 1494
1314/* the tail of transfer: execute stuff we can only do after a transfer */ 1495/* the tail of transfer: execute stuff we can only do after a transfer */
1315INLINE void 1496ecb_inline void
1316transfer_tail (pTHX) 1497transfer_tail (pTHX)
1317{ 1498{
1318 free_coro_mortal (aTHX); 1499 free_coro_mortal (aTHX);
1500}
1501
1502/* try to exit the same way perl's main function would do */
1503/* we do not bother resetting the environment or other things *7
1504/* that are not, uhm, essential */
1505/* this obviously also doesn't work when perl is embedded */
1506static void ecb_noinline ecb_cold
1507perlish_exit (pTHX)
1508{
1509 int exitstatus = perl_destruct (PL_curinterp);
1510 perl_free (PL_curinterp);
1511 exit (exitstatus);
1319} 1512}
1320 1513
1321/* 1514/*
1322 * this is a _very_ stripped down perl interpreter ;) 1515 * this is a _very_ stripped down perl interpreter ;)
1323 */ 1516 */
… …
1352 */ 1545 */
1353 1546
1354 /* 1547 /*
1355 * If perl-run returns we assume exit() was being called or the coro 1548 * If perl-run returns we assume exit() was being called or the coro
1356 * fell off the end, which seems to be the only valid (non-bug) 1549 * fell off the end, which seems to be the only valid (non-bug)
1357 * reason for perl_run to return. We try to exit by jumping to the 1550 * reason for perl_run to return. We try to mimic whatever perl is normally
1358 * bootstrap-time "top" top_env, as we cannot restore the "main" 1551 * doing in that case. YMMV.
1359 * coroutine as Coro has no such concept.
1360 * This actually isn't valid with the pthread backend, but OSes requiring
1361 * that backend are too broken to do it in a standards-compliant way.
1362 */ 1552 */
1363 PL_top_env = main_top_env; 1553 perlish_exit (aTHX);
1364 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1365 } 1554 }
1366} 1555}
1367 1556
1368static coro_cctx * 1557static coro_cctx *
1369cctx_new () 1558cctx_new (void)
1370{ 1559{
1371 coro_cctx *cctx; 1560 coro_cctx *cctx;
1372 1561
1373 ++cctx_count; 1562 ++cctx_count;
1374 New (0, cctx, 1, coro_cctx); 1563 New (0, cctx, 1, coro_cctx);
… …
1380 return cctx; 1569 return cctx;
1381} 1570}
1382 1571
1383/* create a new cctx only suitable as source */ 1572/* create a new cctx only suitable as source */
1384static coro_cctx * 1573static coro_cctx *
1385cctx_new_empty () 1574cctx_new_empty (void)
1386{ 1575{
1387 coro_cctx *cctx = cctx_new (); 1576 coro_cctx *cctx = cctx_new ();
1388 1577
1389 cctx->sptr = 0; 1578 cctx->stack.sptr = 0;
1390 coro_create (&cctx->cctx, 0, 0, 0, 0); 1579 coro_create (&cctx->cctx, 0, 0, 0, 0);
1391 1580
1392 return cctx; 1581 return cctx;
1393} 1582}
1394 1583
1395/* create a new cctx suitable as destination/running a perl interpreter */ 1584/* create a new cctx suitable as destination/running a perl interpreter */
1396static coro_cctx * 1585static coro_cctx *
1397cctx_new_run () 1586cctx_new_run (void)
1398{ 1587{
1399 coro_cctx *cctx = cctx_new (); 1588 coro_cctx *cctx = cctx_new ();
1400 void *stack_start;
1401 size_t stack_size;
1402 1589
1403#if HAVE_MMAP 1590 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1404 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1405 /* mmap supposedly does allocate-on-write for us */
1406 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1407
1408 if (cctx->sptr != (void *)-1)
1409 {
1410 #if CORO_STACKGUARD
1411 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1412 #endif
1413 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1414 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1415 cctx->flags |= CC_MAPPED;
1416 } 1591 {
1417 else
1418#endif
1419 {
1420 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1421 New (0, cctx->sptr, cctx_stacksize, long);
1422
1423 if (!cctx->sptr)
1424 {
1425 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1592 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1426 _exit (EXIT_FAILURE); 1593 _exit (EXIT_FAILURE);
1427 }
1428
1429 stack_start = cctx->sptr;
1430 stack_size = cctx->ssize;
1431 } 1594 }
1432 1595
1433 #if CORO_USE_VALGRIND
1434 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1435 #endif
1436
1437 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1596 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1438 1597
1439 return cctx; 1598 return cctx;
1440} 1599}
1441 1600
1442static void 1601static void
1443cctx_destroy (coro_cctx *cctx) 1602cctx_destroy (coro_cctx *cctx)
1444{ 1603{
1445 if (!cctx) 1604 if (!cctx)
1446 return; 1605 return;
1447 1606
1448 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1607 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1449 1608
1450 --cctx_count; 1609 --cctx_count;
1451 coro_destroy (&cctx->cctx); 1610 coro_destroy (&cctx->cctx);
1452 1611
1453 /* coro_transfer creates new, empty cctx's */ 1612 coro_stack_free (&cctx->stack);
1454 if (cctx->sptr)
1455 {
1456 #if CORO_USE_VALGRIND
1457 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1458 #endif
1459
1460#if HAVE_MMAP
1461 if (cctx->flags & CC_MAPPED)
1462 munmap (cctx->sptr, cctx->ssize);
1463 else
1464#endif
1465 Safefree (cctx->sptr);
1466 }
1467 1613
1468 Safefree (cctx); 1614 Safefree (cctx);
1469} 1615}
1470 1616
1471/* wether this cctx should be destructed */ 1617/* wether this cctx should be destructed */
1472#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1618#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1473 1619
1474static coro_cctx * 1620static coro_cctx *
1475cctx_get (pTHX) 1621cctx_get (pTHX)
1476{ 1622{
1477 while (expect_true (cctx_first)) 1623 while (ecb_expect_true (cctx_first))
1478 { 1624 {
1479 coro_cctx *cctx = cctx_first; 1625 coro_cctx *cctx = cctx_first;
1480 cctx_first = cctx->next; 1626 cctx_first = cctx->next;
1481 --cctx_idle; 1627 --cctx_idle;
1482 1628
1483 if (expect_true (!CCTX_EXPIRED (cctx))) 1629 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1484 return cctx; 1630 return cctx;
1485 1631
1486 cctx_destroy (cctx); 1632 cctx_destroy (cctx);
1487 } 1633 }
1488 1634
… …
1490} 1636}
1491 1637
1492static void 1638static void
1493cctx_put (coro_cctx *cctx) 1639cctx_put (coro_cctx *cctx)
1494{ 1640{
1495 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1641 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1496 1642
1497 /* free another cctx if overlimit */ 1643 /* free another cctx if overlimit */
1498 if (expect_false (cctx_idle >= cctx_max_idle)) 1644 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1499 { 1645 {
1500 coro_cctx *first = cctx_first; 1646 coro_cctx *first = cctx_first;
1501 cctx_first = first->next; 1647 cctx_first = first->next;
1502 --cctx_idle; 1648 --cctx_idle;
1503 1649
… …
1514static void 1660static void
1515transfer_check (pTHX_ struct coro *prev, struct coro *next) 1661transfer_check (pTHX_ struct coro *prev, struct coro *next)
1516{ 1662{
1517 /* TODO: throwing up here is considered harmful */ 1663 /* TODO: throwing up here is considered harmful */
1518 1664
1519 if (expect_true (prev != next)) 1665 if (ecb_expect_true (prev != next))
1520 { 1666 {
1521 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1667 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1522 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1668 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1523 1669
1524 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1670 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1525 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1671 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1526 1672
1527#if !PERL_VERSION_ATLEAST (5,10,0) 1673#if !PERL_VERSION_ATLEAST (5,10,0)
1528 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1674 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1529 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1675 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1530#endif 1676#endif
1531 } 1677 }
1532} 1678}
1533 1679
1534/* always use the TRANSFER macro */ 1680/* always use the TRANSFER macro */
1535static void NOINLINE /* noinline so we have a fixed stackframe */ 1681static void ecb_noinline /* noinline so we have a fixed stackframe */
1536transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1682transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1537{ 1683{
1538 dSTACKLEVEL; 1684 dSTACKLEVEL;
1539 1685
1540 /* sometimes transfer is only called to set idle_sp */ 1686 /* sometimes transfer is only called to set idle_sp */
1541 if (expect_false (!prev)) 1687 if (ecb_expect_false (!prev))
1542 { 1688 {
1543 cctx_current->idle_sp = STACKLEVEL; 1689 cctx_current->idle_sp = STACKLEVEL;
1544 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1690 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1545 } 1691 }
1546 else if (expect_true (prev != next)) 1692 else if (ecb_expect_true (prev != next))
1547 { 1693 {
1548 coro_cctx *cctx_prev; 1694 coro_cctx *cctx_prev;
1549 1695
1550 if (expect_false (prev->flags & CF_NEW)) 1696 if (ecb_expect_false (prev->flags & CF_NEW))
1551 { 1697 {
1552 /* create a new empty/source context */ 1698 /* create a new empty/source context */
1553 prev->flags &= ~CF_NEW; 1699 prev->flags &= ~CF_NEW;
1554 prev->flags |= CF_RUNNING; 1700 prev->flags |= CF_RUNNING;
1555 } 1701 }
… …
1558 next->flags |= CF_RUNNING; 1704 next->flags |= CF_RUNNING;
1559 1705
1560 /* first get rid of the old state */ 1706 /* first get rid of the old state */
1561 save_perl (aTHX_ prev); 1707 save_perl (aTHX_ prev);
1562 1708
1563 if (expect_false (next->flags & CF_NEW)) 1709 if (ecb_expect_false (next->flags & CF_NEW))
1564 { 1710 {
1565 /* need to start coroutine */ 1711 /* need to start coroutine */
1566 next->flags &= ~CF_NEW; 1712 next->flags &= ~CF_NEW;
1567 /* setup coroutine call */ 1713 /* setup coroutine call */
1568 init_perl (aTHX_ next); 1714 init_perl (aTHX_ next);
1569 } 1715 }
1570 else 1716 else
1571 load_perl (aTHX_ next); 1717 load_perl (aTHX_ next);
1572 1718
1573 /* possibly untie and reuse the cctx */ 1719 /* possibly untie and reuse the cctx */
1574 if (expect_true ( 1720 if (ecb_expect_true (
1575 cctx_current->idle_sp == STACKLEVEL 1721 cctx_current->idle_sp == STACKLEVEL
1576 && !(cctx_current->flags & CC_TRACE) 1722 && !(cctx_current->flags & CC_TRACE)
1577 && !force_cctx 1723 && !force_cctx
1578 )) 1724 ))
1579 { 1725 {
1580 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1726 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1581 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1727 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1582 1728
1583 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1729 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1584 /* without this the next cctx_get might destroy the running cctx while still in use */ 1730 /* without this the next cctx_get might destroy the running cctx while still in use */
1585 if (expect_false (CCTX_EXPIRED (cctx_current))) 1731 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1586 if (expect_true (!next->cctx)) 1732 if (ecb_expect_true (!next->cctx))
1587 next->cctx = cctx_get (aTHX); 1733 next->cctx = cctx_get (aTHX);
1588 1734
1589 cctx_put (cctx_current); 1735 cctx_put (cctx_current);
1590 } 1736 }
1591 else 1737 else
1592 prev->cctx = cctx_current; 1738 prev->cctx = cctx_current;
1593 1739
1594 ++next->usecount; 1740 ++next->usecount;
1595 1741
1596 cctx_prev = cctx_current; 1742 cctx_prev = cctx_current;
1597 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1743 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1598 1744
1599 next->cctx = 0; 1745 next->cctx = 0;
1600 1746
1601 if (expect_false (cctx_prev != cctx_current)) 1747 if (ecb_expect_false (cctx_prev != cctx_current))
1602 { 1748 {
1603 cctx_prev->top_env = PL_top_env; 1749 cctx_prev->top_env = PL_top_env;
1604 PL_top_env = cctx_current->top_env; 1750 PL_top_env = cctx_current->top_env;
1605 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1751 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1606 } 1752 }
… …
1612#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1758#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1613#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1759#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1614 1760
1615/** high level stuff ********************************************************/ 1761/** high level stuff ********************************************************/
1616 1762
1763/* this function is actually Coro, not Coro::State, but we call it from here */
1764/* because it is convenient - but it hasn't been declared yet for that reason */
1617static int 1765static void
1766coro_call_on_destroy (pTHX_ struct coro *coro);
1767
1768static void
1618coro_state_destroy (pTHX_ struct coro *coro) 1769coro_state_destroy (pTHX_ struct coro *coro)
1619{ 1770{
1620 if (coro->flags & CF_DESTROYED) 1771 if (coro->flags & CF_ZOMBIE)
1621 return 0; 1772 return;
1622 1773
1623 if (coro->on_destroy && !PL_dirty)
1624 coro->on_destroy (aTHX_ coro); 1774 slf_destroy (aTHX_ coro);
1625 1775
1626 coro->flags |= CF_DESTROYED; 1776 coro->flags |= CF_ZOMBIE;
1627 1777
1628 if (coro->flags & CF_READY) 1778 if (coro->flags & CF_READY)
1629 { 1779 {
1630 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1780 /* reduce nready, as destroying a ready coro effectively unreadies it */
1631 /* alternative: look through all ready queues and remove the coro */ 1781 /* alternative: look through all ready queues and remove the coro */
1632 --coro_nready; 1782 --coro_nready;
1633 } 1783 }
1634 else 1784 else
1635 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1785 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1786
1787 if (coro->next) coro->next->prev = coro->prev;
1788 if (coro->prev) coro->prev->next = coro->next;
1789 if (coro == coro_first) coro_first = coro->next;
1636 1790
1637 if (coro->mainstack 1791 if (coro->mainstack
1638 && coro->mainstack != main_mainstack 1792 && coro->mainstack != main_mainstack
1639 && coro->slot 1793 && coro->slot
1640 && !PL_dirty) 1794 && !PL_dirty)
1641 destroy_perl (aTHX_ coro); 1795 destroy_perl (aTHX_ coro);
1642 1796
1643 if (coro->next) coro->next->prev = coro->prev;
1644 if (coro->prev) coro->prev->next = coro->next;
1645 if (coro == coro_first) coro_first = coro->next;
1646
1647 cctx_destroy (coro->cctx); 1797 cctx_destroy (coro->cctx);
1648 SvREFCNT_dec (coro->startcv); 1798 SvREFCNT_dec (coro->startcv);
1649 SvREFCNT_dec (coro->args); 1799 SvREFCNT_dec (coro->args);
1650 SvREFCNT_dec (coro->swap_sv); 1800 SvREFCNT_dec (coro->swap_sv);
1651 SvREFCNT_dec (CORO_THROW); 1801 SvREFCNT_dec (CORO_THROW);
1652 1802
1653 return 1; 1803 coro_call_on_destroy (aTHX_ coro);
1804
1805 /* more destruction mayhem in coro_state_free */
1654} 1806}
1655 1807
1656static int 1808static int
1657coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1809coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1658{ 1810{
1659 struct coro *coro = (struct coro *)mg->mg_ptr; 1811 struct coro *coro = (struct coro *)mg->mg_ptr;
1660 mg->mg_ptr = 0; 1812 mg->mg_ptr = 0;
1661 1813
1662 coro->hv = 0;
1663
1664 if (--coro->refcnt < 0)
1665 {
1666 coro_state_destroy (aTHX_ coro); 1814 coro_state_destroy (aTHX_ coro);
1815 SvREFCNT_dec (coro->on_destroy);
1816 SvREFCNT_dec (coro->status);
1817
1667 Safefree (coro); 1818 Safefree (coro);
1668 }
1669 1819
1670 return 0; 1820 return 0;
1671} 1821}
1672 1822
1673static int 1823static int ecb_cold
1674coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1824coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1675{ 1825{
1676 struct coro *coro = (struct coro *)mg->mg_ptr; 1826 /* called when perl clones the current process the slow way (windows process emulation) */
1677 1827 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1678 ++coro->refcnt; 1828 mg->mg_ptr = 0;
1829 mg->mg_virtual = 0;
1679 1830
1680 return 0; 1831 return 0;
1681} 1832}
1682 1833
1683static MGVTBL coro_state_vtbl = { 1834static MGVTBL coro_state_vtbl = {
… …
1708 TRANSFER (ta, 1); 1859 TRANSFER (ta, 1);
1709} 1860}
1710 1861
1711/** Coro ********************************************************************/ 1862/** Coro ********************************************************************/
1712 1863
1713INLINE void 1864ecb_inline void
1714coro_enq (pTHX_ struct coro *coro) 1865coro_enq (pTHX_ struct coro *coro)
1715{ 1866{
1716 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1867 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1717 1868
1718 SvREFCNT_inc_NN (coro->hv); 1869 SvREFCNT_inc_NN (coro->hv);
… …
1720 coro->next_ready = 0; 1871 coro->next_ready = 0;
1721 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1872 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1722 ready [1] = coro; 1873 ready [1] = coro;
1723} 1874}
1724 1875
1725INLINE struct coro * 1876ecb_inline struct coro *
1726coro_deq (pTHX) 1877coro_deq (pTHX)
1727{ 1878{
1728 int prio; 1879 int prio;
1729 1880
1730 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1881 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1783{ 1934{
1784 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1935 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1785} 1936}
1786 1937
1787/* expects to own a reference to next->hv */ 1938/* expects to own a reference to next->hv */
1788INLINE void 1939ecb_inline void
1789prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1940prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1790{ 1941{
1791 SV *prev_sv = SvRV (coro_current); 1942 SV *prev_sv = SvRV (coro_current);
1792 1943
1793 ta->prev = SvSTATE_hv (prev_sv); 1944 ta->prev = SvSTATE_hv (prev_sv);
… …
1806{ 1957{
1807 for (;;) 1958 for (;;)
1808 { 1959 {
1809 struct coro *next = coro_deq (aTHX); 1960 struct coro *next = coro_deq (aTHX);
1810 1961
1811 if (expect_true (next)) 1962 if (ecb_expect_true (next))
1812 { 1963 {
1813 /* cannot transfer to destroyed coros, skip and look for next */ 1964 /* cannot transfer to destroyed coros, skip and look for next */
1814 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1965 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1815 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1966 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1816 else 1967 else
1817 { 1968 {
1818 next->flags &= ~CF_READY; 1969 next->flags &= ~CF_READY;
1819 --coro_nready; 1970 --coro_nready;
… …
1827 /* nothing to schedule: call the idle handler */ 1978 /* nothing to schedule: call the idle handler */
1828 if (SvROK (sv_idle) 1979 if (SvROK (sv_idle)
1829 && SvOBJECT (SvRV (sv_idle))) 1980 && SvOBJECT (SvRV (sv_idle)))
1830 { 1981 {
1831 if (SvRV (sv_idle) == SvRV (coro_current)) 1982 if (SvRV (sv_idle) == SvRV (coro_current))
1983 {
1984 require_pv ("Carp");
1985
1986 {
1987 dSP;
1988
1989 ENTER;
1990 SAVETMPS;
1991
1992 PUSHMARK (SP);
1832 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1993 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1994 PUTBACK;
1995 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1996
1997 FREETMPS;
1998 LEAVE;
1999 }
2000 }
1833 2001
1834 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2002 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1835 api_ready (aTHX_ SvRV (sv_idle)); 2003 api_ready (aTHX_ SvRV (sv_idle));
1836 --coro_nready; 2004 --coro_nready;
1837 } 2005 }
… …
1852 } 2020 }
1853 } 2021 }
1854 } 2022 }
1855} 2023}
1856 2024
1857INLINE void 2025ecb_inline void
1858prepare_cede (pTHX_ struct coro_transfer_args *ta) 2026prepare_cede (pTHX_ struct coro_transfer_args *ta)
1859{ 2027{
1860 api_ready (aTHX_ coro_current); 2028 api_ready (aTHX_ coro_current);
1861 prepare_schedule (aTHX_ ta); 2029 prepare_schedule (aTHX_ ta);
1862} 2030}
1863 2031
1864INLINE void 2032ecb_inline void
1865prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2033prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1866{ 2034{
1867 SV *prev = SvRV (coro_current); 2035 SV *prev = SvRV (coro_current);
1868 2036
1869 if (coro_nready) 2037 if (coro_nready)
… …
1899{ 2067{
1900 struct coro_transfer_args ta; 2068 struct coro_transfer_args ta;
1901 2069
1902 prepare_cede (aTHX_ &ta); 2070 prepare_cede (aTHX_ &ta);
1903 2071
1904 if (expect_true (ta.prev != ta.next)) 2072 if (ecb_expect_true (ta.prev != ta.next))
1905 { 2073 {
1906 TRANSFER (ta, 1); 2074 TRANSFER (ta, 1);
1907 return 1; 2075 return 1;
1908 } 2076 }
1909 else 2077 else
… …
1952 coro->slot->runops = RUNOPS_DEFAULT; 2120 coro->slot->runops = RUNOPS_DEFAULT;
1953 } 2121 }
1954} 2122}
1955 2123
1956static void 2124static void
2125coro_push_av (pTHX_ AV *av, I32 gimme_v)
2126{
2127 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2128 {
2129 dSP;
2130
2131 if (gimme_v == G_SCALAR)
2132 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2133 else
2134 {
2135 int i;
2136 EXTEND (SP, AvFILLp (av) + 1);
2137
2138 for (i = 0; i <= AvFILLp (av); ++i)
2139 PUSHs (AvARRAY (av)[i]);
2140 }
2141
2142 PUTBACK;
2143 }
2144}
2145
2146static void
2147coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2148{
2149 if (!coro->on_destroy)
2150 coro->on_destroy = newAV ();
2151
2152 av_push (coro->on_destroy, cb);
2153}
2154
2155static void
2156slf_destroy_join (pTHX_ struct CoroSLF *frame)
2157{
2158 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2159}
2160
2161static int
2162slf_check_join (pTHX_ struct CoroSLF *frame)
2163{
2164 struct coro *coro = (struct coro *)frame->data;
2165
2166 if (!coro->status)
2167 return 1;
2168
2169 frame->destroy = 0;
2170
2171 coro_push_av (aTHX_ coro->status, GIMME_V);
2172
2173 SvREFCNT_dec ((SV *)coro->hv);
2174
2175 return 0;
2176}
2177
2178static void
2179slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2180{
2181 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2182
2183 if (items > 1)
2184 croak ("join called with too many arguments");
2185
2186 if (coro->status)
2187 frame->prepare = prepare_nop;
2188 else
2189 {
2190 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2191 frame->prepare = prepare_schedule;
2192 }
2193
2194 frame->check = slf_check_join;
2195 frame->destroy = slf_destroy_join;
2196 frame->data = (void *)coro;
2197 SvREFCNT_inc (coro->hv);
2198}
2199
2200static void
1957coro_call_on_destroy (pTHX_ struct coro *coro) 2201coro_call_on_destroy (pTHX_ struct coro *coro)
1958{ 2202{
1959 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2203 AV *od = coro->on_destroy;
1960 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1961 2204
1962 if (on_destroyp) 2205 if (!od)
1963 { 2206 return;
1964 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1965 2207
2208 coro->on_destroy = 0;
2209 sv_2mortal ((SV *)od);
2210
1966 while (AvFILLp (on_destroy) >= 0) 2211 while (AvFILLp (od) >= 0)
2212 {
2213 SV *cb = sv_2mortal (av_pop (od));
2214
2215 /* coro hv's (and only hv's at the moment) are supported as well */
2216 if (SvSTATEhv_p (aTHX_ cb))
2217 api_ready (aTHX_ cb);
2218 else
1967 { 2219 {
1968 dSP; /* don't disturb outer sp */ 2220 dSP; /* don't disturb outer sp */
1969 SV *cb = av_pop (on_destroy);
1970
1971 PUSHMARK (SP); 2221 PUSHMARK (SP);
1972 2222
1973 if (statusp) 2223 if (coro->status)
1974 { 2224 {
1975 int i; 2225 PUTBACK;
1976 AV *status = (AV *)SvRV (*statusp); 2226 coro_push_av (aTHX_ coro->status, G_ARRAY);
1977 EXTEND (SP, AvFILLp (status) + 1); 2227 SPAGAIN;
1978
1979 for (i = 0; i <= AvFILLp (status); ++i)
1980 PUSHs (AvARRAY (status)[i]);
1981 } 2228 }
1982 2229
1983 PUTBACK; 2230 PUTBACK;
1984 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2231 call_sv (cb, G_VOID | G_DISCARD);
1985 } 2232 }
1986 } 2233 }
1987} 2234}
1988 2235
1989static void 2236static void
1990slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2237coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1991{ 2238{
1992 int i; 2239 AV *av;
1993 HV *hv = (HV *)SvRV (coro_current); 2240
1994 AV *av = newAV (); 2241 if (coro->status)
2242 {
2243 av = coro->status;
2244 av_clear (av);
2245 }
2246 else
2247 av = coro->status = newAV ();
1995 2248
1996 /* items are actually not so common, so optimise for this case */ 2249 /* items are actually not so common, so optimise for this case */
1997 if (items) 2250 if (items)
1998 { 2251 {
2252 int i;
2253
1999 av_extend (av, items - 1); 2254 av_extend (av, items - 1);
2000 2255
2001 for (i = 0; i < items; ++i) 2256 for (i = 0; i < items; ++i)
2002 av_push (av, SvREFCNT_inc_NN (arg [i])); 2257 av_push (av, SvREFCNT_inc_NN (arg [i]));
2003 } 2258 }
2259}
2004 2260
2005 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2261static void
2006 2262slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2263{
2007 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2264 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2008 api_ready (aTHX_ sv_manager); 2265 api_ready (aTHX_ sv_manager);
2009 2266
2010 frame->prepare = prepare_schedule; 2267 frame->prepare = prepare_schedule;
2011 frame->check = slf_check_repeat; 2268 frame->check = slf_check_repeat;
2012 2269
2013 /* as a minor optimisation, we could unwind all stacks here */ 2270 /* as a minor optimisation, we could unwind all stacks here */
2014 /* but that puts extra pressure on pp_slf, and is not worth much */ 2271 /* but that puts extra pressure on pp_slf, and is not worth much */
2015 /*coro_unwind_stacks (aTHX);*/ 2272 /*coro_unwind_stacks (aTHX);*/
2273}
2274
2275static void
2276slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2277{
2278 HV *coro_hv = (HV *)SvRV (coro_current);
2279
2280 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2281 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2282}
2283
2284static void
2285slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2286{
2287 HV *coro_hv;
2288 struct coro *coro;
2289
2290 if (items <= 0)
2291 croak ("Coro::cancel called without coro object,");
2292
2293 coro = SvSTATE (arg [0]);
2294 coro_hv = coro->hv;
2295
2296 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2297
2298 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2299 {
2300 /* coro currently busy cancelling something, so just notify it */
2301 coro->slf_frame.data = (void *)coro;
2302
2303 frame->prepare = prepare_nop;
2304 frame->check = slf_check_nop;
2305 }
2306 else if (coro_hv == (HV *)SvRV (coro_current))
2307 {
2308 /* cancelling the current coro is allowed, and equals terminate */
2309 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2310 }
2311 else
2312 {
2313 struct coro *self = SvSTATE_current;
2314
2315 if (!self)
2316 croak ("Coro::cancel called outside of thread content,");
2317
2318 /* otherwise we cancel directly, purely for speed reasons
2319 * unfortunately, this requires some magic trickery, as
2320 * somebody else could cancel us, so we have to fight the cancellation.
2321 * this is ugly, and hopefully fully worth the extra speed.
2322 * besides, I can't get the slow-but-safe version working...
2323 */
2324 slf_frame.data = 0;
2325 self->flags |= CF_NOCANCEL;
2326 coro_state_destroy (aTHX_ coro);
2327 self->flags &= ~CF_NOCANCEL;
2328
2329 if (slf_frame.data)
2330 {
2331 /* while we were busy we have been cancelled, so terminate */
2332 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2333 }
2334 else
2335 {
2336 frame->prepare = prepare_nop;
2337 frame->check = slf_check_nop;
2338 }
2339 }
2340}
2341
2342static int
2343slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2344{
2345 frame->prepare = 0;
2346 coro_unwind_stacks (aTHX);
2347
2348 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2349
2350 return 1;
2351}
2352
2353static int
2354safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2355{
2356 if (coro->cctx)
2357 croak ("coro inside C callback, unable to cancel at this time, caught");
2358
2359 if (coro->flags & CF_NEW)
2360 {
2361 coro_set_status (aTHX_ coro, arg, items);
2362 coro_state_destroy (aTHX_ coro);
2363 }
2364 else
2365 {
2366 if (!coro->slf_frame.prepare)
2367 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2368
2369 slf_destroy (aTHX_ coro);
2370
2371 coro_set_status (aTHX_ coro, arg, items);
2372 coro->slf_frame.prepare = prepare_nop;
2373 coro->slf_frame.check = slf_check_safe_cancel;
2374
2375 api_ready (aTHX_ (SV *)coro->hv);
2376 }
2377
2378 return 1;
2016} 2379}
2017 2380
2018/*****************************************************************************/ 2381/*****************************************************************************/
2019/* async pool handler */ 2382/* async pool handler */
2020 2383
… …
2051slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2414slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2052{ 2415{
2053 HV *hv = (HV *)SvRV (coro_current); 2416 HV *hv = (HV *)SvRV (coro_current);
2054 struct coro *coro = SvSTATE_hv ((SV *)hv); 2417 struct coro *coro = SvSTATE_hv ((SV *)hv);
2055 2418
2056 if (expect_true (coro->saved_deffh)) 2419 if (ecb_expect_true (coro->saved_deffh))
2057 { 2420 {
2058 /* subsequent iteration */ 2421 /* subsequent iteration */
2059 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2422 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2060 coro->saved_deffh = 0; 2423 coro->saved_deffh = 0;
2061 2424
2062 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2425 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2063 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2426 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2064 { 2427 {
2065 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2428 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2066 coro->invoke_av = newAV (); 2429 return;
2067
2068 frame->prepare = prepare_nop;
2069 } 2430 }
2070 else 2431 else
2071 { 2432 {
2072 av_clear (GvAV (PL_defgv)); 2433 av_clear (GvAV (PL_defgv));
2073 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2434 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2074 2435
2436 if (ecb_expect_false (coro->swap_sv))
2437 {
2438 swap_svs_leave (coro);
2439 SvREFCNT_dec_NN (coro->swap_sv);
2440 coro->swap_sv = 0;
2441 }
2442
2075 coro->prio = 0; 2443 coro->prio = 0;
2076 2444
2077 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2445 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2078 api_trace (aTHX_ coro_current, 0); 2446 api_trace (aTHX_ coro_current, 0);
2079 2447
2080 frame->prepare = prepare_schedule; 2448 frame->prepare = prepare_schedule;
2081 av_push (av_async_pool, SvREFCNT_inc (hv)); 2449 av_push (av_async_pool, SvREFCNT_inc (hv));
2082 } 2450 }
… …
2123 2491
2124static int 2492static int
2125slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2493slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2126{ 2494{
2127 SV *data = (SV *)frame->data; 2495 SV *data = (SV *)frame->data;
2128 2496
2129 if (CORO_THROW) 2497 if (CORO_THROW)
2130 return 0; 2498 return 0;
2131 2499
2132 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2500 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2133 return 1; 2501 return 1;
… …
2169 cb = sv_2mortal (coro->rouse_cb); 2537 cb = sv_2mortal (coro->rouse_cb);
2170 coro->rouse_cb = 0; 2538 coro->rouse_cb = 0;
2171 } 2539 }
2172 2540
2173 if (!SvROK (cb) 2541 if (!SvROK (cb)
2174 || SvTYPE (SvRV (cb)) != SVt_PVCV 2542 || SvTYPE (SvRV (cb)) != SVt_PVCV
2175 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2543 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2176 croak ("Coro::rouse_wait called with illegal callback argument,"); 2544 croak ("Coro::rouse_wait called with illegal callback argument,");
2177 2545
2178 { 2546 {
2179 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2547 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2296static void 2664static void
2297slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2665slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2298{ 2666{
2299 frame->prepare = prepare_cede_notself; 2667 frame->prepare = prepare_cede_notself;
2300 frame->check = slf_check_nop; 2668 frame->check = slf_check_nop;
2669}
2670
2671/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2672static void
2673slf_destroy (pTHX_ struct coro *coro)
2674{
2675 struct CoroSLF frame = coro->slf_frame;
2676
2677 /*
2678 * The on_destroy below most likely is from an SLF call.
2679 * Since by definition the SLF call will not finish when we destroy
2680 * the coro, we will have to force-finish it here, otherwise
2681 * cleanup functions cannot call SLF functions.
2682 */
2683 coro->slf_frame.prepare = 0;
2684
2685 /* this callback is reserved for slf functions needing to do cleanup */
2686 if (frame.destroy && frame.prepare && !PL_dirty)
2687 frame.destroy (aTHX_ &frame);
2301} 2688}
2302 2689
2303/* 2690/*
2304 * these not obviously related functions are all rolled into one 2691 * these not obviously related functions are all rolled into one
2305 * function to increase chances that they all will call transfer with the same 2692 * function to increase chances that they all will call transfer with the same
… …
2312 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2699 I32 checkmark; /* mark SP to see how many elements check has pushed */
2313 2700
2314 /* set up the slf frame, unless it has already been set-up */ 2701 /* set up the slf frame, unless it has already been set-up */
2315 /* the latter happens when a new coro has been started */ 2702 /* the latter happens when a new coro has been started */
2316 /* or when a new cctx was attached to an existing coroutine */ 2703 /* or when a new cctx was attached to an existing coroutine */
2317 if (expect_true (!slf_frame.prepare)) 2704 if (ecb_expect_true (!slf_frame.prepare))
2318 { 2705 {
2319 /* first iteration */ 2706 /* first iteration */
2320 dSP; 2707 dSP;
2321 SV **arg = PL_stack_base + TOPMARK + 1; 2708 SV **arg = PL_stack_base + TOPMARK + 1;
2322 int items = SP - arg; /* args without function object */ 2709 int items = SP - arg; /* args without function object */
… …
2363 while (slf_frame.check (aTHX_ &slf_frame)); 2750 while (slf_frame.check (aTHX_ &slf_frame));
2364 2751
2365 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2752 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2366 2753
2367 /* exception handling */ 2754 /* exception handling */
2368 if (expect_false (CORO_THROW)) 2755 if (ecb_expect_false (CORO_THROW))
2369 { 2756 {
2370 SV *exception = sv_2mortal (CORO_THROW); 2757 SV *exception = sv_2mortal (CORO_THROW);
2371 2758
2372 CORO_THROW = 0; 2759 CORO_THROW = 0;
2373 sv_setsv (ERRSV, exception); 2760 sv_setsv (ERRSV, exception);
2374 croak (0); 2761 croak (0);
2375 } 2762 }
2376 2763
2377 /* return value handling - mostly like entersub */ 2764 /* return value handling - mostly like entersub */
2378 /* make sure we put something on the stack in scalar context */ 2765 /* make sure we put something on the stack in scalar context */
2379 if (GIMME_V == G_SCALAR) 2766 if (GIMME_V == G_SCALAR
2767 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2380 { 2768 {
2381 dSP; 2769 dSP;
2382 SV **bot = PL_stack_base + checkmark; 2770 SV **bot = PL_stack_base + checkmark;
2383 2771
2384 if (sp == bot) /* too few, push undef */ 2772 if (sp == bot) /* too few, push undef */
2385 bot [1] = &PL_sv_undef; 2773 bot [1] = &PL_sv_undef;
2386 else if (sp != bot + 1) /* too many, take last one */ 2774 else /* too many, take last one */
2387 bot [1] = *sp; 2775 bot [1] = *sp;
2388 2776
2389 SP = bot + 1; 2777 SP = bot + 1;
2390 2778
2391 PUTBACK; 2779 PUTBACK;
… …
2489{ 2877{
2490 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2878 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2491 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2879 on_enterleave_call (aTHX_ sv_2mortal (cb));
2492} 2880}
2493 2881
2882static void
2883enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2884{
2885 if (!hook)
2886 return;
2887
2888 if (!*avp)
2889 {
2890 *avp = newAV ();
2891 AvREAL_off (*avp);
2892 }
2893
2894 av_push (*avp, (SV *)hook);
2895 av_push (*avp, (SV *)arg);
2896}
2897
2898static void
2899enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2900{
2901 AV *av = *avp;
2902 int i;
2903
2904 if (!av)
2905 return;
2906
2907 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2908 if (AvARRAY (av)[i] == (SV *)hook)
2909 {
2910 if (execute)
2911 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2912
2913 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2914 av_pop (av);
2915 av_pop (av);
2916 break;
2917 }
2918
2919 if (AvFILLp (av) >= 0)
2920 {
2921 *avp = 0;
2922 SvREFCNT_dec_NN (av);
2923 }
2924}
2925
2926static void
2927api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2928{
2929 struct coro *coro = SvSTATE (coro_sv);
2930
2931 if (SvSTATE_current == coro)
2932 if (enter)
2933 enter (aTHX_ enter_arg);
2934
2935 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2936 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2937}
2938
2939static void
2940api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2941{
2942 struct coro *coro = SvSTATE (coro_sv);
2943
2944 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2945 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2946}
2947
2948static void
2949savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2950{
2951 struct coro *coro = SvSTATE_current;
2952
2953 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2954}
2955
2956static void
2957savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2958{
2959 struct coro *coro = SvSTATE_current;
2960
2961 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2962}
2963
2964static void
2965api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2966{
2967 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2968
2969 /* this ought to be much cheaper than malloc + a single destructor call */
2970 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2971 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2972}
2973
2494/*****************************************************************************/ 2974/*****************************************************************************/
2495/* PerlIO::cede */ 2975/* PerlIO::cede */
2496 2976
2497typedef struct 2977typedef struct
2498{ 2978{
2499 PerlIOBuf base; 2979 PerlIOBuf base;
2500 NV next, every; 2980 NV next, every;
2501} PerlIOCede; 2981} PerlIOCede;
2502 2982
2503static IV 2983static IV ecb_cold
2504PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2984PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2505{ 2985{
2506 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2986 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2507 2987
2508 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2988 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2509 self->next = nvtime () + self->every; 2989 self->next = nvtime () + self->every;
2510 2990
2511 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2991 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2512} 2992}
2513 2993
2514static SV * 2994static SV * ecb_cold
2515PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2995PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2516{ 2996{
2517 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2997 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2518 2998
2519 return newSVnv (self->every); 2999 return newSVnv (self->every);
… …
2626 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3106 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2627 PUTBACK; 3107 PUTBACK;
2628 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3108 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2629 } 3109 }
2630 3110
2631 SvREFCNT_dec (cb); 3111 SvREFCNT_dec_NN (cb);
2632 } 3112 }
2633} 3113}
2634 3114
2635static void 3115static void
2636coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3116coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2637{ 3117{
2638 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3118 /* call $sem->adjust (0) to possibly wake up some other waiters */
2639 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3119 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2640} 3120}
2641 3121
2642static int 3122static int
2643slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3123slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2644{ 3124{
2645 AV *av = (AV *)frame->data; 3125 AV *av = (AV *)frame->data;
2646 SV *count_sv = AvARRAY (av)[0]; 3126 SV *count_sv = AvARRAY (av)[0];
3127 SV *coro_hv = SvRV (coro_current);
3128
3129 frame->destroy = 0;
2647 3130
2648 /* if we are about to throw, don't actually acquire the lock, just throw */ 3131 /* if we are about to throw, don't actually acquire the lock, just throw */
2649 if (CORO_THROW) 3132 if (ecb_expect_false (CORO_THROW))
3133 {
3134 /* we still might be responsible for the semaphore, so wake up others */
3135 coro_semaphore_adjust (aTHX_ av, 0);
3136
2650 return 0; 3137 return 0;
3138 }
2651 else if (SvIVX (count_sv) > 0) 3139 else if (SvIVX (count_sv) > 0)
2652 { 3140 {
2653 SvSTATE_current->on_destroy = 0;
2654
2655 if (acquire) 3141 if (acquire)
2656 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3142 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2657 else 3143 else
2658 coro_semaphore_adjust (aTHX_ av, 0); 3144 coro_semaphore_adjust (aTHX_ av, 0);
2659 3145
… …
2663 { 3149 {
2664 int i; 3150 int i;
2665 /* if we were woken up but can't down, we look through the whole */ 3151 /* if we were woken up but can't down, we look through the whole */
2666 /* waiters list and only add us if we aren't in there already */ 3152 /* waiters list and only add us if we aren't in there already */
2667 /* this avoids some degenerate memory usage cases */ 3153 /* this avoids some degenerate memory usage cases */
2668 3154 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2669 for (i = 1; i <= AvFILLp (av); ++i)
2670 if (AvARRAY (av)[i] == SvRV (coro_current)) 3155 if (AvARRAY (av)[i] == coro_hv)
2671 return 1; 3156 return 1;
2672 3157
2673 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3158 av_push (av, SvREFCNT_inc (coro_hv));
2674 return 1; 3159 return 1;
2675 } 3160 }
2676} 3161}
2677 3162
2678static int 3163static int
… …
2701 { 3186 {
2702 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3187 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2703 3188
2704 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3189 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2705 frame->prepare = prepare_schedule; 3190 frame->prepare = prepare_schedule;
2706
2707 /* to avoid race conditions when a woken-up coro gets terminated */ 3191 /* to avoid race conditions when a woken-up coro gets terminated */
2708 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3192 /* we arrange for a temporary on_destroy that calls adjust (0) */
2709 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3193 frame->destroy = coro_semaphore_destroy;
2710 } 3194 }
2711} 3195}
2712 3196
2713static void 3197static void
2714slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3198slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2772 { 3256 {
2773 api_ready (aTHX_ cb); 3257 api_ready (aTHX_ cb);
2774 sv_setiv (cb, 0); /* signal waiter */ 3258 sv_setiv (cb, 0); /* signal waiter */
2775 } 3259 }
2776 3260
2777 SvREFCNT_dec (cb); 3261 SvREFCNT_dec_NN (cb);
2778 3262
2779 --count; 3263 --count;
2780 } 3264 }
2781} 3265}
2782 3266
… …
2867 } 3351 }
2868 3352
2869 av_push (state, data_sv); 3353 av_push (state, data_sv);
2870 3354
2871 api_ready (aTHX_ coro); 3355 api_ready (aTHX_ coro);
2872 SvREFCNT_dec (coro); 3356 SvREFCNT_dec_NN (coro);
2873 SvREFCNT_dec ((AV *)state); 3357 SvREFCNT_dec_NN ((AV *)state);
2874} 3358}
2875 3359
2876static int 3360static int
2877slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3361slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2878{ 3362{
… …
2883 /* it quickly returns */ 3367 /* it quickly returns */
2884 if (CORO_THROW) 3368 if (CORO_THROW)
2885 return 0; 3369 return 0;
2886 3370
2887 /* one element that is an RV? repeat! */ 3371 /* one element that is an RV? repeat! */
2888 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3372 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2889 return 1; 3373 return 1;
2890 3374
2891 /* restore status */ 3375 /* restore status */
2892 { 3376 {
2893 SV *data_sv = av_pop (state); 3377 SV *data_sv = av_pop (state);
… …
2896 errno = data->errorno; 3380 errno = data->errorno;
2897 PL_laststype = data->laststype; 3381 PL_laststype = data->laststype;
2898 PL_laststatval = data->laststatval; 3382 PL_laststatval = data->laststatval;
2899 PL_statcache = data->statcache; 3383 PL_statcache = data->statcache;
2900 3384
2901 SvREFCNT_dec (data_sv); 3385 SvREFCNT_dec_NN (data_sv);
2902 } 3386 }
2903 3387
2904 /* push result values */ 3388 /* push result values */
2905 { 3389 {
2906 dSP; 3390 dSP;
… …
2932 dSP; 3416 dSP;
2933 3417
2934 static SV *prio_cv; 3418 static SV *prio_cv;
2935 static SV *prio_sv; 3419 static SV *prio_sv;
2936 3420
2937 if (expect_false (!prio_cv)) 3421 if (ecb_expect_false (!prio_cv))
2938 { 3422 {
2939 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3423 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2940 prio_sv = newSViv (0); 3424 prio_sv = newSViv (0);
2941 } 3425 }
2942 3426
… …
3048 } 3532 }
3049 3533
3050 return coro_sv; 3534 return coro_sv;
3051} 3535}
3052 3536
3537#ifndef __cplusplus
3538ecb_cold XS(boot_Coro__State);
3539#endif
3540
3541#if CORO_JIT
3542
3543static void ecb_noinline ecb_cold
3544pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3545{
3546 dSP;
3547 AV *av = newAV ();
3548
3549 av_store (av, 3, newSVuv (d));
3550 av_store (av, 2, newSVuv (c));
3551 av_store (av, 1, newSVuv (b));
3552 av_store (av, 0, newSVuv (a));
3553
3554 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3555
3556 PUTBACK;
3557}
3558
3559static void ecb_noinline ecb_cold
3560jit_init (pTHX)
3561{
3562 dSP;
3563 SV *load, *save;
3564 char *map_base;
3565 char *load_ptr, *save_ptr;
3566 STRLEN load_len, save_len, map_len;
3567 int count;
3568
3569 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3570
3571 PUSHMARK (SP);
3572 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3573 #include "state.h"
3574 count = call_pv ("Coro::State::_jit", G_ARRAY);
3575 SPAGAIN;
3576
3577 save = POPs; save_ptr = SvPVbyte (save, save_len);
3578 load = POPs; load_ptr = SvPVbyte (load, load_len);
3579
3580 map_len = load_len + save_len + 16;
3581
3582 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3583
3584 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3585
3586 load_perl_slots = (load_save_perl_slots_type)map_base;
3587 memcpy (map_base, load_ptr, load_len);
3588
3589 map_base += (load_len + 15) & ~15;
3590
3591 save_perl_slots = (load_save_perl_slots_type)map_base;
3592 memcpy (map_base, save_ptr, save_len);
3593
3594 /* we are good citizens and try to make the page read-only, so the evil evil */
3595 /* hackers might have it a bit more difficult */
3596 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3597
3598 PUTBACK;
3599 eval_pv ("undef &Coro::State::_jit", 1);
3600}
3601
3602#endif
3603
3053MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3604MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3054 3605
3055PROTOTYPES: DISABLE 3606PROTOTYPES: DISABLE
3056 3607
3057BOOT: 3608BOOT:
3058{ 3609{
3610#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3611#include "state.h"
3059#ifdef USE_ITHREADS 3612#ifdef USE_ITHREADS
3060# if CORO_PTHREAD 3613# if CORO_PTHREAD
3061 coro_thx = PERL_GET_CONTEXT; 3614 coro_thx = PERL_GET_CONTEXT;
3062# endif 3615# endif
3063#endif 3616#endif
3064 BOOT_PAGESIZE; 3617 /* perl defines these to check for existance first, but why it doesn't */
3618 /* just create them one at init time is not clear to me, except for */
3619 /* programs trying to delete them, but... */
3620 /* anyway, we declare this as invalid and make sure they are initialised here */
3621 DEFSV;
3622 ERRSV;
3065 3623
3066 cctx_current = cctx_new_empty (); 3624 cctx_current = cctx_new_empty ();
3067 3625
3068 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3626 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3069 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3627 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3070 3628
3071 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3629 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
3072 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3630 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
3073 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3631 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
3074 3632
3075 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3076 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3633 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3077 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3634 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3078 3635
3079 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3636 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3080 3637
… …
3109 coroapi.prepare_nop = prepare_nop; 3666 coroapi.prepare_nop = prepare_nop;
3110 coroapi.prepare_schedule = prepare_schedule; 3667 coroapi.prepare_schedule = prepare_schedule;
3111 coroapi.prepare_cede = prepare_cede; 3668 coroapi.prepare_cede = prepare_cede;
3112 coroapi.prepare_cede_notself = prepare_cede_notself; 3669 coroapi.prepare_cede_notself = prepare_cede_notself;
3113 3670
3114 { 3671 time_init (aTHX);
3115 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3116
3117 if (!svp) croak ("Time::HiRes is required");
3118 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3119
3120 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3121
3122 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3123 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3124 }
3125 3672
3126 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3673 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3674#if CORO_JIT
3675 PUTBACK;
3676 jit_init (aTHX);
3677 SPAGAIN;
3678#endif
3127} 3679}
3128 3680
3129SV * 3681SV *
3130new (SV *klass, ...) 3682new (SV *klass, ...)
3131 ALIAS: 3683 ALIAS:
… …
3138void 3690void
3139transfer (...) 3691transfer (...)
3140 PROTOTYPE: $$ 3692 PROTOTYPE: $$
3141 CODE: 3693 CODE:
3142 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3694 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3143
3144bool
3145_destroy (SV *coro_sv)
3146 CODE:
3147 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3148 OUTPUT:
3149 RETVAL
3150
3151void
3152_exit (int code)
3153 PROTOTYPE: $
3154 CODE:
3155 _exit (code);
3156 3695
3157SV * 3696SV *
3158clone (Coro::State coro) 3697clone (Coro::State coro)
3159 CODE: 3698 CODE:
3160{ 3699{
… …
3215void 3754void
3216list () 3755list ()
3217 PROTOTYPE: 3756 PROTOTYPE:
3218 PPCODE: 3757 PPCODE:
3219{ 3758{
3220 struct coro *coro; 3759 struct coro *coro;
3221 for (coro = coro_first; coro; coro = coro->next) 3760 for (coro = coro_first; coro; coro = coro->next)
3222 if (coro->hv) 3761 if (coro->hv)
3223 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3762 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3224} 3763}
3225 3764
… …
3230 CODE: 3769 CODE:
3231{ 3770{
3232 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3771 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3233 { 3772 {
3234 struct coro *current = SvSTATE_current; 3773 struct coro *current = SvSTATE_current;
3774 struct CoroSLF slf_save;
3235 3775
3236 if (current != coro) 3776 if (current != coro)
3237 { 3777 {
3238 PUTBACK; 3778 PUTBACK;
3239 save_perl (aTHX_ current); 3779 save_perl (aTHX_ current);
3240 load_perl (aTHX_ coro); 3780 load_perl (aTHX_ coro);
3781 /* the coro is most likely in an active SLF call.
3782 * while not strictly required (the code we execute is
3783 * not allowed to call any SLF functions), it's cleaner
3784 * to reinitialise the slf_frame and restore it later.
3785 * This might one day allow us to actually do SLF calls
3786 * from code executed here.
3787 */
3788 slf_save = slf_frame;
3789 slf_frame.prepare = 0;
3241 SPAGAIN; 3790 SPAGAIN;
3242 } 3791 }
3243 3792
3244 PUSHSTACK; 3793 PUSHSTACK;
3245 3794
… …
3255 SPAGAIN; 3804 SPAGAIN;
3256 3805
3257 if (current != coro) 3806 if (current != coro)
3258 { 3807 {
3259 PUTBACK; 3808 PUTBACK;
3809 slf_frame = slf_save;
3260 save_perl (aTHX_ coro); 3810 save_perl (aTHX_ coro);
3261 load_perl (aTHX_ current); 3811 load_perl (aTHX_ current);
3262 SPAGAIN; 3812 SPAGAIN;
3263 } 3813 }
3264 } 3814 }
… …
3269 PROTOTYPE: $ 3819 PROTOTYPE: $
3270 ALIAS: 3820 ALIAS:
3271 is_ready = CF_READY 3821 is_ready = CF_READY
3272 is_running = CF_RUNNING 3822 is_running = CF_RUNNING
3273 is_new = CF_NEW 3823 is_new = CF_NEW
3274 is_destroyed = CF_DESTROYED 3824 is_destroyed = CF_ZOMBIE
3825 is_zombie = CF_ZOMBIE
3275 is_suspended = CF_SUSPENDED 3826 is_suspended = CF_SUSPENDED
3276 CODE: 3827 CODE:
3277 RETVAL = boolSV (coro->flags & ix); 3828 RETVAL = boolSV (coro->flags & ix);
3278 OUTPUT: 3829 OUTPUT:
3279 RETVAL 3830 RETVAL
3280 3831
3281void 3832void
3282throw (Coro::State self, SV *exception = &PL_sv_undef) 3833throw (SV *self, SV *exception = &PL_sv_undef)
3283 PROTOTYPE: $;$ 3834 PROTOTYPE: $;$
3284 CODE: 3835 CODE:
3285{ 3836{
3837 struct coro *coro = SvSTATE (self);
3286 struct coro *current = SvSTATE_current; 3838 struct coro *current = SvSTATE_current;
3287 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3839 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3288 SvREFCNT_dec (*exceptionp); 3840 SvREFCNT_dec (*exceptionp);
3289 SvGETMAGIC (exception); 3841 SvGETMAGIC (exception);
3290 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3842 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3843
3844 api_ready (aTHX_ self);
3291} 3845}
3292 3846
3293void 3847void
3294api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3848api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3295 PROTOTYPE: $;$ 3849 PROTOTYPE: $;$
… …
3350 3904
3351void 3905void
3352cancel (Coro::State self) 3906cancel (Coro::State self)
3353 CODE: 3907 CODE:
3354 coro_state_destroy (aTHX_ self); 3908 coro_state_destroy (aTHX_ self);
3355 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3356
3357 3909
3358SV * 3910SV *
3359enable_times (int enabled = enable_times) 3911enable_times (int enabled = enable_times)
3360 CODE: 3912 CODE:
3361{ 3913{
… …
3374 3926
3375void 3927void
3376times (Coro::State self) 3928times (Coro::State self)
3377 PPCODE: 3929 PPCODE:
3378{ 3930{
3379 struct coro *current = SvSTATE (coro_current); 3931 struct coro *current = SvSTATE (coro_current);
3380 3932
3381 if (expect_false (current == self)) 3933 if (ecb_expect_false (current == self))
3382 { 3934 {
3383 coro_times_update (); 3935 coro_times_update ();
3384 coro_times_add (SvSTATE (coro_current)); 3936 coro_times_add (SvSTATE (coro_current));
3385 } 3937 }
3386 3938
3387 EXTEND (SP, 2); 3939 EXTEND (SP, 2);
3388 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3940 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3389 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3941 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3390 3942
3391 if (expect_false (current == self)) 3943 if (ecb_expect_false (current == self))
3392 coro_times_sub (SvSTATE (coro_current)); 3944 coro_times_sub (SvSTATE (coro_current));
3393} 3945}
3394 3946
3395void 3947void
3396swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3948swap_sv (Coro::State coro, SV *sva, SV *svb)
3397 CODE: 3949 CODE:
3398{ 3950{
3399 struct coro *current = SvSTATE_current; 3951 struct coro *current = SvSTATE_current;
3952 AV *swap_sv;
3953 int i;
3954
3955 sva = SvRV (sva);
3956 svb = SvRV (svb);
3400 3957
3401 if (current == coro) 3958 if (current == coro)
3402 SWAP_SVS (current); 3959 SWAP_SVS_LEAVE (current);
3403 3960
3404 if (!coro->swap_sv) 3961 if (!coro->swap_sv)
3405 coro->swap_sv = newAV (); 3962 coro->swap_sv = newAV ();
3406 3963
3964 swap_sv = coro->swap_sv;
3965
3966 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
3967 {
3968 SV *a = AvARRAY (swap_sv)[i ];
3969 SV *b = AvARRAY (swap_sv)[i + 1];
3970
3971 if (a == sva && b == svb)
3972 {
3973 SvREFCNT_dec_NN (a);
3974 SvREFCNT_dec_NN (b);
3975
3976 for (; i <= AvFILLp (swap_sv) - 2; i++)
3977 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
3978
3979 AvFILLp (swap_sv) -= 2;
3980
3981 goto removed;
3982 }
3983 }
3984
3407 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 3985 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3408 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 3986 av_push (swap_sv, SvREFCNT_inc_NN (svb));
3987
3988 removed:
3409 3989
3410 if (current == coro) 3990 if (current == coro)
3411 SWAP_SVS (current); 3991 SWAP_SVS_ENTER (current);
3412} 3992}
3413 3993
3414 3994
3415MODULE = Coro::State PACKAGE = Coro 3995MODULE = Coro::State PACKAGE = Coro
3416 3996
3417BOOT: 3997BOOT:
3418{ 3998{
3999 if (SVt_LAST > 32)
4000 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4001
3419 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4002 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3420 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4003 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3421 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4004 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3422 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3423 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4005 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3424 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4006 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3425 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4007 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3426 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4008 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3427 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4009 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3428 4010
3429 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4011 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3430 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4012 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3431 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4013 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3432 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 4014 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3433 4015
3434 coro_stash = gv_stashpv ("Coro", TRUE); 4016 coro_stash = gv_stashpv ("Coro", TRUE);
3435 4017
3436 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4018 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3437 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4019 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3438 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4020 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3450 coroapi.ready = api_ready; 4032 coroapi.ready = api_ready;
3451 coroapi.is_ready = api_is_ready; 4033 coroapi.is_ready = api_is_ready;
3452 coroapi.nready = coro_nready; 4034 coroapi.nready = coro_nready;
3453 coroapi.current = coro_current; 4035 coroapi.current = coro_current;
3454 4036
4037 coroapi.enterleave_hook = api_enterleave_hook;
4038 coroapi.enterleave_unhook = api_enterleave_unhook;
4039 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4040
3455 /*GCoroAPI = &coroapi;*/ 4041 /*GCoroAPI = &coroapi;*/
3456 sv_setiv (sv, (IV)&coroapi); 4042 sv_setiv (sv, (IV)&coroapi);
3457 SvREADONLY_on (sv); 4043 SvREADONLY_on (sv);
3458 } 4044 }
3459} 4045}
… …
3466 api_ready (aTHX_ RETVAL); 4052 api_ready (aTHX_ RETVAL);
3467 OUTPUT: 4053 OUTPUT:
3468 RETVAL 4054 RETVAL
3469 4055
3470void 4056void
4057_destroy (Coro::State coro)
4058 CODE:
4059 /* used by the manager thread */
4060 coro_state_destroy (aTHX_ coro);
4061
4062void
4063on_destroy (Coro::State coro, SV *cb)
4064 CODE:
4065 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4066
4067void
4068join (...)
4069 CODE:
4070 CORO_EXECUTE_SLF_XS (slf_init_join);
4071
4072void
3471terminate (...) 4073terminate (...)
3472 CODE: 4074 CODE:
3473 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4075 CORO_EXECUTE_SLF_XS (slf_init_terminate);
4076
4077void
4078cancel (...)
4079 CODE:
4080 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4081
4082int
4083safe_cancel (Coro::State self, ...)
4084 C_ARGS: aTHX_ self, &ST (1), items - 1
3474 4085
3475void 4086void
3476schedule (...) 4087schedule (...)
3477 CODE: 4088 CODE:
3478 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4089 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3499 4110
3500void 4111void
3501_set_current (SV *current) 4112_set_current (SV *current)
3502 PROTOTYPE: $ 4113 PROTOTYPE: $
3503 CODE: 4114 CODE:
3504 SvREFCNT_dec (SvRV (coro_current)); 4115 SvREFCNT_dec_NN (SvRV (coro_current));
3505 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4116 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3506 4117
3507void 4118void
3508_set_readyhook (SV *hook) 4119_set_readyhook (SV *hook)
3509 PROTOTYPE: $ 4120 PROTOTYPE: $
… …
3593 4204
3594 if ((SV *)hv == &PL_sv_undef) 4205 if ((SV *)hv == &PL_sv_undef)
3595 { 4206 {
3596 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4207 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3597 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4208 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3598 SvREFCNT_dec (sv); 4209 SvREFCNT_dec_NN (sv);
3599 } 4210 }
3600 4211
3601 { 4212 {
3602 struct coro *coro = SvSTATE_hv (hv); 4213 struct coro *coro = SvSTATE_hv (hv);
3603 4214
… …
3610 api_ready (aTHX_ (SV *)hv); 4221 api_ready (aTHX_ (SV *)hv);
3611 4222
3612 if (GIMME_V != G_VOID) 4223 if (GIMME_V != G_VOID)
3613 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4224 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3614 else 4225 else
3615 SvREFCNT_dec (hv); 4226 SvREFCNT_dec_NN (hv);
3616} 4227}
3617 4228
3618SV * 4229SV *
3619rouse_cb () 4230rouse_cb ()
3620 PROTOTYPE: 4231 PROTOTYPE:
… …
3635 on_leave = 1 4246 on_leave = 1
3636 PROTOTYPE: & 4247 PROTOTYPE: &
3637 CODE: 4248 CODE:
3638{ 4249{
3639 struct coro *coro = SvSTATE_current; 4250 struct coro *coro = SvSTATE_current;
3640 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4251 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3641 4252
3642 block = s_get_cv_croak (block); 4253 block = s_get_cv_croak (block);
3643 4254
3644 if (!*avp) 4255 if (!*avp)
3645 *avp = newAV (); 4256 *avp = newAV ();
… …
3665 4276
3666SV * 4277SV *
3667new (SV *klass, SV *count = 0) 4278new (SV *klass, SV *count = 0)
3668 CODE: 4279 CODE:
3669{ 4280{
3670 int semcnt = 1; 4281 int semcnt = 1;
3671 4282
3672 if (count) 4283 if (count)
3673 { 4284 {
3674 SvGETMAGIC (count); 4285 SvGETMAGIC (count);
3675 4286
… …
3699 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4310 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3700 OUTPUT: 4311 OUTPUT:
3701 RETVAL 4312 RETVAL
3702 4313
3703void 4314void
3704up (SV *self, int adjust = 1) 4315up (SV *self)
3705 ALIAS:
3706 adjust = 1
3707 CODE: 4316 CODE:
4317 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4318
4319void
4320adjust (SV *self, int adjust)
4321 CODE:
3708 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4322 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3709 4323
3710void 4324void
3711down (...) 4325down (...)
3712 CODE: 4326 CODE:
3713 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4327 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3735 XSRETURN_NO; 4349 XSRETURN_NO;
3736} 4350}
3737 4351
3738void 4352void
3739waiters (SV *self) 4353waiters (SV *self)
3740 PPCODE: 4354 PPCODE:
3741{ 4355{
3742 AV *av = (AV *)SvRV (self); 4356 AV *av = (AV *)SvRV (self);
3743 int wcount = AvFILLp (av) + 1 - 1; 4357 int wcount = AvFILLp (av) + 1 - 1;
3744 4358
3745 if (GIMME_V == G_SCALAR) 4359 if (GIMME_V == G_SCALAR)
… …
3754} 4368}
3755 4369
3756MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4370MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3757 4371
3758void 4372void
3759_may_delete (SV *sem, int count, int extra_refs) 4373_may_delete (SV *sem, int count, unsigned int extra_refs)
3760 PPCODE: 4374 PPCODE:
3761{ 4375{
3762 AV *av = (AV *)SvRV (sem); 4376 AV *av = (AV *)SvRV (sem);
3763 4377
3764 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4378 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3765 && AvFILLp (av) == 0 /* no waiters, just count */ 4379 && AvFILLp (av) == 0 /* no waiters, just count */
3766 && SvIV (AvARRAY (av)[0]) == count) 4380 && SvIV (AvARRAY (av)[0]) == count)
3767 XSRETURN_YES; 4381 XSRETURN_YES;
… …
3788 4402
3789void 4403void
3790broadcast (SV *self) 4404broadcast (SV *self)
3791 CODE: 4405 CODE:
3792{ 4406{
3793 AV *av = (AV *)SvRV (self); 4407 AV *av = (AV *)SvRV (self);
3794 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4408 coro_signal_wake (aTHX_ av, AvFILLp (av));
3795} 4409}
3796 4410
3797void 4411void
3798send (SV *self) 4412send (SV *self)
… …
3806 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4420 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3807} 4421}
3808 4422
3809IV 4423IV
3810awaited (SV *self) 4424awaited (SV *self)
3811 CODE: 4425 CODE:
3812 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4426 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3813 OUTPUT: 4427 OUTPUT:
3814 RETVAL 4428 RETVAL
3815 4429
3816 4430
… …
3821 4435
3822void 4436void
3823_schedule (...) 4437_schedule (...)
3824 CODE: 4438 CODE:
3825{ 4439{
3826 static int incede; 4440 static int incede;
3827 4441
3828 api_cede_notself (aTHX); 4442 api_cede_notself (aTHX);
3829 4443
3830 ++incede; 4444 ++incede;
3831 while (coro_nready >= incede && api_cede (aTHX)) 4445 while (coro_nready >= incede && api_cede (aTHX))
… …
3875 { 4489 {
3876 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4490 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3877 coro_old_pp_sselect = 0; 4491 coro_old_pp_sselect = 0;
3878 } 4492 }
3879 4493
4494MODULE = Coro::State PACKAGE = Coro::Util
4495
4496void
4497_exit (int code)
4498 CODE:
4499 _exit (code);
4500
4501NV
4502time ()
4503 CODE:
4504 RETVAL = nvtime (aTHX);
4505 OUTPUT:
4506 RETVAL
4507
4508NV
4509gettimeofday ()
4510 PPCODE:
4511{
4512 UV tv [2];
4513 u2time (aTHX_ tv);
4514 EXTEND (SP, 2);
4515 PUSHs (sv_2mortal (newSVuv (tv [0])));
4516 PUSHs (sv_2mortal (newSVuv (tv [1])));
4517}
4518

Diff Legend

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