ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/Coro/State.xs
(Generate patch)

Comparing Coro/Coro/State.xs (file contents):
Revision 1.376 by root, Fri Oct 2 20:48:04 2009 UTC vs.
Revision 1.463 by root, Wed Jun 22 20:37:27 2016 UTC

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

Diff Legend

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