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.371 by root, Sat Aug 22 22:36:23 2009 UTC vs.
Revision 1.464 by root, Wed Jun 22 22:53:49 2016 UTC

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 */
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
… …
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "schmorp.h" 16#include "schmorp.h"
12 17
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
20#include "ecb.h"
21
22#include <stddef.h>
13#include <stdio.h> 23#include <stdio.h>
14#include <errno.h> 24#include <errno.h>
15#include <assert.h> 25#include <assert.h>
16 26
17#ifdef WIN32 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
35#ifndef SVs_PADSTALE
36# define SVs_PADSTALE 0
37#endif
38
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
18# undef setjmp 70# undef setjmp
19# undef longjmp 71# undef longjmp
20# undef _exit 72# undef _exit
21# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
22#else 74#else
23# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
24#endif 76#endif
25 77
26#ifdef HAVE_MMAP
27# include <unistd.h>
28# include <sys/mman.h>
29# ifndef MAP_ANONYMOUS
30# ifdef MAP_ANON
31# define MAP_ANONYMOUS MAP_ANON
32# else
33# undef HAVE_MMAP
34# endif
35# endif
36# include <limits.h>
37# ifndef PAGESIZE
38# define PAGESIZE pagesize
39# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
40static long pagesize;
41# else
42# define BOOT_PAGESIZE (void)0
43# endif
44#else
45# define PAGESIZE 0
46# define BOOT_PAGESIZE (void)0
47#endif
48
49#if CORO_USE_VALGRIND
50# include <valgrind/valgrind.h>
51#endif
52
53/* the maximum number of idle cctx that will be pooled */ 78/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
55 80
56#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57# undef CORO_STACKGUARD 82# define HAS_SCOPESTACK_NAME 1
58#endif
59
60#ifndef CORO_STACKGUARD
61# define CORO_STACKGUARD 0
62#endif 83#endif
63 84
64/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
65#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
66# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
… …
76# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
77#endif 98#endif
78 99
79#define IN_DESTRUCT PL_dirty 100#define IN_DESTRUCT PL_dirty
80 101
81#if __GNUC__ >= 3
82# define attribute(x) __attribute__(x)
83# define expect(expr,value) __builtin_expect ((expr), (value))
84# define INLINE static inline
85#else
86# define attribute(x)
87# define expect(expr,value) (expr)
88# define INLINE static
89#endif
90
91#define expect_false(expr) expect ((expr) != 0, 0)
92#define expect_true(expr) expect ((expr) != 0, 1)
93
94#define NOINLINE attribute ((noinline))
95
96#include "CoroAPI.h" 102#include "CoroAPI.h"
97#define GCoroAPI (&coroapi) /* very sneaky */ 103#define GCoroAPI (&coroapi) /* very sneaky */
98 104
99#ifdef USE_ITHREADS 105#ifdef USE_ITHREADS
100# if CORO_PTHREAD 106# if CORO_PTHREAD
… …
110# define CORO_CLOCK_MONOTONIC 1 116# define CORO_CLOCK_MONOTONIC 1
111# define CORO_CLOCK_THREAD_CPUTIME_ID 3 117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
112# endif 118# endif
113#endif 119#endif
114 120
121/* perl usually suppressed asserts. for debugging, we sometimes force it to be on */
122#if 0
123# undef NDEBUG
124# include <assert.h>
125#endif
126
115static double (*nvtime)(); /* so why doesn't it take void? */ 127static double (*nvtime)(); /* so why doesn't it take void? */
116static void (*u2time)(pTHX_ UV ret[2]); 128static void (*u2time)(pTHX_ UV ret[2]);
117 129
118/* we hijack an hopefully unused CV flag for our purposes */ 130/* we hijack an hopefully unused CV flag for our purposes */
119#define CVf_SLF 0x4000 131#define CVf_SLF 0x4000
120static OP *pp_slf (pTHX); 132static OP *pp_slf (pTHX);
133static void slf_destroy (pTHX_ struct coro *coro);
121 134
122static U32 cctx_gen; 135static U32 cctx_gen;
123static size_t cctx_stacksize = CORO_STACKSIZE; 136static size_t cctx_stacksize = CORO_STACKSIZE;
124static struct CoroAPI coroapi; 137static struct CoroAPI coroapi;
125static AV *main_mainstack; /* used to differentiate between $main and others */ 138static AV *main_mainstack; /* used to differentiate between $main and others */
… …
133 146
134static GV *irsgv; /* $/ */ 147static GV *irsgv; /* $/ */
135static GV *stdoutgv; /* *STDOUT */ 148static GV *stdoutgv; /* *STDOUT */
136static SV *rv_diehook; 149static SV *rv_diehook;
137static SV *rv_warnhook; 150static SV *rv_warnhook;
138static HV *hv_sig; /* %SIG */
139 151
140/* async_pool helper stuff */ 152/* async_pool helper stuff */
141static SV *sv_pool_rss; 153static SV *sv_pool_rss;
142static SV *sv_pool_size; 154static SV *sv_pool_size;
143static SV *sv_async_pool_idle; /* description string */ 155static SV *sv_async_pool_idle; /* description string */
… …
155static char times_valid; 167static char times_valid;
156 168
157static struct coro_cctx *cctx_first; 169static struct coro_cctx *cctx_first;
158static int cctx_count, cctx_idle; 170static int cctx_count, cctx_idle;
159 171
160enum { 172enum
173{
161 CC_MAPPED = 0x01, 174 CC_MAPPED = 0x01,
162 CC_NOREUSE = 0x02, /* throw this away after tracing */ 175 CC_NOREUSE = 0x02, /* throw this away after tracing */
163 CC_TRACE = 0x04, 176 CC_TRACE = 0x04,
164 CC_TRACE_SUB = 0x08, /* trace sub calls */ 177 CC_TRACE_SUB = 0x08, /* trace sub calls */
165 CC_TRACE_LINE = 0x10, /* trace each statement */ 178 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
170typedef struct coro_cctx 183typedef struct coro_cctx
171{ 184{
172 struct coro_cctx *next; 185 struct coro_cctx *next;
173 186
174 /* the stack */ 187 /* the stack */
175 void *sptr; 188 struct coro_stack stack;
176 size_t ssize;
177 189
178 /* cpu state */ 190 /* cpu state */
179 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 191 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
192#ifndef NDEBUG
180 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 193 JMPENV *idle_te; /* same as idle_sp, but for top_env */
194#endif
181 JMPENV *top_env; 195 JMPENV *top_env;
182 coro_context cctx; 196 coro_context cctx;
183 197
184 U32 gen; 198 U32 gen;
185#if CORO_USE_VALGRIND 199#if CORO_USE_VALGRIND
186 int valgrind_id; 200 int valgrind_id;
187#endif 201#endif
188 unsigned char flags; 202 unsigned char flags;
189} coro_cctx; 203} coro_cctx;
190 204
191coro_cctx *cctx_current; /* the currently running cctx */ 205static coro_cctx *cctx_current; /* the currently running cctx */
192 206
193/*****************************************************************************/ 207/*****************************************************************************/
194 208
209static MGVTBL coro_state_vtbl;
210
195enum { 211enum
212{
196 CF_RUNNING = 0x0001, /* coroutine is running */ 213 CF_RUNNING = 0x0001, /* coroutine is running */
197 CF_READY = 0x0002, /* coroutine is ready */ 214 CF_READY = 0x0002, /* coroutine is ready */
198 CF_NEW = 0x0004, /* has never been switched to */ 215 CF_NEW = 0x0004, /* has never been switched to */
199 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 216 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
200 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 217 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
218 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
201}; 219};
202 220
203/* the structure where most of the perl state is stored, overlaid on the cxstack */ 221/* the structure where most of the perl state is stored, overlaid on the cxstack */
204typedef struct 222typedef struct
205{ 223{
206 SV *defsv;
207 AV *defav;
208 SV *errsv;
209 SV *irsgv;
210 HV *hinthv;
211#define VAR(name,type) type name; 224 #define VARx(name,expr,type) type name;
212# include "state.h" 225 #include "state.h"
213#undef VAR
214} perl_slots; 226} perl_slots;
215 227
228/* how many context stack entries do we need for perl_slots */
216#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 229#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
217 230
218/* this is a structure representing a perl-level coroutine */ 231/* this is a structure representing a perl-level coroutine */
219struct coro { 232struct coro
233{
220 /* the C coroutine allocated to this perl coroutine, if any */ 234 /* the C coroutine allocated to this perl coroutine, if any */
221 coro_cctx *cctx; 235 coro_cctx *cctx;
222 236
223 /* ready queue */ 237 /* ready queue */
224 struct coro *next_ready; 238 struct coro *next_ready;
… …
226 /* state data */ 240 /* state data */
227 struct CoroSLF slf_frame; /* saved slf frame */ 241 struct CoroSLF slf_frame; /* saved slf frame */
228 AV *mainstack; 242 AV *mainstack;
229 perl_slots *slot; /* basically the saved sp */ 243 perl_slots *slot; /* basically the saved sp */
230 244
231 CV *startcv; /* the CV to execute */ 245 CV *startcv; /* the CV to execute */
232 AV *args; /* data associated with this coroutine (initial args) */ 246 AV *args; /* data associated with this coroutine (initial args) */
233 int refcnt; /* coroutines are refcounted, yes */
234 int flags; /* CF_ flags */ 247 int flags; /* CF_ flags */
235 HV *hv; /* the perl hash associated with this coro, if any */ 248 HV *hv; /* the perl hash associated with this coro, if any */
236 void (*on_destroy)(pTHX_ struct coro *coro);
237 249
238 /* statistics */ 250 /* statistics */
239 int usecount; /* number of transfers to this coro */ 251 int usecount; /* number of transfers to this coro */
240 252
241 /* coro process data */ 253 /* coro process data */
242 int prio; 254 int prio;
243 SV *except; /* exception to be thrown */ 255 SV *except; /* exception to be thrown */
244 SV *rouse_cb; 256 SV *rouse_cb; /* last rouse callback */
257 AV *on_destroy; /* callbacks or coros to notify on destroy */
258 AV *status; /* the exit status list */
245 259
246 /* async_pool */ 260 /* async_pool */
247 SV *saved_deffh; 261 SV *saved_deffh;
248 SV *invoke_cb; 262 SV *invoke_cb;
249 AV *invoke_av; 263 AV *invoke_av;
250 264
251 /* on_enter/on_leave */ 265 /* on_enter/on_leave */
252 AV *on_enter; 266 AV *on_enter; AV *on_enter_xs;
253 AV *on_leave; 267 AV *on_leave; AV *on_leave_xs;
268
269 /* swap_sv */
270 AV *swap_sv;
254 271
255 /* times */ 272 /* times */
256 coro_ts t_cpu, t_real; 273 coro_ts t_cpu, t_real;
257 274
258 /* linked list */ 275 /* linked list */
… …
262typedef struct coro *Coro__State; 279typedef struct coro *Coro__State;
263typedef struct coro *Coro__State_or_hashref; 280typedef struct coro *Coro__State_or_hashref;
264 281
265/* the following variables are effectively part of the perl context */ 282/* the following variables are effectively part of the perl context */
266/* and get copied between struct coro and these variables */ 283/* and get copied between struct coro and these variables */
267/* the mainr easonw e don't support windows process emulation */ 284/* the main reason we don't support windows process emulation */
268static struct CoroSLF slf_frame; /* the current slf frame */ 285static struct CoroSLF slf_frame; /* the current slf frame */
269 286
270/** Coro ********************************************************************/ 287/** Coro ********************************************************************/
271 288
272#define CORO_PRIO_MAX 3 289#define CORO_PRIO_MAX 3
… …
278 295
279/* for Coro.pm */ 296/* for Coro.pm */
280static SV *coro_current; 297static SV *coro_current;
281static SV *coro_readyhook; 298static SV *coro_readyhook;
282static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 299static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
283static CV *cv_coro_run, *cv_coro_terminate; 300static CV *cv_coro_run;
284static struct coro *coro_first; 301static struct coro *coro_first;
285#define coro_nready coroapi.nready 302#define coro_nready coroapi.nready
303
304/** JIT *********************************************************************/
305
306#if CORO_JIT
307 /* APPLE doesn't have mmap though */
308 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
309 #ifndef CORO_JIT_TYPE
310 #if ECB_AMD64 && CORO_JIT_UNIXY
311 #define CORO_JIT_TYPE "amd64-unix"
312 #elif __i386 && CORO_JIT_UNIXY
313 #define CORO_JIT_TYPE "x86-unix"
314 #endif
315 #endif
316#endif
317
318#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
319 #undef CORO_JIT
320#endif
321
322#if CORO_JIT
323 typedef void (*load_save_perl_slots_type)(perl_slots *);
324 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
325#endif
286 326
287/** Coro::Select ************************************************************/ 327/** Coro::Select ************************************************************/
288 328
289static OP *(*coro_old_pp_sselect) (pTHX); 329static OP *(*coro_old_pp_sselect) (pTHX);
290static SV *coro_select_select; 330static SV *coro_select_select;
… …
302 PL_op->op_flags |= OPf_STACKED; 342 PL_op->op_flags |= OPf_STACKED;
303 PL_op->op_private = 0; 343 PL_op->op_private = 0;
304 return PL_ppaddr [OP_ENTERSUB](aTHX); 344 return PL_ppaddr [OP_ENTERSUB](aTHX);
305} 345}
306 346
347/** time stuff **************************************************************/
348
349#ifdef HAS_GETTIMEOFDAY
350
351ecb_inline void
352coro_u2time (pTHX_ UV ret[2])
353{
354 struct timeval tv;
355 gettimeofday (&tv, 0);
356
357 ret [0] = tv.tv_sec;
358 ret [1] = tv.tv_usec;
359}
360
361ecb_inline double
362coro_nvtime (void)
363{
364 struct timeval tv;
365 gettimeofday (&tv, 0);
366
367 return tv.tv_sec + tv.tv_usec * 1e-6;
368}
369
370ecb_inline void
371time_init (pTHX)
372{
373 nvtime = coro_nvtime;
374 u2time = coro_u2time;
375}
376
377#else
378
379ecb_inline void
380time_init (pTHX)
381{
382 SV **svp;
383
384 require_pv ("Time/HiRes.pm");
385
386 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
387
388 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
389 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
390
391 nvtime = INT2PTR (double (*)(), SvIV (*svp));
392
393 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
394 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
395}
396
397#endif
398
307/** lowlevel stuff **********************************************************/ 399/** lowlevel stuff **********************************************************/
308 400
309static SV * 401static SV * ecb_noinline
310coro_get_sv (pTHX_ const char *name, int create) 402coro_get_sv (pTHX_ const char *name, int create)
311{ 403{
312#if PERL_VERSION_ATLEAST (5,10,0) 404#if PERL_VERSION_ATLEAST (5,10,0)
313 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 405 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
314 get_sv (name, create); 406 get_sv (name, create);
315#endif 407#endif
316 return get_sv (name, create); 408 return get_sv (name, create);
317} 409}
318 410
319static AV * 411static AV * ecb_noinline
320coro_get_av (pTHX_ const char *name, int create) 412coro_get_av (pTHX_ const char *name, int create)
321{ 413{
322#if PERL_VERSION_ATLEAST (5,10,0) 414#if PERL_VERSION_ATLEAST (5,10,0)
323 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 415 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
324 get_av (name, create); 416 get_av (name, create);
325#endif 417#endif
326 return get_av (name, create); 418 return get_av (name, create);
327} 419}
328 420
329static HV * 421static HV * ecb_noinline
330coro_get_hv (pTHX_ const char *name, int create) 422coro_get_hv (pTHX_ const char *name, int create)
331{ 423{
332#if PERL_VERSION_ATLEAST (5,10,0) 424#if PERL_VERSION_ATLEAST (5,10,0)
333 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 425 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
334 get_hv (name, create); 426 get_hv (name, create);
335#endif 427#endif
336 return get_hv (name, create); 428 return get_hv (name, create);
337} 429}
338 430
339INLINE void 431ecb_inline void
340coro_times_update () 432coro_times_update (void)
341{ 433{
342#ifdef coro_clock_gettime 434#ifdef coro_clock_gettime
343 struct timespec ts; 435 struct timespec ts;
344 436
345 ts.tv_sec = ts.tv_nsec = 0; 437 ts.tv_sec = ts.tv_nsec = 0;
… …
357 time_real [0] = tv [0]; 449 time_real [0] = tv [0];
358 time_real [1] = tv [1] * 1000; 450 time_real [1] = tv [1] * 1000;
359#endif 451#endif
360} 452}
361 453
362INLINE void 454ecb_inline void
363coro_times_add (struct coro *c) 455coro_times_add (struct coro *c)
364{ 456{
365 c->t_real [1] += time_real [1]; 457 c->t_real [1] += time_real [1];
366 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 458 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
367 c->t_real [0] += time_real [0]; 459 c->t_real [0] += time_real [0];
… …
369 c->t_cpu [1] += time_cpu [1]; 461 c->t_cpu [1] += time_cpu [1];
370 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 462 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
371 c->t_cpu [0] += time_cpu [0]; 463 c->t_cpu [0] += time_cpu [0];
372} 464}
373 465
374INLINE void 466ecb_inline void
375coro_times_sub (struct coro *c) 467coro_times_sub (struct coro *c)
376{ 468{
377 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 469 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
378 c->t_real [1] -= time_real [1]; 470 c->t_real [1] -= time_real [1];
379 c->t_real [0] -= time_real [0]; 471 c->t_real [0] -= time_real [0];
… …
387/* magic glue */ 479/* magic glue */
388 480
389#define CORO_MAGIC_type_cv 26 481#define CORO_MAGIC_type_cv 26
390#define CORO_MAGIC_type_state PERL_MAGIC_ext 482#define CORO_MAGIC_type_state PERL_MAGIC_ext
391 483
392#define CORO_MAGIC_NN(sv, type) \ 484#define CORO_MAGIC_NN(sv, type) \
393 (expect_true (SvMAGIC (sv)->mg_type == type) \ 485 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
394 ? SvMAGIC (sv) \ 486 ? SvMAGIC (sv) \
395 : mg_find (sv, type)) 487 : mg_find (sv, type))
396 488
397#define CORO_MAGIC(sv, type) \ 489#define CORO_MAGIC(sv, type) \
398 (expect_true (SvMAGIC (sv)) \ 490 (ecb_expect_true (SvMAGIC (sv)) \
399 ? CORO_MAGIC_NN (sv, type) \ 491 ? CORO_MAGIC_NN (sv, type) \
400 : 0) 492 : 0)
401 493
402#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 494#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
403#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 495#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
404 496
405INLINE struct coro * 497ecb_inline MAGIC *
406SvSTATE_ (pTHX_ SV *coro) 498SvSTATEhv_p (pTHX_ SV *coro)
407{ 499{
408 HV *stash;
409 MAGIC *mg; 500 MAGIC *mg;
410 501
502 if (ecb_expect_true (
503 SvTYPE (coro) == SVt_PVHV
504 && (mg = CORO_MAGIC_state (coro))
505 && mg->mg_virtual == &coro_state_vtbl
506 ))
507 return mg;
508
509 return 0;
510}
511
512ecb_inline struct coro *
513SvSTATE_ (pTHX_ SV *coro_sv)
514{
515 MAGIC *mg;
516
411 if (SvROK (coro)) 517 if (SvROK (coro_sv))
412 coro = SvRV (coro); 518 coro_sv = SvRV (coro_sv);
413 519
414 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 520 mg = SvSTATEhv_p (aTHX_ coro_sv);
521 if (!mg)
415 croak ("Coro::State object required"); 522 croak ("Coro::State object required");
416 523
417 stash = SvSTASH (coro);
418 if (expect_false (stash != coro_stash && stash != coro_state_stash))
419 {
420 /* very slow, but rare, check */
421 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
422 croak ("Coro::State object required");
423 }
424
425 mg = CORO_MAGIC_state (coro);
426 return (struct coro *)mg->mg_ptr; 524 return (struct coro *)mg->mg_ptr;
427} 525}
428 526
429#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 527#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
430 528
… …
433#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 531#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
434 532
435/*****************************************************************************/ 533/*****************************************************************************/
436/* padlist management and caching */ 534/* padlist management and caching */
437 535
438static AV * 536ecb_inline PADLIST *
439coro_derive_padlist (pTHX_ CV *cv) 537coro_derive_padlist (pTHX_ CV *cv)
440{ 538{
441 AV *padlist = CvPADLIST (cv); 539 PADLIST *padlist = CvPADLIST (cv);
442 AV *newpadlist, *newpad; 540 PADLIST *newpadlist;
541 PADNAMELIST *padnames;
542 PAD *newpad;
543 PADOFFSET off = PadlistMAX (padlist) + 1;
443 544
444 newpadlist = newAV (); 545#if NEWPADAPI
546
547 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
548 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
549 while (!PadlistARRAY (padlist)[off - 1])
550 --off;
551
552 Perl_pad_push (aTHX_ padlist, off);
553
554 newpad = PadlistARRAY (padlist)[off];
555 PadlistARRAY (padlist)[off] = 0;
556
557#else
558
559#if PERL_VERSION_ATLEAST (5,10,0)
560 Perl_pad_push (aTHX_ padlist, off);
561#else
562 Perl_pad_push (aTHX_ padlist, off, 1);
563#endif
564
565 newpad = PadlistARRAY (padlist)[off];
566 PadlistMAX (padlist) = off - 1;
567
568#endif
569
570 newPADLIST (newpadlist);
571#if !PERL_VERSION_ATLEAST(5,15,3)
572 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
445 AvREAL_off (newpadlist); 573 AvREAL_off (newpadlist);
446#if PERL_VERSION_ATLEAST (5,10,0)
447 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
448#else
449 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
450#endif 574#endif
451 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
452 --AvFILLp (padlist);
453 575
454 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 576 /* Already extended to 2 elements by newPADLIST. */
455 av_store (newpadlist, 1, (SV *)newpad); 577 PadlistMAX (newpadlist) = 1;
578
579 padnames = PadlistNAMES (padlist);
580 ++PadnamelistREFCNT (padnames);
581 PadlistNAMES (newpadlist) = padnames;
582
583 PadlistARRAY (newpadlist)[1] = newpad;
456 584
457 return newpadlist; 585 return newpadlist;
458} 586}
459 587
460static void 588ecb_inline void
461free_padlist (pTHX_ AV *padlist) 589free_padlist (pTHX_ PADLIST *padlist)
462{ 590{
463 /* may be during global destruction */ 591 /* may be during global destruction */
464 if (!IN_DESTRUCT) 592 if (!IN_DESTRUCT)
465 { 593 {
466 I32 i = AvFILLp (padlist); 594 I32 i = PadlistMAX (padlist);
467 595
468 while (i > 0) /* special-case index 0 */ 596 while (i > 0) /* special-case index 0 */
469 { 597 {
470 /* we try to be extra-careful here */ 598 /* we try to be extra-careful here */
471 AV *av = (AV *)AvARRAY (padlist)[i--]; 599 PAD *pad = PadlistARRAY (padlist)[i--];
472 I32 j = AvFILLp (av);
473 600
601 if (pad)
602 {
603 I32 j = PadMAX (pad);
604
474 while (j >= 0) 605 while (j >= 0)
475 SvREFCNT_dec (AvARRAY (av)[j--]); 606 SvREFCNT_dec (PadARRAY (pad)[j--]);
476 607
477 AvFILLp (av) = -1; 608 PadMAX (pad) = -1;
478 SvREFCNT_dec (av); 609 SvREFCNT_dec (pad);
610 }
479 } 611 }
480 612
481 SvREFCNT_dec (AvARRAY (padlist)[0]); 613 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
482 614
615#if NEWPADAPI
616 Safefree (PadlistARRAY (padlist));
617 Safefree (padlist);
618#else
483 AvFILLp (padlist) = -1; 619 AvFILLp (padlist) = -1;
620 AvREAL_off (padlist);
484 SvREFCNT_dec ((SV*)padlist); 621 SvREFCNT_dec ((SV*)padlist);
622#endif
485 } 623 }
486} 624}
487 625
488static int 626static int
489coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 627coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
490{ 628{
491 AV *padlist; 629 PADLIST *padlist;
492 AV *av = (AV *)mg->mg_obj; 630 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
631 size_t len = *(size_t *)mg->mg_ptr;
493 632
494 /* perl manages to free our internal AV and _then_ call us */ 633 /* perl manages to free our internal AV and _then_ call us */
495 if (IN_DESTRUCT) 634 if (IN_DESTRUCT)
496 return 0; 635 return 0;
497 636
498 /* casting is fun. */ 637 while (len--)
499 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
500 free_padlist (aTHX_ padlist); 638 free_padlist (aTHX_ padlists[len]);
501
502 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
503 639
504 return 0; 640 return 0;
505} 641}
506 642
507static MGVTBL coro_cv_vtbl = { 643static MGVTBL coro_cv_vtbl = {
508 0, 0, 0, 0, 644 0, 0, 0, 0,
509 coro_cv_free 645 coro_cv_free
510}; 646};
511 647
512/* the next two functions merely cache the padlists */ 648/* the next two functions merely cache the padlists */
513static void 649ecb_inline void
514get_padlist (pTHX_ CV *cv) 650get_padlist (pTHX_ CV *cv)
515{ 651{
516 MAGIC *mg = CORO_MAGIC_cv (cv); 652 MAGIC *mg = CORO_MAGIC_cv (cv);
517 AV *av; 653 size_t *lenp;
518 654
519 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 655 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
520 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 656 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
521 else 657 else
522 { 658 {
523#if CORO_PREFER_PERL_FUNCTIONS 659#if CORO_PREFER_PERL_FUNCTIONS
524 /* this is probably cleaner? but also slower! */ 660 /* this is probably cleaner? but also slower! */
525 /* in practise, it seems to be less stable */ 661 /* in practise, it seems to be less stable */
… …
531 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 667 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
532#endif 668#endif
533 } 669 }
534} 670}
535 671
536static void 672ecb_inline void
537put_padlist (pTHX_ CV *cv) 673put_padlist (pTHX_ CV *cv)
538{ 674{
539 MAGIC *mg = CORO_MAGIC_cv (cv); 675 MAGIC *mg = CORO_MAGIC_cv (cv);
540 AV *av;
541 676
542 if (expect_false (!mg)) 677 if (ecb_expect_false (!mg))
678 {
543 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 679 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
680 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
681 mg->mg_len = 1; /* so mg_free frees mg_ptr */
682 }
683 else
684 Renew (mg->mg_ptr,
685 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
686 char);
544 687
545 av = (AV *)mg->mg_obj; 688 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
546
547 if (expect_false (AvFILLp (av) >= AvMAX (av)))
548 av_extend (av, AvFILLp (av) + 1);
549
550 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
551} 689}
552 690
553/** load & save, init *******************************************************/ 691/** load & save, init *******************************************************/
692
693ecb_inline void
694swap_sv (SV *a, SV *b)
695{
696 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
697 SV tmp;
698
699 /* swap sv_any */
700 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
701
702 /* swap sv_flags */
703 SvFLAGS (&tmp) = SvFLAGS (a);
704 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
705 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
706
707#if PERL_VERSION_ATLEAST (5,10,0)
708 /* perl 5.10 and later complicates this _quite_ a bit, but it also
709 * is much faster, so no quarrels here. alternatively, we could
710 * sv_upgrade to avoid this.
711 */
712 {
713 /* swap sv_u */
714 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
715
716 /* if SvANY points to the head, we need to adjust the pointers,
717 * as the pointer for a still points to b, and maybe vice versa.
718 */
719 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
720 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
721 svany_in_head_set |= 1 << SVt_NV;
722 #endif
723
724 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
725
726 if (svany_in_head (SvTYPE (a)))
727 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
728
729 if (svany_in_head (SvTYPE (b)))
730 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
731 }
732#endif
733}
734
735/* swap sv heads, at least logically */
736static void
737swap_svs_enter (pTHX_ Coro__State c)
738{
739 int i;
740
741 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
742 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
743}
744
745static void
746swap_svs_leave (pTHX_ Coro__State c)
747{
748 int i;
749
750 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
751 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
752}
753
754#define SWAP_SVS_ENTER(coro) \
755 if (ecb_expect_false ((coro)->swap_sv)) \
756 swap_svs_enter (aTHX_ (coro))
757
758#define SWAP_SVS_LEAVE(coro) \
759 if (ecb_expect_false ((coro)->swap_sv)) \
760 swap_svs_leave (aTHX_ (coro))
554 761
555static void 762static void
556on_enterleave_call (pTHX_ SV *cb); 763on_enterleave_call (pTHX_ SV *cb);
557 764
558static void 765static void
… …
561 perl_slots *slot = c->slot; 768 perl_slots *slot = c->slot;
562 c->slot = 0; 769 c->slot = 0;
563 770
564 PL_mainstack = c->mainstack; 771 PL_mainstack = c->mainstack;
565 772
566 GvSV (PL_defgv) = slot->defsv; 773#if CORO_JIT
567 GvAV (PL_defgv) = slot->defav; 774 load_perl_slots (slot);
568 GvSV (PL_errgv) = slot->errsv; 775#else
569 GvSV (irsgv) = slot->irsgv;
570 GvHV (PL_hintgv) = slot->hinthv;
571
572 #define VAR(name,type) PL_ ## name = slot->name; 776 #define VARx(name,expr,type) expr = slot->name;
573 # include "state.h" 777 #include "state.h"
574 #undef VAR 778#endif
575 779
576 { 780 {
577 dSP; 781 dSP;
578 782
579 CV *cv; 783 CV *cv;
580 784
581 /* now do the ugly restore mess */ 785 /* now do the ugly restore mess */
582 while (expect_true (cv = (CV *)POPs)) 786 while (ecb_expect_true (cv = (CV *)POPs))
583 { 787 {
584 put_padlist (aTHX_ cv); /* mark this padlist as available */ 788 put_padlist (aTHX_ cv); /* mark this padlist as available */
585 CvDEPTH (cv) = PTR2IV (POPs); 789 CvDEPTH (cv) = PTR2IV (POPs);
586 CvPADLIST (cv) = (AV *)POPs; 790 CvPADLIST (cv) = (PADLIST *)POPs;
587 } 791 }
588 792
589 PUTBACK; 793 PUTBACK;
590 } 794 }
591 795
592 slf_frame = c->slf_frame; 796 slf_frame = c->slf_frame;
593 CORO_THROW = c->except; 797 CORO_THROW = c->except;
594 798
595 if (expect_false (enable_times)) 799 if (ecb_expect_false (enable_times))
596 { 800 {
597 if (expect_false (!times_valid)) 801 if (ecb_expect_false (!times_valid))
598 coro_times_update (); 802 coro_times_update ();
599 803
600 coro_times_sub (c); 804 coro_times_sub (c);
601 } 805 }
602 806
603 if (expect_false (c->on_enter)) 807 if (ecb_expect_false (c->on_enter))
604 { 808 {
605 int i; 809 int i;
606 810
607 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 811 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
608 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 812 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
609 } 813 }
814
815 if (ecb_expect_false (c->on_enter_xs))
816 {
817 int i;
818
819 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
820 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
821 }
822
823 SWAP_SVS_ENTER (c);
610} 824}
611 825
612static void 826static void
613save_perl (pTHX_ Coro__State c) 827save_perl (pTHX_ Coro__State c)
614{ 828{
829 SWAP_SVS_LEAVE (c);
830
831 if (ecb_expect_false (c->on_leave_xs))
832 {
833 int i;
834
835 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
836 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
837 }
838
615 if (expect_false (c->on_leave)) 839 if (ecb_expect_false (c->on_leave))
616 { 840 {
617 int i; 841 int i;
618 842
619 for (i = AvFILLp (c->on_leave); i >= 0; --i) 843 for (i = AvFILLp (c->on_leave); i >= 0; --i)
620 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 844 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
621 } 845 }
622 846
623 times_valid = 0; 847 times_valid = 0;
624 848
625 if (expect_false (enable_times)) 849 if (ecb_expect_false (enable_times))
626 { 850 {
627 coro_times_update (); times_valid = 1; 851 coro_times_update (); times_valid = 1;
628 coro_times_add (c); 852 coro_times_add (c);
629 } 853 }
630 854
… …
644 868
645 XPUSHs (Nullsv); 869 XPUSHs (Nullsv);
646 /* this loop was inspired by pp_caller */ 870 /* this loop was inspired by pp_caller */
647 for (;;) 871 for (;;)
648 { 872 {
649 while (expect_true (cxix >= 0)) 873 while (ecb_expect_true (cxix >= 0))
650 { 874 {
651 PERL_CONTEXT *cx = &ccstk[cxix--]; 875 PERL_CONTEXT *cx = &ccstk[cxix--];
652 876
653 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 877 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
654 { 878 {
655 CV *cv = cx->blk_sub.cv; 879 CV *cv = cx->blk_sub.cv;
656 880
657 if (expect_true (CvDEPTH (cv))) 881 if (ecb_expect_true (CvDEPTH (cv)))
658 { 882 {
659 EXTEND (SP, 3); 883 EXTEND (SP, 3);
660 PUSHs ((SV *)CvPADLIST (cv)); 884 PUSHs ((SV *)CvPADLIST (cv));
661 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 885 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
662 PUSHs ((SV *)cv); 886 PUSHs ((SV *)cv);
… …
665 get_padlist (aTHX_ cv); 889 get_padlist (aTHX_ cv);
666 } 890 }
667 } 891 }
668 } 892 }
669 893
670 if (expect_true (top_si->si_type == PERLSI_MAIN)) 894 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
671 break; 895 break;
672 896
673 top_si = top_si->si_prev; 897 top_si = top_si->si_prev;
674 ccstk = top_si->si_cxstack; 898 ccstk = top_si->si_cxstack;
675 cxix = top_si->si_cxix; 899 cxix = top_si->si_cxix;
… …
677 901
678 PUTBACK; 902 PUTBACK;
679 } 903 }
680 904
681 /* allocate some space on the context stack for our purposes */ 905 /* allocate some space on the context stack for our purposes */
682 /* we manually unroll here, as usually 2 slots is enough */ 906 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
683 if (SLOT_COUNT >= 1) CXINC;
684 if (SLOT_COUNT >= 2) CXINC;
685 if (SLOT_COUNT >= 3) CXINC;
686 { 907 {
687 unsigned int i; 908 unsigned int i;
909
688 for (i = 3; i < SLOT_COUNT; ++i) 910 for (i = 0; i < SLOT_COUNT; ++i)
689 CXINC; 911 CXINC;
690 } 912
691 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 913 cxstack_ix -= SLOT_COUNT; /* undo allocation */
914 }
692 915
693 c->mainstack = PL_mainstack; 916 c->mainstack = PL_mainstack;
694 917
695 { 918 {
696 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 919 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
697 920
698 slot->defav = GvAV (PL_defgv); 921#if CORO_JIT
699 slot->defsv = DEFSV; 922 save_perl_slots (slot);
700 slot->errsv = ERRSV; 923#else
701 slot->irsgv = GvSV (irsgv);
702 slot->hinthv = GvHV (PL_hintgv);
703
704 #define VAR(name,type) slot->name = PL_ ## name; 924 #define VARx(name,expr,type) slot->name = expr;
705 # include "state.h" 925 #include "state.h"
706 #undef VAR 926#endif
707 } 927 }
708} 928}
709 929
710/* 930/*
711 * allocate various perl stacks. This is almost an exact copy 931 * allocate various perl stacks. This is almost an exact copy
… …
717# define coro_init_stacks(thx) init_stacks () 937# define coro_init_stacks(thx) init_stacks ()
718#else 938#else
719static void 939static void
720coro_init_stacks (pTHX) 940coro_init_stacks (pTHX)
721{ 941{
722 PL_curstackinfo = new_stackinfo(32, 8); 942 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
723 PL_curstackinfo->si_type = PERLSI_MAIN; 943 PL_curstackinfo->si_type = PERLSI_MAIN;
724 PL_curstack = PL_curstackinfo->si_stack; 944 PL_curstack = PL_curstackinfo->si_stack;
725 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 945 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
726 946
727 PL_stack_base = AvARRAY(PL_curstack); 947 PL_stack_base = AvARRAY(PL_curstack);
… …
742#endif 962#endif
743 963
744 New(54,PL_scopestack,8,I32); 964 New(54,PL_scopestack,8,I32);
745 PL_scopestack_ix = 0; 965 PL_scopestack_ix = 0;
746 PL_scopestack_max = 8; 966 PL_scopestack_max = 8;
967#if HAS_SCOPESTACK_NAME
968 New(54,PL_scopestack_name,8,const char*);
969#endif
747 970
748 New(54,PL_savestack,24,ANY); 971 New(54,PL_savestack,24,ANY);
749 PL_savestack_ix = 0; 972 PL_savestack_ix = 0;
750 PL_savestack_max = 24; 973 PL_savestack_max = 24;
974#if !PERL_VERSION_ATLEAST (5,24,0)
975 /* perl 5.24 moves SS_MAXPUSH optimisation from */
976 /* the header macros to PL_savestack_max */
977 PL_savestack_max -= SS_MAXPUSH;
978#endif
751 979
752#if !PERL_VERSION_ATLEAST (5,10,0) 980#if !PERL_VERSION_ATLEAST (5,10,0)
753 New(54,PL_retstack,4,OP*); 981 New(54,PL_retstack,4,OP*);
754 PL_retstack_ix = 0; 982 PL_retstack_ix = 0;
755 PL_retstack_max = 4; 983 PL_retstack_max = 4;
… …
779 } 1007 }
780 1008
781 Safefree (PL_tmps_stack); 1009 Safefree (PL_tmps_stack);
782 Safefree (PL_markstack); 1010 Safefree (PL_markstack);
783 Safefree (PL_scopestack); 1011 Safefree (PL_scopestack);
1012#if HAS_SCOPESTACK_NAME
1013 Safefree (PL_scopestack_name);
1014#endif
784 Safefree (PL_savestack); 1015 Safefree (PL_savestack);
785#if !PERL_VERSION_ATLEAST (5,10,0) 1016#if !PERL_VERSION_ATLEAST (5,10,0)
786 Safefree (PL_retstack); 1017 Safefree (PL_retstack);
787#endif 1018#endif
788} 1019}
… …
818 } 1049 }
819 1050
820 return rss; 1051 return rss;
821} 1052}
822 1053
823/** coroutine stack handling ************************************************/ 1054/** provide custom get/set/clear methods for %SIG elements ******************/
824
825static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
826static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
827static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
828 1055
829/* apparently < 5.8.8 */ 1056/* apparently < 5.8.8 */
830#ifndef MgPV_nolen_const 1057#ifndef MgPV_nolen_const
831#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1058#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
832 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1059 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
833 (const char*)(mg)->mg_ptr) 1060 (const char*)(mg)->mg_ptr)
834#endif 1061#endif
835 1062
1063/* this will be a patched copy of PL_vtbl_sigelem */
1064static MGVTBL coro_sigelem_vtbl;
1065
1066static int ecb_cold
1067coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1068{
1069 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1070 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1071 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1072 return 1;
1073}
1074
1075/* perl does not have a %SIG vtbl, we provide one so we can override */
1076/* the cwvtblagic for %SIG members */
1077static const MGVTBL coro_sig_vtbl = {
1078 0, 0, 0, 0, 0,
1079 coro_sig_copy
1080};
1081
836/* 1082/*
837 * This overrides the default magic get method of %SIG elements. 1083 * This overrides the default magic get method of %SIG elements.
838 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1084 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
839 * and instead of trying to save and restore the hash elements, we just provide 1085 * and instead of trying to save and restore the hash elements (extremely slow),
840 * readback here. 1086 * we just provide our own readback here.
841 */ 1087 */
842static int 1088static int ecb_cold
843coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1089coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
844{ 1090{
845 const char *s = MgPV_nolen_const (mg); 1091 const char *s = MgPV_nolen_const (mg);
846 1092
847 if (*s == '_') 1093 if (*s == '_')
848 { 1094 {
849 SV **svp = 0; 1095 SV **svp = 0;
850 1096
851 if (strEQ (s, "__DIE__" )) svp = &PL_diehook; 1097 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
852 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1098 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
853 1099
854 if (svp) 1100 if (svp)
855 { 1101 {
856 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1102 SV *ssv;
1103
1104 if (!*svp)
1105 ssv = &PL_sv_undef;
1106 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1107 ssv = sv_2mortal (newRV_inc (*svp));
1108 else
1109 ssv = *svp;
1110
1111 sv_setsv (sv, ssv);
857 return 0; 1112 return 0;
858 } 1113 }
859 } 1114 }
860 1115
861 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1116 return PL_vtbl_sigelem.svt_get ? PL_vtbl_sigelem.svt_get (aTHX_ sv, mg) : 0;
862} 1117}
863 1118
864static int 1119static int ecb_cold
865coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1120coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
866{ 1121{
867 const char *s = MgPV_nolen_const (mg); 1122 const char *s = MgPV_nolen_const (mg);
868 1123
869 if (*s == '_') 1124 if (*s == '_')
… …
880 SvREFCNT_dec (old); 1135 SvREFCNT_dec (old);
881 return 0; 1136 return 0;
882 } 1137 }
883 } 1138 }
884 1139
885 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0; 1140 return PL_vtbl_sigelem.svt_clear ? PL_vtbl_sigelem.svt_clear (aTHX_ sv, mg) : 0;
886} 1141}
887 1142
888static int 1143static int ecb_cold
889coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1144coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
890{ 1145{
891 const char *s = MgPV_nolen_const (mg); 1146 const char *s = MgPV_nolen_const (mg);
892 1147
893 if (*s == '_') 1148 if (*s == '_')
… …
904 SvREFCNT_dec (old); 1159 SvREFCNT_dec (old);
905 return 0; 1160 return 0;
906 } 1161 }
907 } 1162 }
908 1163
909 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0; 1164 return PL_vtbl_sigelem.svt_set ? PL_vtbl_sigelem.svt_set (aTHX_ sv, mg) : 0;
910} 1165}
911 1166
912static void 1167static void
913prepare_nop (pTHX_ struct coro_transfer_args *ta) 1168prepare_nop (pTHX_ struct coro_transfer_args *ta)
914{ 1169{
… …
926slf_check_repeat (pTHX_ struct CoroSLF *frame) 1181slf_check_repeat (pTHX_ struct CoroSLF *frame)
927{ 1182{
928 return 1; 1183 return 1;
929} 1184}
930 1185
931static UNOP coro_setup_op; 1186/** coroutine stack handling ************************************************/
932 1187
933static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1188static UNOP init_perl_op;
1189
1190ecb_noinline static void /* noinline to keep it out of the transfer fast path */
934coro_setup (pTHX_ struct coro *coro) 1191init_perl (pTHX_ struct coro *coro)
935{ 1192{
936 /* 1193 /*
937 * emulate part of the perl startup here. 1194 * emulate part of the perl startup here.
938 */ 1195 */
939 coro_init_stacks (aTHX); 1196 coro_init_stacks (aTHX);
… …
946 PL_comppad_name_fill = 0; 1203 PL_comppad_name_fill = 0;
947 PL_comppad_name_floor = 0; 1204 PL_comppad_name_floor = 0;
948 PL_curpm = 0; 1205 PL_curpm = 0;
949 PL_curpad = 0; 1206 PL_curpad = 0;
950 PL_localizing = 0; 1207 PL_localizing = 0;
951 PL_dirty = 0;
952 PL_restartop = 0; 1208 PL_restartop = 0;
953#if PERL_VERSION_ATLEAST (5,10,0) 1209#if PERL_VERSION_ATLEAST (5,10,0)
954 PL_parser = 0; 1210 PL_parser = 0;
955#endif 1211#endif
956 PL_hints = 0; 1212 PL_hints = 0;
957 1213
958 /* recreate the die/warn hooks */ 1214 /* recreate the die/warn hooks */
959 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1215 PL_diehook = SvREFCNT_inc (rv_diehook);
960 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1216 PL_warnhook = SvREFCNT_inc (rv_warnhook);
961 1217
962 GvSV (PL_defgv) = newSV (0); 1218 GvSV (PL_defgv) = newSV (0);
963 GvAV (PL_defgv) = coro->args; coro->args = 0; 1219 GvAV (PL_defgv) = coro->args; coro->args = 0;
964 GvSV (PL_errgv) = newSV (0); 1220 GvSV (PL_errgv) = newSV (0);
965 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1221 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
966 GvHV (PL_hintgv) = 0; 1222 GvHV (PL_hintgv) = newHV ();
1223#if PERL_VERSION_ATLEAST (5,10,0)
1224 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1225#endif
967 PL_rs = newSVsv (GvSV (irsgv)); 1226 PL_rs = newSVsv (GvSV (irsgv));
968 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1227 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
969 1228
970 { 1229 {
971 dSP; 1230 dSP;
… …
986 /* this newly created coroutine might be run on an existing cctx which most 1245 /* this newly created coroutine might be run on an existing cctx which most
987 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1246 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
988 */ 1247 */
989 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1248 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
990 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1249 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1250 slf_frame.destroy = 0;
991 1251
992 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1252 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
993 coro_setup_op.op_next = PL_op; 1253 init_perl_op.op_next = PL_op;
994 coro_setup_op.op_type = OP_ENTERSUB; 1254 init_perl_op.op_type = OP_ENTERSUB;
995 coro_setup_op.op_ppaddr = pp_slf; 1255 init_perl_op.op_ppaddr = pp_slf;
996 /* no flags etc. required, as an init function won't be called */ 1256 /* no flags etc. required, as an init function won't be called */
997 1257
998 PL_op = (OP *)&coro_setup_op; 1258 PL_op = (OP *)&init_perl_op;
999 1259
1000 /* copy throw, in case it was set before coro_setup */ 1260 /* copy throw, in case it was set before init_perl */
1001 CORO_THROW = coro->except; 1261 CORO_THROW = coro->except;
1002 1262
1263 SWAP_SVS_ENTER (coro);
1264
1003 if (expect_false (enable_times)) 1265 if (ecb_expect_false (enable_times))
1004 { 1266 {
1005 coro_times_update (); 1267 coro_times_update ();
1006 coro_times_sub (coro); 1268 coro_times_sub (coro);
1007 } 1269 }
1008} 1270}
… …
1027 dounwind (-1); 1289 dounwind (-1);
1028 } 1290 }
1029} 1291}
1030 1292
1031static void 1293static void
1032coro_destruct_perl (pTHX_ struct coro *coro) 1294destroy_perl (pTHX_ struct coro *coro)
1033{ 1295{
1034 SV *svf [9]; 1296 SV *svf [9];
1035 1297
1036 { 1298 {
1299 SV *old_current = SvRV (coro_current);
1037 struct coro *current = SvSTATE_current; 1300 struct coro *current = SvSTATE (old_current);
1038 1301
1039 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1302 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1040 1303
1041 save_perl (aTHX_ current); 1304 save_perl (aTHX_ current);
1305
1306 /* this will cause transfer_check to croak on block*/
1307 SvRV_set (coro_current, (SV *)coro->hv);
1308
1042 load_perl (aTHX_ coro); 1309 load_perl (aTHX_ coro);
1043 1310
1311 /* restore swapped sv's */
1312 SWAP_SVS_LEAVE (coro);
1313
1044 coro_unwind_stacks (aTHX); 1314 coro_unwind_stacks (aTHX);
1315
1045 coro_destruct_stacks (aTHX); 1316 coro_destruct_stacks (aTHX);
1046 1317
1047 // now save some sv's to be free'd later 1318 /* now save some sv's to be free'd later */
1048 svf [0] = GvSV (PL_defgv); 1319 svf [0] = GvSV (PL_defgv);
1049 svf [1] = (SV *)GvAV (PL_defgv); 1320 svf [1] = (SV *)GvAV (PL_defgv);
1050 svf [2] = GvSV (PL_errgv); 1321 svf [2] = GvSV (PL_errgv);
1051 svf [3] = (SV *)PL_defoutgv; 1322 svf [3] = (SV *)PL_defoutgv;
1052 svf [4] = PL_rs; 1323 svf [4] = PL_rs;
… …
1054 svf [6] = (SV *)GvHV (PL_hintgv); 1325 svf [6] = (SV *)GvHV (PL_hintgv);
1055 svf [7] = PL_diehook; 1326 svf [7] = PL_diehook;
1056 svf [8] = PL_warnhook; 1327 svf [8] = PL_warnhook;
1057 assert (9 == sizeof (svf) / sizeof (*svf)); 1328 assert (9 == sizeof (svf) / sizeof (*svf));
1058 1329
1330 SvRV_set (coro_current, old_current);
1331
1059 load_perl (aTHX_ current); 1332 load_perl (aTHX_ current);
1060 } 1333 }
1061 1334
1062 { 1335 {
1063 unsigned int i; 1336 unsigned int i;
… …
1067 1340
1068 SvREFCNT_dec (coro->saved_deffh); 1341 SvREFCNT_dec (coro->saved_deffh);
1069 SvREFCNT_dec (coro->rouse_cb); 1342 SvREFCNT_dec (coro->rouse_cb);
1070 SvREFCNT_dec (coro->invoke_cb); 1343 SvREFCNT_dec (coro->invoke_cb);
1071 SvREFCNT_dec (coro->invoke_av); 1344 SvREFCNT_dec (coro->invoke_av);
1345 SvREFCNT_dec (coro->on_enter_xs);
1346 SvREFCNT_dec (coro->on_leave_xs);
1072 } 1347 }
1073} 1348}
1074 1349
1075INLINE void 1350ecb_inline void
1076free_coro_mortal (pTHX) 1351free_coro_mortal (pTHX)
1077{ 1352{
1078 if (expect_true (coro_mortal)) 1353 if (ecb_expect_true (coro_mortal))
1079 { 1354 {
1080 SvREFCNT_dec (coro_mortal); 1355 SvREFCNT_dec ((SV *)coro_mortal);
1081 coro_mortal = 0; 1356 coro_mortal = 0;
1082 } 1357 }
1083} 1358}
1084 1359
1085static int 1360static int
… …
1139 1414
1140 if (PL_curcop != &PL_compiling) 1415 if (PL_curcop != &PL_compiling)
1141 { 1416 {
1142 SV **cb; 1417 SV **cb;
1143 1418
1144 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1419 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1145 { 1420 {
1146 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1421 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1147 1422
1148 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1423 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1149 { 1424 {
… …
1218 1493
1219 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1494 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1220} 1495}
1221 1496
1222/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1497/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1223static void NOINLINE 1498static void ecb_noinline
1224cctx_prepare (pTHX) 1499cctx_prepare (pTHX)
1225{ 1500{
1226 PL_top_env = &PL_start_env; 1501 PL_top_env = &PL_start_env;
1227 1502
1228 if (cctx_current->flags & CC_TRACE) 1503 if (cctx_current->flags & CC_TRACE)
… …
1239 slf_frame.prepare = slf_prepare_set_stacklevel; 1514 slf_frame.prepare = slf_prepare_set_stacklevel;
1240 slf_frame.check = slf_check_set_stacklevel; 1515 slf_frame.check = slf_check_set_stacklevel;
1241} 1516}
1242 1517
1243/* the tail of transfer: execute stuff we can only do after a transfer */ 1518/* the tail of transfer: execute stuff we can only do after a transfer */
1244INLINE void 1519ecb_inline void
1245transfer_tail (pTHX) 1520transfer_tail (pTHX)
1246{ 1521{
1247 free_coro_mortal (aTHX); 1522 free_coro_mortal (aTHX);
1523}
1524
1525/* try to exit the same way perl's main function would do */
1526/* we do not bother resetting the environment or other things *7
1527/* that are not, uhm, essential */
1528/* this obviously also doesn't work when perl is embedded */
1529static void ecb_noinline ecb_cold
1530perlish_exit (pTHX)
1531{
1532 int exitstatus = perl_destruct (PL_curinterp);
1533 perl_free (PL_curinterp);
1534 exit (exitstatus);
1248} 1535}
1249 1536
1250/* 1537/*
1251 * this is a _very_ stripped down perl interpreter ;) 1538 * this is a _very_ stripped down perl interpreter ;)
1252 */ 1539 */
… …
1279 * coro body here, as perl_run destroys these. Likewise, we cannot catch 1566 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1280 * runtime errors here, as this is just a random interpreter, not a thread. 1567 * runtime errors here, as this is just a random interpreter, not a thread.
1281 */ 1568 */
1282 1569
1283 /* 1570 /*
1571 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1572 * requires PL_scopestack_ix, so do it here if required.
1573 */
1574 if (!PL_scopestack_ix)
1575 ENTER;
1576
1577 /*
1284 * If perl-run returns we assume exit() was being called or the coro 1578 * If perl-run returns we assume exit() was being called or the coro
1285 * fell off the end, which seems to be the only valid (non-bug) 1579 * fell off the end, which seems to be the only valid (non-bug)
1286 * reason for perl_run to return. We try to exit by jumping to the 1580 * reason for perl_run to return. We try to mimic whatever perl is normally
1287 * bootstrap-time "top" top_env, as we cannot restore the "main" 1581 * doing in that case. YMMV.
1288 * coroutine as Coro has no such concept.
1289 * This actually isn't valid with the pthread backend, but OSes requiring
1290 * that backend are too broken to do it in a standards-compliant way.
1291 */ 1582 */
1292 PL_top_env = main_top_env; 1583 perlish_exit (aTHX);
1293 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1294 } 1584 }
1295} 1585}
1296 1586
1297static coro_cctx * 1587static coro_cctx *
1298cctx_new () 1588cctx_new (void)
1299{ 1589{
1300 coro_cctx *cctx; 1590 coro_cctx *cctx;
1301 1591
1302 ++cctx_count; 1592 ++cctx_count;
1303 New (0, cctx, 1, coro_cctx); 1593 New (0, cctx, 1, coro_cctx);
… …
1309 return cctx; 1599 return cctx;
1310} 1600}
1311 1601
1312/* create a new cctx only suitable as source */ 1602/* create a new cctx only suitable as source */
1313static coro_cctx * 1603static coro_cctx *
1314cctx_new_empty () 1604cctx_new_empty (void)
1315{ 1605{
1316 coro_cctx *cctx = cctx_new (); 1606 coro_cctx *cctx = cctx_new ();
1317 1607
1318 cctx->sptr = 0; 1608 cctx->stack.sptr = 0;
1319 coro_create (&cctx->cctx, 0, 0, 0, 0); 1609 coro_create (&cctx->cctx, 0, 0, 0, 0);
1320 1610
1321 return cctx; 1611 return cctx;
1322} 1612}
1323 1613
1324/* create a new cctx suitable as destination/running a perl interpreter */ 1614/* create a new cctx suitable as destination/running a perl interpreter */
1325static coro_cctx * 1615static coro_cctx *
1326cctx_new_run () 1616cctx_new_run (void)
1327{ 1617{
1328 coro_cctx *cctx = cctx_new (); 1618 coro_cctx *cctx = cctx_new ();
1329 void *stack_start;
1330 size_t stack_size;
1331 1619
1332#if HAVE_MMAP 1620 if (!coro_stack_alloc (&cctx->stack, cctx_stacksize))
1333 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1334 /* mmap supposedly does allocate-on-write for us */
1335 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1336
1337 if (cctx->sptr != (void *)-1)
1338 {
1339 #if CORO_STACKGUARD
1340 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1341 #endif
1342 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1343 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1344 cctx->flags |= CC_MAPPED;
1345 } 1621 {
1346 else
1347#endif
1348 {
1349 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1350 New (0, cctx->sptr, cctx_stacksize, long);
1351
1352 if (!cctx->sptr)
1353 {
1354 perror ("FATAL: unable to allocate stack for coroutine, exiting."); 1622 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1355 _exit (EXIT_FAILURE); 1623 _exit (EXIT_FAILURE);
1356 }
1357
1358 stack_start = cctx->sptr;
1359 stack_size = cctx->ssize;
1360 } 1624 }
1361 1625
1362 #if CORO_USE_VALGRIND
1363 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1364 #endif
1365
1366 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1626 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1367 1627
1368 return cctx; 1628 return cctx;
1369} 1629}
1370 1630
1371static void 1631static void
1372cctx_destroy (coro_cctx *cctx) 1632cctx_destroy (coro_cctx *cctx)
1373{ 1633{
1374 if (!cctx) 1634 if (!cctx)
1375 return; 1635 return;
1376 1636
1377 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1637 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1378 1638
1379 --cctx_count; 1639 --cctx_count;
1380 coro_destroy (&cctx->cctx); 1640 coro_destroy (&cctx->cctx);
1381 1641
1382 /* coro_transfer creates new, empty cctx's */ 1642 coro_stack_free (&cctx->stack);
1383 if (cctx->sptr)
1384 {
1385 #if CORO_USE_VALGRIND
1386 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1387 #endif
1388
1389#if HAVE_MMAP
1390 if (cctx->flags & CC_MAPPED)
1391 munmap (cctx->sptr, cctx->ssize);
1392 else
1393#endif
1394 Safefree (cctx->sptr);
1395 }
1396 1643
1397 Safefree (cctx); 1644 Safefree (cctx);
1398} 1645}
1399 1646
1400/* wether this cctx should be destructed */ 1647/* wether this cctx should be destructed */
1401#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1648#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1402 1649
1403static coro_cctx * 1650static coro_cctx *
1404cctx_get (pTHX) 1651cctx_get (pTHX)
1405{ 1652{
1406 while (expect_true (cctx_first)) 1653 while (ecb_expect_true (cctx_first))
1407 { 1654 {
1408 coro_cctx *cctx = cctx_first; 1655 coro_cctx *cctx = cctx_first;
1409 cctx_first = cctx->next; 1656 cctx_first = cctx->next;
1410 --cctx_idle; 1657 --cctx_idle;
1411 1658
1412 if (expect_true (!CCTX_EXPIRED (cctx))) 1659 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1413 return cctx; 1660 return cctx;
1414 1661
1415 cctx_destroy (cctx); 1662 cctx_destroy (cctx);
1416 } 1663 }
1417 1664
… …
1419} 1666}
1420 1667
1421static void 1668static void
1422cctx_put (coro_cctx *cctx) 1669cctx_put (coro_cctx *cctx)
1423{ 1670{
1424 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1671 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1425 1672
1426 /* free another cctx if overlimit */ 1673 /* free another cctx if overlimit */
1427 if (expect_false (cctx_idle >= cctx_max_idle)) 1674 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1428 { 1675 {
1429 coro_cctx *first = cctx_first; 1676 coro_cctx *first = cctx_first;
1430 cctx_first = first->next; 1677 cctx_first = first->next;
1431 --cctx_idle; 1678 --cctx_idle;
1432 1679
… …
1443static void 1690static void
1444transfer_check (pTHX_ struct coro *prev, struct coro *next) 1691transfer_check (pTHX_ struct coro *prev, struct coro *next)
1445{ 1692{
1446 /* TODO: throwing up here is considered harmful */ 1693 /* TODO: throwing up here is considered harmful */
1447 1694
1448 if (expect_true (prev != next)) 1695 if (ecb_expect_true (prev != next))
1449 { 1696 {
1450 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1697 if (ecb_expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1451 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1698 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1452 1699
1453 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1700 if (ecb_expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1454 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1701 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1455 1702
1456#if !PERL_VERSION_ATLEAST (5,10,0) 1703#if !PERL_VERSION_ATLEAST (5,10,0)
1457 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1704 if (ecb_expect_false (PL_lex_state != LEX_NOTPARSING))
1458 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1705 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1459#endif 1706#endif
1460 } 1707 }
1461} 1708}
1462 1709
1463/* always use the TRANSFER macro */ 1710/* always use the TRANSFER macro */
1464static void NOINLINE /* noinline so we have a fixed stackframe */ 1711static void ecb_noinline /* noinline so we have a fixed stackframe */
1465transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1712transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1466{ 1713{
1467 dSTACKLEVEL; 1714 dSTACKLEVEL;
1468 1715
1469 /* sometimes transfer is only called to set idle_sp */ 1716 /* sometimes transfer is only called to set idle_sp */
1470 if (expect_false (!prev)) 1717 if (ecb_expect_false (!prev))
1471 { 1718 {
1472 cctx_current->idle_sp = STACKLEVEL; 1719 cctx_current->idle_sp = STACKLEVEL;
1473 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1720 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1474 } 1721 }
1475 else if (expect_true (prev != next)) 1722 else if (ecb_expect_true (prev != next))
1476 { 1723 {
1477 coro_cctx *cctx_prev; 1724 coro_cctx *cctx_prev;
1478 1725
1479 if (expect_false (prev->flags & CF_NEW)) 1726 if (ecb_expect_false (prev->flags & CF_NEW))
1480 { 1727 {
1481 /* create a new empty/source context */ 1728 /* create a new empty/source context */
1482 prev->flags &= ~CF_NEW; 1729 prev->flags &= ~CF_NEW;
1483 prev->flags |= CF_RUNNING; 1730 prev->flags |= CF_RUNNING;
1484 } 1731 }
… …
1487 next->flags |= CF_RUNNING; 1734 next->flags |= CF_RUNNING;
1488 1735
1489 /* first get rid of the old state */ 1736 /* first get rid of the old state */
1490 save_perl (aTHX_ prev); 1737 save_perl (aTHX_ prev);
1491 1738
1492 if (expect_false (next->flags & CF_NEW)) 1739 if (ecb_expect_false (next->flags & CF_NEW))
1493 { 1740 {
1494 /* need to start coroutine */ 1741 /* need to start coroutine */
1495 next->flags &= ~CF_NEW; 1742 next->flags &= ~CF_NEW;
1496 /* setup coroutine call */ 1743 /* setup coroutine call */
1497 coro_setup (aTHX_ next); 1744 init_perl (aTHX_ next);
1498 } 1745 }
1499 else 1746 else
1500 load_perl (aTHX_ next); 1747 load_perl (aTHX_ next);
1501 1748
1502 /* possibly untie and reuse the cctx */ 1749 /* possibly untie and reuse the cctx */
1503 if (expect_true ( 1750 if (ecb_expect_true (
1504 cctx_current->idle_sp == STACKLEVEL 1751 cctx_current->idle_sp == STACKLEVEL
1505 && !(cctx_current->flags & CC_TRACE) 1752 && !(cctx_current->flags & CC_TRACE)
1506 && !force_cctx 1753 && !force_cctx
1507 )) 1754 ))
1508 { 1755 {
1509 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1756 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1510 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1757 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1511 1758
1512 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1759 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1513 /* without this the next cctx_get might destroy the running cctx while still in use */ 1760 /* without this the next cctx_get might destroy the running cctx while still in use */
1514 if (expect_false (CCTX_EXPIRED (cctx_current))) 1761 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1515 if (expect_true (!next->cctx)) 1762 if (ecb_expect_true (!next->cctx))
1516 next->cctx = cctx_get (aTHX); 1763 next->cctx = cctx_get (aTHX);
1517 1764
1518 cctx_put (cctx_current); 1765 cctx_put (cctx_current);
1519 } 1766 }
1520 else 1767 else
1521 prev->cctx = cctx_current; 1768 prev->cctx = cctx_current;
1522 1769
1523 ++next->usecount; 1770 ++next->usecount;
1524 1771
1525 cctx_prev = cctx_current; 1772 cctx_prev = cctx_current;
1526 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1773 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1527 1774
1528 next->cctx = 0; 1775 next->cctx = 0;
1529 1776
1530 if (expect_false (cctx_prev != cctx_current)) 1777 if (ecb_expect_false (cctx_prev != cctx_current))
1531 { 1778 {
1532 cctx_prev->top_env = PL_top_env; 1779 cctx_prev->top_env = PL_top_env;
1533 PL_top_env = cctx_current->top_env; 1780 PL_top_env = cctx_current->top_env;
1534 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1781 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1535 } 1782 }
… …
1541#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1788#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1542#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1789#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1543 1790
1544/** high level stuff ********************************************************/ 1791/** high level stuff ********************************************************/
1545 1792
1793/* this function is actually Coro, not Coro::State, but we call it from here */
1794/* because it is convenient - but it hasn't been declared yet for that reason */
1546static int 1795static void
1796coro_call_on_destroy (pTHX_ struct coro *coro);
1797
1798static void
1547coro_state_destroy (pTHX_ struct coro *coro) 1799coro_state_destroy (pTHX_ struct coro *coro)
1548{ 1800{
1549 if (coro->flags & CF_DESTROYED) 1801 if (coro->flags & CF_ZOMBIE)
1550 return 0; 1802 return;
1551 1803
1552 if (coro->on_destroy && !PL_dirty)
1553 coro->on_destroy (aTHX_ coro); 1804 slf_destroy (aTHX_ coro);
1554 1805
1555 coro->flags |= CF_DESTROYED; 1806 coro->flags |= CF_ZOMBIE;
1556 1807
1557 if (coro->flags & CF_READY) 1808 if (coro->flags & CF_READY)
1558 { 1809 {
1559 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1810 /* reduce nready, as destroying a ready coro effectively unreadies it */
1560 /* alternative: look through all ready queues and remove the coro */ 1811 /* alternative: look through all ready queues and remove the coro */
1561 --coro_nready; 1812 --coro_nready;
1562 } 1813 }
1563 else 1814 else
1564 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1815 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1816
1817 if (coro->next) coro->next->prev = coro->prev;
1818 if (coro->prev) coro->prev->next = coro->next;
1819 if (coro == coro_first) coro_first = coro->next;
1565 1820
1566 if (coro->mainstack 1821 if (coro->mainstack
1567 && coro->mainstack != main_mainstack 1822 && coro->mainstack != main_mainstack
1568 && coro->slot 1823 && coro->slot
1569 && !PL_dirty) 1824 && !PL_dirty)
1570 coro_destruct_perl (aTHX_ coro); 1825 destroy_perl (aTHX_ coro);
1571 1826
1572 cctx_destroy (coro->cctx); 1827 cctx_destroy (coro->cctx);
1573 SvREFCNT_dec (coro->startcv); 1828 SvREFCNT_dec (coro->startcv);
1574 SvREFCNT_dec (coro->args); 1829 SvREFCNT_dec (coro->args);
1830 SvREFCNT_dec (coro->swap_sv);
1575 SvREFCNT_dec (CORO_THROW); 1831 SvREFCNT_dec (CORO_THROW);
1576 1832
1577 if (coro->next) coro->next->prev = coro->prev; 1833 coro_call_on_destroy (aTHX_ coro);
1578 if (coro->prev) coro->prev->next = coro->next;
1579 if (coro == coro_first) coro_first = coro->next;
1580 1834
1581 return 1; 1835 /* more destruction mayhem in coro_state_free */
1582} 1836}
1583 1837
1584static int 1838static int
1585coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1839coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1586{ 1840{
1587 struct coro *coro = (struct coro *)mg->mg_ptr; 1841 struct coro *coro = (struct coro *)mg->mg_ptr;
1588 mg->mg_ptr = 0; 1842 mg->mg_ptr = 0;
1589 1843
1590 coro->hv = 0;
1591
1592 if (--coro->refcnt < 0)
1593 {
1594 coro_state_destroy (aTHX_ coro); 1844 coro_state_destroy (aTHX_ coro);
1845 SvREFCNT_dec (coro->on_destroy);
1846 SvREFCNT_dec (coro->status);
1847
1595 Safefree (coro); 1848 Safefree (coro);
1596 }
1597 1849
1598 return 0; 1850 return 0;
1599} 1851}
1600 1852
1601static int 1853static int ecb_cold
1602coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1854coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1603{ 1855{
1604 struct coro *coro = (struct coro *)mg->mg_ptr; 1856 /* called when perl clones the current process the slow way (windows process emulation) */
1605 1857 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1606 ++coro->refcnt; 1858 mg->mg_ptr = 0;
1859 mg->mg_virtual = 0;
1607 1860
1608 return 0; 1861 return 0;
1609} 1862}
1610 1863
1611static MGVTBL coro_state_vtbl = { 1864static MGVTBL coro_state_vtbl = {
… …
1636 TRANSFER (ta, 1); 1889 TRANSFER (ta, 1);
1637} 1890}
1638 1891
1639/** Coro ********************************************************************/ 1892/** Coro ********************************************************************/
1640 1893
1641INLINE void 1894ecb_inline void
1642coro_enq (pTHX_ struct coro *coro) 1895coro_enq (pTHX_ struct coro *coro)
1643{ 1896{
1644 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1897 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1645 1898
1646 SvREFCNT_inc_NN (coro->hv); 1899 SvREFCNT_inc_NN (coro->hv);
… …
1648 coro->next_ready = 0; 1901 coro->next_ready = 0;
1649 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1902 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1650 ready [1] = coro; 1903 ready [1] = coro;
1651} 1904}
1652 1905
1653INLINE struct coro * 1906ecb_inline struct coro *
1654coro_deq (pTHX) 1907coro_deq (pTHX)
1655{ 1908{
1656 int prio; 1909 int prio;
1657 1910
1658 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1911 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
… …
1711{ 1964{
1712 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1965 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1713} 1966}
1714 1967
1715/* expects to own a reference to next->hv */ 1968/* expects to own a reference to next->hv */
1716INLINE void 1969ecb_inline void
1717prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1970prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1718{ 1971{
1719 SV *prev_sv = SvRV (coro_current); 1972 SV *prev_sv = SvRV (coro_current);
1720 1973
1721 ta->prev = SvSTATE_hv (prev_sv); 1974 ta->prev = SvSTATE_hv (prev_sv);
… …
1734{ 1987{
1735 for (;;) 1988 for (;;)
1736 { 1989 {
1737 struct coro *next = coro_deq (aTHX); 1990 struct coro *next = coro_deq (aTHX);
1738 1991
1739 if (expect_true (next)) 1992 if (ecb_expect_true (next))
1740 { 1993 {
1741 /* cannot transfer to destroyed coros, skip and look for next */ 1994 /* cannot transfer to destroyed coros, skip and look for next */
1742 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1995 if (ecb_expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1743 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1996 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1744 else 1997 else
1745 { 1998 {
1746 next->flags &= ~CF_READY; 1999 next->flags &= ~CF_READY;
1747 --coro_nready; 2000 --coro_nready;
… …
1754 { 2007 {
1755 /* nothing to schedule: call the idle handler */ 2008 /* nothing to schedule: call the idle handler */
1756 if (SvROK (sv_idle) 2009 if (SvROK (sv_idle)
1757 && SvOBJECT (SvRV (sv_idle))) 2010 && SvOBJECT (SvRV (sv_idle)))
1758 { 2011 {
2012 if (SvRV (sv_idle) == SvRV (coro_current))
2013 {
2014 require_pv ("Carp");
2015
2016 {
2017 dSP;
2018
2019 ENTER;
2020 SAVETMPS;
2021
2022 PUSHMARK (SP);
2023 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2024 PUTBACK;
2025 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2026
2027 FREETMPS;
2028 LEAVE;
2029 }
2030 }
2031
1759 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2032 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1760 api_ready (aTHX_ SvRV (sv_idle)); 2033 api_ready (aTHX_ SvRV (sv_idle));
1761 --coro_nready; 2034 --coro_nready;
1762 } 2035 }
1763 else 2036 else
1764 { 2037 {
2038 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1765 dSP; 2039 dSP;
1766 2040
1767 ENTER; 2041 ENTER;
1768 SAVETMPS; 2042 SAVETMPS;
1769 2043
… …
1776 } 2050 }
1777 } 2051 }
1778 } 2052 }
1779} 2053}
1780 2054
1781INLINE void 2055ecb_inline void
1782prepare_cede (pTHX_ struct coro_transfer_args *ta) 2056prepare_cede (pTHX_ struct coro_transfer_args *ta)
1783{ 2057{
1784 api_ready (aTHX_ coro_current); 2058 api_ready (aTHX_ coro_current);
1785 prepare_schedule (aTHX_ ta); 2059 prepare_schedule (aTHX_ ta);
1786} 2060}
1787 2061
1788INLINE void 2062ecb_inline void
1789prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2063prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1790{ 2064{
1791 SV *prev = SvRV (coro_current); 2065 SV *prev = SvRV (coro_current);
1792 2066
1793 if (coro_nready) 2067 if (coro_nready)
… …
1823{ 2097{
1824 struct coro_transfer_args ta; 2098 struct coro_transfer_args ta;
1825 2099
1826 prepare_cede (aTHX_ &ta); 2100 prepare_cede (aTHX_ &ta);
1827 2101
1828 if (expect_true (ta.prev != ta.next)) 2102 if (ecb_expect_true (ta.prev != ta.next))
1829 { 2103 {
1830 TRANSFER (ta, 1); 2104 TRANSFER (ta, 1);
1831 return 1; 2105 return 1;
1832 } 2106 }
1833 else 2107 else
… …
1876 coro->slot->runops = RUNOPS_DEFAULT; 2150 coro->slot->runops = RUNOPS_DEFAULT;
1877 } 2151 }
1878} 2152}
1879 2153
1880static void 2154static void
2155coro_push_av (pTHX_ AV *av, I32 gimme_v)
2156{
2157 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2158 {
2159 dSP;
2160
2161 if (gimme_v == G_SCALAR)
2162 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2163 else
2164 {
2165 int i;
2166 EXTEND (SP, AvFILLp (av) + 1);
2167
2168 for (i = 0; i <= AvFILLp (av); ++i)
2169 PUSHs (AvARRAY (av)[i]);
2170 }
2171
2172 PUTBACK;
2173 }
2174}
2175
2176static void
2177coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2178{
2179 if (!coro->on_destroy)
2180 coro->on_destroy = newAV ();
2181
2182 av_push (coro->on_destroy, cb);
2183}
2184
2185static void
2186slf_destroy_join (pTHX_ struct CoroSLF *frame)
2187{
2188 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2189}
2190
2191static int
2192slf_check_join (pTHX_ struct CoroSLF *frame)
2193{
2194 struct coro *coro = (struct coro *)frame->data;
2195
2196 if (!coro->status)
2197 return 1;
2198
2199 frame->destroy = 0;
2200
2201 coro_push_av (aTHX_ coro->status, GIMME_V);
2202
2203 SvREFCNT_dec ((SV *)coro->hv);
2204
2205 return 0;
2206}
2207
2208static void
2209slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2210{
2211 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2212
2213 if (items > 1)
2214 croak ("join called with too many arguments");
2215
2216 if (coro->status)
2217 frame->prepare = prepare_nop;
2218 else
2219 {
2220 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2221 frame->prepare = prepare_schedule;
2222 }
2223
2224 frame->check = slf_check_join;
2225 frame->destroy = slf_destroy_join;
2226 frame->data = (void *)coro;
2227 SvREFCNT_inc (coro->hv);
2228}
2229
2230static void
1881coro_call_on_destroy (pTHX_ struct coro *coro) 2231coro_call_on_destroy (pTHX_ struct coro *coro)
1882{ 2232{
1883 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2233 AV *od = coro->on_destroy;
1884 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1885 2234
1886 if (on_destroyp) 2235 if (!od)
1887 { 2236 return;
1888 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1889 2237
2238 coro->on_destroy = 0;
2239 sv_2mortal ((SV *)od);
2240
1890 while (AvFILLp (on_destroy) >= 0) 2241 while (AvFILLp (od) >= 0)
2242 {
2243 SV *cb = sv_2mortal (av_pop (od));
2244
2245 /* coro hv's (and only hv's at the moment) are supported as well */
2246 if (SvSTATEhv_p (aTHX_ cb))
2247 api_ready (aTHX_ cb);
2248 else
1891 { 2249 {
1892 dSP; /* don't disturb outer sp */ 2250 dSP; /* don't disturb outer sp */
1893 SV *cb = av_pop (on_destroy);
1894
1895 PUSHMARK (SP); 2251 PUSHMARK (SP);
1896 2252
1897 if (statusp) 2253 if (coro->status)
1898 { 2254 {
1899 int i; 2255 PUTBACK;
1900 AV *status = (AV *)SvRV (*statusp); 2256 coro_push_av (aTHX_ coro->status, G_ARRAY);
1901 EXTEND (SP, AvFILLp (status) + 1); 2257 SPAGAIN;
1902
1903 for (i = 0; i <= AvFILLp (status); ++i)
1904 PUSHs (AvARRAY (status)[i]);
1905 } 2258 }
1906 2259
1907 PUTBACK; 2260 PUTBACK;
1908 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2261 call_sv (cb, G_VOID | G_DISCARD);
1909 } 2262 }
1910 } 2263 }
1911} 2264}
1912 2265
1913static void 2266static void
1914slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2267coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1915{ 2268{
1916 int i; 2269 AV *av;
1917 HV *hv = (HV *)SvRV (coro_current); 2270
1918 AV *av = newAV (); 2271 if (coro->status)
2272 {
2273 av = coro->status;
2274 av_clear (av);
2275 }
2276 else
2277 av = coro->status = newAV ();
1919 2278
1920 /* items are actually not so common, so optimise for this case */ 2279 /* items are actually not so common, so optimise for this case */
1921 if (items) 2280 if (items)
1922 { 2281 {
2282 int i;
2283
1923 av_extend (av, items - 1); 2284 av_extend (av, items - 1);
1924 2285
1925 for (i = 0; i < items; ++i) 2286 for (i = 0; i < items; ++i)
1926 av_push (av, SvREFCNT_inc_NN (arg [i])); 2287 av_push (av, SvREFCNT_inc_NN (arg [i]));
1927 } 2288 }
2289}
1928 2290
1929 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2291static void
1930 2292slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2293{
1931 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2294 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1932 api_ready (aTHX_ sv_manager); 2295 api_ready (aTHX_ sv_manager);
1933 2296
1934 frame->prepare = prepare_schedule; 2297 frame->prepare = prepare_schedule;
1935 frame->check = slf_check_repeat; 2298 frame->check = slf_check_repeat;
1936 2299
1937 /* as a minor optimisation, we could unwind all stacks here */ 2300 /* as a minor optimisation, we could unwind all stacks here */
1938 /* but that puts extra pressure on pp_slf, and is not worth much */ 2301 /* but that puts extra pressure on pp_slf, and is not worth much */
1939 /*coro_unwind_stacks (aTHX);*/ 2302 /*coro_unwind_stacks (aTHX);*/
2303}
2304
2305static void
2306slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2307{
2308 HV *coro_hv = (HV *)SvRV (coro_current);
2309
2310 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2311 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2312}
2313
2314static void
2315slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2316{
2317 HV *coro_hv;
2318 struct coro *coro;
2319
2320 if (items <= 0)
2321 croak ("Coro::cancel called without coro object,");
2322
2323 coro = SvSTATE (arg [0]);
2324 coro_hv = coro->hv;
2325
2326 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2327
2328 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2329 {
2330 /* coro currently busy cancelling something, so just notify it */
2331 coro->slf_frame.data = (void *)coro;
2332
2333 frame->prepare = prepare_nop;
2334 frame->check = slf_check_nop;
2335 }
2336 else if (coro_hv == (HV *)SvRV (coro_current))
2337 {
2338 /* cancelling the current coro is allowed, and equals terminate */
2339 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2340 }
2341 else
2342 {
2343 struct coro *self = SvSTATE_current;
2344
2345 if (!self)
2346 croak ("Coro::cancel called outside of thread content,");
2347
2348 /* otherwise we cancel directly, purely for speed reasons
2349 * unfortunately, this requires some magic trickery, as
2350 * somebody else could cancel us, so we have to fight the cancellation.
2351 * this is ugly, and hopefully fully worth the extra speed.
2352 * besides, I can't get the slow-but-safe version working...
2353 */
2354 slf_frame.data = 0;
2355 self->flags |= CF_NOCANCEL;
2356 coro_state_destroy (aTHX_ coro);
2357 self->flags &= ~CF_NOCANCEL;
2358
2359 if (slf_frame.data)
2360 {
2361 /* while we were busy we have been cancelled, so terminate */
2362 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2363 }
2364 else
2365 {
2366 frame->prepare = prepare_nop;
2367 frame->check = slf_check_nop;
2368 }
2369 }
2370}
2371
2372static int
2373slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2374{
2375 frame->prepare = 0;
2376 coro_unwind_stacks (aTHX);
2377
2378 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2379
2380 return 1;
2381}
2382
2383static int
2384safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2385{
2386 if (coro->cctx)
2387 croak ("coro inside C callback, unable to cancel at this time, caught");
2388
2389 if (coro->flags & CF_NEW)
2390 {
2391 coro_set_status (aTHX_ coro, arg, items);
2392 coro_state_destroy (aTHX_ coro);
2393 }
2394 else
2395 {
2396 if (!coro->slf_frame.prepare)
2397 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2398
2399 slf_destroy (aTHX_ coro);
2400
2401 coro_set_status (aTHX_ coro, arg, items);
2402 coro->slf_frame.prepare = prepare_nop;
2403 coro->slf_frame.check = slf_check_safe_cancel;
2404
2405 api_ready (aTHX_ (SV *)coro->hv);
2406 }
2407
2408 return 1;
1940} 2409}
1941 2410
1942/*****************************************************************************/ 2411/*****************************************************************************/
1943/* async pool handler */ 2412/* async pool handler */
1944 2413
… …
1975slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2444slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1976{ 2445{
1977 HV *hv = (HV *)SvRV (coro_current); 2446 HV *hv = (HV *)SvRV (coro_current);
1978 struct coro *coro = SvSTATE_hv ((SV *)hv); 2447 struct coro *coro = SvSTATE_hv ((SV *)hv);
1979 2448
1980 if (expect_true (coro->saved_deffh)) 2449 if (ecb_expect_true (coro->saved_deffh))
1981 { 2450 {
1982 /* subsequent iteration */ 2451 /* subsequent iteration */
1983 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2452 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1984 coro->saved_deffh = 0; 2453 coro->saved_deffh = 0;
1985 2454
1986 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2455 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1987 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2456 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1988 { 2457 {
1989 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2458 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1990 coro->invoke_av = newAV (); 2459 return;
1991
1992 frame->prepare = prepare_nop;
1993 } 2460 }
1994 else 2461 else
1995 { 2462 {
1996 av_clear (GvAV (PL_defgv)); 2463 av_clear (GvAV (PL_defgv));
1997 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2464 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1998 2465
2466 if (ecb_expect_false (coro->swap_sv))
2467 {
2468 swap_svs_leave (coro);
2469 SvREFCNT_dec_NN (coro->swap_sv);
2470 coro->swap_sv = 0;
2471 }
2472
1999 coro->prio = 0; 2473 coro->prio = 0;
2000 2474
2001 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2475 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2002 api_trace (aTHX_ coro_current, 0); 2476 api_trace (aTHX_ coro_current, 0);
2003 2477
2004 frame->prepare = prepare_schedule; 2478 frame->prepare = prepare_schedule;
2005 av_push (av_async_pool, SvREFCNT_inc (hv)); 2479 av_push (av_async_pool, SvREFCNT_inc (hv));
2006 } 2480 }
… …
2047 2521
2048static int 2522static int
2049slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2523slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2050{ 2524{
2051 SV *data = (SV *)frame->data; 2525 SV *data = (SV *)frame->data;
2052 2526
2053 if (CORO_THROW) 2527 if (CORO_THROW)
2054 return 0; 2528 return 0;
2055 2529
2056 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2530 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2057 return 1; 2531 return 1;
… …
2093 cb = sv_2mortal (coro->rouse_cb); 2567 cb = sv_2mortal (coro->rouse_cb);
2094 coro->rouse_cb = 0; 2568 coro->rouse_cb = 0;
2095 } 2569 }
2096 2570
2097 if (!SvROK (cb) 2571 if (!SvROK (cb)
2098 || SvTYPE (SvRV (cb)) != SVt_PVCV 2572 || SvTYPE (SvRV (cb)) != SVt_PVCV
2099 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2573 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2100 croak ("Coro::rouse_wait called with illegal callback argument,"); 2574 croak ("Coro::rouse_wait called with illegal callback argument,");
2101 2575
2102 { 2576 {
2103 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2577 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
… …
2220static void 2694static void
2221slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2695slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2222{ 2696{
2223 frame->prepare = prepare_cede_notself; 2697 frame->prepare = prepare_cede_notself;
2224 frame->check = slf_check_nop; 2698 frame->check = slf_check_nop;
2699}
2700
2701/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2702static void
2703slf_destroy (pTHX_ struct coro *coro)
2704{
2705 struct CoroSLF frame = coro->slf_frame;
2706
2707 /*
2708 * The on_destroy below most likely is from an SLF call.
2709 * Since by definition the SLF call will not finish when we destroy
2710 * the coro, we will have to force-finish it here, otherwise
2711 * cleanup functions cannot call SLF functions.
2712 */
2713 coro->slf_frame.prepare = 0;
2714
2715 /* this callback is reserved for slf functions needing to do cleanup */
2716 if (frame.destroy && frame.prepare && !PL_dirty)
2717 frame.destroy (aTHX_ &frame);
2225} 2718}
2226 2719
2227/* 2720/*
2228 * these not obviously related functions are all rolled into one 2721 * these not obviously related functions are all rolled into one
2229 * function to increase chances that they all will call transfer with the same 2722 * function to increase chances that they all will call transfer with the same
… …
2236 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2729 I32 checkmark; /* mark SP to see how many elements check has pushed */
2237 2730
2238 /* set up the slf frame, unless it has already been set-up */ 2731 /* set up the slf frame, unless it has already been set-up */
2239 /* the latter happens when a new coro has been started */ 2732 /* the latter happens when a new coro has been started */
2240 /* or when a new cctx was attached to an existing coroutine */ 2733 /* or when a new cctx was attached to an existing coroutine */
2241 if (expect_true (!slf_frame.prepare)) 2734 if (ecb_expect_true (!slf_frame.prepare))
2242 { 2735 {
2243 /* first iteration */ 2736 /* first iteration */
2244 dSP; 2737 dSP;
2245 SV **arg = PL_stack_base + TOPMARK + 1; 2738 SV **arg = PL_stack_base + TOPMARK + 1;
2246 int items = SP - arg; /* args without function object */ 2739 int items = SP - arg; /* args without function object */
… …
2287 while (slf_frame.check (aTHX_ &slf_frame)); 2780 while (slf_frame.check (aTHX_ &slf_frame));
2288 2781
2289 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2782 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2290 2783
2291 /* exception handling */ 2784 /* exception handling */
2292 if (expect_false (CORO_THROW)) 2785 if (ecb_expect_false (CORO_THROW))
2293 { 2786 {
2294 SV *exception = sv_2mortal (CORO_THROW); 2787 SV *exception = sv_2mortal (CORO_THROW);
2295 2788
2296 CORO_THROW = 0; 2789 CORO_THROW = 0;
2297 sv_setsv (ERRSV, exception); 2790 sv_setsv (ERRSV, exception);
2298 croak (0); 2791 croak (0);
2299 } 2792 }
2300 2793
2301 /* return value handling - mostly like entersub */ 2794 /* return value handling - mostly like entersub */
2302 /* make sure we put something on the stack in scalar context */ 2795 /* make sure we put something on the stack in scalar context */
2303 if (GIMME_V == G_SCALAR) 2796 if (GIMME_V == G_SCALAR
2797 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2304 { 2798 {
2305 dSP; 2799 dSP;
2306 SV **bot = PL_stack_base + checkmark; 2800 SV **bot = PL_stack_base + checkmark;
2307 2801
2308 if (sp == bot) /* too few, push undef */ 2802 if (sp == bot) /* too few, push undef */
2309 bot [1] = &PL_sv_undef; 2803 bot [1] = &PL_sv_undef;
2310 else if (sp != bot + 1) /* too many, take last one */ 2804 else /* too many, take last one */
2311 bot [1] = *sp; 2805 bot [1] = *sp;
2312 2806
2313 SP = bot + 1; 2807 SP = bot + 1;
2314 2808
2315 PUTBACK; 2809 PUTBACK;
… …
2348 if (PL_op->op_flags & OPf_STACKED) 2842 if (PL_op->op_flags & OPf_STACKED)
2349 { 2843 {
2350 if (items > slf_arga) 2844 if (items > slf_arga)
2351 { 2845 {
2352 slf_arga = items; 2846 slf_arga = items;
2353 free (slf_argv); 2847 Safefree (slf_argv);
2354 slf_argv = malloc (slf_arga * sizeof (SV *)); 2848 New (0, slf_argv, slf_arga, SV *);
2355 } 2849 }
2356 2850
2357 slf_argc = items; 2851 slf_argc = items;
2358 2852
2359 for (i = 0; i < items; ++i) 2853 for (i = 0; i < items; ++i)
… …
2413{ 2907{
2414 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2908 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2415 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2909 on_enterleave_call (aTHX_ sv_2mortal (cb));
2416} 2910}
2417 2911
2912static void
2913enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2914{
2915 if (!hook)
2916 return;
2917
2918 if (!*avp)
2919 {
2920 *avp = newAV ();
2921 AvREAL_off (*avp);
2922 }
2923
2924 av_push (*avp, (SV *)hook);
2925 av_push (*avp, (SV *)arg);
2926}
2927
2928static void
2929enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2930{
2931 AV *av = *avp;
2932 int i;
2933
2934 if (!av)
2935 return;
2936
2937 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2938 if (AvARRAY (av)[i] == (SV *)hook)
2939 {
2940 if (execute)
2941 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2942
2943 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2944 av_pop (av);
2945 av_pop (av);
2946 break;
2947 }
2948
2949 if (AvFILLp (av) >= 0)
2950 {
2951 *avp = 0;
2952 SvREFCNT_dec_NN (av);
2953 }
2954}
2955
2956static void
2957api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2958{
2959 struct coro *coro = SvSTATE (coro_sv);
2960
2961 if (SvSTATE_current == coro)
2962 if (enter)
2963 enter (aTHX_ enter_arg);
2964
2965 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2966 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2967}
2968
2969static void
2970api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2971{
2972 struct coro *coro = SvSTATE (coro_sv);
2973
2974 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2975 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2976}
2977
2978static void
2979savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2980{
2981 struct coro *coro = SvSTATE_current;
2982
2983 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2984}
2985
2986static void
2987savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2988{
2989 struct coro *coro = SvSTATE_current;
2990
2991 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2992}
2993
2994static void
2995api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2996{
2997 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2998
2999 /* this ought to be much cheaper than malloc + a single destructor call */
3000 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
3001 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
3002}
3003
2418/*****************************************************************************/ 3004/*****************************************************************************/
2419/* PerlIO::cede */ 3005/* PerlIO::cede */
2420 3006
2421typedef struct 3007typedef struct
2422{ 3008{
2423 PerlIOBuf base; 3009 PerlIOBuf base;
2424 NV next, every; 3010 NV next, every;
2425} PerlIOCede; 3011} PerlIOCede;
2426 3012
2427static IV 3013static IV ecb_cold
2428PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 3014PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2429{ 3015{
2430 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3016 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2431 3017
2432 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 3018 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2433 self->next = nvtime () + self->every; 3019 self->next = nvtime () + self->every;
2434 3020
2435 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 3021 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2436} 3022}
2437 3023
2438static SV * 3024static SV * ecb_cold
2439PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3025PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2440{ 3026{
2441 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3027 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2442 3028
2443 return newSVnv (self->every); 3029 return newSVnv (self->every);
… …
2550 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3136 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2551 PUTBACK; 3137 PUTBACK;
2552 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3138 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2553 } 3139 }
2554 3140
2555 SvREFCNT_dec (cb); 3141 SvREFCNT_dec_NN (cb);
2556 } 3142 }
2557} 3143}
2558 3144
2559static void 3145static void
2560coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3146coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2561{ 3147{
2562 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3148 /* call $sem->adjust (0) to possibly wake up some other waiters */
2563 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3149 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2564} 3150}
2565 3151
2566static int 3152static int
2567slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3153slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2568{ 3154{
2569 AV *av = (AV *)frame->data; 3155 AV *av = (AV *)frame->data;
2570 SV *count_sv = AvARRAY (av)[0]; 3156 SV *count_sv = AvARRAY (av)[0];
3157 SV *coro_hv = SvRV (coro_current);
3158
3159 frame->destroy = 0;
2571 3160
2572 /* if we are about to throw, don't actually acquire the lock, just throw */ 3161 /* if we are about to throw, don't actually acquire the lock, just throw */
2573 if (CORO_THROW) 3162 if (ecb_expect_false (CORO_THROW))
3163 {
3164 /* we still might be responsible for the semaphore, so wake up others */
3165 coro_semaphore_adjust (aTHX_ av, 0);
3166
2574 return 0; 3167 return 0;
3168 }
2575 else if (SvIVX (count_sv) > 0) 3169 else if (SvIVX (count_sv) > 0)
2576 { 3170 {
2577 SvSTATE_current->on_destroy = 0;
2578
2579 if (acquire) 3171 if (acquire)
2580 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3172 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2581 else 3173 else
2582 coro_semaphore_adjust (aTHX_ av, 0); 3174 coro_semaphore_adjust (aTHX_ av, 0);
2583 3175
… …
2587 { 3179 {
2588 int i; 3180 int i;
2589 /* if we were woken up but can't down, we look through the whole */ 3181 /* if we were woken up but can't down, we look through the whole */
2590 /* waiters list and only add us if we aren't in there already */ 3182 /* waiters list and only add us if we aren't in there already */
2591 /* this avoids some degenerate memory usage cases */ 3183 /* this avoids some degenerate memory usage cases */
2592 3184 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2593 for (i = 1; i <= AvFILLp (av); ++i)
2594 if (AvARRAY (av)[i] == SvRV (coro_current)) 3185 if (AvARRAY (av)[i] == coro_hv)
2595 return 1; 3186 return 1;
2596 3187
2597 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3188 av_push (av, SvREFCNT_inc (coro_hv));
2598 return 1; 3189 return 1;
2599 } 3190 }
2600} 3191}
2601 3192
2602static int 3193static int
… …
2625 { 3216 {
2626 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3217 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2627 3218
2628 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3219 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2629 frame->prepare = prepare_schedule; 3220 frame->prepare = prepare_schedule;
2630
2631 /* to avoid race conditions when a woken-up coro gets terminated */ 3221 /* to avoid race conditions when a woken-up coro gets terminated */
2632 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3222 /* we arrange for a temporary on_destroy that calls adjust (0) */
2633 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3223 frame->destroy = coro_semaphore_destroy;
2634 } 3224 }
2635} 3225}
2636 3226
2637static void 3227static void
2638slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3228slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2696 { 3286 {
2697 api_ready (aTHX_ cb); 3287 api_ready (aTHX_ cb);
2698 sv_setiv (cb, 0); /* signal waiter */ 3288 sv_setiv (cb, 0); /* signal waiter */
2699 } 3289 }
2700 3290
2701 SvREFCNT_dec (cb); 3291 SvREFCNT_dec_NN (cb);
2702 3292
2703 --count; 3293 --count;
2704 } 3294 }
2705} 3295}
2706 3296
… …
2720 { 3310 {
2721 SV *cb_cv = s_get_cv_croak (arg [1]); 3311 SV *cb_cv = s_get_cv_croak (arg [1]);
2722 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3312 av_push (av, SvREFCNT_inc_NN (cb_cv));
2723 3313
2724 if (SvIVX (AvARRAY (av)[0])) 3314 if (SvIVX (AvARRAY (av)[0]))
2725 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3315 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2726 3316
2727 frame->prepare = prepare_nop; 3317 frame->prepare = prepare_nop;
2728 frame->check = slf_check_nop; 3318 frame->check = slf_check_nop;
2729 } 3319 }
2730 else if (SvIVX (AvARRAY (av)[0])) 3320 else if (SvIVX (AvARRAY (av)[0]))
… …
2791 } 3381 }
2792 3382
2793 av_push (state, data_sv); 3383 av_push (state, data_sv);
2794 3384
2795 api_ready (aTHX_ coro); 3385 api_ready (aTHX_ coro);
2796 SvREFCNT_dec (coro); 3386 SvREFCNT_dec_NN (coro);
2797 SvREFCNT_dec ((AV *)state); 3387 SvREFCNT_dec_NN ((AV *)state);
2798} 3388}
2799 3389
2800static int 3390static int
2801slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3391slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2802{ 3392{
… …
2807 /* it quickly returns */ 3397 /* it quickly returns */
2808 if (CORO_THROW) 3398 if (CORO_THROW)
2809 return 0; 3399 return 0;
2810 3400
2811 /* one element that is an RV? repeat! */ 3401 /* one element that is an RV? repeat! */
2812 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3402 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2813 return 1; 3403 return 1;
2814 3404
2815 /* restore status */ 3405 /* restore status */
2816 { 3406 {
2817 SV *data_sv = av_pop (state); 3407 SV *data_sv = av_pop (state);
… …
2820 errno = data->errorno; 3410 errno = data->errorno;
2821 PL_laststype = data->laststype; 3411 PL_laststype = data->laststype;
2822 PL_laststatval = data->laststatval; 3412 PL_laststatval = data->laststatval;
2823 PL_statcache = data->statcache; 3413 PL_statcache = data->statcache;
2824 3414
2825 SvREFCNT_dec (data_sv); 3415 SvREFCNT_dec_NN (data_sv);
2826 } 3416 }
2827 3417
2828 /* push result values */ 3418 /* push result values */
2829 { 3419 {
2830 dSP; 3420 dSP;
… …
2856 dSP; 3446 dSP;
2857 3447
2858 static SV *prio_cv; 3448 static SV *prio_cv;
2859 static SV *prio_sv; 3449 static SV *prio_sv;
2860 3450
2861 if (expect_false (!prio_cv)) 3451 if (ecb_expect_false (!prio_cv))
2862 { 3452 {
2863 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3453 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2864 prio_sv = newSViv (0); 3454 prio_sv = newSViv (0);
2865 } 3455 }
2866 3456
… …
2892 /* now call the AIO function - we assume our request is uncancelable */ 3482 /* now call the AIO function - we assume our request is uncancelable */
2893 PUTBACK; 3483 PUTBACK;
2894 call_sv ((SV *)req, G_VOID | G_DISCARD); 3484 call_sv ((SV *)req, G_VOID | G_DISCARD);
2895 } 3485 }
2896 3486
2897 /* now that the requets is going, we loop toll we have a result */ 3487 /* now that the request is going, we loop till we have a result */
2898 frame->data = (void *)state; 3488 frame->data = (void *)state;
2899 frame->prepare = prepare_schedule; 3489 frame->prepare = prepare_schedule;
2900 frame->check = slf_check_aio_req; 3490 frame->check = slf_check_aio_req;
2901} 3491}
2902 3492
… …
2972 } 3562 }
2973 3563
2974 return coro_sv; 3564 return coro_sv;
2975} 3565}
2976 3566
3567#ifndef __cplusplus
3568ecb_cold XS(boot_Coro__State);
3569#endif
3570
3571#if CORO_JIT
3572
3573static void ecb_noinline ecb_cold
3574pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3575{
3576 dSP;
3577 AV *av = newAV ();
3578
3579 av_store (av, 3, newSVuv (d));
3580 av_store (av, 2, newSVuv (c));
3581 av_store (av, 1, newSVuv (b));
3582 av_store (av, 0, newSVuv (a));
3583
3584 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3585
3586 PUTBACK;
3587}
3588
3589static void ecb_noinline ecb_cold
3590jit_init (pTHX)
3591{
3592 dSP;
3593 SV *load, *save;
3594 char *map_base;
3595 char *load_ptr, *save_ptr;
3596 STRLEN load_len, save_len, map_len;
3597 int count;
3598
3599 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3600
3601 PUSHMARK (SP);
3602 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3603 #include "state.h"
3604 count = call_pv ("Coro::State::_jit", G_ARRAY);
3605 SPAGAIN;
3606
3607 save = POPs; save_ptr = SvPVbyte (save, save_len);
3608 load = POPs; load_ptr = SvPVbyte (load, load_len);
3609
3610 map_len = load_len + save_len + 16;
3611
3612 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3613
3614 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3615
3616 load_perl_slots = (load_save_perl_slots_type)map_base;
3617 memcpy (map_base, load_ptr, load_len);
3618
3619 map_base += (load_len + 15) & ~15;
3620
3621 save_perl_slots = (load_save_perl_slots_type)map_base;
3622 memcpy (map_base, save_ptr, save_len);
3623
3624 /* we are good citizens and try to make the page read-only, so the evil evil */
3625 /* hackers might have it a bit more difficult */
3626 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3627
3628 PUTBACK;
3629 eval_pv ("undef &Coro::State::_jit", 1);
3630}
3631
3632#endif
3633
2977MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3634MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2978 3635
2979PROTOTYPES: DISABLE 3636PROTOTYPES: DISABLE
2980 3637
2981BOOT: 3638BOOT:
2982{ 3639{
3640#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3641#include "state.h"
2983#ifdef USE_ITHREADS 3642#ifdef USE_ITHREADS
2984# if CORO_PTHREAD 3643# if CORO_PTHREAD
2985 coro_thx = PERL_GET_CONTEXT; 3644 coro_thx = PERL_GET_CONTEXT;
2986# endif 3645# endif
2987#endif 3646#endif
2988 BOOT_PAGESIZE; 3647 /* perl defines these to check for existance first, but why it doesn't */
3648 /* just create them one at init time is not clear to me, except for */
3649 /* programs trying to delete them, but... */
3650 /* anyway, we declare this as invalid and make sure they are initialised here */
3651 DEFSV;
3652 ERRSV;
2989 3653
2990 cctx_current = cctx_new_empty (); 3654 cctx_current = cctx_new_empty ();
2991 3655
2992 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3656 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2993 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3657 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2994 3658
2995 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3659 {
2996 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3660 /*
2997 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3661 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3662 * by coro_sig_vtbl in hash values.
3663 */
3664 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3665
3666 /* this only works if perl doesn't have a vtbl for %SIG */
3667 assert (!mg->mg_virtual);
3668
3669 /*
3670 * The irony is that the perl API itself asserts that mg_virtual
3671 * must be non-const, yet perl5porters insisted on marking their
3672 * vtbls as read-only, just to thwart perl modules from patching
3673 * them.
3674 */
3675 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3676 mg->mg_flags |= MGf_COPY;
3677
3678 coro_sigelem_vtbl = PL_vtbl_sigelem;
3679 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3680 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3681 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3682 }
2998 3683
2999 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
3000 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3684 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3001 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3685 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3002 3686
3003 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3687 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3004 3688
… …
3033 coroapi.prepare_nop = prepare_nop; 3717 coroapi.prepare_nop = prepare_nop;
3034 coroapi.prepare_schedule = prepare_schedule; 3718 coroapi.prepare_schedule = prepare_schedule;
3035 coroapi.prepare_cede = prepare_cede; 3719 coroapi.prepare_cede = prepare_cede;
3036 coroapi.prepare_cede_notself = prepare_cede_notself; 3720 coroapi.prepare_cede_notself = prepare_cede_notself;
3037 3721
3038 { 3722 time_init (aTHX);
3039 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3040
3041 if (!svp) croak ("Time::HiRes is required");
3042 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3043
3044 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3045
3046 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3047 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3048 }
3049 3723
3050 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3724 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3725#if CORO_JIT
3726 PUTBACK;
3727 jit_init (aTHX);
3728 SPAGAIN;
3729#endif
3051} 3730}
3052 3731
3053SV * 3732SV *
3054new (SV *klass, ...) 3733new (SV *klass, ...)
3055 ALIAS: 3734 ALIAS:
… …
3062void 3741void
3063transfer (...) 3742transfer (...)
3064 PROTOTYPE: $$ 3743 PROTOTYPE: $$
3065 CODE: 3744 CODE:
3066 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3745 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3067
3068bool
3069_destroy (SV *coro_sv)
3070 CODE:
3071 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3072 OUTPUT:
3073 RETVAL
3074
3075void
3076_exit (int code)
3077 PROTOTYPE: $
3078 CODE:
3079 _exit (code);
3080 3746
3081SV * 3747SV *
3082clone (Coro::State coro) 3748clone (Coro::State coro)
3083 CODE: 3749 CODE:
3084{ 3750{
… …
3139void 3805void
3140list () 3806list ()
3141 PROTOTYPE: 3807 PROTOTYPE:
3142 PPCODE: 3808 PPCODE:
3143{ 3809{
3144 struct coro *coro; 3810 struct coro *coro;
3145 for (coro = coro_first; coro; coro = coro->next) 3811 for (coro = coro_first; coro; coro = coro->next)
3146 if (coro->hv) 3812 if (coro->hv)
3147 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3813 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3148} 3814}
3149 3815
… …
3154 CODE: 3820 CODE:
3155{ 3821{
3156 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3822 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3157 { 3823 {
3158 struct coro *current = SvSTATE_current; 3824 struct coro *current = SvSTATE_current;
3825 struct CoroSLF slf_save;
3159 3826
3160 if (current != coro) 3827 if (current != coro)
3161 { 3828 {
3162 PUTBACK; 3829 PUTBACK;
3163 save_perl (aTHX_ current); 3830 save_perl (aTHX_ current);
3164 load_perl (aTHX_ coro); 3831 load_perl (aTHX_ coro);
3832 /* the coro is most likely in an active SLF call.
3833 * while not strictly required (the code we execute is
3834 * not allowed to call any SLF functions), it's cleaner
3835 * to reinitialise the slf_frame and restore it later.
3836 * This might one day allow us to actually do SLF calls
3837 * from code executed here.
3838 */
3839 slf_save = slf_frame;
3840 slf_frame.prepare = 0;
3165 SPAGAIN; 3841 SPAGAIN;
3166 } 3842 }
3167 3843
3168 PUSHSTACK; 3844 PUSHSTACK;
3169 3845
… …
3179 SPAGAIN; 3855 SPAGAIN;
3180 3856
3181 if (current != coro) 3857 if (current != coro)
3182 { 3858 {
3183 PUTBACK; 3859 PUTBACK;
3860 slf_frame = slf_save;
3184 save_perl (aTHX_ coro); 3861 save_perl (aTHX_ coro);
3185 load_perl (aTHX_ current); 3862 load_perl (aTHX_ current);
3186 SPAGAIN; 3863 SPAGAIN;
3187 } 3864 }
3188 } 3865 }
… …
3193 PROTOTYPE: $ 3870 PROTOTYPE: $
3194 ALIAS: 3871 ALIAS:
3195 is_ready = CF_READY 3872 is_ready = CF_READY
3196 is_running = CF_RUNNING 3873 is_running = CF_RUNNING
3197 is_new = CF_NEW 3874 is_new = CF_NEW
3198 is_destroyed = CF_DESTROYED 3875 is_destroyed = CF_ZOMBIE
3876 is_zombie = CF_ZOMBIE
3199 is_suspended = CF_SUSPENDED 3877 is_suspended = CF_SUSPENDED
3200 CODE: 3878 CODE:
3201 RETVAL = boolSV (coro->flags & ix); 3879 RETVAL = boolSV (coro->flags & ix);
3202 OUTPUT: 3880 OUTPUT:
3203 RETVAL 3881 RETVAL
3204 3882
3205void 3883void
3206throw (Coro::State self, SV *throw = &PL_sv_undef) 3884throw (SV *self, SV *exception = &PL_sv_undef)
3207 PROTOTYPE: $;$ 3885 PROTOTYPE: $;$
3208 CODE: 3886 CODE:
3209{ 3887{
3888 struct coro *coro = SvSTATE (self);
3210 struct coro *current = SvSTATE_current; 3889 struct coro *current = SvSTATE_current;
3211 SV **throwp = self == current ? &CORO_THROW : &self->except; 3890 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3212 SvREFCNT_dec (*throwp); 3891 SvREFCNT_dec (*exceptionp);
3213 SvGETMAGIC (throw); 3892 SvGETMAGIC (exception);
3214 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3893 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3894
3895 api_ready (aTHX_ self);
3215} 3896}
3216 3897
3217void 3898void
3218api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3899api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3219 PROTOTYPE: $;$ 3900 PROTOTYPE: $;$
… …
3274 3955
3275void 3956void
3276cancel (Coro::State self) 3957cancel (Coro::State self)
3277 CODE: 3958 CODE:
3278 coro_state_destroy (aTHX_ self); 3959 coro_state_destroy (aTHX_ self);
3279 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3280
3281 3960
3282SV * 3961SV *
3283enable_times (int enabled = enable_times) 3962enable_times (int enabled = enable_times)
3284 CODE: 3963 CODE:
3285{ 3964{
… …
3298 3977
3299void 3978void
3300times (Coro::State self) 3979times (Coro::State self)
3301 PPCODE: 3980 PPCODE:
3302{ 3981{
3303 struct coro *current = SvSTATE (coro_current); 3982 struct coro *current = SvSTATE (coro_current);
3304 3983
3305 if (expect_false (current == self)) 3984 if (ecb_expect_false (current == self))
3306 { 3985 {
3307 coro_times_update (); 3986 coro_times_update ();
3308 coro_times_add (SvSTATE (coro_current)); 3987 coro_times_add (SvSTATE (coro_current));
3309 } 3988 }
3310 3989
3311 EXTEND (SP, 2); 3990 EXTEND (SP, 2);
3312 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3991 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3313 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3992 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3314 3993
3315 if (expect_false (current == self)) 3994 if (ecb_expect_false (current == self))
3316 coro_times_sub (SvSTATE (coro_current)); 3995 coro_times_sub (SvSTATE (coro_current));
3317} 3996}
3318 3997
3998void
3999swap_sv (Coro::State coro, SV *sva, SV *svb)
4000 CODE:
4001{
4002 struct coro *current = SvSTATE_current;
4003 AV *swap_sv;
4004 int i;
4005
4006 sva = SvRV (sva);
4007 svb = SvRV (svb);
4008
4009 if (current == coro)
4010 SWAP_SVS_LEAVE (current);
4011
4012 if (!coro->swap_sv)
4013 coro->swap_sv = newAV ();
4014
4015 swap_sv = coro->swap_sv;
4016
4017 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
4018 {
4019 SV *a = AvARRAY (swap_sv)[i ];
4020 SV *b = AvARRAY (swap_sv)[i + 1];
4021
4022 if (a == sva && b == svb)
4023 {
4024 SvREFCNT_dec_NN (a);
4025 SvREFCNT_dec_NN (b);
4026
4027 for (; i <= AvFILLp (swap_sv) - 2; i++)
4028 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4029
4030 AvFILLp (swap_sv) -= 2;
4031
4032 goto removed;
4033 }
4034 }
4035
4036 av_push (swap_sv, SvREFCNT_inc_NN (sva));
4037 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4038
4039 removed:
4040
4041 if (current == coro)
4042 SWAP_SVS_ENTER (current);
4043}
4044
4045
3319MODULE = Coro::State PACKAGE = Coro 4046MODULE = Coro::State PACKAGE = Coro
3320 4047
3321BOOT: 4048BOOT:
3322{ 4049{
4050 if (SVt_LAST > 32)
4051 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4052
3323 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4053 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3324 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4054 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3325 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4055 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3326 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3327 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4056 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3328 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4057 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3329 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4058 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3330 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4059 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3331 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4060 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3332 4061
3333 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4062 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3334 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4063 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3335 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4064 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3336 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */ 4065 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3337 4066
3338 coro_stash = gv_stashpv ("Coro", TRUE); 4067 coro_stash = gv_stashpv ("Coro", TRUE);
3339 4068
3340 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4069 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3341 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4070 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3342 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 4071 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3354 coroapi.ready = api_ready; 4083 coroapi.ready = api_ready;
3355 coroapi.is_ready = api_is_ready; 4084 coroapi.is_ready = api_is_ready;
3356 coroapi.nready = coro_nready; 4085 coroapi.nready = coro_nready;
3357 coroapi.current = coro_current; 4086 coroapi.current = coro_current;
3358 4087
4088 coroapi.enterleave_hook = api_enterleave_hook;
4089 coroapi.enterleave_unhook = api_enterleave_unhook;
4090 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4091
3359 /*GCoroAPI = &coroapi;*/ 4092 /*GCoroAPI = &coroapi;*/
3360 sv_setiv (sv, (IV)&coroapi); 4093 sv_setiv (sv, (IV)&coroapi);
3361 SvREADONLY_on (sv); 4094 SvREADONLY_on (sv);
3362 } 4095 }
3363} 4096}
… …
3370 api_ready (aTHX_ RETVAL); 4103 api_ready (aTHX_ RETVAL);
3371 OUTPUT: 4104 OUTPUT:
3372 RETVAL 4105 RETVAL
3373 4106
3374void 4107void
4108_destroy (Coro::State coro)
4109 CODE:
4110 /* used by the manager thread */
4111 coro_state_destroy (aTHX_ coro);
4112
4113void
4114on_destroy (Coro::State coro, SV *cb)
4115 CODE:
4116 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4117
4118void
4119join (...)
4120 CODE:
4121 CORO_EXECUTE_SLF_XS (slf_init_join);
4122
4123void
3375terminate (...) 4124terminate (...)
3376 CODE: 4125 CODE:
3377 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4126 CORO_EXECUTE_SLF_XS (slf_init_terminate);
4127
4128void
4129cancel (...)
4130 CODE:
4131 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4132
4133int
4134safe_cancel (Coro::State self, ...)
4135 C_ARGS: aTHX_ self, &ST (1), items - 1
3378 4136
3379void 4137void
3380schedule (...) 4138schedule (...)
3381 CODE: 4139 CODE:
3382 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4140 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3403 4161
3404void 4162void
3405_set_current (SV *current) 4163_set_current (SV *current)
3406 PROTOTYPE: $ 4164 PROTOTYPE: $
3407 CODE: 4165 CODE:
3408 SvREFCNT_dec (SvRV (coro_current)); 4166 SvREFCNT_dec_NN (SvRV (coro_current));
3409 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4167 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3410 4168
3411void 4169void
3412_set_readyhook (SV *hook) 4170_set_readyhook (SV *hook)
3413 PROTOTYPE: $ 4171 PROTOTYPE: $
… …
3497 4255
3498 if ((SV *)hv == &PL_sv_undef) 4256 if ((SV *)hv == &PL_sv_undef)
3499 { 4257 {
3500 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1); 4258 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3501 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv)); 4259 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3502 SvREFCNT_dec (sv); 4260 SvREFCNT_dec_NN (sv);
3503 } 4261 }
3504 4262
3505 { 4263 {
3506 struct coro *coro = SvSTATE_hv (hv); 4264 struct coro *coro = SvSTATE_hv (hv);
3507 4265
… …
3514 api_ready (aTHX_ (SV *)hv); 4272 api_ready (aTHX_ (SV *)hv);
3515 4273
3516 if (GIMME_V != G_VOID) 4274 if (GIMME_V != G_VOID)
3517 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4275 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3518 else 4276 else
3519 SvREFCNT_dec (hv); 4277 SvREFCNT_dec_NN (hv);
3520} 4278}
3521 4279
3522SV * 4280SV *
3523rouse_cb () 4281rouse_cb ()
3524 PROTOTYPE: 4282 PROTOTYPE:
… …
3539 on_leave = 1 4297 on_leave = 1
3540 PROTOTYPE: & 4298 PROTOTYPE: &
3541 CODE: 4299 CODE:
3542{ 4300{
3543 struct coro *coro = SvSTATE_current; 4301 struct coro *coro = SvSTATE_current;
3544 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4302 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3545 4303
3546 block = s_get_cv_croak (block); 4304 block = s_get_cv_croak (block);
3547 4305
3548 if (!*avp) 4306 if (!*avp)
3549 *avp = newAV (); 4307 *avp = newAV ();
… …
3569 4327
3570SV * 4328SV *
3571new (SV *klass, SV *count = 0) 4329new (SV *klass, SV *count = 0)
3572 CODE: 4330 CODE:
3573{ 4331{
3574 int semcnt = 1; 4332 int semcnt = 1;
3575 4333
3576 if (count) 4334 if (count)
3577 { 4335 {
3578 SvGETMAGIC (count); 4336 SvGETMAGIC (count);
3579 4337
… …
3603 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4361 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3604 OUTPUT: 4362 OUTPUT:
3605 RETVAL 4363 RETVAL
3606 4364
3607void 4365void
3608up (SV *self, int adjust = 1) 4366up (SV *self)
3609 ALIAS:
3610 adjust = 1
3611 CODE: 4367 CODE:
4368 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4369
4370void
4371adjust (SV *self, int adjust)
4372 CODE:
3612 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4373 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3613 4374
3614void 4375void
3615down (...) 4376down (...)
3616 CODE: 4377 CODE:
3617 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4378 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
… …
3639 XSRETURN_NO; 4400 XSRETURN_NO;
3640} 4401}
3641 4402
3642void 4403void
3643waiters (SV *self) 4404waiters (SV *self)
3644 PPCODE: 4405 PPCODE:
3645{ 4406{
3646 AV *av = (AV *)SvRV (self); 4407 AV *av = (AV *)SvRV (self);
3647 int wcount = AvFILLp (av) + 1 - 1; 4408 int wcount = AvFILLp (av) + 1 - 1;
3648 4409
3649 if (GIMME_V == G_SCALAR) 4410 if (GIMME_V == G_SCALAR)
… …
3658} 4419}
3659 4420
3660MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4421MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3661 4422
3662void 4423void
3663_may_delete (SV *sem, int count, int extra_refs) 4424_may_delete (SV *sem, int count, unsigned int extra_refs)
3664 PPCODE: 4425 PPCODE:
3665{ 4426{
3666 AV *av = (AV *)SvRV (sem); 4427 AV *av = (AV *)SvRV (sem);
3667 4428
3668 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4429 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3669 && AvFILLp (av) == 0 /* no waiters, just count */ 4430 && AvFILLp (av) == 0 /* no waiters, just count */
3670 && SvIV (AvARRAY (av)[0]) == count) 4431 && SvIV (AvARRAY (av)[0]) == count)
3671 XSRETURN_YES; 4432 XSRETURN_YES;
… …
3692 4453
3693void 4454void
3694broadcast (SV *self) 4455broadcast (SV *self)
3695 CODE: 4456 CODE:
3696{ 4457{
3697 AV *av = (AV *)SvRV (self); 4458 AV *av = (AV *)SvRV (self);
3698 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4459 coro_signal_wake (aTHX_ av, AvFILLp (av));
3699} 4460}
3700 4461
3701void 4462void
3702send (SV *self) 4463send (SV *self)
… …
3710 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4471 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3711} 4472}
3712 4473
3713IV 4474IV
3714awaited (SV *self) 4475awaited (SV *self)
3715 CODE: 4476 CODE:
3716 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4477 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3717 OUTPUT: 4478 OUTPUT:
3718 RETVAL 4479 RETVAL
3719 4480
3720 4481
… …
3725 4486
3726void 4487void
3727_schedule (...) 4488_schedule (...)
3728 CODE: 4489 CODE:
3729{ 4490{
3730 static int incede; 4491 static int incede;
3731 4492
3732 api_cede_notself (aTHX); 4493 api_cede_notself (aTHX);
3733 4494
3734 ++incede; 4495 ++incede;
3735 while (coro_nready >= incede && api_cede (aTHX)) 4496 while (coro_nready >= incede && api_cede (aTHX))
… …
3779 { 4540 {
3780 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4541 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3781 coro_old_pp_sselect = 0; 4542 coro_old_pp_sselect = 0;
3782 } 4543 }
3783 4544
4545MODULE = Coro::State PACKAGE = Coro::Util
3784 4546
4547void
4548_exit (int code)
4549 CODE:
4550 _exit (code);
4551
4552NV
4553time ()
4554 CODE:
4555 RETVAL = nvtime (aTHX);
4556 OUTPUT:
4557 RETVAL
4558
4559NV
4560gettimeofday ()
4561 PPCODE:
4562{
4563 UV tv [2];
4564 u2time (aTHX_ tv);
4565 EXTEND (SP, 2);
4566 PUSHs (sv_2mortal (newSVuv (tv [0])));
4567 PUSHs (sv_2mortal (newSVuv (tv [1])));
4568}
4569

Diff Legend

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