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.365 by root, Mon Jul 20 16:18:30 2009 UTC vs.
Revision 1.467 by root, Sun Jun 26 21:46:03 2016 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "schmorp.h" 16#include "schmorp.h"
12 17
18#define ECB_NO_THREADS 1
19#define ECB_NO_LIBM 1
20#include "ecb.h"
21
22#include <stddef.h>
13#include <stdio.h> 23#include <stdio.h>
14#include <errno.h> 24#include <errno.h>
15#include <assert.h> 25#include <assert.h>
16 26
17#ifdef WIN32 27#ifndef SvREFCNT_dec_NN
28 #define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
29#endif
30
31#ifndef SvREFCNT_inc_NN
32 #define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
33#endif
34
35#ifndef SVs_PADSTALE
36# define SVs_PADSTALE 0
37#endif
38
39#ifdef PadARRAY
40# define NEWPADAPI 1
41# define newPADLIST(var) (Newz (0, var, 1, PADLIST), Newx (PadlistARRAY (var), 2, PAD *))
42#else
43typedef AV PADNAMELIST;
44# if !PERL_VERSION_ATLEAST(5,8,0)
45typedef AV PADLIST;
46typedef AV PAD;
47# endif
48# define PadlistARRAY(pl) ((PAD **)AvARRAY (pl))
49# define PadlistMAX(pl) AvFILLp (pl)
50# define PadlistNAMES(pl) (*PadlistARRAY (pl))
51# define PadARRAY AvARRAY
52# define PadMAX AvFILLp
53# define newPADLIST(var) ((var) = newAV (), av_extend (var, 1))
54#endif
55#ifndef PadnamelistREFCNT
56# define PadnamelistREFCNT(pnl) SvREFCNT (pnl)
57#endif
58#ifndef PadnamelistREFCNT_dec
59# define PadnamelistREFCNT_dec(pnl) SvREFCNT_dec (pnl)
60#endif
61
62/* 5.19.something has replaced SVt_BIND by SVt_INVLIST */
63/* we just alias it to SVt_IV, as that is sufficient for swap_sv for now */
64#if PERL_VERSION_ATLEAST(5,19,0)
65# define SVt_BIND SVt_IV
66#endif
67
68#if defined(_WIN32)
69# undef HAS_GETTIMEOFDAY
18# undef setjmp 70# undef setjmp
19# undef longjmp 71# undef longjmp
20# undef _exit 72# undef _exit
21# define setjmp _setjmp /* deep magic */ 73# define setjmp _setjmp /* deep magic */
22#else 74#else
23# include <inttypes.h> /* most portable stdint.h */ 75# include <inttypes.h> /* most portable stdint.h */
24#endif 76#endif
25 77
26#ifdef HAVE_MMAP
27# include <unistd.h>
28# include <sys/mman.h>
29# ifndef MAP_ANONYMOUS
30# ifdef MAP_ANON
31# define MAP_ANONYMOUS MAP_ANON
32# else
33# undef HAVE_MMAP
34# endif
35# endif
36# include <limits.h>
37# ifndef PAGESIZE
38# define PAGESIZE pagesize
39# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
40static long pagesize;
41# else
42# define BOOT_PAGESIZE (void)0
43# endif
44#else
45# define PAGESIZE 0
46# define BOOT_PAGESIZE (void)0
47#endif
48
49#if CORO_USE_VALGRIND
50# include <valgrind/valgrind.h>
51#endif
52
53/* the maximum number of idle cctx that will be pooled */ 78/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 79static int cctx_max_idle = 4;
55 80
56#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 81#if defined(DEBUGGING) && PERL_VERSION_ATLEAST(5,12,0)
57# undef CORO_STACKGUARD 82# define HAS_SCOPESTACK_NAME 1
58#endif
59
60#ifndef CORO_STACKGUARD
61# define CORO_STACKGUARD 0
62#endif 83#endif
63 84
64/* prefer perl internal functions over our own? */ 85/* prefer perl internal functions over our own? */
65#ifndef CORO_PREFER_PERL_FUNCTIONS 86#ifndef CORO_PREFER_PERL_FUNCTIONS
66# define CORO_PREFER_PERL_FUNCTIONS 0 87# define CORO_PREFER_PERL_FUNCTIONS 0
76# define STACKLEVEL ((void *)&stacklevel) 97# define STACKLEVEL ((void *)&stacklevel)
77#endif 98#endif
78 99
79#define IN_DESTRUCT PL_dirty 100#define IN_DESTRUCT PL_dirty
80 101
81#if __GNUC__ >= 3
82# define attribute(x) __attribute__(x)
83# define expect(expr,value) __builtin_expect ((expr), (value))
84# define INLINE static inline
85#else
86# define attribute(x)
87# define expect(expr,value) (expr)
88# define INLINE static
89#endif
90
91#define expect_false(expr) expect ((expr) != 0, 0)
92#define expect_true(expr) expect ((expr) != 0, 1)
93
94#define NOINLINE attribute ((noinline))
95
96#include "CoroAPI.h" 102#include "CoroAPI.h"
97#define GCoroAPI (&coroapi) /* very sneaky */ 103#define GCoroAPI (&coroapi) /* very sneaky */
98 104
99#ifdef USE_ITHREADS 105#ifdef USE_ITHREADS
100# if CORO_PTHREAD 106# if CORO_PTHREAD
110# define CORO_CLOCK_MONOTONIC 1 116# define CORO_CLOCK_MONOTONIC 1
111# define CORO_CLOCK_THREAD_CPUTIME_ID 3 117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
112# endif 118# endif
113#endif 119#endif
114 120
121/* perl usually suppressed asserts. for debugging, we sometimes force it to be on */
122#if 0
123# undef NDEBUG
124# include <assert.h>
125#endif
126
115static double (*nvtime)(); /* so why doesn't it take void? */ 127static double (*nvtime)(); /* so why doesn't it take void? */
116static void (*u2time)(pTHX_ UV ret[2]); 128static void (*u2time)(pTHX_ UV ret[2]);
117 129
118/* we hijack an hopefully unused CV flag for our purposes */ 130/* we hijack an hopefully unused CV flag for our purposes */
119#define CVf_SLF 0x4000 131#define CVf_SLF 0x4000
120static OP *pp_slf (pTHX); 132static OP *pp_slf (pTHX);
133static void slf_destroy (pTHX_ struct coro *coro);
121 134
122static U32 cctx_gen; 135static U32 cctx_gen;
123static size_t cctx_stacksize = CORO_STACKSIZE; 136static size_t cctx_stacksize = CORO_STACKSIZE;
124static struct CoroAPI coroapi; 137static struct CoroAPI coroapi;
125static AV *main_mainstack; /* used to differentiate between $main and others */ 138static AV *main_mainstack; /* used to differentiate between $main and others */
133 146
134static GV *irsgv; /* $/ */ 147static GV *irsgv; /* $/ */
135static GV *stdoutgv; /* *STDOUT */ 148static GV *stdoutgv; /* *STDOUT */
136static SV *rv_diehook; 149static SV *rv_diehook;
137static SV *rv_warnhook; 150static SV *rv_warnhook;
138static HV *hv_sig; /* %SIG */
139 151
140/* async_pool helper stuff */ 152/* async_pool helper stuff */
141static SV *sv_pool_rss; 153static SV *sv_pool_rss;
142static SV *sv_pool_size; 154static SV *sv_pool_size;
143static SV *sv_async_pool_idle; /* description string */ 155static SV *sv_async_pool_idle; /* description string */
144static AV *av_async_pool; /* idle pool */ 156static AV *av_async_pool; /* idle pool */
145static SV *sv_Coro; /* class string */ 157static SV *sv_Coro; /* class string */
146static CV *cv_pool_handler; 158static CV *cv_pool_handler;
147static CV *cv_coro_state_new;
148 159
149/* Coro::AnyEvent */ 160/* Coro::AnyEvent */
150static SV *sv_activity; 161static SV *sv_activity;
151 162
152/* enable processtime/realtime profiling */ 163/* enable processtime/realtime profiling */
156static char times_valid; 167static char times_valid;
157 168
158static struct coro_cctx *cctx_first; 169static struct coro_cctx *cctx_first;
159static int cctx_count, cctx_idle; 170static int cctx_count, cctx_idle;
160 171
161enum { 172enum
173{
162 CC_MAPPED = 0x01, 174 CC_MAPPED = 0x01,
163 CC_NOREUSE = 0x02, /* throw this away after tracing */ 175 CC_NOREUSE = 0x02, /* throw this away after tracing */
164 CC_TRACE = 0x04, 176 CC_TRACE = 0x04,
165 CC_TRACE_SUB = 0x08, /* trace sub calls */ 177 CC_TRACE_SUB = 0x08, /* trace sub calls */
166 CC_TRACE_LINE = 0x10, /* trace each statement */ 178 CC_TRACE_LINE = 0x10, /* trace each statement */
171typedef struct coro_cctx 183typedef struct coro_cctx
172{ 184{
173 struct coro_cctx *next; 185 struct coro_cctx *next;
174 186
175 /* the stack */ 187 /* the stack */
176 void *sptr; 188 struct coro_stack stack;
177 size_t ssize;
178 189
179 /* cpu state */ 190 /* cpu state */
180 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 191 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
192#ifndef NDEBUG
181 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 193 JMPENV *idle_te; /* same as idle_sp, but for top_env */
194#endif
182 JMPENV *top_env; 195 JMPENV *top_env;
183 coro_context cctx; 196 coro_context cctx;
184 197
185 U32 gen; 198 U32 gen;
186#if CORO_USE_VALGRIND 199#if CORO_USE_VALGRIND
187 int valgrind_id; 200 int valgrind_id;
188#endif 201#endif
189 unsigned char flags; 202 unsigned char flags;
190} coro_cctx; 203} coro_cctx;
191 204
192coro_cctx *cctx_current; /* the currently running cctx */ 205static coro_cctx *cctx_current; /* the currently running cctx */
193 206
194/*****************************************************************************/ 207/*****************************************************************************/
195 208
209static MGVTBL coro_state_vtbl;
210
196enum { 211enum
212{
197 CF_RUNNING = 0x0001, /* coroutine is running */ 213 CF_RUNNING = 0x0001, /* coroutine is running */
198 CF_READY = 0x0002, /* coroutine is ready */ 214 CF_READY = 0x0002, /* coroutine is ready */
199 CF_NEW = 0x0004, /* has never been switched to */ 215 CF_NEW = 0x0004, /* has never been switched to */
200 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 216 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
201 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 217 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
218 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
202}; 219};
203 220
204/* the structure where most of the perl state is stored, overlaid on the cxstack */ 221/* the structure where most of the perl state is stored, overlaid on the cxstack */
205typedef struct 222typedef struct
206{ 223{
207 SV *defsv;
208 AV *defav;
209 SV *errsv;
210 SV *irsgv;
211 HV *hinthv;
212#define VAR(name,type) type name; 224 #define VARx(name,expr,type) type name;
213# include "state.h" 225 #include "state.h"
214#undef VAR
215} perl_slots; 226} perl_slots;
216 227
228/* how many context stack entries do we need for perl_slots */
217#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 229#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
218 230
219/* this is a structure representing a perl-level coroutine */ 231/* this is a structure representing a perl-level coroutine */
220struct coro { 232struct coro
233{
221 /* the C coroutine allocated to this perl coroutine, if any */ 234 /* the C coroutine allocated to this perl coroutine, if any */
222 coro_cctx *cctx; 235 coro_cctx *cctx;
223 236
224 /* ready queue */ 237 /* ready queue */
225 struct coro *next_ready; 238 struct coro *next_ready;
227 /* state data */ 240 /* state data */
228 struct CoroSLF slf_frame; /* saved slf frame */ 241 struct CoroSLF slf_frame; /* saved slf frame */
229 AV *mainstack; 242 AV *mainstack;
230 perl_slots *slot; /* basically the saved sp */ 243 perl_slots *slot; /* basically the saved sp */
231 244
232 CV *startcv; /* the CV to execute */ 245 CV *startcv; /* the CV to execute */
233 AV *args; /* data associated with this coroutine (initial args) */ 246 AV *args; /* data associated with this coroutine (initial args) */
234 int refcnt; /* coroutines are refcounted, yes */
235 int flags; /* CF_ flags */ 247 int flags; /* CF_ flags */
236 HV *hv; /* the perl hash associated with this coro, if any */ 248 HV *hv; /* the perl hash associated with this coro, if any */
237 void (*on_destroy)(pTHX_ struct coro *coro);
238 249
239 /* statistics */ 250 /* statistics */
240 int usecount; /* number of transfers to this coro */ 251 int usecount; /* number of transfers to this coro */
241 252
242 /* coro process data */ 253 /* coro process data */
243 int prio; 254 int prio;
244 SV *except; /* exception to be thrown */ 255 SV *except; /* exception to be thrown */
245 SV *rouse_cb; 256 SV *rouse_cb; /* last rouse callback */
257 AV *on_destroy; /* callbacks or coros to notify on destroy */
258 AV *status; /* the exit status list */
246 259
247 /* async_pool */ 260 /* async_pool */
248 SV *saved_deffh; 261 SV *saved_deffh;
249 SV *invoke_cb; 262 SV *invoke_cb;
250 AV *invoke_av; 263 AV *invoke_av;
251 264
252 /* on_enter/on_leave */ 265 /* on_enter/on_leave */
253 AV *on_enter; 266 AV *on_enter; AV *on_enter_xs;
254 AV *on_leave; 267 AV *on_leave; AV *on_leave_xs;
268
269 /* swap_sv */
270 AV *swap_sv;
255 271
256 /* times */ 272 /* times */
257 coro_ts t_cpu, t_real; 273 coro_ts t_cpu, t_real;
258 274
259 /* linked list */ 275 /* linked list */
263typedef struct coro *Coro__State; 279typedef struct coro *Coro__State;
264typedef struct coro *Coro__State_or_hashref; 280typedef struct coro *Coro__State_or_hashref;
265 281
266/* the following variables are effectively part of the perl context */ 282/* the following variables are effectively part of the perl context */
267/* and get copied between struct coro and these variables */ 283/* and get copied between struct coro and these variables */
268/* the mainr easonw e don't support windows process emulation */ 284/* the main reason we don't support windows process emulation */
269static struct CoroSLF slf_frame; /* the current slf frame */ 285static struct CoroSLF slf_frame; /* the current slf frame */
270 286
271/** Coro ********************************************************************/ 287/** Coro ********************************************************************/
272 288
273#define CORO_PRIO_MAX 3 289#define CORO_PRIO_MAX 3
279 295
280/* for Coro.pm */ 296/* for Coro.pm */
281static SV *coro_current; 297static SV *coro_current;
282static SV *coro_readyhook; 298static SV *coro_readyhook;
283static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */ 299static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
284static CV *cv_coro_run, *cv_coro_terminate; 300static CV *cv_coro_run;
285static struct coro *coro_first; 301static struct coro *coro_first;
286#define coro_nready coroapi.nready 302#define coro_nready coroapi.nready
287 303
304/** JIT *********************************************************************/
305
306#if CORO_JIT
307 /* APPLE doesn't have mmap though */
308 #define CORO_JIT_UNIXY (__linux || __FreeBSD__ || __OpenBSD__ || __NetBSD__ || __solaris || __APPLE__)
309 #ifndef CORO_JIT_TYPE
310 #if ECB_AMD64 && CORO_JIT_UNIXY
311 #define CORO_JIT_TYPE "amd64-unix"
312 #elif __i386 && CORO_JIT_UNIXY
313 #define CORO_JIT_TYPE "x86-unix"
314 #endif
315 #endif
316#endif
317
318#if !defined(CORO_JIT_TYPE) || _POSIX_MEMORY_PROTECTION <= 0
319 #undef CORO_JIT
320#endif
321
322#if CORO_JIT
323 typedef void (*load_save_perl_slots_type)(perl_slots *);
324 static load_save_perl_slots_type load_perl_slots, save_perl_slots;
325#endif
326
288/** Coro::Select ************************************************************/ 327/** Coro::Select ************************************************************/
289 328
290static OP *(*coro_old_pp_sselect) (pTHX); 329static OP *(*coro_old_pp_sselect) (pTHX);
291static SV *coro_select_select; 330static SV *coro_select_select;
292 331
293/* horrible hack, but if it works... */ 332/* horrible hack, but if it works... */
294static OP * 333static OP *
295coro_pp_sselect (aTHX) 334coro_pp_sselect (pTHX)
296{ 335{
297 dSP; 336 dSP;
298 PUSHMARK (SP - 4); /* fake argument list */ 337 PUSHMARK (SP - 4); /* fake argument list */
299 XPUSHs (coro_select_select); 338 XPUSHs (coro_select_select);
300 PUTBACK; 339 PUTBACK;
303 PL_op->op_flags |= OPf_STACKED; 342 PL_op->op_flags |= OPf_STACKED;
304 PL_op->op_private = 0; 343 PL_op->op_private = 0;
305 return PL_ppaddr [OP_ENTERSUB](aTHX); 344 return PL_ppaddr [OP_ENTERSUB](aTHX);
306} 345}
307 346
347/** time stuff **************************************************************/
348
349#ifdef HAS_GETTIMEOFDAY
350
351ecb_inline void
352coro_u2time (pTHX_ UV ret[2])
353{
354 struct timeval tv;
355 gettimeofday (&tv, 0);
356
357 ret [0] = tv.tv_sec;
358 ret [1] = tv.tv_usec;
359}
360
361ecb_inline double
362coro_nvtime (void)
363{
364 struct timeval tv;
365 gettimeofday (&tv, 0);
366
367 return tv.tv_sec + tv.tv_usec * 1e-6;
368}
369
370ecb_inline void
371time_init (pTHX)
372{
373 nvtime = coro_nvtime;
374 u2time = coro_u2time;
375}
376
377#else
378
379ecb_inline void
380time_init (pTHX)
381{
382 SV **svp;
383
384 require_pv ("Time/HiRes.pm");
385
386 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
387
388 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
389 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
390
391 nvtime = INT2PTR (double (*)(), SvIV (*svp));
392
393 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
394 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
395}
396
397#endif
398
308/** lowlevel stuff **********************************************************/ 399/** lowlevel stuff **********************************************************/
309 400
310static SV * 401static SV * ecb_noinline
311coro_get_sv (pTHX_ const char *name, int create) 402coro_get_sv (pTHX_ const char *name, int create)
312{ 403{
313#if PERL_VERSION_ATLEAST (5,10,0) 404#if PERL_VERSION_ATLEAST (5,10,0)
314 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 405 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
315 get_sv (name, create); 406 get_sv (name, create);
316#endif 407#endif
317 return get_sv (name, create); 408 return get_sv (name, create);
318} 409}
319 410
320static AV * 411static AV * ecb_noinline
321coro_get_av (pTHX_ const char *name, int create) 412coro_get_av (pTHX_ const char *name, int create)
322{ 413{
323#if PERL_VERSION_ATLEAST (5,10,0) 414#if PERL_VERSION_ATLEAST (5,10,0)
324 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 415 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
325 get_av (name, create); 416 get_av (name, create);
326#endif 417#endif
327 return get_av (name, create); 418 return get_av (name, create);
328} 419}
329 420
330static HV * 421static HV * ecb_noinline
331coro_get_hv (pTHX_ const char *name, int create) 422coro_get_hv (pTHX_ const char *name, int create)
332{ 423{
333#if PERL_VERSION_ATLEAST (5,10,0) 424#if PERL_VERSION_ATLEAST (5,10,0)
334 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 425 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
335 get_hv (name, create); 426 get_hv (name, create);
336#endif 427#endif
337 return get_hv (name, create); 428 return get_hv (name, create);
338} 429}
339 430
340INLINE void 431ecb_inline void
341coro_times_update () 432coro_times_update (void)
342{ 433{
343#ifdef coro_clock_gettime 434#ifdef coro_clock_gettime
344 struct timespec ts; 435 struct timespec ts;
345 436
346 ts.tv_sec = ts.tv_nsec = 0; 437 ts.tv_sec = ts.tv_nsec = 0;
358 time_real [0] = tv [0]; 449 time_real [0] = tv [0];
359 time_real [1] = tv [1] * 1000; 450 time_real [1] = tv [1] * 1000;
360#endif 451#endif
361} 452}
362 453
363INLINE void 454ecb_inline void
364coro_times_add (struct coro *c) 455coro_times_add (struct coro *c)
365{ 456{
366 c->t_real [1] += time_real [1]; 457 c->t_real [1] += time_real [1];
367 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; } 458 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
368 c->t_real [0] += time_real [0]; 459 c->t_real [0] += time_real [0];
370 c->t_cpu [1] += time_cpu [1]; 461 c->t_cpu [1] += time_cpu [1];
371 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; } 462 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
372 c->t_cpu [0] += time_cpu [0]; 463 c->t_cpu [0] += time_cpu [0];
373} 464}
374 465
375INLINE void 466ecb_inline void
376coro_times_sub (struct coro *c) 467coro_times_sub (struct coro *c)
377{ 468{
378 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; } 469 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
379 c->t_real [1] -= time_real [1]; 470 c->t_real [1] -= time_real [1];
380 c->t_real [0] -= time_real [0]; 471 c->t_real [0] -= time_real [0];
388/* magic glue */ 479/* magic glue */
389 480
390#define CORO_MAGIC_type_cv 26 481#define CORO_MAGIC_type_cv 26
391#define CORO_MAGIC_type_state PERL_MAGIC_ext 482#define CORO_MAGIC_type_state PERL_MAGIC_ext
392 483
393#define CORO_MAGIC_NN(sv, type) \ 484#define CORO_MAGIC_NN(sv, type) \
394 (expect_true (SvMAGIC (sv)->mg_type == type) \ 485 (ecb_expect_true (SvMAGIC (sv)->mg_type == type) \
395 ? SvMAGIC (sv) \ 486 ? SvMAGIC (sv) \
396 : mg_find (sv, type)) 487 : mg_find (sv, type))
397 488
398#define CORO_MAGIC(sv, type) \ 489#define CORO_MAGIC(sv, type) \
399 (expect_true (SvMAGIC (sv)) \ 490 (ecb_expect_true (SvMAGIC (sv)) \
400 ? CORO_MAGIC_NN (sv, type) \ 491 ? CORO_MAGIC_NN (sv, type) \
401 : 0) 492 : 0)
402 493
403#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 494#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
404#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 495#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
405 496
406INLINE struct coro * 497ecb_inline MAGIC *
407SvSTATE_ (pTHX_ SV *coro) 498SvSTATEhv_p (pTHX_ SV *coro)
408{ 499{
409 HV *stash;
410 MAGIC *mg; 500 MAGIC *mg;
411 501
502 if (ecb_expect_true (
503 SvTYPE (coro) == SVt_PVHV
504 && (mg = CORO_MAGIC_state (coro))
505 && mg->mg_virtual == &coro_state_vtbl
506 ))
507 return mg;
508
509 return 0;
510}
511
512ecb_inline struct coro *
513SvSTATE_ (pTHX_ SV *coro_sv)
514{
515 MAGIC *mg;
516
412 if (SvROK (coro)) 517 if (SvROK (coro_sv))
413 coro = SvRV (coro); 518 coro_sv = SvRV (coro_sv);
414 519
415 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 520 mg = SvSTATEhv_p (aTHX_ coro_sv);
521 if (!mg)
416 croak ("Coro::State object required"); 522 croak ("Coro::State object required");
417 523
418 stash = SvSTASH (coro);
419 if (expect_false (stash != coro_stash && stash != coro_state_stash))
420 {
421 /* very slow, but rare, check */
422 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
423 croak ("Coro::State object required");
424 }
425
426 mg = CORO_MAGIC_state (coro);
427 return (struct coro *)mg->mg_ptr; 524 return (struct coro *)mg->mg_ptr;
428} 525}
429 526
430#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 527#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
431 528
434#define SvSTATE_current SvSTATE_hv (SvRV (coro_current)) 531#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
435 532
436/*****************************************************************************/ 533/*****************************************************************************/
437/* padlist management and caching */ 534/* padlist management and caching */
438 535
439static AV * 536ecb_inline PADLIST *
440coro_derive_padlist (pTHX_ CV *cv) 537coro_derive_padlist (pTHX_ CV *cv)
441{ 538{
442 AV *padlist = CvPADLIST (cv); 539 PADLIST *padlist = CvPADLIST (cv);
443 AV *newpadlist, *newpad; 540 PADLIST *newpadlist;
541 PADNAMELIST *padnames;
542 PAD *newpad;
543 PADOFFSET off = PadlistMAX (padlist) + 1;
444 544
445 newpadlist = newAV (); 545#if NEWPADAPI
546
547 /* if we had the original CvDEPTH, we might be able to steal the CvDEPTH+1 entry instead */
548 /* 20131102194744.GA6705@schmorp.de, 20131102195825.2013.qmail@lists-nntp.develooper.com */
549 while (!PadlistARRAY (padlist)[off - 1])
550 --off;
551
552 Perl_pad_push (aTHX_ padlist, off);
553
554 newpad = PadlistARRAY (padlist)[off];
555 PadlistARRAY (padlist)[off] = 0;
556
557#else
558
559#if PERL_VERSION_ATLEAST (5,10,0)
560 Perl_pad_push (aTHX_ padlist, off);
561#else
562 Perl_pad_push (aTHX_ padlist, off, 1);
563#endif
564
565 newpad = PadlistARRAY (padlist)[off];
566 PadlistMAX (padlist) = off - 1;
567
568#endif
569
570 newPADLIST (newpadlist);
571#if !PERL_VERSION_ATLEAST(5,15,3)
572 /* Padlists are AvREAL as of 5.15.3. See perl bug #98092 and perl commit 7d953ba. */
446 AvREAL_off (newpadlist); 573 AvREAL_off (newpadlist);
447#if PERL_VERSION_ATLEAST (5,10,0)
448 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
449#else
450 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
451#endif 574#endif
452 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
453 --AvFILLp (padlist);
454 575
455 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0])); 576 /* Already extended to 2 elements by newPADLIST. */
456 av_store (newpadlist, 1, (SV *)newpad); 577 PadlistMAX (newpadlist) = 1;
578
579 padnames = PadlistNAMES (padlist);
580 ++PadnamelistREFCNT (padnames);
581 PadlistNAMES (newpadlist) = padnames;
582
583 PadlistARRAY (newpadlist)[1] = newpad;
457 584
458 return newpadlist; 585 return newpadlist;
459} 586}
460 587
461static void 588ecb_inline void
462free_padlist (pTHX_ AV *padlist) 589free_padlist (pTHX_ PADLIST *padlist)
463{ 590{
464 /* may be during global destruction */ 591 /* may be during global destruction */
465 if (!IN_DESTRUCT) 592 if (!IN_DESTRUCT)
466 { 593 {
467 I32 i = AvFILLp (padlist); 594 I32 i = PadlistMAX (padlist);
468 595
469 while (i > 0) /* special-case index 0 */ 596 while (i > 0) /* special-case index 0 */
470 { 597 {
471 /* we try to be extra-careful here */ 598 /* we try to be extra-careful here */
472 AV *av = (AV *)AvARRAY (padlist)[i--]; 599 PAD *pad = PadlistARRAY (padlist)[i--];
473 I32 j = AvFILLp (av);
474 600
601 if (pad)
602 {
603 I32 j = PadMAX (pad);
604
475 while (j >= 0) 605 while (j >= 0)
476 SvREFCNT_dec (AvARRAY (av)[j--]); 606 SvREFCNT_dec (PadARRAY (pad)[j--]);
477 607
478 AvFILLp (av) = -1; 608 PadMAX (pad) = -1;
479 SvREFCNT_dec (av); 609 SvREFCNT_dec (pad);
610 }
480 } 611 }
481 612
482 SvREFCNT_dec (AvARRAY (padlist)[0]); 613 PadnamelistREFCNT_dec (PadlistNAMES (padlist));
483 614
615#if NEWPADAPI
616 Safefree (PadlistARRAY (padlist));
617 Safefree (padlist);
618#else
484 AvFILLp (padlist) = -1; 619 AvFILLp (padlist) = -1;
620 AvREAL_off (padlist);
485 SvREFCNT_dec ((SV*)padlist); 621 SvREFCNT_dec ((SV*)padlist);
622#endif
486 } 623 }
487} 624}
488 625
489static int 626static int
490coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 627coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
491{ 628{
492 AV *padlist; 629 PADLIST *padlist;
493 AV *av = (AV *)mg->mg_obj; 630 PADLIST **padlists = (PADLIST **)(mg->mg_ptr + sizeof(size_t));
631 size_t len = *(size_t *)mg->mg_ptr;
494 632
495 /* perl manages to free our internal AV and _then_ call us */ 633 /* perl manages to free our internal AV and _then_ call us */
496 if (IN_DESTRUCT) 634 if (IN_DESTRUCT)
497 return 0; 635 return 0;
498 636
499 /* casting is fun. */ 637 while (len--)
500 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
501 free_padlist (aTHX_ padlist); 638 free_padlist (aTHX_ padlists[len]);
502
503 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
504 639
505 return 0; 640 return 0;
506} 641}
507 642
508static MGVTBL coro_cv_vtbl = { 643static MGVTBL coro_cv_vtbl = {
509 0, 0, 0, 0, 644 0, 0, 0, 0,
510 coro_cv_free 645 coro_cv_free
511}; 646};
512 647
513/* the next two functions merely cache the padlists */ 648/* the next two functions merely cache the padlists */
514static void 649ecb_inline void
515get_padlist (pTHX_ CV *cv) 650get_padlist (pTHX_ CV *cv)
516{ 651{
517 MAGIC *mg = CORO_MAGIC_cv (cv); 652 MAGIC *mg = CORO_MAGIC_cv (cv);
518 AV *av; 653 size_t *lenp;
519 654
520 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 655 if (ecb_expect_true (mg && *(lenp = (size_t *)mg->mg_ptr)))
521 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 656 CvPADLIST (cv) = ((PADLIST **)(mg->mg_ptr + sizeof(size_t)))[--*lenp];
522 else 657 else
523 { 658 {
524#if CORO_PREFER_PERL_FUNCTIONS 659#if CORO_PREFER_PERL_FUNCTIONS
525 /* this is probably cleaner? but also slower! */ 660 /* this is probably cleaner? but also slower! */
526 /* in practise, it seems to be less stable */ 661 /* in practise, it seems to be less stable */
532 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv); 667 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
533#endif 668#endif
534 } 669 }
535} 670}
536 671
537static void 672ecb_inline void
538put_padlist (pTHX_ CV *cv) 673put_padlist (pTHX_ CV *cv)
539{ 674{
540 MAGIC *mg = CORO_MAGIC_cv (cv); 675 MAGIC *mg = CORO_MAGIC_cv (cv);
541 AV *av;
542 676
543 if (expect_false (!mg)) 677 if (ecb_expect_false (!mg))
678 {
544 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 679 mg = sv_magicext ((SV *)cv, 0, CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
680 Newz (0, mg->mg_ptr ,sizeof (size_t) + sizeof (PADLIST *), char);
681 mg->mg_len = 1; /* so mg_free frees mg_ptr */
682 }
683 else
684 Renew (mg->mg_ptr,
685 sizeof(size_t) + (*(size_t *)mg->mg_ptr + 1) * sizeof(PADLIST *),
686 char);
545 687
546 av = (AV *)mg->mg_obj; 688 ((PADLIST **)(mg->mg_ptr + sizeof (size_t))) [(*(size_t *)mg->mg_ptr)++] = CvPADLIST (cv);
547
548 if (expect_false (AvFILLp (av) >= AvMAX (av)))
549 av_extend (av, AvFILLp (av) + 1);
550
551 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
552} 689}
553 690
554/** load & save, init *******************************************************/ 691/** load & save, init *******************************************************/
692
693ecb_inline void
694swap_sv (SV *a, SV *b)
695{
696 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
697 SV tmp;
698
699 /* swap sv_any */
700 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
701
702 /* swap sv_flags */
703 SvFLAGS (&tmp) = SvFLAGS (a);
704 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
705 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
706
707#if PERL_VERSION_ATLEAST (5,10,0)
708 /* perl 5.10 and later complicates this _quite_ a bit, but it also
709 * is much faster, so no quarrels here. alternatively, we could
710 * sv_upgrade to avoid this.
711 */
712 {
713 /* swap sv_u */
714 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
715
716 /* if SvANY points to the head, we need to adjust the pointers,
717 * as the pointer for a still points to b, and maybe vice versa.
718 */
719 U32 svany_in_head_set = (1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV);
720 #if NVSIZE <= IVSIZE && PERL_VERSION_ATLEAST(5,22,0)
721 svany_in_head_set |= 1 << SVt_NV;
722 #endif
723
724 #define svany_in_head(type) (svany_in_head_set & (1 << (type)))
725
726 if (svany_in_head (SvTYPE (a)))
727 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
728
729 if (svany_in_head (SvTYPE (b)))
730 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
731 }
732#endif
733}
734
735/* swap sv heads, at least logically */
736static void
737swap_svs_enter (pTHX_ Coro__State c)
738{
739 int i;
740
741 for (i = 0; i <= AvFILLp (c->swap_sv); i += 2)
742 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
743}
744
745static void
746swap_svs_leave (pTHX_ Coro__State c)
747{
748 int i;
749
750 for (i = AvFILLp (c->swap_sv) - 1; i >= 0; i -= 2)
751 swap_sv (AvARRAY (c->swap_sv)[i], AvARRAY (c->swap_sv)[i + 1]);
752}
753
754#define SWAP_SVS_ENTER(coro) \
755 if (ecb_expect_false ((coro)->swap_sv)) \
756 swap_svs_enter (aTHX_ (coro))
757
758#define SWAP_SVS_LEAVE(coro) \
759 if (ecb_expect_false ((coro)->swap_sv)) \
760 swap_svs_leave (aTHX_ (coro))
555 761
556static void 762static void
557on_enterleave_call (pTHX_ SV *cb); 763on_enterleave_call (pTHX_ SV *cb);
558 764
559static void 765static void
562 perl_slots *slot = c->slot; 768 perl_slots *slot = c->slot;
563 c->slot = 0; 769 c->slot = 0;
564 770
565 PL_mainstack = c->mainstack; 771 PL_mainstack = c->mainstack;
566 772
567 GvSV (PL_defgv) = slot->defsv; 773#if CORO_JIT
568 GvAV (PL_defgv) = slot->defav; 774 load_perl_slots (slot);
569 GvSV (PL_errgv) = slot->errsv; 775#else
570 GvSV (irsgv) = slot->irsgv;
571 GvHV (PL_hintgv) = slot->hinthv;
572
573 #define VAR(name,type) PL_ ## name = slot->name; 776 #define VARx(name,expr,type) expr = slot->name;
574 # include "state.h" 777 #include "state.h"
575 #undef VAR 778#endif
576 779
577 { 780 {
578 dSP; 781 dSP;
579 782
580 CV *cv; 783 CV *cv;
581 784
582 /* now do the ugly restore mess */ 785 /* now do the ugly restore mess */
583 while (expect_true (cv = (CV *)POPs)) 786 while (ecb_expect_true (cv = (CV *)POPs))
584 { 787 {
585 put_padlist (aTHX_ cv); /* mark this padlist as available */ 788 put_padlist (aTHX_ cv); /* mark this padlist as available */
586 CvDEPTH (cv) = PTR2IV (POPs); 789 CvDEPTH (cv) = PTR2IV (POPs);
587 CvPADLIST (cv) = (AV *)POPs; 790 CvPADLIST (cv) = (PADLIST *)POPs;
588 } 791 }
589 792
590 PUTBACK; 793 PUTBACK;
591 } 794 }
592 795
593 slf_frame = c->slf_frame; 796 slf_frame = c->slf_frame;
594 CORO_THROW = c->except; 797 CORO_THROW = c->except;
595 798
596 if (expect_false (enable_times)) 799 if (ecb_expect_false (enable_times))
597 { 800 {
598 if (expect_false (!times_valid)) 801 if (ecb_expect_false (!times_valid))
599 coro_times_update (); 802 coro_times_update ();
600 803
601 coro_times_sub (c); 804 coro_times_sub (c);
602 } 805 }
603 806
604 if (expect_false (c->on_enter)) 807 if (ecb_expect_false (c->on_enter))
605 { 808 {
606 int i; 809 int i;
607 810
608 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 811 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 812 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
610 } 813 }
814
815 if (ecb_expect_false (c->on_enter_xs))
816 {
817 int i;
818
819 for (i = 0; i <= AvFILLp (c->on_enter_xs); i += 2)
820 ((coro_enterleave_hook)AvARRAY (c->on_enter_xs)[i]) (aTHX_ AvARRAY (c->on_enter_xs)[i + 1]);
821 }
822
823 SWAP_SVS_ENTER (c);
611} 824}
612 825
613static void 826static void
614save_perl (pTHX_ Coro__State c) 827save_perl (pTHX_ Coro__State c)
615{ 828{
829 SWAP_SVS_LEAVE (c);
830
831 if (ecb_expect_false (c->on_leave_xs))
832 {
833 int i;
834
835 for (i = AvFILLp (c->on_leave_xs) - 1; i >= 0; i -= 2)
836 ((coro_enterleave_hook)AvARRAY (c->on_leave_xs)[i]) (aTHX_ AvARRAY (c->on_leave_xs)[i + 1]);
837 }
838
616 if (expect_false (c->on_leave)) 839 if (ecb_expect_false (c->on_leave))
617 { 840 {
618 int i; 841 int i;
619 842
620 for (i = AvFILLp (c->on_leave); i >= 0; --i) 843 for (i = AvFILLp (c->on_leave); i >= 0; --i)
621 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 844 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
622 } 845 }
623 846
624 times_valid = 0; 847 times_valid = 0;
625 848
626 if (expect_false (enable_times)) 849 if (ecb_expect_false (enable_times))
627 { 850 {
628 coro_times_update (); times_valid = 1; 851 coro_times_update (); times_valid = 1;
629 coro_times_add (c); 852 coro_times_add (c);
630 } 853 }
631 854
645 868
646 XPUSHs (Nullsv); 869 XPUSHs (Nullsv);
647 /* this loop was inspired by pp_caller */ 870 /* this loop was inspired by pp_caller */
648 for (;;) 871 for (;;)
649 { 872 {
650 while (expect_true (cxix >= 0)) 873 while (ecb_expect_true (cxix >= 0))
651 { 874 {
652 PERL_CONTEXT *cx = &ccstk[cxix--]; 875 PERL_CONTEXT *cx = &ccstk[cxix--];
653 876
654 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT)) 877 if (ecb_expect_true (CxTYPE (cx) == CXt_SUB) || ecb_expect_false (CxTYPE (cx) == CXt_FORMAT))
655 { 878 {
656 CV *cv = cx->blk_sub.cv; 879 CV *cv = cx->blk_sub.cv;
657 880
658 if (expect_true (CvDEPTH (cv))) 881 if (ecb_expect_true (CvDEPTH (cv)))
659 { 882 {
660 EXTEND (SP, 3); 883 EXTEND (SP, 3);
661 PUSHs ((SV *)CvPADLIST (cv)); 884 PUSHs ((SV *)CvPADLIST (cv));
662 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 885 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
663 PUSHs ((SV *)cv); 886 PUSHs ((SV *)cv);
666 get_padlist (aTHX_ cv); 889 get_padlist (aTHX_ cv);
667 } 890 }
668 } 891 }
669 } 892 }
670 893
671 if (expect_true (top_si->si_type == PERLSI_MAIN)) 894 if (ecb_expect_true (top_si->si_type == PERLSI_MAIN))
672 break; 895 break;
673 896
674 top_si = top_si->si_prev; 897 top_si = top_si->si_prev;
675 ccstk = top_si->si_cxstack; 898 ccstk = top_si->si_cxstack;
676 cxix = top_si->si_cxix; 899 cxix = top_si->si_cxix;
678 901
679 PUTBACK; 902 PUTBACK;
680 } 903 }
681 904
682 /* allocate some space on the context stack for our purposes */ 905 /* allocate some space on the context stack for our purposes */
683 /* we manually unroll here, as usually 2 slots is enough */ 906 if (ecb_expect_false (cxstack_ix + (int)SLOT_COUNT >= cxstack_max))
684 if (SLOT_COUNT >= 1) CXINC;
685 if (SLOT_COUNT >= 2) CXINC;
686 if (SLOT_COUNT >= 3) CXINC;
687 { 907 {
688 unsigned int i; 908 unsigned int i;
909
689 for (i = 3; i < SLOT_COUNT; ++i) 910 for (i = 0; i < SLOT_COUNT; ++i)
690 CXINC; 911 CXINC;
691 } 912
692 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 913 cxstack_ix -= SLOT_COUNT; /* undo allocation */
914 }
693 915
694 c->mainstack = PL_mainstack; 916 c->mainstack = PL_mainstack;
695 917
696 { 918 {
697 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 919 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
698 920
699 slot->defav = GvAV (PL_defgv); 921#if CORO_JIT
700 slot->defsv = DEFSV; 922 save_perl_slots (slot);
701 slot->errsv = ERRSV; 923#else
702 slot->irsgv = GvSV (irsgv);
703 slot->hinthv = GvHV (PL_hintgv);
704
705 #define VAR(name,type) slot->name = PL_ ## name; 924 #define VARx(name,expr,type) slot->name = expr;
706 # include "state.h" 925 #include "state.h"
707 #undef VAR 926#endif
708 } 927 }
709} 928}
710 929
711/* 930/*
712 * allocate various perl stacks. This is almost an exact copy 931 * allocate various perl stacks. This is almost an exact copy
718# define coro_init_stacks(thx) init_stacks () 937# define coro_init_stacks(thx) init_stacks ()
719#else 938#else
720static void 939static void
721coro_init_stacks (pTHX) 940coro_init_stacks (pTHX)
722{ 941{
723 PL_curstackinfo = new_stackinfo(32, 8); 942 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
724 PL_curstackinfo->si_type = PERLSI_MAIN; 943 PL_curstackinfo->si_type = PERLSI_MAIN;
725 PL_curstack = PL_curstackinfo->si_stack; 944 PL_curstack = PL_curstackinfo->si_stack;
726 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 945 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
727 946
728 PL_stack_base = AvARRAY(PL_curstack); 947 PL_stack_base = AvARRAY(PL_curstack);
743#endif 962#endif
744 963
745 New(54,PL_scopestack,8,I32); 964 New(54,PL_scopestack,8,I32);
746 PL_scopestack_ix = 0; 965 PL_scopestack_ix = 0;
747 PL_scopestack_max = 8; 966 PL_scopestack_max = 8;
967#if HAS_SCOPESTACK_NAME
968 New(54,PL_scopestack_name,8,const char*);
969#endif
748 970
749 New(54,PL_savestack,24,ANY); 971 New(54,PL_savestack,24,ANY);
750 PL_savestack_ix = 0; 972 PL_savestack_ix = 0;
751 PL_savestack_max = 24; 973 PL_savestack_max = 24;
974#if PERL_VERSION_ATLEAST (5,24,0)
975 /* perl 5.24 moves SS_MAXPUSH optimisation from */
976 /* the header macros to PL_savestack_max */
977 PL_savestack_max -= SS_MAXPUSH;
978#endif
752 979
753#if !PERL_VERSION_ATLEAST (5,10,0) 980#if !PERL_VERSION_ATLEAST (5,10,0)
754 New(54,PL_retstack,4,OP*); 981 New(54,PL_retstack,4,OP*);
755 PL_retstack_ix = 0; 982 PL_retstack_ix = 0;
756 PL_retstack_max = 4; 983 PL_retstack_max = 4;
780 } 1007 }
781 1008
782 Safefree (PL_tmps_stack); 1009 Safefree (PL_tmps_stack);
783 Safefree (PL_markstack); 1010 Safefree (PL_markstack);
784 Safefree (PL_scopestack); 1011 Safefree (PL_scopestack);
1012#if HAS_SCOPESTACK_NAME
1013 Safefree (PL_scopestack_name);
1014#endif
785 Safefree (PL_savestack); 1015 Safefree (PL_savestack);
786#if !PERL_VERSION_ATLEAST (5,10,0) 1016#if !PERL_VERSION_ATLEAST (5,10,0)
787 Safefree (PL_retstack); 1017 Safefree (PL_retstack);
788#endif 1018#endif
789} 1019}
819 } 1049 }
820 1050
821 return rss; 1051 return rss;
822} 1052}
823 1053
824/** coroutine stack handling ************************************************/ 1054/** provide custom get/set/clear methods for %SIG elements ******************/
825
826static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
827static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
828static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
829 1055
830/* apparently < 5.8.8 */ 1056/* apparently < 5.8.8 */
831#ifndef MgPV_nolen_const 1057#ifndef MgPV_nolen_const
832#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \ 1058#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
833 SvPV_nolen((SV*)((mg)->mg_ptr)) : \ 1059 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
834 (const char*)(mg)->mg_ptr) 1060 (const char*)(mg)->mg_ptr)
835#endif 1061#endif
836 1062
1063/* this will be a patched copy of PL_vtbl_sigelem */
1064static MGVTBL coro_sigelem_vtbl;
1065
1066static int ecb_cold
1067coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1068{
1069 char *key = SvPV_nolen ((SV *)name);
1070
1071 /* do what mg_copy normally does */
1072 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1073 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1074
1075 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1076 if (*key == '_'
1077 && (strEQ (key, "__DIE__")
1078 || strEQ (key, "__WARN__")))
1079 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1080
1081 return 1;
1082}
1083
1084/* perl does not have a %SIG vtbl, we provide one so we can override */
1085/* the magic vtbl for the __DIE__ and __WARN__ members */
1086static const MGVTBL coro_sig_vtbl = {
1087 0, 0, 0, 0, 0,
1088 coro_sig_copy
1089};
1090
837/* 1091/*
838 * This overrides the default magic get method of %SIG elements. 1092 * This overrides the default magic get method of %SIG elements.
839 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 1093 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
840 * and instead of trying to save and restore the hash elements, we just provide 1094 * and instead of trying to save and restore the hash elements (extremely slow),
841 * readback here. 1095 * we just provide our own readback here.
842 */ 1096 */
843static int 1097static int ecb_cold
844coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1098coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
845{ 1099{
846 const char *s = MgPV_nolen_const (mg); 1100 const char *s = MgPV_nolen_const (mg);
1101 /* the key must be either __DIE__ or __WARN__ here */
1102 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
847 1103
848 if (*s == '_') 1104 SV *ssv;
849 {
850 SV **svp = 0;
851 1105
852 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
853 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
854
855 if (svp) 1106 if (!*svp)
856 { 1107 ssv = &PL_sv_undef;
857 sv_setsv (sv, *svp ? *svp : &PL_sv_undef); 1108 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
858 return 0; 1109 ssv = sv_2mortal (newRV_inc (*svp));
859 } 1110 else
860 } 1111 ssv = *svp;
861 1112
862 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0; 1113 sv_setsv (sv, ssv);
1114 return 0;
863} 1115}
864 1116
865static int 1117static int ecb_cold
866coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1118coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
867{ 1119{
868 const char *s = MgPV_nolen_const (mg); 1120 const char *s = MgPV_nolen_const (mg);
1121 /* the key must be either __DIE__ or __WARN__ here */
1122 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
869 1123
870 if (*s == '_')
871 {
872 SV **svp = 0;
873
874 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
875 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
876
877 if (svp)
878 {
879 SV *old = *svp; 1124 SV *old = *svp;
880 *svp = 0; 1125 *svp = 0;
881 SvREFCNT_dec (old); 1126 SvREFCNT_dec (old);
882 return 0; 1127 return 0;
883 }
884 }
885
886 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
887} 1128}
888 1129
889static int 1130static int ecb_cold
890coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1131coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
891{ 1132{
892 const char *s = MgPV_nolen_const (mg); 1133 const char *s = MgPV_nolen_const (mg);
1134 /* the key must be either __DIE__ or __WARN__ here */
1135 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
893 1136
894 if (*s == '_')
895 {
896 SV **svp = 0;
897
898 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
899 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
900
901 if (svp)
902 {
903 SV *old = *svp; 1137 SV *old = *svp;
904 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1138 *svp = SvOK (sv) ? newSVsv (sv) : 0;
905 SvREFCNT_dec (old); 1139 SvREFCNT_dec (old);
906 return 0; 1140 return 0;
907 }
908 }
909
910 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
911} 1141}
912 1142
913static void 1143static void
914prepare_nop (pTHX_ struct coro_transfer_args *ta) 1144prepare_nop (pTHX_ struct coro_transfer_args *ta)
915{ 1145{
927slf_check_repeat (pTHX_ struct CoroSLF *frame) 1157slf_check_repeat (pTHX_ struct CoroSLF *frame)
928{ 1158{
929 return 1; 1159 return 1;
930} 1160}
931 1161
932static UNOP coro_setup_op; 1162/** coroutine stack handling ************************************************/
933 1163
934static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1164static UNOP init_perl_op;
1165
1166ecb_noinline static void /* noinline to keep it out of the transfer fast path */
935coro_setup (pTHX_ struct coro *coro) 1167init_perl (pTHX_ struct coro *coro)
936{ 1168{
937 /* 1169 /*
938 * emulate part of the perl startup here. 1170 * emulate part of the perl startup here.
939 */ 1171 */
940 coro_init_stacks (aTHX); 1172 coro_init_stacks (aTHX);
947 PL_comppad_name_fill = 0; 1179 PL_comppad_name_fill = 0;
948 PL_comppad_name_floor = 0; 1180 PL_comppad_name_floor = 0;
949 PL_curpm = 0; 1181 PL_curpm = 0;
950 PL_curpad = 0; 1182 PL_curpad = 0;
951 PL_localizing = 0; 1183 PL_localizing = 0;
952 PL_dirty = 0;
953 PL_restartop = 0; 1184 PL_restartop = 0;
954#if PERL_VERSION_ATLEAST (5,10,0) 1185#if PERL_VERSION_ATLEAST (5,10,0)
955 PL_parser = 0; 1186 PL_parser = 0;
956#endif 1187#endif
957 PL_hints = 0; 1188 PL_hints = 0;
958 1189
959 /* recreate the die/warn hooks */ 1190 /* recreate the die/warn hooks */
960 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1191 PL_diehook = SvREFCNT_inc (rv_diehook);
961 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1192 PL_warnhook = SvREFCNT_inc (rv_warnhook);
962 1193
963 GvSV (PL_defgv) = newSV (0); 1194 GvSV (PL_defgv) = newSV (0);
964 GvAV (PL_defgv) = coro->args; coro->args = 0; 1195 GvAV (PL_defgv) = coro->args; coro->args = 0;
965 GvSV (PL_errgv) = newSV (0); 1196 GvSV (PL_errgv) = newSV (0);
966 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1197 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
967 GvHV (PL_hintgv) = 0; 1198 GvHV (PL_hintgv) = newHV ();
1199#if PERL_VERSION_ATLEAST (5,10,0)
1200 hv_magic (GvHV (PL_hintgv), 0, PERL_MAGIC_hints);
1201#endif
968 PL_rs = newSVsv (GvSV (irsgv)); 1202 PL_rs = newSVsv (GvSV (irsgv));
969 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1203 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
970 1204
971 { 1205 {
972 dSP; 1206 dSP;
987 /* this newly created coroutine might be run on an existing cctx which most 1221 /* this newly created coroutine might be run on an existing cctx which most
988 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1222 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
989 */ 1223 */
990 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1224 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
991 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1225 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1226 slf_frame.destroy = 0;
992 1227
993 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1228 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
994 coro_setup_op.op_next = PL_op; 1229 init_perl_op.op_next = PL_op;
995 coro_setup_op.op_type = OP_ENTERSUB; 1230 init_perl_op.op_type = OP_ENTERSUB;
996 coro_setup_op.op_ppaddr = pp_slf; 1231 init_perl_op.op_ppaddr = pp_slf;
997 /* no flags etc. required, as an init function won't be called */ 1232 /* no flags etc. required, as an init function won't be called */
998 1233
999 PL_op = (OP *)&coro_setup_op; 1234 PL_op = (OP *)&init_perl_op;
1000 1235
1001 /* copy throw, in case it was set before coro_setup */ 1236 /* copy throw, in case it was set before init_perl */
1002 CORO_THROW = coro->except; 1237 CORO_THROW = coro->except;
1003 1238
1239 SWAP_SVS_ENTER (coro);
1240
1004 if (expect_false (enable_times)) 1241 if (ecb_expect_false (enable_times))
1005 { 1242 {
1006 coro_times_update (); 1243 coro_times_update ();
1007 coro_times_sub (coro); 1244 coro_times_sub (coro);
1008 } 1245 }
1009} 1246}
1028 dounwind (-1); 1265 dounwind (-1);
1029 } 1266 }
1030} 1267}
1031 1268
1032static void 1269static void
1033coro_destruct_perl (pTHX_ struct coro *coro) 1270destroy_perl (pTHX_ struct coro *coro)
1034{ 1271{
1035 SV *svf [9]; 1272 SV *svf [9];
1036 1273
1037 { 1274 {
1275 SV *old_current = SvRV (coro_current);
1038 struct coro *current = SvSTATE_current; 1276 struct coro *current = SvSTATE (old_current);
1039 1277
1040 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1278 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1041 1279
1042 save_perl (aTHX_ current); 1280 save_perl (aTHX_ current);
1281
1282 /* this will cause transfer_check to croak on block*/
1283 SvRV_set (coro_current, (SV *)coro->hv);
1284
1043 load_perl (aTHX_ coro); 1285 load_perl (aTHX_ coro);
1044 1286
1287 /* restore swapped sv's */
1288 SWAP_SVS_LEAVE (coro);
1289
1045 coro_unwind_stacks (aTHX); 1290 coro_unwind_stacks (aTHX);
1291
1046 coro_destruct_stacks (aTHX); 1292 coro_destruct_stacks (aTHX);
1047 1293
1048 // now save some sv's to be free'd later 1294 /* now save some sv's to be free'd later */
1049 svf [0] = GvSV (PL_defgv); 1295 svf [0] = GvSV (PL_defgv);
1050 svf [1] = (SV *)GvAV (PL_defgv); 1296 svf [1] = (SV *)GvAV (PL_defgv);
1051 svf [2] = GvSV (PL_errgv); 1297 svf [2] = GvSV (PL_errgv);
1052 svf [3] = (SV *)PL_defoutgv; 1298 svf [3] = (SV *)PL_defoutgv;
1053 svf [4] = PL_rs; 1299 svf [4] = PL_rs;
1055 svf [6] = (SV *)GvHV (PL_hintgv); 1301 svf [6] = (SV *)GvHV (PL_hintgv);
1056 svf [7] = PL_diehook; 1302 svf [7] = PL_diehook;
1057 svf [8] = PL_warnhook; 1303 svf [8] = PL_warnhook;
1058 assert (9 == sizeof (svf) / sizeof (*svf)); 1304 assert (9 == sizeof (svf) / sizeof (*svf));
1059 1305
1306 SvRV_set (coro_current, old_current);
1307
1060 load_perl (aTHX_ current); 1308 load_perl (aTHX_ current);
1061 } 1309 }
1062 1310
1063 { 1311 {
1064 unsigned int i; 1312 unsigned int i;
1068 1316
1069 SvREFCNT_dec (coro->saved_deffh); 1317 SvREFCNT_dec (coro->saved_deffh);
1070 SvREFCNT_dec (coro->rouse_cb); 1318 SvREFCNT_dec (coro->rouse_cb);
1071 SvREFCNT_dec (coro->invoke_cb); 1319 SvREFCNT_dec (coro->invoke_cb);
1072 SvREFCNT_dec (coro->invoke_av); 1320 SvREFCNT_dec (coro->invoke_av);
1321 SvREFCNT_dec (coro->on_enter_xs);
1322 SvREFCNT_dec (coro->on_leave_xs);
1073 } 1323 }
1074} 1324}
1075 1325
1076INLINE void 1326ecb_inline void
1077free_coro_mortal (pTHX) 1327free_coro_mortal (pTHX)
1078{ 1328{
1079 if (expect_true (coro_mortal)) 1329 if (ecb_expect_true (coro_mortal))
1080 { 1330 {
1081 SvREFCNT_dec (coro_mortal); 1331 SvREFCNT_dec ((SV *)coro_mortal);
1082 coro_mortal = 0; 1332 coro_mortal = 0;
1083 } 1333 }
1084} 1334}
1085 1335
1086static int 1336static int
1140 1390
1141 if (PL_curcop != &PL_compiling) 1391 if (PL_curcop != &PL_compiling)
1142 { 1392 {
1143 SV **cb; 1393 SV **cb;
1144 1394
1145 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB) 1395 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB && cxstack_ix >= 0)
1146 { 1396 {
1147 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1397 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1148 1398
1149 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1399 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1150 { 1400 {
1219 1469
1220 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1470 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1221} 1471}
1222 1472
1223/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1473/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1224static void NOINLINE 1474static void ecb_noinline
1225cctx_prepare (pTHX) 1475cctx_prepare (pTHX)
1226{ 1476{
1227 PL_top_env = &PL_start_env; 1477 PL_top_env = &PL_start_env;
1228 1478
1229 if (cctx_current->flags & CC_TRACE) 1479 if (cctx_current->flags & CC_TRACE)
1240 slf_frame.prepare = slf_prepare_set_stacklevel; 1490 slf_frame.prepare = slf_prepare_set_stacklevel;
1241 slf_frame.check = slf_check_set_stacklevel; 1491 slf_frame.check = slf_check_set_stacklevel;
1242} 1492}
1243 1493
1244/* the tail of transfer: execute stuff we can only do after a transfer */ 1494/* the tail of transfer: execute stuff we can only do after a transfer */
1245INLINE void 1495ecb_inline void
1246transfer_tail (pTHX) 1496transfer_tail (pTHX)
1247{ 1497{
1248 free_coro_mortal (aTHX); 1498 free_coro_mortal (aTHX);
1499}
1500
1501/* try to exit the same way perl's main function would do */
1502/* we do not bother resetting the environment or other things *7
1503/* that are not, uhm, essential */
1504/* this obviously also doesn't work when perl is embedded */
1505static void ecb_noinline ecb_cold
1506perlish_exit (pTHX)
1507{
1508 int exitstatus = perl_destruct (PL_curinterp);
1509 perl_free (PL_curinterp);
1510 exit (exitstatus);
1249} 1511}
1250 1512
1251/* 1513/*
1252 * this is a _very_ stripped down perl interpreter ;) 1514 * this is a _very_ stripped down perl interpreter ;)
1253 */ 1515 */
1275 /* somebody or something will hit me for both perl_run and PL_restartop */ 1537 /* somebody or something will hit me for both perl_run and PL_restartop */
1276 PL_restartop = PL_op; 1538 PL_restartop = PL_op;
1277 perl_run (PL_curinterp); 1539 perl_run (PL_curinterp);
1278 /* 1540 /*
1279 * Unfortunately, there is no way to get at the return values of the 1541 * Unfortunately, there is no way to get at the return values of the
1280 * coro body here, as perl_run destroys these 1542 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1543 * runtime errors here, as this is just a random interpreter, not a thread.
1281 */ 1544 */
1545
1546 /*
1547 * pp_entersub in 5.24 no longer ENTERs, but perl_destruct
1548 * requires PL_scopestack_ix, so do it here if required.
1549 */
1550 if (!PL_scopestack_ix)
1551 ENTER;
1282 1552
1283 /* 1553 /*
1284 * If perl-run returns we assume exit() was being called or the coro 1554 * 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) 1555 * 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 1556 * 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" 1557 * 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 */ 1558 */
1292 PL_top_env = main_top_env; 1559 perlish_exit (aTHX);
1293 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1294 } 1560 }
1295} 1561}
1296 1562
1297static coro_cctx * 1563static coro_cctx *
1298cctx_new () 1564cctx_new (void)
1299{ 1565{
1300 coro_cctx *cctx; 1566 coro_cctx *cctx;
1301 1567
1302 ++cctx_count; 1568 ++cctx_count;
1303 New (0, cctx, 1, coro_cctx); 1569 New (0, cctx, 1, coro_cctx);
1309 return cctx; 1575 return cctx;
1310} 1576}
1311 1577
1312/* create a new cctx only suitable as source */ 1578/* create a new cctx only suitable as source */
1313static coro_cctx * 1579static coro_cctx *
1314cctx_new_empty () 1580cctx_new_empty (void)
1315{ 1581{
1316 coro_cctx *cctx = cctx_new (); 1582 coro_cctx *cctx = cctx_new ();
1317 1583
1318 cctx->sptr = 0; 1584 cctx->stack.sptr = 0;
1319 coro_create (&cctx->cctx, 0, 0, 0, 0); 1585 coro_create (&cctx->cctx, 0, 0, 0, 0);
1320 1586
1321 return cctx; 1587 return cctx;
1322} 1588}
1323 1589
1324/* create a new cctx suitable as destination/running a perl interpreter */ 1590/* create a new cctx suitable as destination/running a perl interpreter */
1325static coro_cctx * 1591static coro_cctx *
1326cctx_new_run () 1592cctx_new_run (void)
1327{ 1593{
1328 coro_cctx *cctx = cctx_new (); 1594 coro_cctx *cctx = cctx_new ();
1329 void *stack_start;
1330 size_t stack_size;
1331 1595
1332#if HAVE_MMAP 1596 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 } 1597 {
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."); 1598 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1355 _exit (EXIT_FAILURE); 1599 _exit (EXIT_FAILURE);
1356 }
1357
1358 stack_start = cctx->sptr;
1359 stack_size = cctx->ssize;
1360 } 1600 }
1361 1601
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); 1602 coro_create (&cctx->cctx, cctx_run, (void *)cctx, cctx->stack.sptr, cctx->stack.ssze);
1367 1603
1368 return cctx; 1604 return cctx;
1369} 1605}
1370 1606
1371static void 1607static void
1372cctx_destroy (coro_cctx *cctx) 1608cctx_destroy (coro_cctx *cctx)
1373{ 1609{
1374 if (!cctx) 1610 if (!cctx)
1375 return; 1611 return;
1376 1612
1377 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1613 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1378 1614
1379 --cctx_count; 1615 --cctx_count;
1380 coro_destroy (&cctx->cctx); 1616 coro_destroy (&cctx->cctx);
1381 1617
1382 /* coro_transfer creates new, empty cctx's */ 1618 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 1619
1397 Safefree (cctx); 1620 Safefree (cctx);
1398} 1621}
1399 1622
1400/* wether this cctx should be destructed */ 1623/* wether this cctx should be destructed */
1401#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE)) 1624#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1402 1625
1403static coro_cctx * 1626static coro_cctx *
1404cctx_get (pTHX) 1627cctx_get (pTHX)
1405{ 1628{
1406 while (expect_true (cctx_first)) 1629 while (ecb_expect_true (cctx_first))
1407 { 1630 {
1408 coro_cctx *cctx = cctx_first; 1631 coro_cctx *cctx = cctx_first;
1409 cctx_first = cctx->next; 1632 cctx_first = cctx->next;
1410 --cctx_idle; 1633 --cctx_idle;
1411 1634
1412 if (expect_true (!CCTX_EXPIRED (cctx))) 1635 if (ecb_expect_true (!CCTX_EXPIRED (cctx)))
1413 return cctx; 1636 return cctx;
1414 1637
1415 cctx_destroy (cctx); 1638 cctx_destroy (cctx);
1416 } 1639 }
1417 1640
1419} 1642}
1420 1643
1421static void 1644static void
1422cctx_put (coro_cctx *cctx) 1645cctx_put (coro_cctx *cctx)
1423{ 1646{
1424 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr)); 1647 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->stack.sptr));
1425 1648
1426 /* free another cctx if overlimit */ 1649 /* free another cctx if overlimit */
1427 if (expect_false (cctx_idle >= cctx_max_idle)) 1650 if (ecb_expect_false (cctx_idle >= cctx_max_idle))
1428 { 1651 {
1429 coro_cctx *first = cctx_first; 1652 coro_cctx *first = cctx_first;
1430 cctx_first = first->next; 1653 cctx_first = first->next;
1431 --cctx_idle; 1654 --cctx_idle;
1432 1655
1443static void 1666static void
1444transfer_check (pTHX_ struct coro *prev, struct coro *next) 1667transfer_check (pTHX_ struct coro *prev, struct coro *next)
1445{ 1668{
1446 /* TODO: throwing up here is considered harmful */ 1669 /* TODO: throwing up here is considered harmful */
1447 1670
1448 if (expect_true (prev != next)) 1671 if (ecb_expect_true (prev != next))
1449 { 1672 {
1450 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1673 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,"); 1674 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1452 1675
1453 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1676 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,"); 1677 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1455 1678
1456#if !PERL_VERSION_ATLEAST (5,10,0) 1679#if !PERL_VERSION_ATLEAST (5,10,0)
1457 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1680 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,"); 1681 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1459#endif 1682#endif
1460 } 1683 }
1461} 1684}
1462 1685
1463/* always use the TRANSFER macro */ 1686/* always use the TRANSFER macro */
1464static void NOINLINE /* noinline so we have a fixed stackframe */ 1687static void ecb_noinline /* noinline so we have a fixed stackframe */
1465transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1688transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1466{ 1689{
1467 dSTACKLEVEL; 1690 dSTACKLEVEL;
1468 1691
1469 /* sometimes transfer is only called to set idle_sp */ 1692 /* sometimes transfer is only called to set idle_sp */
1470 if (expect_false (!prev)) 1693 if (ecb_expect_false (!prev))
1471 { 1694 {
1472 cctx_current->idle_sp = STACKLEVEL; 1695 cctx_current->idle_sp = STACKLEVEL;
1473 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1696 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1474 } 1697 }
1475 else if (expect_true (prev != next)) 1698 else if (ecb_expect_true (prev != next))
1476 { 1699 {
1477 coro_cctx *cctx_prev; 1700 coro_cctx *cctx_prev;
1478 1701
1479 if (expect_false (prev->flags & CF_NEW)) 1702 if (ecb_expect_false (prev->flags & CF_NEW))
1480 { 1703 {
1481 /* create a new empty/source context */ 1704 /* create a new empty/source context */
1482 prev->flags &= ~CF_NEW; 1705 prev->flags &= ~CF_NEW;
1483 prev->flags |= CF_RUNNING; 1706 prev->flags |= CF_RUNNING;
1484 } 1707 }
1487 next->flags |= CF_RUNNING; 1710 next->flags |= CF_RUNNING;
1488 1711
1489 /* first get rid of the old state */ 1712 /* first get rid of the old state */
1490 save_perl (aTHX_ prev); 1713 save_perl (aTHX_ prev);
1491 1714
1492 if (expect_false (next->flags & CF_NEW)) 1715 if (ecb_expect_false (next->flags & CF_NEW))
1493 { 1716 {
1494 /* need to start coroutine */ 1717 /* need to start coroutine */
1495 next->flags &= ~CF_NEW; 1718 next->flags &= ~CF_NEW;
1496 /* setup coroutine call */ 1719 /* setup coroutine call */
1497 coro_setup (aTHX_ next); 1720 init_perl (aTHX_ next);
1498 } 1721 }
1499 else 1722 else
1500 load_perl (aTHX_ next); 1723 load_perl (aTHX_ next);
1501 1724
1502 /* possibly untie and reuse the cctx */ 1725 /* possibly untie and reuse the cctx */
1503 if (expect_true ( 1726 if (ecb_expect_true (
1504 cctx_current->idle_sp == STACKLEVEL 1727 cctx_current->idle_sp == STACKLEVEL
1505 && !(cctx_current->flags & CC_TRACE) 1728 && !(cctx_current->flags & CC_TRACE)
1506 && !force_cctx 1729 && !force_cctx
1507 )) 1730 ))
1508 { 1731 {
1509 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1732 /* 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)); 1733 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1511 1734
1512 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */ 1735 /* 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 */ 1736 /* without this the next cctx_get might destroy the running cctx while still in use */
1514 if (expect_false (CCTX_EXPIRED (cctx_current))) 1737 if (ecb_expect_false (CCTX_EXPIRED (cctx_current)))
1515 if (expect_true (!next->cctx)) 1738 if (ecb_expect_true (!next->cctx))
1516 next->cctx = cctx_get (aTHX); 1739 next->cctx = cctx_get (aTHX);
1517 1740
1518 cctx_put (cctx_current); 1741 cctx_put (cctx_current);
1519 } 1742 }
1520 else 1743 else
1521 prev->cctx = cctx_current; 1744 prev->cctx = cctx_current;
1522 1745
1523 ++next->usecount; 1746 ++next->usecount;
1524 1747
1525 cctx_prev = cctx_current; 1748 cctx_prev = cctx_current;
1526 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX); 1749 cctx_current = ecb_expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1527 1750
1528 next->cctx = 0; 1751 next->cctx = 0;
1529 1752
1530 if (expect_false (cctx_prev != cctx_current)) 1753 if (ecb_expect_false (cctx_prev != cctx_current))
1531 { 1754 {
1532 cctx_prev->top_env = PL_top_env; 1755 cctx_prev->top_env = PL_top_env;
1533 PL_top_env = cctx_current->top_env; 1756 PL_top_env = cctx_current->top_env;
1534 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx); 1757 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1535 } 1758 }
1541#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1764#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) 1765#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1543 1766
1544/** high level stuff ********************************************************/ 1767/** high level stuff ********************************************************/
1545 1768
1769/* this function is actually Coro, not Coro::State, but we call it from here */
1770/* because it is convenient - but it hasn't been declared yet for that reason */
1546static int 1771static void
1772coro_call_on_destroy (pTHX_ struct coro *coro);
1773
1774static void
1547coro_state_destroy (pTHX_ struct coro *coro) 1775coro_state_destroy (pTHX_ struct coro *coro)
1548{ 1776{
1549 if (coro->flags & CF_DESTROYED) 1777 if (coro->flags & CF_ZOMBIE)
1550 return 0; 1778 return;
1551 1779
1552 if (coro->on_destroy && !PL_dirty)
1553 coro->on_destroy (aTHX_ coro); 1780 slf_destroy (aTHX_ coro);
1554 1781
1555 coro->flags |= CF_DESTROYED; 1782 coro->flags |= CF_ZOMBIE;
1556 1783
1557 if (coro->flags & CF_READY) 1784 if (coro->flags & CF_READY)
1558 { 1785 {
1559 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1786 /* reduce nready, as destroying a ready coro effectively unreadies it */
1560 /* alternative: look through all ready queues and remove the coro */ 1787 /* alternative: look through all ready queues and remove the coro */
1561 --coro_nready; 1788 --coro_nready;
1562 } 1789 }
1563 else 1790 else
1564 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1791 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1792
1793 if (coro->next) coro->next->prev = coro->prev;
1794 if (coro->prev) coro->prev->next = coro->next;
1795 if (coro == coro_first) coro_first = coro->next;
1565 1796
1566 if (coro->mainstack 1797 if (coro->mainstack
1567 && coro->mainstack != main_mainstack 1798 && coro->mainstack != main_mainstack
1568 && coro->slot 1799 && coro->slot
1569 && !PL_dirty) 1800 && !PL_dirty)
1570 coro_destruct_perl (aTHX_ coro); 1801 destroy_perl (aTHX_ coro);
1571 1802
1572 cctx_destroy (coro->cctx); 1803 cctx_destroy (coro->cctx);
1573 SvREFCNT_dec (coro->startcv); 1804 SvREFCNT_dec (coro->startcv);
1574 SvREFCNT_dec (coro->args); 1805 SvREFCNT_dec (coro->args);
1806 SvREFCNT_dec (coro->swap_sv);
1575 SvREFCNT_dec (CORO_THROW); 1807 SvREFCNT_dec (CORO_THROW);
1576 1808
1577 if (coro->next) coro->next->prev = coro->prev; 1809 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 1810
1581 return 1; 1811 /* more destruction mayhem in coro_state_free */
1582} 1812}
1583 1813
1584static int 1814static int
1585coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1815coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1586{ 1816{
1587 struct coro *coro = (struct coro *)mg->mg_ptr; 1817 struct coro *coro = (struct coro *)mg->mg_ptr;
1588 mg->mg_ptr = 0; 1818 mg->mg_ptr = 0;
1589 1819
1590 coro->hv = 0;
1591
1592 if (--coro->refcnt < 0)
1593 {
1594 coro_state_destroy (aTHX_ coro); 1820 coro_state_destroy (aTHX_ coro);
1821 SvREFCNT_dec (coro->on_destroy);
1822 SvREFCNT_dec (coro->status);
1823
1595 Safefree (coro); 1824 Safefree (coro);
1596 }
1597 1825
1598 return 0; 1826 return 0;
1599} 1827}
1600 1828
1601static int 1829static int ecb_cold
1602coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1830coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1603{ 1831{
1604 struct coro *coro = (struct coro *)mg->mg_ptr; 1832 /* called when perl clones the current process the slow way (windows process emulation) */
1605 1833 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1606 ++coro->refcnt; 1834 mg->mg_ptr = 0;
1835 mg->mg_virtual = 0;
1607 1836
1608 return 0; 1837 return 0;
1609} 1838}
1610 1839
1611static MGVTBL coro_state_vtbl = { 1840static MGVTBL coro_state_vtbl = {
1636 TRANSFER (ta, 1); 1865 TRANSFER (ta, 1);
1637} 1866}
1638 1867
1639/** Coro ********************************************************************/ 1868/** Coro ********************************************************************/
1640 1869
1641INLINE void 1870ecb_inline void
1642coro_enq (pTHX_ struct coro *coro) 1871coro_enq (pTHX_ struct coro *coro)
1643{ 1872{
1644 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN]; 1873 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1645 1874
1646 SvREFCNT_inc_NN (coro->hv); 1875 SvREFCNT_inc_NN (coro->hv);
1648 coro->next_ready = 0; 1877 coro->next_ready = 0;
1649 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1878 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1650 ready [1] = coro; 1879 ready [1] = coro;
1651} 1880}
1652 1881
1653INLINE struct coro * 1882ecb_inline struct coro *
1654coro_deq (pTHX) 1883coro_deq (pTHX)
1655{ 1884{
1656 int prio; 1885 int prio;
1657 1886
1658 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; ) 1887 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1711{ 1940{
1712 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1941 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1713} 1942}
1714 1943
1715/* expects to own a reference to next->hv */ 1944/* expects to own a reference to next->hv */
1716INLINE void 1945ecb_inline void
1717prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1946prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1718{ 1947{
1719 SV *prev_sv = SvRV (coro_current); 1948 SV *prev_sv = SvRV (coro_current);
1720 1949
1721 ta->prev = SvSTATE_hv (prev_sv); 1950 ta->prev = SvSTATE_hv (prev_sv);
1734{ 1963{
1735 for (;;) 1964 for (;;)
1736 { 1965 {
1737 struct coro *next = coro_deq (aTHX); 1966 struct coro *next = coro_deq (aTHX);
1738 1967
1739 if (expect_true (next)) 1968 if (ecb_expect_true (next))
1740 { 1969 {
1741 /* cannot transfer to destroyed coros, skip and look for next */ 1970 /* cannot transfer to destroyed coros, skip and look for next */
1742 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1971 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 */ 1972 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1744 else 1973 else
1745 { 1974 {
1746 next->flags &= ~CF_READY; 1975 next->flags &= ~CF_READY;
1747 --coro_nready; 1976 --coro_nready;
1754 { 1983 {
1755 /* nothing to schedule: call the idle handler */ 1984 /* nothing to schedule: call the idle handler */
1756 if (SvROK (sv_idle) 1985 if (SvROK (sv_idle)
1757 && SvOBJECT (SvRV (sv_idle))) 1986 && SvOBJECT (SvRV (sv_idle)))
1758 { 1987 {
1988 if (SvRV (sv_idle) == SvRV (coro_current))
1989 {
1990 require_pv ("Carp");
1991
1992 {
1993 dSP;
1994
1995 ENTER;
1996 SAVETMPS;
1997
1998 PUSHMARK (SP);
1999 XPUSHs (sv_2mortal (newSVpv ("FATAL: $Coro::idle blocked itself - did you try to block inside an event loop callback? Caught", 0)));
2000 PUTBACK;
2001 call_pv ("Carp::confess", G_VOID | G_DISCARD);
2002
2003 FREETMPS;
2004 LEAVE;
2005 }
2006 }
2007
1759 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 2008 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1760 api_ready (aTHX_ SvRV (sv_idle)); 2009 api_ready (aTHX_ SvRV (sv_idle));
1761 --coro_nready; 2010 --coro_nready;
1762 } 2011 }
1763 else 2012 else
1764 { 2013 {
2014 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1765 dSP; 2015 dSP;
1766 2016
1767 ENTER; 2017 ENTER;
1768 SAVETMPS; 2018 SAVETMPS;
1769 2019
1776 } 2026 }
1777 } 2027 }
1778 } 2028 }
1779} 2029}
1780 2030
1781INLINE void 2031ecb_inline void
1782prepare_cede (pTHX_ struct coro_transfer_args *ta) 2032prepare_cede (pTHX_ struct coro_transfer_args *ta)
1783{ 2033{
1784 api_ready (aTHX_ coro_current); 2034 api_ready (aTHX_ coro_current);
1785 prepare_schedule (aTHX_ ta); 2035 prepare_schedule (aTHX_ ta);
1786} 2036}
1787 2037
1788INLINE void 2038ecb_inline void
1789prepare_cede_notself (pTHX_ struct coro_transfer_args *ta) 2039prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1790{ 2040{
1791 SV *prev = SvRV (coro_current); 2041 SV *prev = SvRV (coro_current);
1792 2042
1793 if (coro_nready) 2043 if (coro_nready)
1823{ 2073{
1824 struct coro_transfer_args ta; 2074 struct coro_transfer_args ta;
1825 2075
1826 prepare_cede (aTHX_ &ta); 2076 prepare_cede (aTHX_ &ta);
1827 2077
1828 if (expect_true (ta.prev != ta.next)) 2078 if (ecb_expect_true (ta.prev != ta.next))
1829 { 2079 {
1830 TRANSFER (ta, 1); 2080 TRANSFER (ta, 1);
1831 return 1; 2081 return 1;
1832 } 2082 }
1833 else 2083 else
1876 coro->slot->runops = RUNOPS_DEFAULT; 2126 coro->slot->runops = RUNOPS_DEFAULT;
1877 } 2127 }
1878} 2128}
1879 2129
1880static void 2130static void
2131coro_push_av (pTHX_ AV *av, I32 gimme_v)
2132{
2133 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2134 {
2135 dSP;
2136
2137 if (gimme_v == G_SCALAR)
2138 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2139 else
2140 {
2141 int i;
2142 EXTEND (SP, AvFILLp (av) + 1);
2143
2144 for (i = 0; i <= AvFILLp (av); ++i)
2145 PUSHs (AvARRAY (av)[i]);
2146 }
2147
2148 PUTBACK;
2149 }
2150}
2151
2152static void
2153coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2154{
2155 if (!coro->on_destroy)
2156 coro->on_destroy = newAV ();
2157
2158 av_push (coro->on_destroy, cb);
2159}
2160
2161static void
2162slf_destroy_join (pTHX_ struct CoroSLF *frame)
2163{
2164 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2165}
2166
2167static int
2168slf_check_join (pTHX_ struct CoroSLF *frame)
2169{
2170 struct coro *coro = (struct coro *)frame->data;
2171
2172 if (!coro->status)
2173 return 1;
2174
2175 frame->destroy = 0;
2176
2177 coro_push_av (aTHX_ coro->status, GIMME_V);
2178
2179 SvREFCNT_dec ((SV *)coro->hv);
2180
2181 return 0;
2182}
2183
2184static void
2185slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2186{
2187 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2188
2189 if (items > 1)
2190 croak ("join called with too many arguments");
2191
2192 if (coro->status)
2193 frame->prepare = prepare_nop;
2194 else
2195 {
2196 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2197 frame->prepare = prepare_schedule;
2198 }
2199
2200 frame->check = slf_check_join;
2201 frame->destroy = slf_destroy_join;
2202 frame->data = (void *)coro;
2203 SvREFCNT_inc (coro->hv);
2204}
2205
2206static void
1881coro_call_on_destroy (pTHX_ struct coro *coro) 2207coro_call_on_destroy (pTHX_ struct coro *coro)
1882{ 2208{
1883 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2209 AV *od = coro->on_destroy;
1884 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1885 2210
1886 if (on_destroyp) 2211 if (!od)
1887 { 2212 return;
1888 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1889 2213
2214 coro->on_destroy = 0;
2215 sv_2mortal ((SV *)od);
2216
1890 while (AvFILLp (on_destroy) >= 0) 2217 while (AvFILLp (od) >= 0)
2218 {
2219 SV *cb = sv_2mortal (av_pop (od));
2220
2221 /* coro hv's (and only hv's at the moment) are supported as well */
2222 if (SvSTATEhv_p (aTHX_ cb))
2223 api_ready (aTHX_ cb);
2224 else
1891 { 2225 {
1892 dSP; /* don't disturb outer sp */ 2226 dSP; /* don't disturb outer sp */
1893 SV *cb = av_pop (on_destroy);
1894
1895 PUSHMARK (SP); 2227 PUSHMARK (SP);
1896 2228
1897 if (statusp) 2229 if (coro->status)
1898 { 2230 {
1899 int i; 2231 PUTBACK;
1900 AV *status = (AV *)SvRV (*statusp); 2232 coro_push_av (aTHX_ coro->status, G_ARRAY);
1901 EXTEND (SP, AvFILLp (status) + 1); 2233 SPAGAIN;
1902
1903 for (i = 0; i <= AvFILLp (status); ++i)
1904 PUSHs (AvARRAY (status)[i]);
1905 } 2234 }
1906 2235
1907 PUTBACK; 2236 PUTBACK;
1908 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2237 call_sv (cb, G_VOID | G_DISCARD);
1909 } 2238 }
1910 } 2239 }
1911} 2240}
1912 2241
1913static void 2242static void
1914slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2243coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1915{ 2244{
2245 AV *av;
2246
2247 if (coro->status)
2248 {
2249 av = coro->status;
2250 av_clear (av);
2251 }
2252 else
2253 av = coro->status = newAV ();
2254
2255 /* items are actually not so common, so optimise for this case */
2256 if (items)
2257 {
1916 int i; 2258 int i;
1917 HV *hv = (HV *)SvRV (coro_current);
1918 AV *av = newAV ();
1919 2259
1920 av_extend (av, items - 1); 2260 av_extend (av, items - 1);
2261
1921 for (i = 0; i < items; ++i) 2262 for (i = 0; i < items; ++i)
1922 av_push (av, SvREFCNT_inc_NN (arg [i])); 2263 av_push (av, SvREFCNT_inc_NN (arg [i]));
2264 }
2265}
1923 2266
1924 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2267static void
1925 2268slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2269{
1926 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2270 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1927 api_ready (aTHX_ sv_manager); 2271 api_ready (aTHX_ sv_manager);
1928 2272
1929 frame->prepare = prepare_schedule; 2273 frame->prepare = prepare_schedule;
1930 frame->check = slf_check_repeat; 2274 frame->check = slf_check_repeat;
1931 2275
1932 /* as a minor optimisation, we could unwind all stacks here */ 2276 /* as a minor optimisation, we could unwind all stacks here */
1933 /* but that puts extra pressure on pp_slf, and is not worth much */ 2277 /* but that puts extra pressure on pp_slf, and is not worth much */
1934 /*coro_unwind_stacks (aTHX);*/ 2278 /*coro_unwind_stacks (aTHX);*/
2279}
2280
2281static void
2282slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2283{
2284 HV *coro_hv = (HV *)SvRV (coro_current);
2285
2286 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2287 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2288}
2289
2290static void
2291slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2292{
2293 HV *coro_hv;
2294 struct coro *coro;
2295
2296 if (items <= 0)
2297 croak ("Coro::cancel called without coro object,");
2298
2299 coro = SvSTATE (arg [0]);
2300 coro_hv = coro->hv;
2301
2302 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2303
2304 if (ecb_expect_false (coro->flags & CF_NOCANCEL))
2305 {
2306 /* coro currently busy cancelling something, so just notify it */
2307 coro->slf_frame.data = (void *)coro;
2308
2309 frame->prepare = prepare_nop;
2310 frame->check = slf_check_nop;
2311 }
2312 else if (coro_hv == (HV *)SvRV (coro_current))
2313 {
2314 /* cancelling the current coro is allowed, and equals terminate */
2315 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2316 }
2317 else
2318 {
2319 struct coro *self = SvSTATE_current;
2320
2321 if (!self)
2322 croak ("Coro::cancel called outside of thread content,");
2323
2324 /* otherwise we cancel directly, purely for speed reasons
2325 * unfortunately, this requires some magic trickery, as
2326 * somebody else could cancel us, so we have to fight the cancellation.
2327 * this is ugly, and hopefully fully worth the extra speed.
2328 * besides, I can't get the slow-but-safe version working...
2329 */
2330 slf_frame.data = 0;
2331 self->flags |= CF_NOCANCEL;
2332 coro_state_destroy (aTHX_ coro);
2333 self->flags &= ~CF_NOCANCEL;
2334
2335 if (slf_frame.data)
2336 {
2337 /* while we were busy we have been cancelled, so terminate */
2338 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2339 }
2340 else
2341 {
2342 frame->prepare = prepare_nop;
2343 frame->check = slf_check_nop;
2344 }
2345 }
2346}
2347
2348static int
2349slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2350{
2351 frame->prepare = 0;
2352 coro_unwind_stacks (aTHX);
2353
2354 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2355
2356 return 1;
2357}
2358
2359static int
2360safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2361{
2362 if (coro->cctx)
2363 croak ("coro inside C callback, unable to cancel at this time, caught");
2364
2365 if (coro->flags & CF_NEW)
2366 {
2367 coro_set_status (aTHX_ coro, arg, items);
2368 coro_state_destroy (aTHX_ coro);
2369 }
2370 else
2371 {
2372 if (!coro->slf_frame.prepare)
2373 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2374
2375 slf_destroy (aTHX_ coro);
2376
2377 coro_set_status (aTHX_ coro, arg, items);
2378 coro->slf_frame.prepare = prepare_nop;
2379 coro->slf_frame.check = slf_check_safe_cancel;
2380
2381 api_ready (aTHX_ (SV *)coro->hv);
2382 }
2383
2384 return 1;
1935} 2385}
1936 2386
1937/*****************************************************************************/ 2387/*****************************************************************************/
1938/* async pool handler */ 2388/* async pool handler */
1939 2389
1970slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2420slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1971{ 2421{
1972 HV *hv = (HV *)SvRV (coro_current); 2422 HV *hv = (HV *)SvRV (coro_current);
1973 struct coro *coro = SvSTATE_hv ((SV *)hv); 2423 struct coro *coro = SvSTATE_hv ((SV *)hv);
1974 2424
1975 if (expect_true (coro->saved_deffh)) 2425 if (ecb_expect_true (coro->saved_deffh))
1976 { 2426 {
1977 /* subsequent iteration */ 2427 /* subsequent iteration */
1978 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2428 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1979 coro->saved_deffh = 0; 2429 coro->saved_deffh = 0;
1980 2430
1981 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2431 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1982 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2432 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1983 { 2433 {
1984 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2434 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1985 coro->invoke_av = newAV (); 2435 return;
1986
1987 frame->prepare = prepare_nop;
1988 } 2436 }
1989 else 2437 else
1990 { 2438 {
1991 av_clear (GvAV (PL_defgv)); 2439 av_clear (GvAV (PL_defgv));
1992 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2440 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1993 2441
2442 if (ecb_expect_false (coro->swap_sv))
2443 {
2444 SWAP_SVS_LEAVE (coro);
2445 SvREFCNT_dec_NN (coro->swap_sv);
2446 coro->swap_sv = 0;
2447 }
2448
1994 coro->prio = 0; 2449 coro->prio = 0;
1995 2450
1996 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2451 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
1997 api_trace (aTHX_ coro_current, 0); 2452 api_trace (aTHX_ coro_current, 0);
1998 2453
1999 frame->prepare = prepare_schedule; 2454 frame->prepare = prepare_schedule;
2000 av_push (av_async_pool, SvREFCNT_inc (hv)); 2455 av_push (av_async_pool, SvREFCNT_inc (hv));
2001 } 2456 }
2042 2497
2043static int 2498static int
2044slf_check_rouse_wait (pTHX_ struct CoroSLF *frame) 2499slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2045{ 2500{
2046 SV *data = (SV *)frame->data; 2501 SV *data = (SV *)frame->data;
2047 2502
2048 if (CORO_THROW) 2503 if (CORO_THROW)
2049 return 0; 2504 return 0;
2050 2505
2051 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2506 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2052 return 1; 2507 return 1;
2088 cb = sv_2mortal (coro->rouse_cb); 2543 cb = sv_2mortal (coro->rouse_cb);
2089 coro->rouse_cb = 0; 2544 coro->rouse_cb = 0;
2090 } 2545 }
2091 2546
2092 if (!SvROK (cb) 2547 if (!SvROK (cb)
2093 || SvTYPE (SvRV (cb)) != SVt_PVCV 2548 || SvTYPE (SvRV (cb)) != SVt_PVCV
2094 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2549 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2095 croak ("Coro::rouse_wait called with illegal callback argument,"); 2550 croak ("Coro::rouse_wait called with illegal callback argument,");
2096 2551
2097 { 2552 {
2098 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2553 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2215static void 2670static void
2216slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2671slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2217{ 2672{
2218 frame->prepare = prepare_cede_notself; 2673 frame->prepare = prepare_cede_notself;
2219 frame->check = slf_check_nop; 2674 frame->check = slf_check_nop;
2675}
2676
2677/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2678static void
2679slf_destroy (pTHX_ struct coro *coro)
2680{
2681 struct CoroSLF frame = coro->slf_frame;
2682
2683 /*
2684 * The on_destroy below most likely is from an SLF call.
2685 * Since by definition the SLF call will not finish when we destroy
2686 * the coro, we will have to force-finish it here, otherwise
2687 * cleanup functions cannot call SLF functions.
2688 */
2689 coro->slf_frame.prepare = 0;
2690
2691 /* this callback is reserved for slf functions needing to do cleanup */
2692 if (frame.destroy && frame.prepare && !PL_dirty)
2693 frame.destroy (aTHX_ &frame);
2220} 2694}
2221 2695
2222/* 2696/*
2223 * these not obviously related functions are all rolled into one 2697 * these not obviously related functions are all rolled into one
2224 * function to increase chances that they all will call transfer with the same 2698 * function to increase chances that they all will call transfer with the same
2231 I32 checkmark; /* mark SP to see how many elements check has pushed */ 2705 I32 checkmark; /* mark SP to see how many elements check has pushed */
2232 2706
2233 /* set up the slf frame, unless it has already been set-up */ 2707 /* set up the slf frame, unless it has already been set-up */
2234 /* the latter happens when a new coro has been started */ 2708 /* the latter happens when a new coro has been started */
2235 /* or when a new cctx was attached to an existing coroutine */ 2709 /* or when a new cctx was attached to an existing coroutine */
2236 if (expect_true (!slf_frame.prepare)) 2710 if (ecb_expect_true (!slf_frame.prepare))
2237 { 2711 {
2238 /* first iteration */ 2712 /* first iteration */
2239 dSP; 2713 dSP;
2240 SV **arg = PL_stack_base + TOPMARK + 1; 2714 SV **arg = PL_stack_base + TOPMARK + 1;
2241 int items = SP - arg; /* args without function object */ 2715 int items = SP - arg; /* args without function object */
2282 while (slf_frame.check (aTHX_ &slf_frame)); 2756 while (slf_frame.check (aTHX_ &slf_frame));
2283 2757
2284 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2758 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
2285 2759
2286 /* exception handling */ 2760 /* exception handling */
2287 if (expect_false (CORO_THROW)) 2761 if (ecb_expect_false (CORO_THROW))
2288 { 2762 {
2289 SV *exception = sv_2mortal (CORO_THROW); 2763 SV *exception = sv_2mortal (CORO_THROW);
2290 2764
2291 CORO_THROW = 0; 2765 CORO_THROW = 0;
2292 sv_setsv (ERRSV, exception); 2766 sv_setsv (ERRSV, exception);
2293 croak (0); 2767 croak (0);
2294 } 2768 }
2295 2769
2296 /* return value handling - mostly like entersub */ 2770 /* return value handling - mostly like entersub */
2297 /* make sure we put something on the stack in scalar context */ 2771 /* make sure we put something on the stack in scalar context */
2298 if (GIMME_V == G_SCALAR) 2772 if (GIMME_V == G_SCALAR
2773 && ecb_expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2299 { 2774 {
2300 dSP; 2775 dSP;
2301 SV **bot = PL_stack_base + checkmark; 2776 SV **bot = PL_stack_base + checkmark;
2302 2777
2303 if (sp == bot) /* too few, push undef */ 2778 if (sp == bot) /* too few, push undef */
2304 bot [1] = &PL_sv_undef; 2779 bot [1] = &PL_sv_undef;
2305 else if (sp != bot + 1) /* too many, take last one */ 2780 else /* too many, take last one */
2306 bot [1] = *sp; 2781 bot [1] = *sp;
2307 2782
2308 SP = bot + 1; 2783 SP = bot + 1;
2309 2784
2310 PUTBACK; 2785 PUTBACK;
2343 if (PL_op->op_flags & OPf_STACKED) 2818 if (PL_op->op_flags & OPf_STACKED)
2344 { 2819 {
2345 if (items > slf_arga) 2820 if (items > slf_arga)
2346 { 2821 {
2347 slf_arga = items; 2822 slf_arga = items;
2348 free (slf_argv); 2823 Safefree (slf_argv);
2349 slf_argv = malloc (slf_arga * sizeof (SV *)); 2824 New (0, slf_argv, slf_arga, SV *);
2350 } 2825 }
2351 2826
2352 slf_argc = items; 2827 slf_argc = items;
2353 2828
2354 for (i = 0; i < items; ++i) 2829 for (i = 0; i < items; ++i)
2408{ 2883{
2409 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave); 2884 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2410 on_enterleave_call (aTHX_ sv_2mortal (cb)); 2885 on_enterleave_call (aTHX_ sv_2mortal (cb));
2411} 2886}
2412 2887
2888static void
2889enterleave_hook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, void *arg)
2890{
2891 if (!hook)
2892 return;
2893
2894 if (!*avp)
2895 {
2896 *avp = newAV ();
2897 AvREAL_off (*avp);
2898 }
2899
2900 av_push (*avp, (SV *)hook);
2901 av_push (*avp, (SV *)arg);
2902}
2903
2904static void
2905enterleave_unhook_xs (pTHX_ struct coro *coro, AV **avp, coro_enterleave_hook hook, int execute)
2906{
2907 AV *av = *avp;
2908 int i;
2909
2910 if (!av)
2911 return;
2912
2913 for (i = AvFILLp (av) - 1; i >= 0; i -= 2)
2914 if (AvARRAY (av)[i] == (SV *)hook)
2915 {
2916 if (execute)
2917 hook (aTHX_ (void *)AvARRAY (av)[i + 1]);
2918
2919 memmove (AvARRAY (av) + i, AvARRAY (av) + i + 2, AvFILLp (av) - i - 1);
2920 av_pop (av);
2921 av_pop (av);
2922 break;
2923 }
2924
2925 if (AvFILLp (av) >= 0)
2926 {
2927 *avp = 0;
2928 SvREFCNT_dec_NN (av);
2929 }
2930}
2931
2932static void
2933api_enterleave_hook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2934{
2935 struct coro *coro = SvSTATE (coro_sv);
2936
2937 if (SvSTATE_current == coro)
2938 if (enter)
2939 enter (aTHX_ enter_arg);
2940
2941 enterleave_hook_xs (aTHX_ coro, &coro->on_enter_xs, enter, enter_arg);
2942 enterleave_hook_xs (aTHX_ coro, &coro->on_leave_xs, leave, leave_arg);
2943}
2944
2945static void
2946api_enterleave_unhook (pTHX_ SV *coro_sv, coro_enterleave_hook enter, coro_enterleave_hook leave)
2947{
2948 struct coro *coro = SvSTATE (coro_sv);
2949
2950 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2951 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, SvSTATE_current == coro);
2952}
2953
2954static void
2955savedestructor_unhook_enter (pTHX_ coro_enterleave_hook enter)
2956{
2957 struct coro *coro = SvSTATE_current;
2958
2959 enterleave_unhook_xs (aTHX_ coro, &coro->on_enter_xs, enter, 0);
2960}
2961
2962static void
2963savedestructor_unhook_leave (pTHX_ coro_enterleave_hook leave)
2964{
2965 struct coro *coro = SvSTATE_current;
2966
2967 enterleave_unhook_xs (aTHX_ coro, &coro->on_leave_xs, leave, 1);
2968}
2969
2970static void
2971api_enterleave_scope_hook (pTHX_ coro_enterleave_hook enter, void *enter_arg, coro_enterleave_hook leave, void *leave_arg)
2972{
2973 api_enterleave_hook (aTHX_ coro_current, enter, enter_arg, leave, leave_arg);
2974
2975 /* this ought to be much cheaper than malloc + a single destructor call */
2976 if (enter) SAVEDESTRUCTOR_X (savedestructor_unhook_enter, enter);
2977 if (leave) SAVEDESTRUCTOR_X (savedestructor_unhook_leave, leave);
2978}
2979
2413/*****************************************************************************/ 2980/*****************************************************************************/
2414/* PerlIO::cede */ 2981/* PerlIO::cede */
2415 2982
2416typedef struct 2983typedef struct
2417{ 2984{
2418 PerlIOBuf base; 2985 PerlIOBuf base;
2419 NV next, every; 2986 NV next, every;
2420} PerlIOCede; 2987} PerlIOCede;
2421 2988
2422static IV 2989static IV ecb_cold
2423PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab) 2990PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
2424{ 2991{
2425 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 2992 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2426 2993
2427 self->every = SvCUR (arg) ? SvNV (arg) : 0.01; 2994 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
2428 self->next = nvtime () + self->every; 2995 self->next = nvtime () + self->every;
2429 2996
2430 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab); 2997 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
2431} 2998}
2432 2999
2433static SV * 3000static SV * ecb_cold
2434PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags) 3001PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
2435{ 3002{
2436 PerlIOCede *self = PerlIOSelf (f, PerlIOCede); 3003 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
2437 3004
2438 return newSVnv (self->every); 3005 return newSVnv (self->every);
2545 XPUSHs (sv_2mortal (newRV_inc ((SV *)av))); 3112 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2546 PUTBACK; 3113 PUTBACK;
2547 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR); 3114 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2548 } 3115 }
2549 3116
2550 SvREFCNT_dec (cb); 3117 SvREFCNT_dec_NN (cb);
2551 } 3118 }
2552} 3119}
2553 3120
2554static void 3121static void
2555coro_semaphore_on_destroy (pTHX_ struct coro *coro) 3122coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2556{ 3123{
2557 /* call $sem->adjust (0) to possibly wake up some other waiters */ 3124 /* call $sem->adjust (0) to possibly wake up some other waiters */
2558 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 3125 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2559} 3126}
2560 3127
2561static int 3128static int
2562slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 3129slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2563{ 3130{
2564 AV *av = (AV *)frame->data; 3131 AV *av = (AV *)frame->data;
2565 SV *count_sv = AvARRAY (av)[0]; 3132 SV *count_sv = AvARRAY (av)[0];
3133 SV *coro_hv = SvRV (coro_current);
3134
3135 frame->destroy = 0;
2566 3136
2567 /* if we are about to throw, don't actually acquire the lock, just throw */ 3137 /* if we are about to throw, don't actually acquire the lock, just throw */
2568 if (CORO_THROW) 3138 if (ecb_expect_false (CORO_THROW))
3139 {
3140 /* we still might be responsible for the semaphore, so wake up others */
3141 coro_semaphore_adjust (aTHX_ av, 0);
3142
2569 return 0; 3143 return 0;
3144 }
2570 else if (SvIVX (count_sv) > 0) 3145 else if (SvIVX (count_sv) > 0)
2571 { 3146 {
2572 SvSTATE_current->on_destroy = 0;
2573
2574 if (acquire) 3147 if (acquire)
2575 SvIVX (count_sv) = SvIVX (count_sv) - 1; 3148 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2576 else 3149 else
2577 coro_semaphore_adjust (aTHX_ av, 0); 3150 coro_semaphore_adjust (aTHX_ av, 0);
2578 3151
2582 { 3155 {
2583 int i; 3156 int i;
2584 /* if we were woken up but can't down, we look through the whole */ 3157 /* if we were woken up but can't down, we look through the whole */
2585 /* waiters list and only add us if we aren't in there already */ 3158 /* waiters list and only add us if we aren't in there already */
2586 /* this avoids some degenerate memory usage cases */ 3159 /* this avoids some degenerate memory usage cases */
2587 3160 for (i = AvFILLp (av); i > 0; --i) /* i > 0 is not an off-by-one bug */
2588 for (i = 1; i <= AvFILLp (av); ++i)
2589 if (AvARRAY (av)[i] == SvRV (coro_current)) 3161 if (AvARRAY (av)[i] == coro_hv)
2590 return 1; 3162 return 1;
2591 3163
2592 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3164 av_push (av, SvREFCNT_inc (coro_hv));
2593 return 1; 3165 return 1;
2594 } 3166 }
2595} 3167}
2596 3168
2597static int 3169static int
2620 { 3192 {
2621 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 3193 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2622 3194
2623 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 3195 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2624 frame->prepare = prepare_schedule; 3196 frame->prepare = prepare_schedule;
2625
2626 /* to avoid race conditions when a woken-up coro gets terminated */ 3197 /* to avoid race conditions when a woken-up coro gets terminated */
2627 /* we arrange for a temporary on_destroy that calls adjust (0) */ 3198 /* we arrange for a temporary on_destroy that calls adjust (0) */
2628 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 3199 frame->destroy = coro_semaphore_destroy;
2629 } 3200 }
2630} 3201}
2631 3202
2632static void 3203static void
2633slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3204slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2691 { 3262 {
2692 api_ready (aTHX_ cb); 3263 api_ready (aTHX_ cb);
2693 sv_setiv (cb, 0); /* signal waiter */ 3264 sv_setiv (cb, 0); /* signal waiter */
2694 } 3265 }
2695 3266
2696 SvREFCNT_dec (cb); 3267 SvREFCNT_dec_NN (cb);
2697 3268
2698 --count; 3269 --count;
2699 } 3270 }
2700} 3271}
2701 3272
2715 { 3286 {
2716 SV *cb_cv = s_get_cv_croak (arg [1]); 3287 SV *cb_cv = s_get_cv_croak (arg [1]);
2717 av_push (av, SvREFCNT_inc_NN (cb_cv)); 3288 av_push (av, SvREFCNT_inc_NN (cb_cv));
2718 3289
2719 if (SvIVX (AvARRAY (av)[0])) 3290 if (SvIVX (AvARRAY (av)[0]))
2720 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 3291 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2721 3292
2722 frame->prepare = prepare_nop; 3293 frame->prepare = prepare_nop;
2723 frame->check = slf_check_nop; 3294 frame->check = slf_check_nop;
2724 } 3295 }
2725 else if (SvIVX (AvARRAY (av)[0])) 3296 else if (SvIVX (AvARRAY (av)[0]))
2786 } 3357 }
2787 3358
2788 av_push (state, data_sv); 3359 av_push (state, data_sv);
2789 3360
2790 api_ready (aTHX_ coro); 3361 api_ready (aTHX_ coro);
2791 SvREFCNT_dec (coro); 3362 SvREFCNT_dec_NN (coro);
2792 SvREFCNT_dec ((AV *)state); 3363 SvREFCNT_dec_NN ((AV *)state);
2793} 3364}
2794 3365
2795static int 3366static int
2796slf_check_aio_req (pTHX_ struct CoroSLF *frame) 3367slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2797{ 3368{
2802 /* it quickly returns */ 3373 /* it quickly returns */
2803 if (CORO_THROW) 3374 if (CORO_THROW)
2804 return 0; 3375 return 0;
2805 3376
2806 /* one element that is an RV? repeat! */ 3377 /* one element that is an RV? repeat! */
2807 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 3378 if (AvFILLp (state) == 0 && SvTYPE (AvARRAY (state)[0]) != SVt_PV)
2808 return 1; 3379 return 1;
2809 3380
2810 /* restore status */ 3381 /* restore status */
2811 { 3382 {
2812 SV *data_sv = av_pop (state); 3383 SV *data_sv = av_pop (state);
2815 errno = data->errorno; 3386 errno = data->errorno;
2816 PL_laststype = data->laststype; 3387 PL_laststype = data->laststype;
2817 PL_laststatval = data->laststatval; 3388 PL_laststatval = data->laststatval;
2818 PL_statcache = data->statcache; 3389 PL_statcache = data->statcache;
2819 3390
2820 SvREFCNT_dec (data_sv); 3391 SvREFCNT_dec_NN (data_sv);
2821 } 3392 }
2822 3393
2823 /* push result values */ 3394 /* push result values */
2824 { 3395 {
2825 dSP; 3396 dSP;
2851 dSP; 3422 dSP;
2852 3423
2853 static SV *prio_cv; 3424 static SV *prio_cv;
2854 static SV *prio_sv; 3425 static SV *prio_sv;
2855 3426
2856 if (expect_false (!prio_cv)) 3427 if (ecb_expect_false (!prio_cv))
2857 { 3428 {
2858 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0); 3429 prio_cv = (SV *)get_cv ("IO::AIO::aioreq_pri", 0);
2859 prio_sv = newSViv (0); 3430 prio_sv = newSViv (0);
2860 } 3431 }
2861 3432
2887 /* now call the AIO function - we assume our request is uncancelable */ 3458 /* now call the AIO function - we assume our request is uncancelable */
2888 PUTBACK; 3459 PUTBACK;
2889 call_sv ((SV *)req, G_VOID | G_DISCARD); 3460 call_sv ((SV *)req, G_VOID | G_DISCARD);
2890 } 3461 }
2891 3462
2892 /* now that the requets is going, we loop toll we have a result */ 3463 /* now that the request is going, we loop till we have a result */
2893 frame->data = (void *)state; 3464 frame->data = (void *)state;
2894 frame->prepare = prepare_schedule; 3465 frame->prepare = prepare_schedule;
2895 frame->check = slf_check_aio_req; 3466 frame->check = slf_check_aio_req;
2896} 3467}
2897 3468
2909 3480
2910#if CORO_CLONE 3481#if CORO_CLONE
2911# include "clone.c" 3482# include "clone.c"
2912#endif 3483#endif
2913 3484
3485/*****************************************************************************/
3486
3487static SV *
3488coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3489{
3490 SV *coro_sv;
3491 struct coro *coro;
3492 MAGIC *mg;
3493 HV *hv;
3494 SV *cb;
3495 int i;
3496
3497 if (argc > 0)
3498 {
3499 cb = s_get_cv_croak (argv [0]);
3500
3501 if (!is_coro)
3502 {
3503 if (CvISXSUB (cb))
3504 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3505
3506 if (!CvROOT (cb))
3507 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3508 }
3509 }
3510
3511 Newz (0, coro, 1, struct coro);
3512 coro->args = newAV ();
3513 coro->flags = CF_NEW;
3514
3515 if (coro_first) coro_first->prev = coro;
3516 coro->next = coro_first;
3517 coro_first = coro;
3518
3519 coro->hv = hv = newHV ();
3520 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3521 mg->mg_flags |= MGf_DUP;
3522 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3523
3524 if (argc > 0)
3525 {
3526 av_extend (coro->args, argc + is_coro - 1);
3527
3528 if (is_coro)
3529 {
3530 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3531 cb = (SV *)cv_coro_run;
3532 }
3533
3534 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3535
3536 for (i = 1; i < argc; i++)
3537 av_push (coro->args, newSVsv (argv [i]));
3538 }
3539
3540 return coro_sv;
3541}
3542
3543#ifndef __cplusplus
3544ecb_cold XS(boot_Coro__State);
3545#endif
3546
3547#if CORO_JIT
3548
3549static void ecb_noinline ecb_cold
3550pushav_4uv (pTHX_ UV a, UV b, UV c, UV d)
3551{
3552 dSP;
3553 AV *av = newAV ();
3554
3555 av_store (av, 3, newSVuv (d));
3556 av_store (av, 2, newSVuv (c));
3557 av_store (av, 1, newSVuv (b));
3558 av_store (av, 0, newSVuv (a));
3559
3560 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
3561
3562 PUTBACK;
3563}
3564
3565static void ecb_noinline ecb_cold
3566jit_init (pTHX)
3567{
3568 dSP;
3569 SV *load, *save;
3570 char *map_base;
3571 char *load_ptr, *save_ptr;
3572 STRLEN load_len, save_len, map_len;
3573 int count;
3574
3575 eval_pv ("require 'Coro/jit-" CORO_JIT_TYPE ".pl'", 1);
3576
3577 PUSHMARK (SP);
3578 #define VARx(name,expr,type) pushav_4uv (aTHX_ (UV)&(expr), sizeof (expr), offsetof (perl_slots, name), sizeof (type));
3579 #include "state.h"
3580 count = call_pv ("Coro::State::_jit", G_ARRAY);
3581 SPAGAIN;
3582
3583 save = POPs; save_ptr = SvPVbyte (save, save_len);
3584 load = POPs; load_ptr = SvPVbyte (load, load_len);
3585
3586 map_len = load_len + save_len + 16;
3587
3588 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3589
3590 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3591
3592 load_perl_slots = (load_save_perl_slots_type)map_base;
3593 memcpy (map_base, load_ptr, load_len);
3594
3595 map_base += (load_len + 15) & ~15;
3596
3597 save_perl_slots = (load_save_perl_slots_type)map_base;
3598 memcpy (map_base, save_ptr, save_len);
3599
3600 /* we are good citizens and try to make the page read-only, so the evil evil */
3601 /* hackers might have it a bit more difficult */
3602 mprotect (map_base, map_len, PROT_READ | PROT_EXEC);
3603
3604 PUTBACK;
3605 eval_pv ("undef &Coro::State::_jit", 1);
3606}
3607
3608#endif
3609
2914MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3610MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2915 3611
2916PROTOTYPES: DISABLE 3612PROTOTYPES: DISABLE
2917 3613
2918BOOT: 3614BOOT:
2919{ 3615{
3616#define VARx(name,expr,type) if (sizeof (type) < sizeof (expr)) croak ("FATAL: Coro thread context slot '" # name "' too small for this version of perl.");
3617#include "state.h"
2920#ifdef USE_ITHREADS 3618#ifdef USE_ITHREADS
2921# if CORO_PTHREAD 3619# if CORO_PTHREAD
2922 coro_thx = PERL_GET_CONTEXT; 3620 coro_thx = PERL_GET_CONTEXT;
2923# endif 3621# endif
2924#endif 3622#endif
2925 BOOT_PAGESIZE; 3623 /* perl defines these to check for existance first, but why it doesn't */
3624 /* just create them one at init time is not clear to me, except for */
3625 /* programs trying to delete them, but... */
3626 /* anyway, we declare this as invalid and make sure they are initialised here */
3627 DEFSV;
3628 ERRSV;
2926 3629
2927 cctx_current = cctx_new_empty (); 3630 cctx_current = cctx_new_empty ();
2928 3631
2929 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3632 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2930 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3633 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2931 3634
2932 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3635 {
2933 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3636 /*
2934 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr; 3637 * we provide a vtbvl for %SIG magic that replaces PL_vtbl_sig
3638 * by coro_sig_vtbl in hash values.
3639 */
3640 MAGIC *mg = mg_find ((SV *)GvHV (gv_fetchpv ("SIG", GV_ADD | GV_NOTQUAL, SVt_PVHV)), PERL_MAGIC_sig);
3641
3642 /* this only works if perl doesn't have a vtbl for %SIG */
3643 assert (!mg->mg_virtual);
3644
3645 /*
3646 * The irony is that the perl API itself asserts that mg_virtual
3647 * must be non-const, yet perl5porters insisted on marking their
3648 * vtbls as read-only, just to thwart perl modules from patching
3649 * them.
3650 */
3651 mg->mg_virtual = (MGVTBL *)&coro_sig_vtbl;
3652 mg->mg_flags |= MGf_COPY;
3653
3654 coro_sigelem_vtbl = PL_vtbl_sigelem;
3655 coro_sigelem_vtbl.svt_get = coro_sigelem_get;
3656 coro_sigelem_vtbl.svt_set = coro_sigelem_set;
3657 coro_sigelem_vtbl.svt_clear = coro_sigelem_clr;
3658 }
2935 3659
2936 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
2937 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3660 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
2938 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3661 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
2939 3662
2940 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3663 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
2941 3664
2970 coroapi.prepare_nop = prepare_nop; 3693 coroapi.prepare_nop = prepare_nop;
2971 coroapi.prepare_schedule = prepare_schedule; 3694 coroapi.prepare_schedule = prepare_schedule;
2972 coroapi.prepare_cede = prepare_cede; 3695 coroapi.prepare_cede = prepare_cede;
2973 coroapi.prepare_cede_notself = prepare_cede_notself; 3696 coroapi.prepare_cede_notself = prepare_cede_notself;
2974 3697
2975 { 3698 time_init (aTHX);
2976 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2977
2978 if (!svp) croak ("Time::HiRes is required");
2979 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2980
2981 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2982
2983 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
2984 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2985 }
2986 3699
2987 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3700 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3701#if CORO_JIT
3702 PUTBACK;
3703 jit_init (aTHX);
3704 SPAGAIN;
3705#endif
2988} 3706}
2989 3707
2990SV * 3708SV *
2991new (char *klass, ...) 3709new (SV *klass, ...)
2992 ALIAS: 3710 ALIAS:
2993 Coro::new = 1 3711 Coro::new = 1
2994 CODE: 3712 CODE:
2995{ 3713 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2996 struct coro *coro; 3714 OUTPUT:
2997 MAGIC *mg;
2998 HV *hv;
2999 SV *cb;
3000 int i;
3001
3002 if (items > 1)
3003 {
3004 cb = s_get_cv_croak (ST (1));
3005
3006 if (!ix)
3007 {
3008 if (CvISXSUB (cb))
3009 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3010
3011 if (!CvROOT (cb))
3012 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3013 }
3014 }
3015
3016 Newz (0, coro, 1, struct coro);
3017 coro->args = newAV ();
3018 coro->flags = CF_NEW;
3019
3020 if (coro_first) coro_first->prev = coro;
3021 coro->next = coro_first;
3022 coro_first = coro;
3023
3024 coro->hv = hv = newHV ();
3025 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3026 mg->mg_flags |= MGf_DUP;
3027 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
3028
3029 if (items > 1)
3030 {
3031 av_extend (coro->args, items - 1 + ix - 1);
3032
3033 if (ix)
3034 {
3035 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3036 cb = (SV *)cv_coro_run;
3037 }
3038
3039 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3040
3041 for (i = 2; i < items; i++)
3042 av_push (coro->args, newSVsv (ST (i)));
3043 }
3044}
3045 OUTPUT:
3046 RETVAL 3715 RETVAL
3047 3716
3048void 3717void
3049transfer (...) 3718transfer (...)
3050 PROTOTYPE: $$ 3719 PROTOTYPE: $$
3051 CODE: 3720 CODE:
3052 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3721 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3053
3054bool
3055_destroy (SV *coro_sv)
3056 CODE:
3057 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3058 OUTPUT:
3059 RETVAL
3060
3061void
3062_exit (int code)
3063 PROTOTYPE: $
3064 CODE:
3065 _exit (code);
3066 3722
3067SV * 3723SV *
3068clone (Coro::State coro) 3724clone (Coro::State coro)
3069 CODE: 3725 CODE:
3070{ 3726{
3125void 3781void
3126list () 3782list ()
3127 PROTOTYPE: 3783 PROTOTYPE:
3128 PPCODE: 3784 PPCODE:
3129{ 3785{
3130 struct coro *coro; 3786 struct coro *coro;
3131 for (coro = coro_first; coro; coro = coro->next) 3787 for (coro = coro_first; coro; coro = coro->next)
3132 if (coro->hv) 3788 if (coro->hv)
3133 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv))); 3789 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
3134} 3790}
3135 3791
3140 CODE: 3796 CODE:
3141{ 3797{
3142 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3798 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3143 { 3799 {
3144 struct coro *current = SvSTATE_current; 3800 struct coro *current = SvSTATE_current;
3801 struct CoroSLF slf_save;
3145 3802
3146 if (current != coro) 3803 if (current != coro)
3147 { 3804 {
3148 PUTBACK; 3805 PUTBACK;
3149 save_perl (aTHX_ current); 3806 save_perl (aTHX_ current);
3150 load_perl (aTHX_ coro); 3807 load_perl (aTHX_ coro);
3808 /* the coro is most likely in an active SLF call.
3809 * while not strictly required (the code we execute is
3810 * not allowed to call any SLF functions), it's cleaner
3811 * to reinitialise the slf_frame and restore it later.
3812 * This might one day allow us to actually do SLF calls
3813 * from code executed here.
3814 */
3815 slf_save = slf_frame;
3816 slf_frame.prepare = 0;
3151 SPAGAIN; 3817 SPAGAIN;
3152 } 3818 }
3153 3819
3154 PUSHSTACK; 3820 PUSHSTACK;
3155 3821
3165 SPAGAIN; 3831 SPAGAIN;
3166 3832
3167 if (current != coro) 3833 if (current != coro)
3168 { 3834 {
3169 PUTBACK; 3835 PUTBACK;
3836 slf_frame = slf_save;
3170 save_perl (aTHX_ coro); 3837 save_perl (aTHX_ coro);
3171 load_perl (aTHX_ current); 3838 load_perl (aTHX_ current);
3172 SPAGAIN; 3839 SPAGAIN;
3173 } 3840 }
3174 } 3841 }
3179 PROTOTYPE: $ 3846 PROTOTYPE: $
3180 ALIAS: 3847 ALIAS:
3181 is_ready = CF_READY 3848 is_ready = CF_READY
3182 is_running = CF_RUNNING 3849 is_running = CF_RUNNING
3183 is_new = CF_NEW 3850 is_new = CF_NEW
3184 is_destroyed = CF_DESTROYED 3851 is_destroyed = CF_ZOMBIE
3852 is_zombie = CF_ZOMBIE
3185 is_suspended = CF_SUSPENDED 3853 is_suspended = CF_SUSPENDED
3186 CODE: 3854 CODE:
3187 RETVAL = boolSV (coro->flags & ix); 3855 RETVAL = boolSV (coro->flags & ix);
3188 OUTPUT: 3856 OUTPUT:
3189 RETVAL 3857 RETVAL
3190 3858
3191void 3859void
3192throw (Coro::State self, SV *throw = &PL_sv_undef) 3860throw (SV *self, SV *exception = &PL_sv_undef)
3193 PROTOTYPE: $;$ 3861 PROTOTYPE: $;$
3194 CODE: 3862 CODE:
3195{ 3863{
3864 struct coro *coro = SvSTATE (self);
3196 struct coro *current = SvSTATE_current; 3865 struct coro *current = SvSTATE_current;
3197 SV **throwp = self == current ? &CORO_THROW : &self->except; 3866 SV **exceptionp = coro == current ? &CORO_THROW : &coro->except;
3198 SvREFCNT_dec (*throwp); 3867 SvREFCNT_dec (*exceptionp);
3199 SvGETMAGIC (throw); 3868 SvGETMAGIC (exception);
3200 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3869 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3870
3871 api_ready (aTHX_ self);
3201} 3872}
3202 3873
3203void 3874void
3204api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3875api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3205 PROTOTYPE: $;$ 3876 PROTOTYPE: $;$
3260 3931
3261void 3932void
3262cancel (Coro::State self) 3933cancel (Coro::State self)
3263 CODE: 3934 CODE:
3264 coro_state_destroy (aTHX_ self); 3935 coro_state_destroy (aTHX_ self);
3265 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3266
3267 3936
3268SV * 3937SV *
3269enable_times (int enabled = enable_times) 3938enable_times (int enabled = enable_times)
3270 CODE: 3939 CODE:
3271{ 3940{
3284 3953
3285void 3954void
3286times (Coro::State self) 3955times (Coro::State self)
3287 PPCODE: 3956 PPCODE:
3288{ 3957{
3289 struct coro *current = SvSTATE (coro_current); 3958 struct coro *current = SvSTATE (coro_current);
3290 3959
3291 if (expect_false (current == self)) 3960 if (ecb_expect_false (current == self))
3292 { 3961 {
3293 coro_times_update (); 3962 coro_times_update ();
3294 coro_times_add (SvSTATE (coro_current)); 3963 coro_times_add (SvSTATE (coro_current));
3295 } 3964 }
3296 3965
3297 EXTEND (SP, 2); 3966 EXTEND (SP, 2);
3298 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9))); 3967 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3299 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3968 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3300 3969
3301 if (expect_false (current == self)) 3970 if (ecb_expect_false (current == self))
3302 coro_times_sub (SvSTATE (coro_current)); 3971 coro_times_sub (SvSTATE (coro_current));
3303} 3972}
3304 3973
3974void
3975swap_sv (Coro::State coro, SV *sva, SV *svb)
3976 CODE:
3977{
3978 struct coro *current = SvSTATE_current;
3979 AV *swap_sv;
3980 int i;
3981
3982 sva = SvRV (sva);
3983 svb = SvRV (svb);
3984
3985 if (current == coro)
3986 SWAP_SVS_LEAVE (current);
3987
3988 if (!coro->swap_sv)
3989 coro->swap_sv = newAV ();
3990
3991 swap_sv = coro->swap_sv;
3992
3993 for (i = AvFILLp (swap_sv) - 1; i >= 0; i -= 2)
3994 {
3995 SV *a = AvARRAY (swap_sv)[i ];
3996 SV *b = AvARRAY (swap_sv)[i + 1];
3997
3998 if (a == sva && b == svb)
3999 {
4000 SvREFCNT_dec_NN (a);
4001 SvREFCNT_dec_NN (b);
4002
4003 for (; i <= AvFILLp (swap_sv) - 2; i++)
4004 AvARRAY (swap_sv)[i] = AvARRAY (swap_sv)[i + 2];
4005
4006 AvFILLp (swap_sv) -= 2;
4007
4008 goto removed;
4009 }
4010 }
4011
4012 av_push (swap_sv, SvREFCNT_inc_NN (sva));
4013 av_push (swap_sv, SvREFCNT_inc_NN (svb));
4014
4015 removed:
4016
4017 if (current == coro)
4018 SWAP_SVS_ENTER (current);
4019}
4020
4021
3305MODULE = Coro::State PACKAGE = Coro 4022MODULE = Coro::State PACKAGE = Coro
3306 4023
3307BOOT: 4024BOOT:
3308{ 4025{
4026 if (SVt_LAST > 32)
4027 croak ("Coro internal error: SVt_LAST > 32, swap_sv might need adjustment");
4028
3309 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 4029 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3310 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 4030 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3311 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 4031 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3312 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3313 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 4032 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3314 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 4033 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3315 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 4034 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3316 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 4035 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3317 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 4036 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3318 4037
3319 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 4038 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3320 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 4039 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3321 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 4040 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3322 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 4041 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3323 4042
3324 coro_stash = gv_stashpv ("Coro", TRUE); 4043 coro_stash = gv_stashpv ("Coro", TRUE);
3325 4044
3326 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 4045 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3327 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 4046 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3340 coroapi.ready = api_ready; 4059 coroapi.ready = api_ready;
3341 coroapi.is_ready = api_is_ready; 4060 coroapi.is_ready = api_is_ready;
3342 coroapi.nready = coro_nready; 4061 coroapi.nready = coro_nready;
3343 coroapi.current = coro_current; 4062 coroapi.current = coro_current;
3344 4063
4064 coroapi.enterleave_hook = api_enterleave_hook;
4065 coroapi.enterleave_unhook = api_enterleave_unhook;
4066 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4067
3345 /*GCoroAPI = &coroapi;*/ 4068 /*GCoroAPI = &coroapi;*/
3346 sv_setiv (sv, (IV)&coroapi); 4069 sv_setiv (sv, (IV)&coroapi);
3347 SvREADONLY_on (sv); 4070 SvREADONLY_on (sv);
3348 } 4071 }
3349} 4072}
3350 4073
4074SV *
4075async (...)
4076 PROTOTYPE: &@
4077 CODE:
4078 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
4079 api_ready (aTHX_ RETVAL);
4080 OUTPUT:
4081 RETVAL
4082
4083void
4084_destroy (Coro::State coro)
4085 CODE:
4086 /* used by the manager thread */
4087 coro_state_destroy (aTHX_ coro);
4088
4089void
4090on_destroy (Coro::State coro, SV *cb)
4091 CODE:
4092 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
4093
4094void
4095join (...)
4096 CODE:
4097 CORO_EXECUTE_SLF_XS (slf_init_join);
4098
3351void 4099void
3352terminate (...) 4100terminate (...)
3353 CODE: 4101 CODE:
3354 CORO_EXECUTE_SLF_XS (slf_init_terminate); 4102 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3355 4103
3356void 4104void
4105cancel (...)
4106 CODE:
4107 CORO_EXECUTE_SLF_XS (slf_init_cancel);
4108
4109int
4110safe_cancel (Coro::State self, ...)
4111 C_ARGS: aTHX_ self, &ST (1), items - 1
4112
4113void
3357schedule (...) 4114schedule (...)
3358 CODE: 4115 CODE:
3359 CORO_EXECUTE_SLF_XS (slf_init_schedule); 4116 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3360 4117
3361void 4118void
3380 4137
3381void 4138void
3382_set_current (SV *current) 4139_set_current (SV *current)
3383 PROTOTYPE: $ 4140 PROTOTYPE: $
3384 CODE: 4141 CODE:
3385 SvREFCNT_dec (SvRV (coro_current)); 4142 SvREFCNT_dec_NN (SvRV (coro_current));
3386 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 4143 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3387 4144
3388void 4145void
3389_set_readyhook (SV *hook) 4146_set_readyhook (SV *hook)
3390 PROTOTYPE: $ 4147 PROTOTYPE: $
3393 SvGETMAGIC (hook); 4150 SvGETMAGIC (hook);
3394 if (SvOK (hook)) 4151 if (SvOK (hook))
3395 { 4152 {
3396 coro_readyhook = newSVsv (hook); 4153 coro_readyhook = newSVsv (hook);
3397 CORO_READYHOOK = invoke_sv_ready_hook_helper; 4154 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3398 CORO_READYHOOK ();
3399 } 4155 }
3400 else 4156 else
3401 { 4157 {
3402 coro_readyhook = 0; 4158 coro_readyhook = 0;
3403 CORO_READYHOOK = 0; 4159 CORO_READYHOOK = 0;
3473 for (i = 1; i < items; ++i) 4229 for (i = 1; i < items; ++i)
3474 av_push (av, SvREFCNT_inc_NN (ST (i))); 4230 av_push (av, SvREFCNT_inc_NN (ST (i)));
3475 4231
3476 if ((SV *)hv == &PL_sv_undef) 4232 if ((SV *)hv == &PL_sv_undef)
3477 { 4233 {
3478 PUSHMARK (SP); 4234 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3479 EXTEND (SP, 2);
3480 PUSHs (sv_Coro);
3481 PUSHs ((SV *)cv_pool_handler);
3482 PUTBACK;
3483 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3484 SPAGAIN;
3485
3486 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 4235 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
4236 SvREFCNT_dec_NN (sv);
3487 } 4237 }
3488 4238
3489 { 4239 {
3490 struct coro *coro = SvSTATE_hv (hv); 4240 struct coro *coro = SvSTATE_hv (hv);
3491 4241
3498 api_ready (aTHX_ (SV *)hv); 4248 api_ready (aTHX_ (SV *)hv);
3499 4249
3500 if (GIMME_V != G_VOID) 4250 if (GIMME_V != G_VOID)
3501 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 4251 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3502 else 4252 else
3503 SvREFCNT_dec (hv); 4253 SvREFCNT_dec_NN (hv);
3504} 4254}
3505 4255
3506SV * 4256SV *
3507rouse_cb () 4257rouse_cb ()
3508 PROTOTYPE: 4258 PROTOTYPE:
3523 on_leave = 1 4273 on_leave = 1
3524 PROTOTYPE: & 4274 PROTOTYPE: &
3525 CODE: 4275 CODE:
3526{ 4276{
3527 struct coro *coro = SvSTATE_current; 4277 struct coro *coro = SvSTATE_current;
3528 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 4278 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3529 4279
3530 block = s_get_cv_croak (block); 4280 block = s_get_cv_croak (block);
3531 4281
3532 if (!*avp) 4282 if (!*avp)
3533 *avp = newAV (); 4283 *avp = newAV ();
3553 4303
3554SV * 4304SV *
3555new (SV *klass, SV *count = 0) 4305new (SV *klass, SV *count = 0)
3556 CODE: 4306 CODE:
3557{ 4307{
3558 int semcnt = 1; 4308 int semcnt = 1;
3559 4309
3560 if (count) 4310 if (count)
3561 { 4311 {
3562 SvGETMAGIC (count); 4312 SvGETMAGIC (count);
3563 4313
3587 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]); 4337 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
3588 OUTPUT: 4338 OUTPUT:
3589 RETVAL 4339 RETVAL
3590 4340
3591void 4341void
3592up (SV *self, int adjust = 1) 4342up (SV *self)
3593 ALIAS:
3594 adjust = 1
3595 CODE: 4343 CODE:
4344 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), 1);
4345
4346void
4347adjust (SV *self, int adjust)
4348 CODE:
3596 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 4349 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), adjust);
3597 4350
3598void 4351void
3599down (...) 4352down (...)
3600 CODE: 4353 CODE:
3601 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 4354 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
3623 XSRETURN_NO; 4376 XSRETURN_NO;
3624} 4377}
3625 4378
3626void 4379void
3627waiters (SV *self) 4380waiters (SV *self)
3628 PPCODE: 4381 PPCODE:
3629{ 4382{
3630 AV *av = (AV *)SvRV (self); 4383 AV *av = (AV *)SvRV (self);
3631 int wcount = AvFILLp (av) + 1 - 1; 4384 int wcount = AvFILLp (av) + 1 - 1;
3632 4385
3633 if (GIMME_V == G_SCALAR) 4386 if (GIMME_V == G_SCALAR)
3642} 4395}
3643 4396
3644MODULE = Coro::State PACKAGE = Coro::SemaphoreSet 4397MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3645 4398
3646void 4399void
3647_may_delete (SV *sem, int count, int extra_refs) 4400_may_delete (SV *sem, int count, unsigned int extra_refs)
3648 PPCODE: 4401 PPCODE:
3649{ 4402{
3650 AV *av = (AV *)SvRV (sem); 4403 AV *av = (AV *)SvRV (sem);
3651 4404
3652 if (SvREFCNT ((SV *)av) == 1 + extra_refs 4405 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3653 && AvFILLp (av) == 0 /* no waiters, just count */ 4406 && AvFILLp (av) == 0 /* no waiters, just count */
3654 && SvIV (AvARRAY (av)[0]) == count) 4407 && SvIV (AvARRAY (av)[0]) == count)
3655 XSRETURN_YES; 4408 XSRETURN_YES;
3676 4429
3677void 4430void
3678broadcast (SV *self) 4431broadcast (SV *self)
3679 CODE: 4432 CODE:
3680{ 4433{
3681 AV *av = (AV *)SvRV (self); 4434 AV *av = (AV *)SvRV (self);
3682 coro_signal_wake (aTHX_ av, AvFILLp (av)); 4435 coro_signal_wake (aTHX_ av, AvFILLp (av));
3683} 4436}
3684 4437
3685void 4438void
3686send (SV *self) 4439send (SV *self)
3694 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */ 4447 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3695} 4448}
3696 4449
3697IV 4450IV
3698awaited (SV *self) 4451awaited (SV *self)
3699 CODE: 4452 CODE:
3700 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1; 4453 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3701 OUTPUT: 4454 OUTPUT:
3702 RETVAL 4455 RETVAL
3703 4456
3704 4457
3709 4462
3710void 4463void
3711_schedule (...) 4464_schedule (...)
3712 CODE: 4465 CODE:
3713{ 4466{
3714 static int incede; 4467 static int incede;
3715 4468
3716 api_cede_notself (aTHX); 4469 api_cede_notself (aTHX);
3717 4470
3718 ++incede; 4471 ++incede;
3719 while (coro_nready >= incede && api_cede (aTHX)) 4472 while (coro_nready >= incede && api_cede (aTHX))
3763 { 4516 {
3764 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4517 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3765 coro_old_pp_sselect = 0; 4518 coro_old_pp_sselect = 0;
3766 } 4519 }
3767 4520
4521MODULE = Coro::State PACKAGE = Coro::Util
3768 4522
4523void
4524_exit (int code)
4525 CODE:
4526 _exit (code);
4527
4528NV
4529time ()
4530 CODE:
4531 RETVAL = nvtime (aTHX);
4532 OUTPUT:
4533 RETVAL
4534
4535NV
4536gettimeofday ()
4537 PPCODE:
4538{
4539 UV tv [2];
4540 u2time (aTHX_ tv);
4541 EXTEND (SP, 2);
4542 PUSHs (sv_2mortal (newSVuv (tv [0])));
4543 PUSHs (sv_2mortal (newSVuv (tv [1])));
4544}
4545

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines