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

Diff Legend

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