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.382 by root, Thu Feb 10 08:06:27 2011 UTC vs.
Revision 1.458 by root, Fri Jun 17 04:59:27 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);
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
735 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
736 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
737}
738
739static void
740swap_svs_leave (pTHX_ Coro__State c)
741{
742 int i;
743
573 for (i = 0; i <= AvFILLp (c->swap_sv); ) 744 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
574 { 745 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} 746}
613 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;
818 968
… …
846 } 996 }
847 997
848 Safefree (PL_tmps_stack); 998 Safefree (PL_tmps_stack);
849 Safefree (PL_markstack); 999 Safefree (PL_markstack);
850 Safefree (PL_scopestack); 1000 Safefree (PL_scopestack);
1001#if HAS_SCOPESTACK_NAME
1002 Safefree (PL_scopestack_name);
1003#endif
851 Safefree (PL_savestack); 1004 Safefree (PL_savestack);
852#if !PERL_VERSION_ATLEAST (5,10,0) 1005#if !PERL_VERSION_ATLEAST (5,10,0)
853 Safefree (PL_retstack); 1006 Safefree (PL_retstack);
854#endif 1007#endif
855} 1008}
… …
901#endif 1054#endif
902 1055
903/* 1056/*
904 * This overrides the default magic get method of %SIG elements. 1057 * 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 1058 * 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 1059 * and instead of trying to save and restore the hash elements (extremely slow),
907 * readback here. 1060 * we just provide our own readback here.
908 */ 1061 */
909static int 1062static int ecb_cold
910coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1063coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
911{ 1064{
912 const char *s = MgPV_nolen_const (mg); 1065 const char *s = MgPV_nolen_const (mg);
913 1066
914 if (*s == '_') 1067 if (*s == '_')
915 { 1068 {
916 SV **svp = 0; 1069 SV **svp = 0;
917 1070
918 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1071 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
919 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1072 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
920 1073
921 if (svp) 1074 if (svp)
922 { 1075 {
923 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1076 SV *ssv;
1077
1078 if (!*svp)
1079 ssv = &PL_sv_undef;
1080 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1081 ssv = sv_2mortal (newRV_inc (*svp));
1082 else
1083 ssv = *svp;
1084
1085 sv_setsv (sv, ssv);
924 return 0; 1086 return 0;
925 } 1087 }
926 } 1088 }
927 1089
928 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1090 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
929} 1091}
930 1092
931static int 1093static int ecb_cold
932coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1094coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
933{ 1095{
934 const char *s = MgPV_nolen_const (mg); 1096 const char *s = MgPV_nolen_const (mg);
935 1097
936 if (*s == '_') 1098 if (*s == '_')
… …
950 } 1112 }
951 1113
952 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1114 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
953} 1115}
954 1116
955static int 1117static int ecb_cold
956coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1118coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
957{ 1119{
958 const char *s = MgPV_nolen_const (mg); 1120 const char *s = MgPV_nolen_const (mg);
959 1121
960 if (*s == '_') 1122 if (*s == '_')
… …
995 return 1; 1157 return 1;
996} 1158}
997 1159
998static UNOP init_perl_op; 1160static UNOP init_perl_op;
999 1161
1000static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1162ecb_noinline static void /* noinline to keep it out of the transfer fast path */
1001init_perl (pTHX_ struct coro *coro) 1163init_perl (pTHX_ struct coro *coro)
1002{ 1164{
1003 /* 1165 /*
1004 * emulate part of the perl startup here. 1166 * emulate part of the perl startup here.
1005 */ 1167 */
… …
1013 PL_comppad_name_fill = 0; 1175 PL_comppad_name_fill = 0;
1014 PL_comppad_name_floor = 0; 1176 PL_comppad_name_floor = 0;
1015 PL_curpm = 0; 1177 PL_curpm = 0;
1016 PL_curpad = 0; 1178 PL_curpad = 0;
1017 PL_localizing = 0; 1179 PL_localizing = 0;
1018 PL_dirty = 0;
1019 PL_restartop = 0; 1180 PL_restartop = 0;
1020#if PERL_VERSION_ATLEAST (5,10,0) 1181#if PERL_VERSION_ATLEAST (5,10,0)
1021 PL_parser = 0; 1182 PL_parser = 0;
1022#endif 1183#endif
1023 PL_hints = 0; 1184 PL_hints = 0;
1024 1185
1025 /* recreate the die/warn hooks */ 1186 /* recreate the die/warn hooks */
1026 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1187 PL_diehook = SvREFCNT_inc (rv_diehook);
1027 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1188 PL_warnhook = SvREFCNT_inc (rv_warnhook);
1028 1189
1029 GvSV (PL_defgv) = newSV (0); 1190 GvSV (PL_defgv) = newSV (0);
1030 GvAV (PL_defgv) = coro->args; coro->args = 0; 1191 GvAV (PL_defgv) = coro->args; coro->args = 0;
1031 GvSV (PL_errgv) = newSV (0); 1192 GvSV (PL_errgv) = newSV (0);
1032 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1193 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1033 GvHV (PL_hintgv) = 0; 1194 GvHV (PL_hintgv) = newHV ();
1195#if PERL_VERSION_ATLEAST (5,10,0)
1196 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1197#endif
1034 PL_rs = newSVsv (GvSV (irsgv)); 1198 PL_rs = newSVsv (GvSV (irsgv));
1035 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1199 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
1036 1200
1037 { 1201 {
1038 dSP; 1202 dSP;
… …
1053 /* this newly created coroutine might be run on an existing cctx which most 1217 /* this newly created coroutine might be run on an existing cctx which most
1054 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1218 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
1055 */ 1219 */
1056 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1220 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
1057 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1221 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1222 slf_frame.destroy = 0;
1058 1223
1059 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1224 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
1060 init_perl_op.op_next = PL_op; 1225 init_perl_op.op_next = PL_op;
1061 init_perl_op.op_type = OP_ENTERSUB; 1226 init_perl_op.op_type = OP_ENTERSUB;
1062 init_perl_op.op_ppaddr = pp_slf; 1227 init_perl_op.op_ppaddr = pp_slf;
… …
1065 PL_op = (OP *)&init_perl_op; 1230 PL_op = (OP *)&init_perl_op;
1066 1231
1067 /* copy throw, in case it was set before init_perl */ 1232 /* copy throw, in case it was set before init_perl */
1068 CORO_THROW = coro->except; 1233 CORO_THROW = coro->except;
1069 1234
1070 SWAP_SVS (coro); 1235 SWAP_SVS_ENTER (coro);
1071 1236
1072 if (expect_false (enable_times)) 1237 if (ecb_expect_false (enable_times))
1073 { 1238 {
1074 coro_times_update (); 1239 coro_times_update ();
1075 coro_times_sub (coro); 1240 coro_times_sub (coro);
1076 } 1241 }
1077} 1242}
… …
1101destroy_perl (pTHX_ struct coro *coro) 1266destroy_perl (pTHX_ struct coro *coro)
1102{ 1267{
1103 SV *svf [9]; 1268 SV *svf [9];
1104 1269
1105 { 1270 {
1271 SV *old_current = SvRV (coro_current);
1106 struct coro *current = SvSTATE_current; 1272 struct coro *current = SvSTATE (old_current);
1107 1273
1108 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1274 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1109 1275
1110 save_perl (aTHX_ current); 1276 save_perl (aTHX_ current);
1277
1278 /* this will cause transfer_check to croak on block*/
1279 SvRV_set (coro_current, (SV *)coro->hv);
1280
1111 load_perl (aTHX_ coro); 1281 load_perl (aTHX_ coro);
1112 1282
1283 /* restore swapped sv's */
1284 SWAP_SVS_LEAVE (coro);
1285
1113 coro_unwind_stacks (aTHX); 1286 coro_unwind_stacks (aTHX);
1287
1114 coro_destruct_stacks (aTHX); 1288 coro_destruct_stacks (aTHX);
1115 1289
1116 /* restore swapped sv's */
1117 SWAP_SVS (coro);
1118
1119 // now save some sv's to be free'd later 1290 /* now save some sv's to be free'd later */
1120 svf [0] = GvSV (PL_defgv); 1291 svf [0] = GvSV (PL_defgv);
1121 svf [1] = (SV *)GvAV (PL_defgv); 1292 svf [1] = (SV *)GvAV (PL_defgv);
1122 svf [2] = GvSV (PL_errgv); 1293 svf [2] = GvSV (PL_errgv);
1123 svf [3] = (SV *)PL_defoutgv; 1294 svf [3] = (SV *)PL_defoutgv;
1124 svf [4] = PL_rs; 1295 svf [4] = PL_rs;
… …
1126 svf [6] = (SV *)GvHV (PL_hintgv); 1297 svf [6] = (SV *)GvHV (PL_hintgv);
1127 svf [7] = PL_diehook; 1298 svf [7] = PL_diehook;
1128 svf [8] = PL_warnhook; 1299 svf [8] = PL_warnhook;
1129 assert (9 == sizeof (svf) / sizeof (*svf)); 1300 assert (9 == sizeof (svf) / sizeof (*svf));
1130 1301
1302 SvRV_set (coro_current, old_current);
1303
1131 load_perl (aTHX_ current); 1304 load_perl (aTHX_ current);
1132 } 1305 }
1133 1306
1134 { 1307 {
1135 unsigned int i; 1308 unsigned int i;
… …
1139 1312
1140 SvREFCNT_dec (coro->saved_deffh); 1313 SvREFCNT_dec (coro->saved_deffh);
1141 SvREFCNT_dec (coro->rouse_cb); 1314 SvREFCNT_dec (coro->rouse_cb);
1142 SvREFCNT_dec (coro->invoke_cb); 1315 SvREFCNT_dec (coro->invoke_cb);
1143 SvREFCNT_dec (coro->invoke_av); 1316 SvREFCNT_dec (coro->invoke_av);
1317 SvREFCNT_dec (coro->on_enter_xs);
1318 SvREFCNT_dec (coro->on_leave_xs);
1144 } 1319 }
1145} 1320}
1146 1321
1147INLINE void 1322ecb_inline void
1148free_coro_mortal (pTHX) 1323free_coro_mortal (pTHX)
1149{ 1324{
1150 if (expect_true (coro_mortal)) 1325 if (ecb_expect_true (coro_mortal))
1151 { 1326 {
1152 SvREFCNT_dec (coro_mortal); 1327 SvREFCNT_dec ((SV *)coro_mortal);
1153 coro_mortal = 0; 1328 coro_mortal = 0;
1154 } 1329 }
1155} 1330}
1156 1331
1157static int 1332static int
… …
1211 1386
1212 if (PL_curcop != &PL_compiling) 1387 if (PL_curcop != &PL_compiling)
1213 { 1388 {
1214 SV **cb; 1389 SV **cb;
1215 1390
1216 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1391 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1217 { 1392 {
1218 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1393 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1219 1394
1220 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1395 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1221 { 1396 {
… …
1290 1465
1291 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1466 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1292} 1467}
1293 1468
1294/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1469/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1295static void NOINLINE 1470static void ecb_noinline
1296cctx_prepare (pTHX) 1471cctx_prepare (pTHX)
1297{ 1472{
1298 PL_top_env = &PL_start_env; 1473 PL_top_env = &PL_start_env;
1299 1474
1300 if (cctx_current->flags & CC_TRACE) 1475 if (cctx_current->flags & CC_TRACE)
… …
1311 slf_frame.prepare = slf_prepare_set_stacklevel; 1486 slf_frame.prepare = slf_prepare_set_stacklevel;
1312 slf_frame.check = slf_check_set_stacklevel; 1487 slf_frame.check = slf_check_set_stacklevel;
1313} 1488}
1314 1489
1315/* the tail of transfer: execute stuff we can only do after a transfer */ 1490/* the tail of transfer: execute stuff we can only do after a transfer */
1316INLINE void 1491ecb_inline void
1317transfer_tail (pTHX) 1492transfer_tail (pTHX)
1318{ 1493{
1319 free_coro_mortal (aTHX); 1494 free_coro_mortal (aTHX);
1495}
1496
1497/* try to exit the same way perl's main function would do */
1498/* we do not bother resetting the environment or other things *7
1499/* that are not, uhm, essential */
1500/* this obviously also doesn't work when perl is embedded */
1501static void ecb_noinline ecb_cold
1502perlish_exit (pTHX)
1503{
1504 int exitstatus = perl_destruct (PL_curinterp);
1505 perl_free (PL_curinterp);
1506 exit (exitstatus);
1320} 1507}
1321 1508
1322/* 1509/*
1323 * this is a _very_ stripped down perl interpreter ;) 1510 * this is a _very_ stripped down perl interpreter ;)
1324 */ 1511 */
… …
1353 */ 1540 */
1354 1541
1355 /* 1542 /*
1356 * If perl-run returns we assume exit() was being called or the coro 1543 * If perl-run returns we assume exit() was being called or the coro
1357 * fell off the end, which seems to be the only valid (non-bug) 1544 * fell off the end, which seems to be the only valid (non-bug)
1358 * reason for perl_run to return. We try to exit by jumping to the 1545 * reason for perl_run to return. We try to mimic whatever perl is normally
1359 * bootstrap-time "top" top_env, as we cannot restore the "main" 1546 * doing in that case. YMMV.
1360 * coroutine as Coro has no such concept.
1361 * This actually isn't valid with the pthread backend, but OSes requiring
1362 * that backend are too broken to do it in a standards-compliant way.
1363 */ 1547 */
1364 PL_top_env = main_top_env; 1548 perlish_exit (aTHX);
1365 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1366 } 1549 }
1367} 1550}
1368 1551
1369static coro_cctx * 1552static coro_cctx *
1370cctx_new () 1553cctx_new (void)
1371{ 1554{
1372 coro_cctx *cctx; 1555 coro_cctx *cctx;
1373 1556
1374 ++cctx_count; 1557 ++cctx_count;
1375 New (0, cctx, 1, coro_cctx); 1558 New (0, cctx, 1, coro_cctx);
… …
1381 return cctx; 1564 return cctx;
1382} 1565}
1383 1566
1384/* create a new cctx only suitable as source */ 1567/* create a new cctx only suitable as source */
1385static coro_cctx * 1568static coro_cctx *
1386cctx_new_empty () 1569cctx_new_empty (void)
1387{ 1570{
1388 coro_cctx *cctx = cctx_new (); 1571 coro_cctx *cctx = cctx_new ();
1389 1572
1390 cctx->sptr = 0; 1573 cctx->stack.sptr = 0;
1391 coro_create (&cctx->cctx, 0, 0, 0, 0); 1574 coro_create (&cctx->cctx, 0, 0, 0, 0);
1392 1575
1393 return cctx; 1576 return cctx;
1394} 1577}
1395 1578
1396/* create a new cctx suitable as destination/running a perl interpreter */ 1579/* create a new cctx suitable as destination/running a perl interpreter */
1397static coro_cctx * 1580static coro_cctx *
1398cctx_new_run () 1581cctx_new_run (void)
1399{ 1582{
1400 coro_cctx *cctx = cctx_new (); 1583 coro_cctx *cctx = cctx_new ();
1401 void *stack_start;
1402 size_t stack_size;
1403 1584
1404#if HAVE_MMAP 1585 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1405 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1406 /* mmap supposedly does allocate-on-write for us */
1407 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1408
1409 if (cctx->sptr != (void *)-1)
1410 {
1411 #if CORO_STACKGUARD
1412 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1413 #endif
1414 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1415 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1416 cctx->flags |= CC_MAPPED;
1417 } 1586 {
1418 else
1419#endif
1420 {
1421 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1422 New (0, cctx->sptr, cctx_stacksize, long);
1423
1424 if (!cctx->sptr)
1425 {
1426 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1587 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1427 _exit (EXIT_FAILURE); 1588 _exit (EXIT_FAILURE);
1428 }
1429
1430 stack_start = cctx->sptr;
1431 stack_size = cctx->ssize;
1432 } 1589 }
1433 1590
1434 #if CORO_USE_VALGRIND
1435 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1436 #endif
1437
1438 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1591 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1439 1592
1440 return cctx; 1593 return cctx;
1441} 1594}
1442 1595
1443static void 1596static void
1444cctx_destroy (coro_cctx *cctx) 1597cctx_destroy (coro_cctx *cctx)
1445{ 1598{
1446 if (!cctx) 1599 if (!cctx)
1447 return; 1600 return;
1448 1601
1449 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1602 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1450 1603
1451 --cctx_count; 1604 --cctx_count;
1452 coro_destroy (&cctx->cctx); 1605 coro_destroy (&cctx->cctx);
1453 1606
1454 /* coro_transfer creates new, empty cctx's */ 1607 coro_stack_free (&cctx->stack);
1455 if (cctx->sptr)
1456 {
1457 #if CORO_USE_VALGRIND
1458 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1459 #endif
1460
1461#if HAVE_MMAP
1462 if (cctx->flags & CC_MAPPED)
1463 munmap (cctx->sptr, cctx->ssize);
1464 else
1465#endif
1466 Safefree (cctx->sptr);
1467 }
1468 1608
1469 Safefree (cctx); 1609 Safefree (cctx);
1470} 1610}
1471 1611
1472/* wether this cctx should be destructed */ 1612/* wether this cctx should be destructed */
1473#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1613#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1474 1614
1475static coro_cctx * 1615static coro_cctx *
1476cctx_get (pTHX) 1616cctx_get (pTHX)
1477{ 1617{
1478 while (expect_true (cctx_first)) 1618 while (ecb_expect_true (cctx_first))
1479 { 1619 {
1480 coro_cctx *cctx = cctx_first; 1620 coro_cctx *cctx = cctx_first;
1481 cctx_first = cctx->next; 1621 cctx_first = cctx->next;
1482 --cctx_idle; 1622 --cctx_idle;
1483 1623
1484 if (expect_true (!CCTX_EXPIRED (cctx))) 1624 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1485 return cctx; 1625 return cctx;
1486 1626
1487 cctx_destroy (cctx); 1627 cctx_destroy (cctx);
1488 } 1628 }
1489 1629
… …
1491} 1631}
1492 1632
1493static void 1633static void
1494cctx_put (coro_cctx *cctx) 1634cctx_put (coro_cctx *cctx)
1495{ 1635{
1496 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1636 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1497 1637
1498 /* free another cctx if overlimit */ 1638 /* free another cctx if overlimit */
1499 if (expect_false (cctx_idle >= cctx_max_idle)) 1639 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1500 { 1640 {
1501 coro_cctx *first = cctx_first; 1641 coro_cctx *first = cctx_first;
1502 cctx_first = first->next; 1642 cctx_first = first->next;
1503 --cctx_idle; 1643 --cctx_idle;
1504 1644
… …
1515static void 1655static void
1516transfer_check (pTHX_ struct coro *prev, struct coro *next) 1656transfer_check (pTHX_ struct coro *prev, struct coro *next)
1517{ 1657{
1518 /* TODO: throwing up here is considered harmful */ 1658 /* TODO: throwing up here is considered harmful */
1519 1659
1520 if (expect_true (prev != next)) 1660 if (ecb_expect_true (prev != next))
1521 { 1661 {
1522 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1662 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1523 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1663 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1524 1664
1525 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1665 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1526 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1666 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1527 1667
1528#if !PERL_VERSION_ATLEAST (5,10,0) 1668#if !PERL_VERSION_ATLEAST (5,10,0)
1529 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1669 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1530 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1670 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1531#endif 1671#endif
1532 } 1672 }
1533} 1673}
1534 1674
1535/* always use the TRANSFER macro */ 1675/* always use the TRANSFER macro */
1536static void NOINLINE /* noinline so we have a fixed stackframe */ 1676static void ecb_noinline /* noinline so we have a fixed stackframe */
1537transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1677transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1538{ 1678{
1539 dSTACKLEVEL; 1679 dSTACKLEVEL;
1540 1680
1541 /* sometimes transfer is only called to set idle_sp */ 1681 /* sometimes transfer is only called to set idle_sp */
1542 if (expect_false (!prev)) 1682 if (ecb_expect_false (!prev))
1543 { 1683 {
1544 cctx_current->idle_sp = STACKLEVEL; 1684 cctx_current->idle_sp = STACKLEVEL;
1545 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1685 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1546 } 1686 }
1547 else if (expect_true (prev != next)) 1687 else if (ecb_expect_true (prev != next))
1548 { 1688 {
1549 coro_cctx *cctx_prev; 1689 coro_cctx *cctx_prev;
1550 1690
1551 if (expect_false (prev->flags & CF_NEW)) 1691 if (ecb_expect_false (prev->flags & CF_NEW))
1552 { 1692 {
1553 /* create a new empty/source context */ 1693 /* create a new empty/source context */
1554 prev->flags &= ~CF_NEW; 1694 prev->flags &= ~CF_NEW;
1555 prev->flags |= CF_RUNNING; 1695 prev->flags |= CF_RUNNING;
1556 } 1696 }
… …
1559 next->flags |= CF_RUNNING; 1699 next->flags |= CF_RUNNING;
1560 1700
1561 /* first get rid of the old state */ 1701 /* first get rid of the old state */
1562 save_perl (aTHX_ prev); 1702 save_perl (aTHX_ prev);
1563 1703
1564 if (expect_false (next->flags & CF_NEW)) 1704 if (ecb_expect_false (next->flags & CF_NEW))
1565 { 1705 {
1566 /* need to start coroutine */ 1706 /* need to start coroutine */
1567 next->flags &= ~CF_NEW; 1707 next->flags &= ~CF_NEW;
1568 /* setup coroutine call */ 1708 /* setup coroutine call */
1569 init_perl (aTHX_ next); 1709 init_perl (aTHX_ next);
1570 } 1710 }
1571 else 1711 else
1572 load_perl (aTHX_ next); 1712 load_perl (aTHX_ next);
1573 1713
1574 /* possibly untie and reuse the cctx */ 1714 /* possibly untie and reuse the cctx */
1575 if (expect_true ( 1715 if (ecb_expect_true (
1576 cctx_current->idle_sp == STACKLEVEL 1716 cctx_current->idle_sp == STACKLEVEL
1577 && !(cctx_current->flags & CC_TRACE) 1717 && !(cctx_current->flags & CC_TRACE)
1578 && !force_cctx 1718 && !force_cctx
1579 )) 1719 ))
1580 { 1720 {
1581 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1721 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1582 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1722 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1583 1723
1584 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1724 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1585 /* without this the next cctx_get might destroy the running cctx while still in use */ 1725 /* without this the next cctx_get might destroy the running cctx while still in use */
1586 if (expect_false (CCTX_EXPIRED (cctx_current))) 1726 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1587 if (expect_true (!next->cctx)) 1727 if (ecb_expect_true (!next->cctx))
1588 next->cctx = cctx_get (aTHX); 1728 next->cctx = cctx_get (aTHX);
1589 1729
1590 cctx_put (cctx_current); 1730 cctx_put (cctx_current);
1591 } 1731 }
1592 else 1732 else
1593 prev->cctx = cctx_current; 1733 prev->cctx = cctx_current;
1594 1734
1595 ++next->usecount; 1735 ++next->usecount;
1596 1736
1597 cctx_prev = cctx_current; 1737 cctx_prev = cctx_current;
1598 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1738 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1599 1739
1600 next->cctx = 0; 1740 next->cctx = 0;
1601 1741
1602 if (expect_false (cctx_prev != cctx_current)) 1742 if (ecb_expect_false (cctx_prev != cctx_current))
1603 { 1743 {
1604 cctx_prev->top_env = PL_top_env; 1744 cctx_prev->top_env = PL_top_env;
1605 PL_top_env = cctx_current->top_env; 1745 PL_top_env = cctx_current->top_env;
1606 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1746 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1607 } 1747 }
… …
1613#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1753#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1614#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1754#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1615 1755
1616/** high level stuff ********************************************************/ 1756/** high level stuff ********************************************************/
1617 1757
1758/* this function is actually Coro, not Coro::State, but we call it from here */
1759/* because it is convenient - but it hasn't been declared yet for that reason */
1618static int 1760static void
1761coro_call_on_destroy (pTHX_ struct coro *coro);
1762
1763static void
1619coro_state_destroy (pTHX_ struct coro *coro) 1764coro_state_destroy (pTHX_ struct coro *coro)
1620{ 1765{
1621 if (coro->flags & CF_DESTROYED) 1766 if (coro->flags & CF_ZOMBIE)
1622 return 0; 1767 return;
1623 1768
1624 if (coro->on_destroy && !PL_dirty)
1625 coro->on_destroy (aTHX_ coro); 1769 slf_destroy (aTHX_ coro);
1626 1770
1627 coro->flags |= CF_DESTROYED; 1771 coro->flags |= CF_ZOMBIE;
1628 1772
1629 if (coro->flags & CF_READY) 1773 if (coro->flags & CF_READY)
1630 { 1774 {
1631 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1775 /* reduce nready, as destroying a ready coro effectively unreadies it */
1632 /* alternative: look through all ready queues and remove the coro */ 1776 /* alternative: look through all ready queues and remove the coro */
1633 --coro_nready; 1777 --coro_nready;
1634 } 1778 }
1635 else 1779 else
1636 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1780 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1781
1782 if (coro->next) coro->next->prev = coro->prev;
1783 if (coro->prev) coro->prev->next = coro->next;
1784 if (coro == coro_first) coro_first = coro->next;
1637 1785
1638 if (coro->mainstack 1786 if (coro->mainstack
1639 && coro->mainstack != main_mainstack 1787 && coro->mainstack != main_mainstack
1640 && coro->slot 1788 && coro->slot
1641 && !PL_dirty) 1789 && !PL_dirty)
1642 destroy_perl (aTHX_ coro); 1790 destroy_perl (aTHX_ coro);
1643 1791
1644 if (coro->next) coro->next->prev = coro->prev;
1645 if (coro->prev) coro->prev->next = coro->next;
1646 if (coro == coro_first) coro_first = coro->next;
1647
1648 cctx_destroy (coro->cctx); 1792 cctx_destroy (coro->cctx);
1649 SvREFCNT_dec (coro->startcv); 1793 SvREFCNT_dec (coro->startcv);
1650 SvREFCNT_dec (coro->args); 1794 SvREFCNT_dec (coro->args);
1651 SvREFCNT_dec (coro->swap_sv); 1795 SvREFCNT_dec (coro->swap_sv);
1652 SvREFCNT_dec (CORO_THROW); 1796 SvREFCNT_dec (CORO_THROW);
1653 1797
1654 return 1; 1798 coro_call_on_destroy (aTHX_ coro);
1799
1800 /* more destruction mayhem in coro_state_free */
1655} 1801}
1656 1802
1657static int 1803static int
1658coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1804coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1659{ 1805{
1660 struct coro *coro = (struct coro *)mg->mg_ptr; 1806 struct coro *coro = (struct coro *)mg->mg_ptr;
1661 mg->mg_ptr = 0; 1807 mg->mg_ptr = 0;
1662 1808
1663 coro->hv = 0;
1664
1665 if (--coro->refcnt < 0)
1666 {
1667 coro_state_destroy (aTHX_ coro); 1809 coro_state_destroy (aTHX_ coro);
1810 SvREFCNT_dec (coro->on_destroy);
1811 SvREFCNT_dec (coro->status);
1812
1668 Safefree (coro); 1813 Safefree (coro);
1669 }
1670 1814
1671 return 0; 1815 return 0;
1672} 1816}
1673 1817
1674static int 1818static int ecb_cold
1675coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1819coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1676{ 1820{
1677 struct coro *coro = (struct coro *)mg->mg_ptr; 1821 /* called when perl clones the current process the slow way (windows process emulation) */
1678 1822 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1679 ++coro->refcnt; 1823 mg->mg_ptr = 0;
1824 mg->mg_virtual = 0;
1680 1825
1681 return 0; 1826 return 0;
1682} 1827}
1683 1828
1684static MGVTBL coro_state_vtbl = { 1829static MGVTBL coro_state_vtbl = {
… …
1709 TRANSFER (ta, 1); 1854 TRANSFER (ta, 1);
1710} 1855}
1711 1856
1712/** Coro ********************************************************************/ 1857/** Coro ********************************************************************/
1713 1858
1714INLINE void 1859ecb_inline void
1715coro_enq (pTHX_ struct coro *coro) 1860coro_enq (pTHX_ struct coro *coro)
1716{ 1861{
1717 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1862 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1718 1863
1719 SvREFCNT_inc_NN (coro->hv); 1864 SvREFCNT_inc_NN (coro->hv);
… …
1721 coro->next_ready = 0; 1866 coro->next_ready = 0;
1722 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1867 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1723 ready [1] = coro; 1868 ready [1] = coro;
1724} 1869}
1725 1870
1726INLINE struct coro * 1871ecb_inline struct coro *
1727coro_deq (pTHX) 1872coro_deq (pTHX)
1728{ 1873{
1729 int prio; 1874 int prio;
1730 1875
1731 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1876 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1784{ 1929{
1785 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1930 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1786} 1931}
1787 1932
1788/* expects to own a reference to next->hv */ 1933/* expects to own a reference to next->hv */
1789INLINE void 1934ecb_inline void
1790prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1935prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1791{ 1936{
1792 SV *prev_sv = SvRV (coro_current); 1937 SV *prev_sv = SvRV (coro_current);
1793 1938
1794 ta->prev = SvSTATE_hv (prev_sv); 1939 ta->prev = SvSTATE_hv (prev_sv);
… …
1807{ 1952{
1808 for (;;) 1953 for (;;)
1809 { 1954 {
1810 struct coro *next = coro_deq (aTHX); 1955 struct coro *next = coro_deq (aTHX);
1811 1956
1812 if (expect_true (next)) 1957 if (ecb_expect_true (next))
1813 { 1958 {
1814 /* cannot transfer to destroyed coros, skip and look for next */ 1959 /* cannot transfer to destroyed coros, skip and look for next */
1815 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1960 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1816 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1961 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1817 else 1962 else
1818 { 1963 {
1819 next->flags &= ~CF_READY; 1964 next->flags &= ~CF_READY;
1820 --coro_nready; 1965 --coro_nready;
… …
1828 /* nothing to schedule: call the idle handler */ 1973 /* nothing to schedule: call the idle handler */
1829 if (SvROK (sv_idle) 1974 if (SvROK (sv_idle)
1830 && SvOBJECT (SvRV (sv_idle))) 1975 && SvOBJECT (SvRV (sv_idle)))
1831 { 1976 {
1832 if (SvRV (sv_idle) == SvRV (coro_current)) 1977 if (SvRV (sv_idle) == SvRV (coro_current))
1978 {
1979 require_pv ("Carp");
1980
1981 {
1982 dSP;
1983
1984 ENTER;
1985 SAVETMPS;
1986
1987 PUSHMARK (SP);
1833 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught"); 1988 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
1989 PUTBACK;
1990 call_pv ("Carp::confess", G_VOID | G_DISCARD);
1991
1992 FREETMPS;
1993 LEAVE;
1994 }
1995 }
1834 1996
1835 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1997 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1836 api_ready (aTHX_ SvRV (sv_idle)); 1998 api_ready (aTHX_ SvRV (sv_idle));
1837 --coro_nready; 1999 --coro_nready;
1838 } 2000 }
… …
1853 } 2015 }
1854 } 2016 }
1855 } 2017 }
1856} 2018}
1857 2019
1858INLINE void 2020ecb_inline void
1859prepare_cede (pTHX_ struct coro_transfer_args *ta) 2021prepare_cede (pTHX_ struct coro_transfer_args *ta)
1860{ 2022{
1861 api_ready (aTHX_ coro_current); 2023 api_ready (aTHX_ coro_current);
1862 prepare_schedule (aTHX_ ta); 2024 prepare_schedule (aTHX_ ta);
1863} 2025}
1864 2026
1865INLINE void 2027ecb_inline void
1866prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2028prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1867{ 2029{
1868 SV *prev = SvRV (coro_current); 2030 SV *prev = SvRV (coro_current);
1869 2031
1870 if (coro_nready) 2032 if (coro_nready)
… …
1900{ 2062{
1901 struct coro_transfer_args ta; 2063 struct coro_transfer_args ta;
1902 2064
1903 prepare_cede (aTHX_ &ta); 2065 prepare_cede (aTHX_ &ta);
1904 2066
1905 if (expect_true (ta.prev != ta.next)) 2067 if (ecb_expect_true (ta.prev != ta.next))
1906 { 2068 {
1907 TRANSFER (ta, 1); 2069 TRANSFER (ta, 1);
1908 return 1; 2070 return 1;
1909 } 2071 }
1910 else 2072 else
… …
1953 coro->slot->runops = RUNOPS_DEFAULT; 2115 coro->slot->runops = RUNOPS_DEFAULT;
1954 } 2116 }
1955} 2117}
1956 2118
1957static void 2119static void
2120coro_push_av (pTHX_ AV *av, I32 gimme_v)
2121{
2122 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2123 {
2124 dSP;
2125
2126 if (gimme_v == G_SCALAR)
2127 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2128 else
2129 {
2130 int i;
2131 EXTEND (SP, AvFILLp (av) + 1);
2132
2133 for (i = 0; i <= AvFILLp (av); ++i)
2134 PUSHs (AvARRAY (av)[i]);
2135 }
2136
2137 PUTBACK;
2138 }
2139}
2140
2141static void
2142coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2143{
2144 if (!coro->on_destroy)
2145 coro->on_destroy = newAV ();
2146
2147 av_push (coro->on_destroy, cb);
2148}
2149
2150static void
2151slf_destroy_join (pTHX_ struct CoroSLF *frame)
2152{
2153 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2154}
2155
2156static int
2157slf_check_join (pTHX_ struct CoroSLF *frame)
2158{
2159 struct coro *coro = (struct coro *)frame->data;
2160
2161 if (!coro->status)
2162 return 1;
2163
2164 frame->destroy = 0;
2165
2166 coro_push_av (aTHX_ coro->status, GIMME_V);
2167
2168 SvREFCNT_dec ((SV *)coro->hv);
2169
2170 return 0;
2171}
2172
2173static void
2174slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2175{
2176 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2177
2178 if (items > 1)
2179 croak ("join called with too many arguments");
2180
2181 if (coro->status)
2182 frame->prepare = prepare_nop;
2183 else
2184 {
2185 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2186 frame->prepare = prepare_schedule;
2187 }
2188
2189 frame->check = slf_check_join;
2190 frame->destroy = slf_destroy_join;
2191 frame->data = (void *)coro;
2192 SvREFCNT_inc (coro->hv);
2193}
2194
2195static void
1958coro_call_on_destroy (pTHX_ struct coro *coro) 2196coro_call_on_destroy (pTHX_ struct coro *coro)
1959{ 2197{
1960 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2198 AV *od = coro->on_destroy;
1961 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1962 2199
1963 if (on_destroyp) 2200 if (!od)
1964 { 2201 return;
1965 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1966 2202
2203 coro->on_destroy = 0;
2204 sv_2mortal ((SV *)od);
2205
1967 while (AvFILLp (on_destroy) >= 0) 2206 while (AvFILLp (od) >= 0)
2207 {
2208 SV *cb = sv_2mortal (av_pop (od));
2209
2210 /* coro hv's (and only hv's at the moment) are supported as well */
2211 if (SvSTATEhv_p (aTHX_ cb))
2212 api_ready (aTHX_ cb);
2213 else
1968 { 2214 {
1969 dSP; /* don't disturb outer sp */ 2215 dSP; /* don't disturb outer sp */
1970 SV *cb = av_pop (on_destroy);
1971
1972 PUSHMARK (SP); 2216 PUSHMARK (SP);
1973 2217
1974 if (statusp) 2218 if (coro->status)
1975 { 2219 {
1976 int i; 2220 PUTBACK;
1977 AV *status = (AV *)SvRV (*statusp); 2221 coro_push_av (aTHX_ coro->status, G_ARRAY);
1978 EXTEND (SP, AvFILLp (status) + 1); 2222 SPAGAIN;
1979
1980 for (i = 0; i <= AvFILLp (status); ++i)
1981 PUSHs (AvARRAY (status)[i]);
1982 } 2223 }
1983 2224
1984 PUTBACK; 2225 PUTBACK;
1985 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2226 call_sv (cb, G_VOID | G_DISCARD);
1986 } 2227 }
1987 } 2228 }
1988} 2229}
1989 2230
1990static void 2231static void
1991slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2232coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1992{ 2233{
1993 int i; 2234 AV *av;
1994 HV *hv = (HV *)SvRV (coro_current); 2235
1995 AV *av = newAV (); 2236 if (coro->status)
2237 {
2238 av = coro->status;
2239 av_clear (av);
2240 }
2241 else
2242 av = coro->status = newAV ();
1996 2243
1997 /* items are actually not so common, so optimise for this case */ 2244 /* items are actually not so common, so optimise for this case */
1998 if (items) 2245 if (items)
1999 { 2246 {
2247 int i;
2248
2000 av_extend (av, items - 1); 2249 av_extend (av, items - 1);
2001 2250
2002 for (i = 0; i < items; ++i) 2251 for (i = 0; i < items; ++i)
2003 av_push (av, SvREFCNT_inc_NN (arg [i])); 2252 av_push (av, SvREFCNT_inc_NN (arg [i]));
2004 } 2253 }
2254}
2005 2255
2006 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2256static void
2007 2257slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2258{
2008 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2259 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
2009 api_ready (aTHX_ sv_manager); 2260 api_ready (aTHX_ sv_manager);
2010 2261
2011 frame->prepare = prepare_schedule; 2262 frame->prepare = prepare_schedule;
2012 frame->check = slf_check_repeat; 2263 frame->check = slf_check_repeat;
2013 2264
2014 /* as a minor optimisation, we could unwind all stacks here */ 2265 /* as a minor optimisation, we could unwind all stacks here */
2015 /* but that puts extra pressure on pp_slf, and is not worth much */ 2266 /* but that puts extra pressure on pp_slf, and is not worth much */
2016 /*coro_unwind_stacks (aTHX);*/ 2267 /*coro_unwind_stacks (aTHX);*/
2268}
2269
2270static void
2271slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2272{
2273 HV *coro_hv = (HV *)SvRV (coro_current);
2274
2275 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2276 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2277}
2278
2279static void
2280slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2281{
2282 HV *coro_hv;
2283 struct coro *coro;
2284
2285 if (items <= 0)
2286 croak ("Coro::cancel called without coro object,");
2287
2288 coro = SvSTATE (arg [0]);
2289 coro_hv = coro->hv;
2290
2291 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2292
2293 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2294 {
2295 /* coro currently busy cancelling something, so just notify it */
2296 coro->slf_frame.data = (void *)coro;
2297
2298 frame->prepare = prepare_nop;
2299 frame->check = slf_check_nop;
2300 }
2301 else if (coro_hv == (HV *)SvRV (coro_current))
2302 {
2303 /* cancelling the current coro is allowed, and equals terminate */
2304 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2305 }
2306 else
2307 {
2308 struct coro *self = SvSTATE_current;
2309
2310 if (!self)
2311 croak ("Coro::cancel called outside of thread content,");
2312
2313 /* otherwise we cancel directly, purely for speed reasons
2314 * unfortunately, this requires some magic trickery, as
2315 * somebody else could cancel us, so we have to fight the cancellation.
2316 * this is ugly, and hopefully fully worth the extra speed.
2317 * besides, I can't get the slow-but-safe version working...
2318 */
2319 slf_frame.data = 0;
2320 self->flags |= CF_NOCANCEL;
2321 coro_state_destroy (aTHX_ coro);
2322 self->flags &= ~CF_NOCANCEL;
2323
2324 if (slf_frame.data)
2325 {
2326 /* while we were busy we have been cancelled, so terminate */
2327 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2328 }
2329 else
2330 {
2331 frame->prepare = prepare_nop;
2332 frame->check = slf_check_nop;
2333 }
2334 }
2335}
2336
2337static int
2338slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2339{
2340 frame->prepare = 0;
2341 coro_unwind_stacks (aTHX);
2342
2343 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2344
2345 return 1;
2346}
2347
2348static int
2349safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2350{
2351 if (coro->cctx)
2352 croak ("coro inside C callback, unable to cancel at this time, caught");
2353
2354 if (coro->flags & CF_NEW)
2355 {
2356 coro_set_status (aTHX_ coro, arg, items);
2357 coro_state_destroy (aTHX_ coro);
2358 }
2359 else
2360 {
2361 if (!coro->slf_frame.prepare)
2362 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2363
2364 slf_destroy (aTHX_ coro);
2365
2366 coro_set_status (aTHX_ coro, arg, items);
2367 coro->slf_frame.prepare = prepare_nop;
2368 coro->slf_frame.check = slf_check_safe_cancel;
2369
2370 api_ready (aTHX_ (SV *)coro->hv);
2371 }
2372
2373 return 1;
2017} 2374}
2018 2375
2019/*****************************************************************************/ 2376/*****************************************************************************/
2020/* async pool handler */ 2377/* async pool handler */
2021 2378
… …
2052slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2409slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2053{ 2410{
2054 HV *hv = (HV *)SvRV (coro_current); 2411 HV *hv = (HV *)SvRV (coro_current);
2055 struct coro *coro = SvSTATE_hv ((SV *)hv); 2412 struct coro *coro = SvSTATE_hv ((SV *)hv);
2056 2413
2057 if (expect_true (coro->saved_deffh)) 2414 if (ecb_expect_true (coro->saved_deffh))
2058 { 2415 {
2059 /* subsequent iteration */ 2416 /* subsequent iteration */
2060 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2417 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2061 coro->saved_deffh = 0; 2418 coro->saved_deffh = 0;
2062 2419
2063 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2420 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2064 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2421 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2065 { 2422 {
2066 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2423 slf_init_terminate_cancel_common (aTHX_ frame, hv);
2067 coro->invoke_av = newAV (); 2424 return;
2068
2069 frame->prepare = prepare_nop;
2070 } 2425 }
2071 else 2426 else
2072 { 2427 {
2073 av_clear (GvAV (PL_defgv)); 2428 av_clear (GvAV (PL_defgv));
2074 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2429 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2075 2430
2431 if (ecb_expect_false (coro->swap_sv))
2432 {
2433 SvREFCNT_dec_NN (coro->swap_sv);
2434 coro->swap_sv = 0;
2435 }
2436
2076 coro->prio = 0; 2437 coro->prio = 0;
2077 2438
2078 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2439 if (coro->cctx && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2079 api_trace (aTHX_ coro_current, 0); 2440 api_trace (aTHX_ coro_current, 0);
2080 2441
2081 frame->prepare = prepare_schedule; 2442 frame->prepare = prepare_schedule;
2082 av_push (av_async_pool, SvREFCNT_inc (hv)); 2443 av_push (av_async_pool, SvREFCNT_inc (hv));
2083 } 2444 }
… …
2124 2485
2125static int 2486static int
2126slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2487slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2127{ 2488{
2128 SV *data = (SV *)frame->data; 2489 SV *data = (SV *)frame->data;
2129 2490
2130 if (CORO_THROW) 2491 if (CORO_THROW)
2131 return 0; 2492 return 0;
2132 2493
2133 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2494 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2134 return 1; 2495 return 1;
… …
2170 cb = sv_2mortal (coro->rouse_cb); 2531 cb = sv_2mortal (coro->rouse_cb);
2171 coro->rouse_cb = 0; 2532 coro->rouse_cb = 0;
2172 } 2533 }
2173 2534
2174 if (!SvROK (cb) 2535 if (!SvROK (cb)
2175 || SvTYPE (SvRV (cb)) != SVt_PVCV 2536 || SvTYPE (SvRV (cb)) != SVt_PVCV
2176 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2537 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2177 croak ("Coro::rouse_wait called with illegal callback argument,"); 2538 croak ("Coro::rouse_wait called with illegal callback argument,");
2178 2539
2179 { 2540 {
2180 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2541 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2297static void 2658static void
2298slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2659slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2299{ 2660{
2300 frame->prepare = prepare_cede_notself; 2661 frame->prepare = prepare_cede_notself;
2301 frame->check = slf_check_nop; 2662 frame->check = slf_check_nop;
2663}
2664
2665/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2666static void
2667slf_destroy (pTHX_ struct coro *coro)
2668{
2669 struct CoroSLF frame = coro->slf_frame;
2670
2671 /*
2672 * The on_destroy below most likely is from an SLF call.
2673 * Since by definition the SLF call will not finish when we destroy
2674 * the coro, we will have to force-finish it here, otherwise
2675 * cleanup functions cannot call SLF functions.
2676 */
2677 coro->slf_frame.prepare = 0;
2678
2679 /* this callback is reserved for slf functions needing to do cleanup */
2680 if (frame.destroy && frame.prepare && !PL_dirty)
2681 frame.destroy (aTHX_ &frame);
2302} 2682}
2303 2683
2304/* 2684/*
2305 * these not obviously related functions are all rolled into one 2685 * these not obviously related functions are all rolled into one
2306 * function to increase chances that they all will call transfer with the same 2686 * function to increase chances that they all will call transfer with the same
… …
2313 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2693 I32 checkmark; /* mark SP to see how many elements check has pushed */
2314 2694
2315 /* set up the slf frame, unless it has already been set-up */ 2695 /* set up the slf frame, unless it has already been set-up */
2316 /* the latter happens when a new coro has been started */ 2696 /* the latter happens when a new coro has been started */
2317 /* or when a new cctx was attached to an existing coroutine */ 2697 /* or when a new cctx was attached to an existing coroutine */
2318 if (expect_true (!slf_frame.prepare)) 2698 if (ecb_expect_true (!slf_frame.prepare))
2319 { 2699 {
2320 /* first iteration */ 2700 /* first iteration */
2321 dSP; 2701 dSP;
2322 SV **arg = PL_stack_base + TOPMARK + 1; 2702 SV **arg = PL_stack_base + TOPMARK + 1;
2323 int items = SP - arg; /* args without function object */ 2703 int items = SP - arg; /* args without function object */
… …
2364 while (slf_frame.check (aTHX_ &slf_frame)); 2744 while (slf_frame.check (aTHX_ &slf_frame));
2365 2745
2366 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2746 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2367 2747
2368 /* exception handling */ 2748 /* exception handling */
2369 if (expect_false (CORO_THROW)) 2749 if (ecb_expect_false (CORO_THROW))
2370 { 2750 {
2371 SV *exception = sv_2mortal (CORO_THROW); 2751 SV *exception = sv_2mortal (CORO_THROW);
2372 2752
2373 CORO_THROW = 0; 2753 CORO_THROW = 0;
2374 sv_setsv (ERRSV, exception); 2754 sv_setsv (ERRSV, exception);
2375 croak (0); 2755 croak (0);
2376 } 2756 }
2377 2757
2378 /* return value handling - mostly like entersub */ 2758 /* return value handling - mostly like entersub */
2379 /* make sure we put something on the stack in scalar context */ 2759 /* make sure we put something on the stack in scalar context */
2380 if (GIMME_V == G_SCALAR) 2760 if (GIMME_V == G_SCALAR
2761 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2381 { 2762 {
2382 dSP; 2763 dSP;
2383 SV **bot = PL_stack_base + checkmark; 2764 SV **bot = PL_stack_base + checkmark;
2384 2765
2385 if (sp == bot) /* too few, push undef */ 2766 if (sp == bot) /* too few, push undef */
2386 bot [1] = &PL_sv_undef; 2767 bot [1] = &PL_sv_undef;
2387 else if (sp != bot + 1) /* too many, take last one */ 2768 else /* too many, take last one */
2388 bot [1] = *sp; 2769 bot [1] = *sp;
2389 2770
2390 SP = bot + 1; 2771 SP = bot + 1;
2391 2772
2392 PUTBACK; 2773 PUTBACK;
… …
2490{ 2871{
2491 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2872 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2492 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2873 on_enterleave_call (aTHX_ sv_2mortal (cb));
2493} 2874}
2494 2875
2876static void
2877enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2878{
2879 if (!hook)
2880 return;
2881
2882 if (!*avp)
2883 {
2884 *avp = newAV ();
2885 AvREAL_off (*avp);
2886 }
2887
2888 av_push (*avp, (SV *)hook);
2889 av_push (*avp, (SV *)arg);
2890}
2891
2892static void
2893enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2894{
2895 AV *av = *avp;
2896 int i;
2897
2898 if (!av)
2899 return;
2900
2901 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2902 if (AvARRAY (av)[i] == (SV *)hook)
2903 {
2904 if (execute)
2905 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2906
2907 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2908 av_pop (av);
2909 av_pop (av);
2910 break;
2911 }
2912
2913 if (AvFILLp (av) >= 0)
2914 {
2915 *avp = 0;
2916 SvREFCNT_dec_NN (av);
2917 }
2918}
2919
2920static void
2921api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2922{
2923 struct coro *coro = SvSTATE (coro_sv);
2924
2925 if (SvSTATE_current == coro)
2926 if (enter)
2927 enter (aTHX_ enter_arg);
2928
2929 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2930 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2931}
2932
2933static void
2934api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2935{
2936 struct coro *coro = SvSTATE (coro_sv);
2937
2938 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2939 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2940}
2941
2942static void
2943savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2944{
2945 struct coro *coro = SvSTATE_current;
2946
2947 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2948}
2949
2950static void
2951savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2952{
2953 struct coro *coro = SvSTATE_current;
2954
2955 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2956}
2957
2958static void
2959api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2960{
2961 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2962
2963 /* this ought to be much cheaper than malloc + a single destructor call */
2964 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2965 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2966}
2967
2495/*****************************************************************************/ 2968/*****************************************************************************/
2496/* PerlIO::cede */ 2969/* PerlIO::cede */
2497 2970
2498typedef struct 2971typedef struct
2499{ 2972{
2500 PerlIOBuf base; 2973 PerlIOBuf base;
2501 NV next, every; 2974 NV next, every;
2502} PerlIOCede; 2975} PerlIOCede;
2503 2976
2504static IV 2977static IV ecb_cold
2505PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2978PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2506{ 2979{
2507 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2980 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2508 2981
2509 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2982 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2510 self->next = nvtime () + self->every; 2983 self->next = nvtime () + self->every;
2511 2984
2512 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2985 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2513} 2986}
2514 2987
2515static SV * 2988static SV * ecb_cold
2516PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 2989PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2517{ 2990{
2518 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2991 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2519 2992
2520 return newSVnv (self->every); 2993 return newSVnv (self->every);
… …
2627 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3100 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2628 PUTBACK; 3101 PUTBACK;
2629 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3102 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2630 } 3103 }
2631 3104
2632 SvREFCNT_dec (cb); 3105 SvREFCNT_dec_NN (cb);
2633 } 3106 }
2634} 3107}
2635 3108
2636static void 3109static void
2637coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3110coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2638{ 3111{
2639 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3112 /* call $sem->adjust (0) to possibly wake up some other waiters */
2640 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3113 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2641} 3114}
2642 3115
2643static int 3116static int
2644slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3117slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2645{ 3118{
2646 AV *av = (AV *)frame->data; 3119 AV *av = (AV *)frame->data;
2647 SV *count_sv = AvARRAY (av)[0]; 3120 SV *count_sv = AvARRAY (av)[0];
3121 SV *coro_hv = SvRV (coro_current);
3122
3123 frame->destroy = 0;
2648 3124
2649 /* if we are about to throw, don't actually acquire the lock, just throw */ 3125 /* if we are about to throw, don't actually acquire the lock, just throw */
2650 if (CORO_THROW) 3126 if (ecb_expect_false (CORO_THROW))
3127 {
3128 /* we still might be responsible for the semaphore, so wake up others */
3129 coro_semaphore_adjust (aTHX_ av, 0);
3130
2651 return 0; 3131 return 0;
3132 }
2652 else if (SvIVX (count_sv) > 0) 3133 else if (SvIVX (count_sv) > 0)
2653 { 3134 {
2654 SvSTATE_current->on_destroy = 0;
2655
2656 if (acquire) 3135 if (acquire)
2657 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3136 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2658 else 3137 else
2659 coro_semaphore_adjust (aTHX_ av, 0); 3138 coro_semaphore_adjust (aTHX_ av, 0);
2660 3139
… …
2664 { 3143 {
2665 int i; 3144 int i;
2666 /* if we were woken up but can't down, we look through the whole */ 3145 /* if we were woken up but can't down, we look through the whole */
2667 /* waiters list and only add us if we aren't in there already */ 3146 /* waiters list and only add us if we aren't in there already */
2668 /* this avoids some degenerate memory usage cases */ 3147 /* this avoids some degenerate memory usage cases */
2669 3148 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2670 for (i = 1; i <= AvFILLp (av); ++i)
2671 if (AvARRAY (av)[i] == SvRV (coro_current)) 3149 if (AvARRAY (av)[i] == coro_hv)
2672 return 1; 3150 return 1;
2673 3151
2674 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3152 av_push (av, SvREFCNT_inc (coro_hv));
2675 return 1; 3153 return 1;
2676 } 3154 }
2677} 3155}
2678 3156
2679static int 3157static int
… …
2702 { 3180 {
2703 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3181 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2704 3182
2705 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3183 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2706 frame->prepare = prepare_schedule; 3184 frame->prepare = prepare_schedule;
2707
2708 /* to avoid race conditions when a woken-up coro gets terminated */ 3185 /* to avoid race conditions when a woken-up coro gets terminated */
2709 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3186 /* we arrange for a temporary on_destroy that calls adjust (0) */
2710 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3187 frame->destroy = coro_semaphore_destroy;
2711 } 3188 }
2712} 3189}
2713 3190
2714static void 3191static void
2715slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3192slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2773 { 3250 {
2774 api_ready (aTHX_ cb); 3251 api_ready (aTHX_ cb);
2775 sv_setiv (cb, 0); /* signal waiter */ 3252 sv_setiv (cb, 0); /* signal waiter */
2776 } 3253 }
2777 3254
2778 SvREFCNT_dec (cb); 3255 SvREFCNT_dec_NN (cb);
2779 3256
2780 --count; 3257 --count;
2781 } 3258 }
2782} 3259}
2783 3260
… …
2868 } 3345 }
2869 3346
2870 av_push (state, data_sv); 3347 av_push (state, data_sv);
2871 3348
2872 api_ready (aTHX_ coro); 3349 api_ready (aTHX_ coro);
2873 SvREFCNT_dec (coro); 3350 SvREFCNT_dec_NN (coro);
2874 SvREFCNT_dec ((AV *)state); 3351 SvREFCNT_dec_NN ((AV *)state);
2875} 3352}
2876 3353
2877static int 3354static int
2878slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3355slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2879{ 3356{
… …
2884 /* it quickly returns */ 3361 /* it quickly returns */
2885 if (CORO_THROW) 3362 if (CORO_THROW)
2886 return 0; 3363 return 0;
2887 3364
2888 /* one element that is an RV? repeat! */ 3365 /* one element that is an RV? repeat! */
2889 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3366 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2890 return 1; 3367 return 1;
2891 3368
2892 /* restore status */ 3369 /* restore status */
2893 { 3370 {
2894 SV *data_sv = av_pop (state); 3371 SV *data_sv = av_pop (state);
… …
2897 errno = data->errorno; 3374 errno = data->errorno;
2898 PL_laststype = data->laststype; 3375 PL_laststype = data->laststype;
2899 PL_laststatval = data->laststatval; 3376 PL_laststatval = data->laststatval;
2900 PL_statcache = data->statcache; 3377 PL_statcache = data->statcache;
2901 3378
2902 SvREFCNT_dec (data_sv); 3379 SvREFCNT_dec_NN (data_sv);
2903 } 3380 }
2904 3381
2905 /* push result values */ 3382 /* push result values */
2906 { 3383 {
2907 dSP; 3384 dSP;
… …
2933 dSP; 3410 dSP;
2934 3411
2935 static SV *prio_cv; 3412 static SV *prio_cv;
2936 static SV *prio_sv; 3413 static SV *prio_sv;
2937 3414
2938 if (expect_false (!prio_cv)) 3415 if (ecb_expect_false (!prio_cv))
2939 { 3416 {
2940 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3417 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2941 prio_sv = newSViv (0); 3418 prio_sv = newSViv (0);
2942 } 3419 }
2943 3420
… …
3049 } 3526 }
3050 3527
3051 return coro_sv; 3528 return coro_sv;
3052} 3529}
3053 3530
3531#ifndef __cplusplus
3532ecb_cold XS(boot_Coro__State);
3533#endif
3534
3535#if CORO_JIT
3536
3537static void ecb_noinline ecb_cold
3538pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3539{
3540 dSP;
3541 AV *av = newAV ();
3542
3543 av_store (av, 3, newSVuv (d));
3544 av_store (av, 2, newSVuv (c));
3545 av_store (av, 1, newSVuv (b));
3546 av_store (av, 0, newSVuv (a));
3547
3548 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3549
3550 PUTBACK;
3551}
3552
3553static void ecb_noinline ecb_cold
3554jit_init (pTHX)
3555{
3556 dSP;
3557 SV *load, *save;
3558 char *map_base;
3559 char *load_ptr, *save_ptr;
3560 STRLEN load_len, save_len, map_len;
3561 int count;
3562
3563 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3564
3565 PUSHMARK (SP);
3566 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3567 #include "state.h"
3568 count = call_pv ("Coro::State::_jit", G_ARRAY);
3569 SPAGAIN;
3570
3571 save = POPs; save_ptr = SvPVbyte (save, save_len);
3572 load = POPs; load_ptr = SvPVbyte (load, load_len);
3573
3574 map_len = load_len + save_len + 16;
3575
3576 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3577
3578 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3579
3580 load_perl_slots = (load_save_perl_slots_type)map_base;
3581 memcpy (map_base, load_ptr, load_len);
3582
3583 map_base += (load_len + 15) & ~15;
3584
3585 save_perl_slots = (load_save_perl_slots_type)map_base;
3586 memcpy (map_base, save_ptr, save_len);
3587
3588 /* we are good citizens and try to make the page read-only, so the evil evil */
3589 /* hackers might have it a bit more difficult */
3590 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3591
3592 PUTBACK;
3593 eval_pv ("undef &Coro::State::_jit", 1);
3594}
3595
3596#endif
3597
3054MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3598MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
3055 3599
3056PROTOTYPES: DISABLE 3600PROTOTYPES: DISABLE
3057 3601
3058BOOT: 3602BOOT:
3059{ 3603{
3604#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3605#include "state.h"
3060#ifdef USE_ITHREADS 3606#ifdef USE_ITHREADS
3061# if CORO_PTHREAD 3607# if CORO_PTHREAD
3062 coro_thx = PERL_GET_CONTEXT; 3608 coro_thx = PERL_GET_CONTEXT;
3063# endif 3609# endif
3064#endif 3610#endif
3065 BOOT_PAGESIZE; 3611 /* perl defines these to check for existance first, but why it doesn't */
3612 /* just create them one at init time is not clear to me, except for */
3613 /* programs trying to delete them, but... */
3614 /* anyway, we declare this as invalid and make sure they are initialised here */
3615 DEFSV;
3616 ERRSV;
3066 3617
3067 cctx_current = cctx_new_empty (); 3618 cctx_current = cctx_new_empty ();
3068 3619
3069 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3620 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
3070 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3621 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
3071 3622
3072 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3623 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
3073 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3624 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
3074 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3625 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
3075 3626
3076 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3077 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3627 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3078 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3628 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3079 3629
3080 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3630 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3081 3631
… …
3110 coroapi.prepare_nop = prepare_nop; 3660 coroapi.prepare_nop = prepare_nop;
3111 coroapi.prepare_schedule = prepare_schedule; 3661 coroapi.prepare_schedule = prepare_schedule;
3112 coroapi.prepare_cede = prepare_cede; 3662 coroapi.prepare_cede = prepare_cede;
3113 coroapi.prepare_cede_notself = prepare_cede_notself; 3663 coroapi.prepare_cede_notself = prepare_cede_notself;
3114 3664
3115 { 3665 time_init (aTHX);
3116 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3117
3118 if (!svp) croak ("Time::HiRes is required");
3119 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3120
3121 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3122
3123 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3124 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3125 }
3126 3666
3127 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3667 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3668#if CORO_JIT
3669 PUTBACK;
3670 jit_init (aTHX);
3671 SPAGAIN;
3672#endif
3128} 3673}
3129 3674
3130SV * 3675SV *
3131new (SV *klass, ...) 3676new (SV *klass, ...)
3132 ALIAS: 3677 ALIAS:
… …
3139void 3684void
3140transfer (...) 3685transfer (...)
3141 PROTOTYPE: $$ 3686 PROTOTYPE: $$
3142 CODE: 3687 CODE:
3143 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3688 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3144
3145bool
3146_destroy (SV *coro_sv)
3147 CODE:
3148 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3149 OUTPUT:
3150 RETVAL
3151
3152void
3153_exit (int code)
3154 PROTOTYPE: $
3155 CODE:
3156 _exit (code);
3157 3689
3158SV * 3690SV *
3159clone (Coro::State coro) 3691clone (Coro::State coro)
3160 CODE: 3692 CODE:
3161{ 3693{
… …
3216void 3748void
3217list () 3749list ()
3218 PROTOTYPE: 3750 PROTOTYPE:
3219 PPCODE: 3751 PPCODE:
3220{ 3752{
3221 struct coro *coro; 3753 struct coro *coro;
3222 for (coro = coro_first; coro; coro = coro->next) 3754 for (coro = coro_first; coro; coro = coro->next)
3223 if (coro->hv) 3755 if (coro->hv)
3224 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3756 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3225} 3757}
3226 3758
… …
3231 CODE: 3763 CODE:
3232{ 3764{
3233 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3765 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3234 { 3766 {
3235 struct coro *current = SvSTATE_current; 3767 struct coro *current = SvSTATE_current;
3768 struct CoroSLF slf_save;
3236 3769
3237 if (current != coro) 3770 if (current != coro)
3238 { 3771 {
3239 PUTBACK; 3772 PUTBACK;
3240 save_perl (aTHX_ current); 3773 save_perl (aTHX_ current);
3241 load_perl (aTHX_ coro); 3774 load_perl (aTHX_ coro);
3775 /* the coro is most likely in an active SLF call.
3776 * while not strictly required (the code we execute is
3777 * not allowed to call any SLF functions), it's cleaner
3778 * to reinitialise the slf_frame and restore it later.
3779 * This might one day allow us to actually do SLF calls
3780 * from code executed here.
3781 */
3782 slf_save = slf_frame;
3783 slf_frame.prepare = 0;
3242 SPAGAIN; 3784 SPAGAIN;
3243 } 3785 }
3244 3786
3245 PUSHSTACK; 3787 PUSHSTACK;
3246 3788
… …
3256 SPAGAIN; 3798 SPAGAIN;
3257 3799
3258 if (current != coro) 3800 if (current != coro)
3259 { 3801 {
3260 PUTBACK; 3802 PUTBACK;
3803 slf_frame = slf_save;
3261 save_perl (aTHX_ coro); 3804 save_perl (aTHX_ coro);
3262 load_perl (aTHX_ current); 3805 load_perl (aTHX_ current);
3263 SPAGAIN; 3806 SPAGAIN;
3264 } 3807 }
3265 } 3808 }
… …
3270 PROTOTYPE: $ 3813 PROTOTYPE: $
3271 ALIAS: 3814 ALIAS:
3272 is_ready = CF_READY 3815 is_ready = CF_READY
3273 is_running = CF_RUNNING 3816 is_running = CF_RUNNING
3274 is_new = CF_NEW 3817 is_new = CF_NEW
3275 is_destroyed = CF_DESTROYED 3818 is_destroyed = CF_ZOMBIE
3819 is_zombie = CF_ZOMBIE
3276 is_suspended = CF_SUSPENDED 3820 is_suspended = CF_SUSPENDED
3277 CODE: 3821 CODE:
3278 RETVAL = boolSV (coro->flags & ix); 3822 RETVAL = boolSV (coro->flags & ix);
3279 OUTPUT: 3823 OUTPUT:
3280 RETVAL 3824 RETVAL
3281 3825
3282void 3826void
3283throw (Coro::State self, SV *exception = &PL_sv_undef) 3827throw (SV *self, SV *exception = &PL_sv_undef)
3284 PROTOTYPE: $;$ 3828 PROTOTYPE: $;$
3285 CODE: 3829 CODE:
3286{ 3830{
3831 struct coro *coro = SvSTATE (self);
3287 struct coro *current = SvSTATE_current; 3832 struct coro *current = SvSTATE_current;
3288 SV **exceptionp = self == current ? &CORO_THROW : &self->except; 3833 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3289 SvREFCNT_dec (*exceptionp); 3834 SvREFCNT_dec (*exceptionp);
3290 SvGETMAGIC (exception); 3835 SvGETMAGIC (exception);
3291 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0; 3836 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3837
3838 api_ready (aTHX_ self);
3292} 3839}
3293 3840
3294void 3841void
3295api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3842api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3296 PROTOTYPE: $;$ 3843 PROTOTYPE: $;$
… …
3351 3898
3352void 3899void
3353cancel (Coro::State self) 3900cancel (Coro::State self)
3354 CODE: 3901 CODE:
3355 coro_state_destroy (aTHX_ self); 3902 coro_state_destroy (aTHX_ self);
3356 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3357
3358 3903
3359SV * 3904SV *
3360enable_times (int enabled = enable_times) 3905enable_times (int enabled = enable_times)
3361 CODE: 3906 CODE:
3362{ 3907{
… …
3375 3920
3376void 3921void
3377times (Coro::State self) 3922times (Coro::State self)
3378 PPCODE: 3923 PPCODE:
3379{ 3924{
3380 struct coro *current = SvSTATE (coro_current); 3925 struct coro *current = SvSTATE (coro_current);
3381 3926
3382 if (expect_false (current == self)) 3927 if (ecb_expect_false (current == self))
3383 { 3928 {
3384 coro_times_update (); 3929 coro_times_update ();
3385 coro_times_add (SvSTATE (coro_current)); 3930 coro_times_add (SvSTATE (coro_current));
3386 } 3931 }
3387 3932
3388 EXTEND (SP, 2); 3933 EXTEND (SP, 2);
3389 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3934 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3390 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3935 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3391 3936
3392 if (expect_false (current == self)) 3937 if (ecb_expect_false (current == self))
3393 coro_times_sub (SvSTATE (coro_current)); 3938 coro_times_sub (SvSTATE (coro_current));
3394} 3939}
3395 3940
3396void 3941void
3397swap_sv (Coro::State coro, SV *sv, SV *swapsv) 3942swap_sv (Coro::State coro, SV *sva, SV *svb)
3398 CODE: 3943 CODE:
3399{ 3944{
3400 struct coro *current = SvSTATE_current; 3945 struct coro *current = SvSTATE_current;
3946 AV *swap_sv;
3947 int i;
3948
3949 sva = SvRV (sva);
3950 svb = SvRV (svb);
3401 3951
3402 if (current == coro) 3952 if (current == coro)
3403 SWAP_SVS (current); 3953 SWAP_SVS_LEAVE (current);
3404 3954
3405 if (!coro->swap_sv) 3955 if (!coro->swap_sv)
3406 coro->swap_sv = newAV (); 3956 coro->swap_sv = newAV ();
3407 3957
3958 swap_sv = coro->swap_sv;
3959
3960 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
3961 {
3962 SV *a = AvARRAY (swap_sv)[i ];
3963 SV *b = AvARRAY (swap_sv)[i + 1];
3964
3965 if (a == sva && b == svb)
3966 {
3967 SvREFCNT_dec_NN (a);
3968 SvREFCNT_dec_NN (b);
3969
3970 for (; i <= AvFILLp (swap_sv) - 2; i++)
3971 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
3972
3973 AvFILLp (swap_sv) -= 2;
3974
3975 goto removed;
3976 }
3977 }
3978
3408 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv ))); 3979 av_push (swap_sv, SvREFCNT_inc_NN (sva));
3409 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv))); 3980 av_push (swap_sv, SvREFCNT_inc_NN (svb));
3981
3982 removed:
3410 3983
3411 if (current == coro) 3984 if (current == coro)
3412 SWAP_SVS (current); 3985 SWAP_SVS_ENTER (current);
3413} 3986}
3414 3987
3415 3988
3416MODULE = Coro::State PACKAGE = Coro 3989MODULE = Coro::State PACKAGE = Coro
3417 3990
3418BOOT: 3991BOOT:
3419{ 3992{
3993 if (SVt_LAST > 32)
3994 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
3995
3420 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3996 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3421 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3997 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3422 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3998 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3423 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3424 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3999 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3425 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4000 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3426 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4001 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3427 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4002 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3428 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4003 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3429 4004
3430 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4005 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3431 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4006 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3432 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4007 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3433 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 4008 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3434 4009
3435 coro_stash = gv_stashpv ("Coro", TRUE); 4010 coro_stash = gv_stashpv ("Coro", TRUE);
3436 4011
3437 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4012 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3438 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4013 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3439 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4014 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3451 coroapi.ready = api_ready; 4026 coroapi.ready = api_ready;
3452 coroapi.is_ready = api_is_ready; 4027 coroapi.is_ready = api_is_ready;
3453 coroapi.nready = coro_nready; 4028 coroapi.nready = coro_nready;
3454 coroapi.current = coro_current; 4029 coroapi.current = coro_current;
3455 4030
4031 coroapi.enterleave_hook = api_enterleave_hook;
4032 coroapi.enterleave_unhook = api_enterleave_unhook;
4033 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4034
3456 /*GCoroAPI = &coroapi;*/ 4035 /*GCoroAPI = &coroapi;*/
3457 sv_setiv (sv, (IV)&coroapi); 4036 sv_setiv (sv, (IV)&coroapi);
3458 SvREADONLY_on (sv); 4037 SvREADONLY_on (sv);
3459 } 4038 }
3460} 4039}
… …
3467 api_ready (aTHX_ RETVAL); 4046 api_ready (aTHX_ RETVAL);
3468 OUTPUT: 4047 OUTPUT:
3469 RETVAL 4048 RETVAL
3470 4049
3471void 4050void
4051_destroy (Coro::State coro)
4052 CODE:
4053 /* used by the manager thread */
4054 coro_state_destroy (aTHX_ coro);
4055
4056void
4057on_destroy (Coro::State coro, SV *cb)
4058 CODE:
4059 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4060
4061void
4062join (...)
4063 CODE:
4064 CORO_EXECUTE_SLF_XS (slf_init_join);
4065
4066void
3472terminate (...) 4067terminate (...)
3473 CODE: 4068 CODE:
3474 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4069 CORO_EXECUTE_SLF_XS (slf_init_terminate);
4070
4071void
4072cancel (...)
4073 CODE:
4074 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4075
4076int
4077safe_cancel (Coro::State self, ...)
4078 C_ARGS: aTHX_ self, &ST (1), items - 1
3475 4079
3476void 4080void
3477schedule (...) 4081schedule (...)
3478 CODE: 4082 CODE:
3479 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4083 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3500 4104
3501void 4105void
3502_set_current (SV *current) 4106_set_current (SV *current)
3503 PROTOTYPE: $ 4107 PROTOTYPE: $
3504 CODE: 4108 CODE:
3505 SvREFCNT_dec (SvRV (coro_current)); 4109 SvREFCNT_dec_NN (SvRV (coro_current));
3506 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4110 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3507 4111
3508void 4112void
3509_set_readyhook (SV *hook) 4113_set_readyhook (SV *hook)
3510 PROTOTYPE: $ 4114 PROTOTYPE: $
… …
3594 4198
3595 if ((SV *)hv == &PL_sv_undef) 4199 if ((SV *)hv == &PL_sv_undef)
3596 { 4200 {
3597 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4201 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3598 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4202 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3599 SvREFCNT_dec (sv); 4203 SvREFCNT_dec_NN (sv);
3600 } 4204 }
3601 4205
3602 { 4206 {
3603 struct coro *coro = SvSTATE_hv (hv); 4207 struct coro *coro = SvSTATE_hv (hv);
3604 4208
… …
3611 api_ready (aTHX_ (SV *)hv); 4215 api_ready (aTHX_ (SV *)hv);
3612 4216
3613 if (GIMME_V != G_VOID) 4217 if (GIMME_V != G_VOID)
3614 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4218 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3615 else 4219 else
3616 SvREFCNT_dec (hv); 4220 SvREFCNT_dec_NN (hv);
3617} 4221}
3618 4222
3619SV * 4223SV *
3620rouse_cb () 4224rouse_cb ()
3621 PROTOTYPE: 4225 PROTOTYPE:
… …
3636 on_leave = 1 4240 on_leave = 1
3637 PROTOTYPE: & 4241 PROTOTYPE: &
3638 CODE: 4242 CODE:
3639{ 4243{
3640 struct coro *coro = SvSTATE_current; 4244 struct coro *coro = SvSTATE_current;
3641 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4245 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3642 4246
3643 block = s_get_cv_croak (block); 4247 block = s_get_cv_croak (block);
3644 4248
3645 if (!*avp) 4249 if (!*avp)
3646 *avp = newAV (); 4250 *avp = newAV ();
… …
3666 4270
3667SV * 4271SV *
3668new (SV *klass, SV *count = 0) 4272new (SV *klass, SV *count = 0)
3669 CODE: 4273 CODE:
3670{ 4274{
3671 int semcnt = 1; 4275 int semcnt = 1;
3672 4276
3673 if (count) 4277 if (count)
3674 { 4278 {
3675 SvGETMAGIC (count); 4279 SvGETMAGIC (count);
3676 4280
… …
3700 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4304 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3701 OUTPUT: 4305 OUTPUT:
3702 RETVAL 4306 RETVAL
3703 4307
3704void 4308void
3705up (SV *self, int adjust = 1) 4309up (SV *self)
3706 ALIAS:
3707 adjust = 1
3708 CODE: 4310 CODE:
4311 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4312
4313void
4314adjust (SV *self, int adjust)
4315 CODE:
3709 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4316 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3710 4317
3711void 4318void
3712down (...) 4319down (...)
3713 CODE: 4320 CODE:
3714 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4321 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3736 XSRETURN_NO; 4343 XSRETURN_NO;
3737} 4344}
3738 4345
3739void 4346void
3740waiters (SV *self) 4347waiters (SV *self)
3741 PPCODE: 4348 PPCODE:
3742{ 4349{
3743 AV *av = (AV *)SvRV (self); 4350 AV *av = (AV *)SvRV (self);
3744 int wcount = AvFILLp (av) + 1 - 1; 4351 int wcount = AvFILLp (av) + 1 - 1;
3745 4352
3746 if (GIMME_V == G_SCALAR) 4353 if (GIMME_V == G_SCALAR)
… …
3755} 4362}
3756 4363
3757MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4364MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3758 4365
3759void 4366void
3760_may_delete (SV *sem, int count, int extra_refs) 4367_may_delete (SV *sem, int count, unsigned int extra_refs)
3761 PPCODE: 4368 PPCODE:
3762{ 4369{
3763 AV *av = (AV *)SvRV (sem); 4370 AV *av = (AV *)SvRV (sem);
3764 4371
3765 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4372 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3766 && AvFILLp (av) == 0 /* no waiters, just count */ 4373 && AvFILLp (av) == 0 /* no waiters, just count */
3767 && SvIV (AvARRAY (av)[0]) == count) 4374 && SvIV (AvARRAY (av)[0]) == count)
3768 XSRETURN_YES; 4375 XSRETURN_YES;
… …
3789 4396
3790void 4397void
3791broadcast (SV *self) 4398broadcast (SV *self)
3792 CODE: 4399 CODE:
3793{ 4400{
3794 AV *av = (AV *)SvRV (self); 4401 AV *av = (AV *)SvRV (self);
3795 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4402 coro_signal_wake (aTHX_ av, AvFILLp (av));
3796} 4403}
3797 4404
3798void 4405void
3799send (SV *self) 4406send (SV *self)
… …
3807 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4414 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3808} 4415}
3809 4416
3810IV 4417IV
3811awaited (SV *self) 4418awaited (SV *self)
3812 CODE: 4419 CODE:
3813 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4420 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3814 OUTPUT: 4421 OUTPUT:
3815 RETVAL 4422 RETVAL
3816 4423
3817 4424
… …
3822 4429
3823void 4430void
3824_schedule (...) 4431_schedule (...)
3825 CODE: 4432 CODE:
3826{ 4433{
3827 static int incede; 4434 static int incede;
3828 4435
3829 api_cede_notself (aTHX); 4436 api_cede_notself (aTHX);
3830 4437
3831 ++incede; 4438 ++incede;
3832 while (coro_nready >= incede && api_cede (aTHX)) 4439 while (coro_nready >= incede && api_cede (aTHX))
… …
3876 { 4483 {
3877 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4484 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3878 coro_old_pp_sselect = 0; 4485 coro_old_pp_sselect = 0;
3879 } 4486 }
3880 4487
4488MODULE = Coro::State PACKAGE = Coro::Util
4489
4490void
4491_exit (int code)
4492 CODE:
4493 _exit (code);
4494
4495NV
4496time ()
4497 CODE:
4498 RETVAL = nvtime (aTHX);
4499 OUTPUT:
4500 RETVAL
4501
4502NV
4503gettimeofday ()
4504 PPCODE:
4505{
4506 UV tv [2];
4507 u2time (aTHX_ tv);
4508 EXTEND (SP, 2);
4509 PUSHs (sv_2mortal (newSVuv (tv [0])));
4510 PUSHs (sv_2mortal (newSVuv (tv [1])));
4511}
4512

Diff Legend

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